From a4256940da049f91bbbea5e53e469a59ea9c10f7 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Fri, 25 Oct 2013 21:20:58 +0200 Subject: Imported Upstream version 0.9.8.8 --- INSTALL | 8 +- Makefile.am | 5 +- Makefile.glib | 22 +- Makefile.in | 352 +- NEWS | 85 + TODO | 10 - aclocal.m4 | 625 +- autogen.sh | 24 + build-aux/compile | 10 +- build-aux/config.guess | 43 +- build-aux/config.sub | 77 +- build-aux/depcomp | 455 +- build-aux/install-sh | 14 +- build-aux/missing | 414 +- callouts/Makefile.in | 323 +- callouts/nm-dhcp-client-action.c | 26 +- callouts/nm-dispatcher-utils.c | 14 +- callouts/org.freedesktop.nm_dispatcher.service.in | 1 + callouts/tests/Makefile.in | 174 +- callouts/tests/test-dispatcher-envp.c | 22 +- cli/Makefile.in | 267 +- cli/completion/Makefile.in | 108 +- cli/src/Makefile.in | 203 +- cli/src/devices.c | 2 +- compile | 143 - config.guess | 1501 --- config.h.in | 3 + config.sub | 1705 ---- configure | 1226 +-- configure.ac | 85 +- data/Makefile.am | 23 +- data/Makefile.in | 130 +- data/NetworkManager-dispatcher.service.in | 11 + ...rkManager-wait-online-systemd-pre200.service.in | 13 + data/NetworkManager-wait-online.service.in | 4 +- data/NetworkManager.service.in | 3 +- depcomp | 630 -- docs/Makefile.am | 5 +- docs/Makefile.in | 271 +- docs/api/Makefile.am | 35 +- docs/api/Makefile.in | 664 +- docs/api/html/NetworkManager.devhelp2 | 28 +- docs/api/html/index.html | 40 +- docs/api/html/ix01.html | 10 +- docs/api/html/license.html | 10 +- docs/api/html/ref-dbus.html | 10 +- docs/api/html/ref-migrating.html | 74 +- docs/api/html/ref-settings.html | 84 +- docs/api/html/secrets-flags.html | 8 +- docs/api/html/spec.html | 95 +- docs/api/settings-spec.xml | 1604 ++++ docs/api/spec.html | 95 +- docs/api/version.xml | 2 +- docs/libnm-glib/Makefile.in | 207 +- docs/libnm-glib/html/NMAccessPoint.html | 377 +- docs/libnm-glib/html/NMActiveConnection.html | 251 +- docs/libnm-glib/html/NMClient.html | 1198 ++- docs/libnm-glib/html/NMDHCP4Config.html | 70 +- docs/libnm-glib/html/NMDHCP6Config.html | 70 +- docs/libnm-glib/html/NMDevice.html | 838 +- docs/libnm-glib/html/NMDeviceAdsl.html | 136 +- docs/libnm-glib/html/NMDeviceBond.html | 182 +- docs/libnm-glib/html/NMDeviceBridge.html | 182 +- docs/libnm-glib/html/NMDeviceBt.html | 164 +- docs/libnm-glib/html/NMDeviceEthernet.html | 173 +- docs/libnm-glib/html/NMDeviceInfiniband.html | 161 +- docs/libnm-glib/html/NMDeviceModem.html | 140 +- docs/libnm-glib/html/NMDeviceOlpcMesh.html | 196 +- docs/libnm-glib/html/NMDeviceVlan.html | 178 +- docs/libnm-glib/html/NMDeviceWifi.html | 338 +- docs/libnm-glib/html/NMDeviceWimax.html | 329 +- docs/libnm-glib/html/NMIP4Config.html | 120 +- docs/libnm-glib/html/NMIP6Config.html | 114 +- docs/libnm-glib/html/NMObject.html | 133 +- docs/libnm-glib/html/NMRemoteConnection.html | 140 +- docs/libnm-glib/html/NMRemoteSettings.html | 430 +- docs/libnm-glib/html/NMSecretAgent.html | 494 +- docs/libnm-glib/html/NMVPNConnection.html | 106 +- docs/libnm-glib/html/NMWimaxNsp.html | 246 +- docs/libnm-glib/html/annotation-glossary.html | 80 +- docs/libnm-glib/html/api-index-full.html | 94 +- docs/libnm-glib/html/ch02.html | 14 +- docs/libnm-glib/html/index.html | 14 +- docs/libnm-glib/html/index.sgml | 560 +- docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html | 189 +- docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html | 388 + .../html/libnm-glib-NMVpnPluginUiWidget.html | 382 - docs/libnm-glib/html/libnm-glib-nm-types.html | 6 +- .../html/libnm-glib-nm-vpn-plugin-utils.html | 96 +- docs/libnm-glib/html/libnm-glib.devhelp2 | 532 +- docs/libnm-glib/html/object-tree.html | 10 +- docs/libnm-glib/html/ref-overview.html | 10 +- docs/libnm-glib/libnm-glib-sections.txt | 507 +- docs/libnm-glib/tmpl/libnm_glib.sgml | 24 - docs/libnm-glib/tmpl/nm-access-point.sgml | 114 +- docs/libnm-glib/tmpl/nm-active-connection.sgml | 90 +- docs/libnm-glib/tmpl/nm-client.sgml | 316 +- docs/libnm-glib/tmpl/nm-device-adsl.sgml | 54 +- docs/libnm-glib/tmpl/nm-device-bond.sgml | 70 +- docs/libnm-glib/tmpl/nm-device-bridge.sgml | 70 +- docs/libnm-glib/tmpl/nm-device-bt.sgml | 72 +- docs/libnm-glib/tmpl/nm-device-ethernet.sgml | 76 +- docs/libnm-glib/tmpl/nm-device-infiniband.sgml | 62 +- docs/libnm-glib/tmpl/nm-device-modem.sgml | 54 +- docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml | 70 +- docs/libnm-glib/tmpl/nm-device-vlan.sgml | 72 +- docs/libnm-glib/tmpl/nm-device-wifi.sgml | 130 +- docs/libnm-glib/tmpl/nm-device-wimax.sgml | 128 +- docs/libnm-glib/tmpl/nm-device.sgml | 248 +- docs/libnm-glib/tmpl/nm-dhcp4-config.sgml | 12 +- docs/libnm-glib/tmpl/nm-dhcp6-config.sgml | 12 +- docs/libnm-glib/tmpl/nm-glib-marshal.sgml | 24 - docs/libnm-glib/tmpl/nm-ip4-config.sgml | 20 +- docs/libnm-glib/tmpl/nm-ip6-config.sgml | 18 +- docs/libnm-glib/tmpl/nm-object.sgml | 60 +- docs/libnm-glib/tmpl/nm-remote-connection.sgml | 36 +- docs/libnm-glib/tmpl/nm-remote-settings.sgml | 142 +- docs/libnm-glib/tmpl/nm-secret-agent.sgml | 148 +- docs/libnm-glib/tmpl/nm-vpn-connection.sgml | 38 +- .../tmpl/nm-vpn-plugin-ui-interface.sgml | 106 +- docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml | 16 +- docs/libnm-glib/tmpl/nm-vpn-plugin.sgml | 82 +- docs/libnm-glib/tmpl/nm-wimax-nsp.sgml | 58 +- docs/libnm-glib/version.xml | 2 +- docs/libnm-util/Makefile.in | 207 +- docs/libnm-util/html/NMConnection.html | 1362 +-- docs/libnm-util/html/NMSetting.html | 1042 ++- docs/libnm-util/html/NMSetting8021x.html | 2098 +++-- docs/libnm-util/html/NMSettingAdsl.html | 246 +- docs/libnm-util/html/NMSettingBluetooth.html | 137 +- docs/libnm-util/html/NMSettingBond.html | 283 +- docs/libnm-util/html/NMSettingBridge.html | 244 +- docs/libnm-util/html/NMSettingBridgePort.html | 164 +- docs/libnm-util/html/NMSettingCdma.html | 163 +- docs/libnm-util/html/NMSettingConnection.html | 588 +- docs/libnm-util/html/NMSettingGsm.html | 586 +- docs/libnm-util/html/NMSettingIP4Config.html | 1389 +-- docs/libnm-util/html/NMSettingIP6Config.html | 1439 +-- docs/libnm-util/html/NMSettingInfiniband.html | 134 +- docs/libnm-util/html/NMSettingOlpcMesh.html | 128 +- docs/libnm-util/html/NMSettingPPP.html | 441 +- docs/libnm-util/html/NMSettingPPPOE.html | 187 +- docs/libnm-util/html/NMSettingSerial.html | 172 +- docs/libnm-util/html/NMSettingVPN.html | 486 +- docs/libnm-util/html/NMSettingVlan.html | 515 +- docs/libnm-util/html/NMSettingWimax.html | 141 +- docs/libnm-util/html/NMSettingWired.html | 391 +- docs/libnm-util/html/NMSettingWireless.html | 565 +- .../libnm-util/html/NMSettingWirelessSecurity.html | 853 +- docs/libnm-util/html/annotation-glossary.html | 67 +- docs/libnm-util/html/api-index-full.html | 18 +- docs/libnm-util/html/ch01.html | 12 +- docs/libnm-util/html/index.html | 12 +- docs/libnm-util/html/index.sgml | 1154 +-- docs/libnm-util/html/libnm-util-nm-utils.html | 1314 +-- docs/libnm-util/html/libnm-util.devhelp2 | 1102 +-- docs/libnm-util/html/object-tree.html | 10 +- docs/libnm-util/libnm-util-sections.txt | 1062 +-- docs/libnm-util/tmpl/nm-connection.sgml | 228 +- docs/libnm-util/tmpl/nm-setting-8021x.sgml | 446 +- docs/libnm-util/tmpl/nm-setting-adsl.sgml | 108 +- docs/libnm-util/tmpl/nm-setting-bluetooth.sgml | 64 +- docs/libnm-util/tmpl/nm-setting-bond.sgml | 76 +- docs/libnm-util/tmpl/nm-setting-bridge-port.sgml | 66 +- docs/libnm-util/tmpl/nm-setting-bridge.sgml | 100 +- docs/libnm-util/tmpl/nm-setting-cdma.sgml | 78 +- docs/libnm-util/tmpl/nm-setting-connection.sgml | 164 +- docs/libnm-util/tmpl/nm-setting-gsm.sgml | 180 +- docs/libnm-util/tmpl/nm-setting-infiniband.sgml | 64 +- docs/libnm-util/tmpl/nm-setting-ip4-config.sgml | 336 +- docs/libnm-util/tmpl/nm-setting-ip6-config.sgml | 342 +- docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml | 64 +- docs/libnm-util/tmpl/nm-setting-ppp.sgml | 186 +- docs/libnm-util/tmpl/nm-setting-pppoe.sgml | 74 +- docs/libnm-util/tmpl/nm-setting-private.sgml | 6 +- docs/libnm-util/tmpl/nm-setting-serial.sgml | 82 +- docs/libnm-util/tmpl/nm-setting-vlan.sgml | 144 +- docs/libnm-util/tmpl/nm-setting-vpn.sgml | 124 +- docs/libnm-util/tmpl/nm-setting-wimax.sgml | 48 +- docs/libnm-util/tmpl/nm-setting-wired.sgml | 146 +- .../tmpl/nm-setting-wireless-security.sgml | 252 +- docs/libnm-util/tmpl/nm-setting-wireless.sgml | 182 +- docs/libnm-util/tmpl/nm-setting.sgml | 214 +- docs/libnm-util/tmpl/nm-utils.sgml | 210 +- docs/libnm-util/version.xml | 2 +- examples/C/Makefile.in | 267 +- examples/C/glib/Makefile.in | 199 +- examples/C/qt/Makefile.in | 194 +- examples/Makefile.in | 267 +- examples/dispatcher/Makefile.in | 104 +- examples/python/Makefile.in | 104 +- examples/ruby/Makefile.in | 104 +- examples/shell/Makefile.in | 104 +- gtk-doc.make | 82 +- include/Makefile.in | 159 +- include/NetworkManager.h | 21 + install-sh | 520 -- introspection/Makefile.in | 104 +- introspection/nm-active-connection.xml | 6 +- introspection/nm-manager.xml | 72 + introspection/nm-secret-agent.xml | 19 +- introspection/nm-settings.xml | 16 +- libnm-glib/Makefile.am | 2 +- libnm-glib/Makefile.in | 323 +- libnm-glib/libnm-glib.ver | 6 + libnm-glib/nm-client.c | 322 +- libnm-glib/nm-client.h | 20 + libnm-glib/nm-device-wimax.c | 2 +- libnm-glib/nm-device.c | 105 +- libnm-glib/nm-dhcp4-config.c | 3 +- libnm-glib/nm-dhcp6-config.c | 3 +- libnm-glib/nm-ip6-config.c | 6 +- libnm-glib/nm-object.c | 18 +- libnm-glib/nm-remote-connection.c | 3 +- libnm-glib/nm-remote-settings.c | 6 +- libnm-glib/nm-secret-agent.c | 6 +- libnm-glib/nm-secret-agent.h | 14 +- libnm-glib/tests/Makefile.in | 174 +- libnm-util/Makefile.in | 332 +- libnm-util/crypto.c | 6 + libnm-util/nm-connection.c | 64 +- libnm-util/nm-setting-8021x.c | 137 +- libnm-util/nm-setting-bluetooth.c | 1 + libnm-util/nm-setting-bond.c | 11 +- libnm-util/nm-setting-connection.c | 3 +- libnm-util/nm-setting-gsm.c | 28 +- libnm-util/nm-setting-ip4-config.c | 27 + libnm-util/nm-setting-ip6-config.c | 36 +- libnm-util/nm-setting-pppoe.c | 13 + libnm-util/nm-setting-vlan.c | 6 +- libnm-util/nm-setting-wired.c | 7 +- libnm-util/nm-setting-wireless-security.c | 46 +- libnm-util/nm-setting-wireless.c | 16 +- libnm-util/nm-setting.c | 14 +- libnm-util/nm-utils.c | 16 +- libnm-util/tests/Makefile.in | 293 +- libnm-util/tests/certs/Makefile.in | 104 +- libnm-util/tests/test-general.c | 24 + ltmain.sh | 9636 -------------------- m4/gtk-doc.m4 | 6 +- man/Makefile.am | 18 +- man/Makefile.in | 153 +- man/nm-online.1.in | 8 +- man/nmcli.1.in | 2 +- missing | 376 - po/POTFILES.in | 1 + po/gl.po | 2 +- po/hr.po | 2 +- po/ja.po | 4515 +++++++-- po/or.po | 2 +- po/pl.po | 1090 ++- policy/Makefile.in | 95 +- src/Makefile.am | 18 +- src/Makefile.in | 370 +- src/bluez-manager/Makefile.am | 17 +- src/bluez-manager/Makefile.in | 279 +- src/bluez-manager/nm-bluez-adapter.c | 397 - src/bluez-manager/nm-bluez-adapter.h | 69 - src/bluez-manager/nm-bluez-common.h | 17 + src/bluez-manager/nm-bluez-device.c | 728 +- src/bluez-manager/nm-bluez-device.h | 19 + src/bluez-manager/nm-bluez-manager.c | 330 +- src/bluez-manager/nm-bluez-manager.h | 1 + src/bluez-manager/nm-bluez4-adapter.c | 397 + src/bluez-manager/nm-bluez4-adapter.h | 69 + src/bluez-manager/nm-bluez4-manager.c | 386 + src/dhcp-manager/Makefile.in | 284 +- src/dhcp-manager/nm-dhcp-client.c | 49 +- src/dhcp-manager/nm-dhcp-dhclient-utils.c | 1 + src/dhcp-manager/nm-dhcp-dhclient.c | 104 +- src/dhcp-manager/nm-dhcp-manager.c | 11 +- src/dhcp-manager/tests/Makefile.in | 174 +- src/dhcp-manager/tests/test-dhcp-dhclient.c | 5 + src/dns-manager/Makefile.in | 205 +- src/dns-manager/nm-dns-dnsmasq.c | 128 +- src/dns-manager/nm-dns-manager.c | 1 - src/dnsmasq-manager/Makefile.in | 205 +- src/firewall-manager/Makefile.in | 205 +- src/generated/Makefile.in | 205 +- src/generated/nm-enum-types.c | 410 +- src/generated/nm-enum-types.h | 60 +- src/generated/nm-marshal.c | 47 +- src/generated/nm-marshal.h | 14 +- src/ip6-manager/Makefile.in | 205 +- src/ip6-manager/nm-ip6-manager.c | 57 +- src/logging/Makefile.in | 205 +- src/logging/nm-logging.c | 3 +- src/logging/nm-logging.h | 1 + src/main.c | 36 +- src/modem-manager/Makefile.in | 205 +- src/modem-manager/nm-modem-broadband.c | 64 +- src/modem-manager/nm-modem-manager.c | 14 +- src/nm-activation-request.c | 2 + src/nm-connection-provider.c | 20 + src/nm-connection-provider.h | 31 + src/nm-connectivity.c | 298 +- src/nm-connectivity.h | 25 +- src/nm-device-bt.c | 167 +- src/nm-device-bt.h | 5 +- src/nm-device-ethernet.c | 17 +- src/nm-device-wifi.c | 39 +- src/nm-device-wired.c | 38 +- src/nm-device.c | 125 +- src/nm-dispatcher.c | 2 +- src/nm-manager-auth.c | 4 + src/nm-manager.c | 424 +- src/nm-manager.h | 3 + src/nm-netlink-utils.c | 2 +- src/nm-policy-hosts.c | 2 + src/nm-policy.c | 637 +- src/nm-policy.h | 29 +- src/nm-system.c | 10 + src/org.freedesktop.NetworkManager.conf | 1 + src/posix-signals/Makefile.in | 205 +- src/ppp-manager/Makefile.in | 223 +- src/ppp-manager/nm-ppp-manager.c | 3 +- src/settings/Makefile.in | 286 +- src/settings/nm-agent-manager.c | 24 +- src/settings/nm-secret-agent.c | 20 +- src/settings/nm-settings-connection.c | 23 +- src/settings/nm-settings.c | 39 +- src/settings/plugins/Makefile.in | 267 +- src/settings/plugins/example/Makefile.in | 205 +- src/settings/plugins/ifcfg-rh/Makefile.in | 303 +- src/settings/plugins/ifcfg-rh/reader.c | 51 +- src/settings/plugins/ifcfg-rh/tests/Makefile.in | 290 +- .../ifcfg-rh/tests/network-scripts/Makefile.am | 2 + .../ifcfg-rh/tests/network-scripts/Makefile.in | 108 +- .../network-scripts/ifcfg-test-bridge-missing-stp | 5 + .../tests/network-scripts/ifcfg-test-vlan-physdev | 6 + .../network-scripts/route6-test-wired-ipv6-manual | 3 + .../plugins/ifcfg-rh/tests/test-ifcfg-rh.c | 254 + src/settings/plugins/ifcfg-rh/writer.c | 10 +- src/settings/plugins/ifcfg-suse/Makefile.in | 208 +- src/settings/plugins/ifnet/Makefile.in | 301 +- src/settings/plugins/ifnet/tests/Makefile.in | 174 +- src/settings/plugins/ifupdown/Makefile.in | 301 +- src/settings/plugins/ifupdown/plugin.c | 116 +- src/settings/plugins/ifupdown/tests/Makefile.in | 174 +- src/settings/plugins/keyfile/Makefile.in | 283 +- src/settings/plugins/keyfile/reader.c | 34 +- src/settings/plugins/keyfile/tests/Makefile.in | 289 +- .../plugins/keyfile/tests/keyfiles/Makefile.am | 3 +- .../plugins/keyfile/tests/keyfiles/Makefile.in | 109 +- .../tests/keyfiles/Test_Missing_Vlan_Setting | 11 + src/settings/plugins/keyfile/tests/test-keyfile.c | 31 +- src/settings/plugins/keyfile/utils.c | 1 + src/settings/plugins/keyfile/writer.c | 12 +- src/settings/tests/Makefile.in | 174 +- src/supplicant-manager/Makefile.in | 283 +- src/supplicant-manager/nm-supplicant-config.c | 2 +- src/supplicant-manager/nm-supplicant-manager.c | 4 +- src/supplicant-manager/tests/Makefile.in | 174 +- src/tests/Makefile.in | 176 +- src/vpn-manager/Makefile.in | 205 +- src/wifi/Makefile.in | 205 +- src/wifi/wifi-utils-nl80211.c | 1 + src/wimax/Makefile.in | 208 +- test/Makefile.in | 202 +- test/nm-online.c | 2 +- tools/Makefile.in | 191 +- vapi/Makefile.am | 12 +- vapi/Makefile.in | 116 +- 363 files changed, 40429 insertions(+), 40994 deletions(-) create mode 100755 autogen.sh delete mode 100755 compile delete mode 100755 config.guess delete mode 100755 config.sub create mode 100644 data/NetworkManager-dispatcher.service.in create mode 100644 data/NetworkManager-wait-online-systemd-pre200.service.in delete mode 100755 depcomp create mode 100644 docs/api/settings-spec.xml create mode 100644 docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html delete mode 100644 docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html delete mode 100644 docs/libnm-glib/tmpl/libnm_glib.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-glib-marshal.sgml delete mode 100755 install-sh delete mode 100755 ltmain.sh delete mode 100755 missing delete mode 100644 src/bluez-manager/nm-bluez-adapter.c delete mode 100644 src/bluez-manager/nm-bluez-adapter.h create mode 100644 src/bluez-manager/nm-bluez4-adapter.c create mode 100644 src/bluez-manager/nm-bluez4-adapter.h create mode 100644 src/bluez-manager/nm-bluez4-manager.c create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-missing-stp create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-physdev create mode 100644 src/settings/plugins/keyfile/tests/keyfiles/Test_Missing_Vlan_Setting diff --git a/INSTALL b/INSTALL index a1e89e18..007e9396 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, @@ -309,9 +309,10 @@ causes the specified `gcc' to be used as the C compiler (unless it is overridden in the site shell script). Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: +an Autoconf limitation. Until the limitation is lifted, you can use +this workaround: - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== @@ -367,4 +368,3 @@ operates. `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. - diff --git a/Makefile.am b/Makefile.am index d9a5896b..89a338b0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,11 +24,12 @@ EXTRA_DIST = \ intltool-extract.in \ intltool-merge.in \ intltool-update.in \ - Makefile.glib + Makefile.glib \ + autogen.sh DISTCHECK_CONFIGURE_FLAGS = \ --with-tests=yes \ - --with-docs=yes \ + --enable-gtk-doc \ --enable-more-warnings=yes \ --with-udev-dir=$$dc_install_base/lib/udev \ --with-wext=no \ diff --git a/Makefile.glib b/Makefile.glib index 951ce6f8..626b946c 100644 --- a/Makefile.glib +++ b/Makefile.glib @@ -8,7 +8,7 @@ _GLIB_DISTCLEANFILES = _GLIB_V_GEN = $(_glib_v_gen_$(V)) _glib_v_gen_ = $(_glib_v_gen_$(AM_DEFAULT_VERBOSITY)) -_glib_v_gen_0 = @echo " GEN " $(subst .stamp,,$@); +_glib_v_gen_0 = @echo " GEN " $(subst .stamp,,$@); ### glib-genmarshal @@ -22,8 +22,8 @@ _glib_marshal_sources = $(filter-out %.h,$(filter-out $(GLIB_GENERATED),$($(_gli define _glib_make_genmarshal_rules $(if $(_glib_marshal_sources),,$(error Need to define $(_glib_marshal_sources_var) for $(1).[ch])) -$(1).list.stamp: $(_glib_marshal_sources) - $$(_GLIB_V_GEN) LC_ALL=C sed -ne 's/.*_$(_glib_marshal_prefix)_\([_A-Z]*\).*/\1/p' $$^ | sort -u | sed -e 's/__/:/' -e 's/_/,/g' > $(1).list.tmp && \ +$(1).list.stamp: $(_glib_marshal_sources) Makefile + $$(_GLIB_V_GEN) LC_ALL=C sed -ne 's/.*_$(_glib_marshal_prefix)_\([_A-Z]*\).*/\1/p' $$(filter-out Makefile, $$^) | sort -u | sed -e 's/__/:/' -e 's/_/,/g' > $(1).list.tmp && \ (cmp -s $(1).list.tmp $(1).list || cp $(1).list.tmp $(1).list) && \ rm -f $(1).list.tmp && \ echo timestamp > $$@ @@ -67,7 +67,7 @@ _glib_enum_types_h_sources = $(filter %.h,$(_glib_enum_types_sources)) define _glib_make_mkenums_rules $(if $(_glib_enum_types_sources),,$(error Need to define $(_glib_enum_types_sources_var) for $(1).[ch])) -$(1).h.stamp: $(_glib_enum_types_h_sources) +$(1).h.stamp: $(_glib_enum_types_h_sources) Makefile $$(_GLIB_V_GEN) $$(GLIB_MKENUMS) \ --fhead "/* Generated by glib-mkenums. Do not edit */\n\n#ifndef $(_glib_enum_types_guard)\n#define $(_glib_enum_types_guard)\n\n" \ $$(GLIB_MKENUMS_H_FLAGS) \ @@ -75,7 +75,7 @@ $(1).h.stamp: $(_glib_enum_types_h_sources) --fhead "#include \n\nG_BEGIN_DECLS\n" \ --vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type ())\n" \ --ftail "G_END_DECLS\n\n#endif /* $(_glib_enum_types_guard) */" \ - $$^ > $(1).h.tmp && \ + $$(filter-out Makefile, $$^) > $(1).h.tmp && \ (cmp -s $(1).h.tmp $(1).h || cp $(1).h.tmp $(1).h) && \ rm -f $(1).h.tmp && \ echo timestamp > $$@ @@ -83,16 +83,16 @@ $(1).h.stamp: $(_glib_enum_types_h_sources) $(1).h: $(1).h.stamp @true -$(1).c.stamp: $(_glib_enum_types_h_sources) +$(1).c.stamp: $(_glib_enum_types_h_sources) Makefile $$(_GLIB_V_GEN) $$(GLIB_MKENUMS) \ --fhead "/* Generated by glib-mkenums. Do not edit */\n\n#include \"$(notdir $(1)).h\"\n" \ $$(GLIB_MKENUMS_C_FLAGS) \ $$($(_glib_enum_types_prefix)_MKENUMS_C_FLAGS) \ - --fhead "$$(foreach f,$$(^F),\n#include \"$$(f)\")\n\n" \ + --fhead "$$(foreach f,$$(filter-out Makefile,$$(^F)),\n#include \"$$(f)\")\n\n" \ --vhead "GType\n@enum_name@_get_type (void)\n{\n static volatile gsize g_define_type_id__volatile = 0;\n\n if (g_once_init_enter (&g_define_type_id__volatile))\n {\n static const G@Type@Value values[] = {\n" \ --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" },\n" \ --vtail " { 0, NULL, NULL }\n };\n GType g_define_type_id =\n g_@type@_register_static (g_intern_static_string (\"@EnumName@\"), values);\n g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);\n }\n\n return g_define_type_id__volatile;\n}\n" \ - $$^ > $(1).c.tmp && \ + $$(filter-out Makefile, $$^) > $(1).c.tmp && \ (cmp -s $(1).c.tmp $(1).c || cp $(1).c.tmp $(1).c) && \ rm -f $(1).c.tmp && \ echo timestamp > $$@ @@ -121,13 +121,13 @@ _glib_enums_xml_namespace = $(subst .enums.xml,,$(notdir $(1))) define _glib_make_enums_xml_rule $(if $(_glib_enums_xml_sources),,$(error Need to define $(_glib_enums_xml_sources_var) for $(1))) -$(1): $(_glib_enums_xml_sources) - $$(_GLIB_V_GEN) $$(GLIB_MKENUMS) --comments '' --fhead "" --vhead " <@type@ id='$(_glib_enums_xml_namespace).@EnumName@'>" --vprod " " --vtail " " --ftail "" $$^ > $$@.tmp && mv $$@.tmp $$@ +$(1): $(_glib_enums_xml_sources) Makefile + $$(_GLIB_V_GEN) $$(GLIB_MKENUMS) --comments '' --fhead "" --vhead " <@type@ id='$(_glib_enums_xml_namespace).@EnumName@'>" --vprod " " --vtail " " --ftail "" $$(filter-out Makefile, $$^) > $$@.tmp && mv $$@.tmp $$@ endef _GLIB_V_CHECK = $(_glib_v_check_$(V)) _glib_v_check_ = $(_glib_v_check_$(AM_DEFAULT_VERBOSITY)) -_glib_v_check_0 = @echo " CHECK " $(subst .valid,.xml,$@); +_glib_v_check_0 = @echo " CHECK " $(subst .valid,.xml,$@); define _glib_make_schema_validate_rule $(subst .xml,.valid,$(1)): $(_GLIB_ENUMS_XML_GENERATED) $(1) diff --git a/Makefile.in b/Makefile.in index 6a80b83c..b5970f72 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,22 +79,29 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/NetworkManager.pc.in \ - $(srcdir)/config.h.in $(top_srcdir)/configure \ - $(top_srcdir)/initscript/Arch/networkmanager.in \ - $(top_srcdir)/initscript/Debian/NetworkManager.in \ - $(top_srcdir)/initscript/Mandriva/networkmanager.in \ +DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in \ $(top_srcdir)/initscript/RedHat/NetworkManager.in \ - $(top_srcdir)/initscript/SUSE/networkmanager.in \ + $(top_srcdir)/initscript/Debian/NetworkManager.in \ $(top_srcdir)/initscript/Slackware/rc.networkmanager.in \ + $(top_srcdir)/initscript/SUSE/networkmanager.in \ + $(top_srcdir)/initscript/Arch/networkmanager.in \ + $(top_srcdir)/initscript/paldo/NetworkManager.in \ + $(top_srcdir)/initscript/Mandriva/networkmanager.in \ $(top_srcdir)/initscript/linexa/networkmanager.in \ - $(top_srcdir)/initscript/paldo/NetworkManager.in ABOUT-NLS \ - AUTHORS COPYING ChangeLog INSTALL NEWS TODO build-aux/compile \ - build-aux/config.guess build-aux/config.rpath \ - build-aux/config.sub build-aux/depcomp build-aux/install-sh \ - build-aux/ltmain.sh build-aux/missing compile config.guess \ - config.sub depcomp install-sh ltmain.sh missing + $(srcdir)/NetworkManager.pc.in ABOUT-NLS COPYING TODO \ + build-aux/compile build-aux/config.guess \ + build-aux/config.rpath build-aux/config.sub build-aux/depcomp \ + build-aux/install-sh build-aux/missing build-aux/ltmain.sh \ + $(top_srcdir)/build-aux/compile \ + $(top_srcdir)/build-aux/config.guess \ + $(top_srcdir)/build-aux/config.rpath \ + $(top_srcdir)/build-aux/config.sub \ + $(top_srcdir)/build-aux/install-sh \ + $(top_srcdir)/build-aux/ltmain.sh \ + $(top_srcdir)/build-aux/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/gettext.m4 \ @@ -95,21 +129,28 @@ CONFIG_CLEAN_FILES = initscript/RedHat/NetworkManager \ initscript/Mandriva/networkmanager \ initscript/linexa/networkmanager NetworkManager.pc CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -146,11 +187,33 @@ am__installdirs = "$(DESTDIR)$(pkgconfigdir)" DATA = $(pkgconfig_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) @@ -161,6 +224,7 @@ am__remove_distdir = \ && rm -rf "$(distdir)" \ || { sleep 5 && rm -rf "$(distdir)"; }; \ else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -188,6 +252,7 @@ am__relativize = \ reldir="$$dir2" GZIP_ENV = --best DIST_ARCHIVES = $(distdir).tar.bz2 +DIST_TARGETS = dist-bzip2 distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -333,7 +398,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PKGCONFIG_PATH = @PKGCONFIG_PATH@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -348,6 +412,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@ +SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@ SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@ SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@ SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@ @@ -453,11 +519,12 @@ EXTRA_DIST = \ intltool-extract.in \ intltool-merge.in \ intltool-update.in \ - Makefile.glib + Makefile.glib \ + autogen.sh DISTCHECK_CONFIGURE_FLAGS = \ --with-tests=yes \ - --with-docs=yes \ + --enable-gtk-doc \ --enable-more-warnings=yes \ --with-udev-dir=$$dc_install_base/lib/udev \ --with-wext=no \ @@ -574,22 +641,25 @@ uninstall-pkgconfigDATA: dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -604,57 +674,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -670,12 +695,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -687,15 +707,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -704,9 +720,28 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -774,39 +809,35 @@ distdir: $(DISTFILES) || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + $(am__post_remove_distdir) dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__remove_distdir) - -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) + $(am__post_remove_distdir) dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -817,8 +848,6 @@ distcheck: dist GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.lz*) \ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ @@ -830,9 +859,9 @@ distcheck: dist *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod u+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ @@ -864,7 +893,7 @@ distcheck: dist && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' @@ -1004,25 +1033,24 @@ ps-am: uninstall-am: uninstall-pkgconfigDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \ - dist-zip distcheck distclean distclean-generic distclean-hdr \ - distclean-libtool distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pkgconfigDATA install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ +.MAKE: $(am__recursive_targets) all install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ + dist-xz dist-zip distcheck distclean distclean-generic \ + distclean-hdr distclean-libtool distclean-tags distcleancheck \ + distdir distuninstallcheck dvi dvi-am html html-am info \ + info-am install install-am install-data install-data-am \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-pkgconfigDATA \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-pkgconfigDATA + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-pkgconfigDATA include $(GLIB_MAKEFILE) diff --git a/NEWS b/NEWS index 01ab10fd..5d6b2ef1 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,88 @@ +================================================ +NetworkManager-0.9.8.8 +Overview of changes since NetworkManager-0.9.8.6 +================================================ + +This is a new stable release of NetworkManager. Notable changes include: + +* Fixes to the BlueZ code +* A few memory leak fixes +* Minor docs fixes + +================================================ +NetworkManager-0.9.8.6 +Overview of changes since NetworkManager-0.9.8.4 +================================================ + +This is a new stable release of NetworkManager. Notable changes include: + +* Now supports BlueZ 5. If you are still using BlueZ 4, configure with + --enable-bluez4 to disable BlueZ 5 support and enable BlueZ 4 support. + (It is not possible to build with support for both versions.) + + +================================================ +NetworkManager-0.9.8.4 +Overview of changes since NetworkManager-0.9.8.2 +================================================ + +This is a new stable release of NetworkManager. Notable changes include: + +* Removed some spurious warnings +* Root clients running outside a login session now have the right permissions +* WiFi AP mode and EAP-FAST support are now detected correctly +* Bonding config removes inappropriate options when switching modes +* Fix reading of bond connections with keyfile plugin +* Fix hang when dbus-daemon restarts +* Fix crash when VPN disconnection fails +* The dispatcher now exposes IPv6 VPN info, and IPv4/IPv6 DNS search domains +* Build fix to support dhcpcd 6.x +* Fix crash on startup when no dhcp client is available +* Fix device descriptions when using the latest udev +* Fix some possible obscure problems at startup +* Always clear the default route correctly when disconnecting mobile broadband +* Keyfile plugin now ignores more emacs temporary files +* When using dnsmasq, pass all nameservers to it, not just the first +* Kill dhclient if nm-dhcp-client-action encounters a fatal error +* Fix dispatcher systemd unit install +* Make ifcfg-rh VLAN parsing match initscripts better +* Change threshold for WiFi background scanning under WPA Enterprise +* Fix crash when deleting a currently-active connection +* Fix ifcfg-rh's handling of IPV6_DEFAULTGW +* Fix manager State transitions when connectivity checking is enabled +* Add Connectivity property to distinguish portals from "limited connectivity" +* Add PrimaryConnection and ActivatingConnection properties to simplify UI code +* Old connection files containing UUIDs without hyphens work again + + +============================================== +NetworkManager-0.9.8.2 +Overview of changes since NetworkManager-0.9.8 +============================================== + +This is a new stable release of NetworkManager. Notable changes include: + +* Memory leak fixes +* Ensure the ifcfg-rh plugin saves the bridging STP setting correctly +* Also request static routes from DHCP servers +* Fix crash when dbus-daemon restarts +* Look harder for the machine ID and don't crash if we don't have one +* Copy DHCP leasefiles from the previous location if necessary +* Wait up to 120 seconds for modems to connect +* Don't crash for PPPoE connections with no wired setting +* Fix AvailableConnections for some WiFi connections +* Ensure new available connections generate the PropertiesChanged signal +* Ensure the keyfile plugin reads all-default VLAN connections correctly +* Suppress the kernel's automatic creation of bond0 +* Make the SecretAgent API introspectable for bindings +* Ensure ActiveConnections get torn down when device is unavailable +* Ensure ifupdown plugin rechecks unmanaged devices on interface changes +* Don't prematurely think IPv6 has succeeded due to left-over addresses +* Fix various systemd issues and add service file for the dispatcher +* Updates for new ModemManager API changes +* Fix crash on Wi-Fi when IP configuration times out + + ============================================== NetworkManager-0.9.8 Overview of changes since NetworkManager-0.9.6 diff --git a/TODO b/TODO index 4e0e2ecd..2e32f914 100644 --- a/TODO +++ b/TODO @@ -116,16 +116,6 @@ the VPN because WiFi choked for 10 seconds, but reconnect the VPN if it was connected before the drop. -* VPN and IPv6 - -The internal VPN capability should support IPv6. Essentially, the D-Bus -interface between NetworkManager and the VPN service daemons should be extended -with an IP6Config signal that passes up the IPv6 addressing and routing details -if the VPN daemon is IPv6 capable. NM should then process those details like it -does with IPv4. include/NetworkManagerVPN.h should be updated with key/value -pairs defining the various IPv6 attributes much like the IPv4 ones are defined. - - * VPN IP Methods Some VPNs (openvpn with TAP for example) require that DHCP is run on a diff --git a/aclocal.m4 b/aclocal.m4 index 6fbff700..2042a9e7 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.6 -*- Autoconf -*- +# generated automatically by aclocal 1.13.4 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -12,13 +11,14 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # serial 1 (pkg-config-0.24) @@ -48,7 +48,8 @@ To do so, use the procedure documented by the package, typically `autoreconf'.]) # ---------------------------------- AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) @@ -94,7 +95,8 @@ m4_define([_PKG_CONFIG], pkg_cv_[]$1="$$1" elif test -n "$PKG_CONFIG"; then PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes]) else pkg_failed=untried @@ -142,9 +144,9 @@ if test $pkg_failed = yes; then AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -157,7 +159,7 @@ $$1_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT]) +_PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then AC_MSG_RESULT([no]) @@ -168,7 +170,7 @@ path to pkg-config. _PKG_TEXT -To get pkg-config, see .]) +To get pkg-config, see .])[]dnl ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS @@ -178,25 +180,77 @@ else fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software -# Foundation, Inc. + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR + + +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------- +# Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])# PKG_CHECK_VAR + +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.13' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.6], [], +m4_if([$1], [1.13.4], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -212,24 +266,22 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.6])dnl +[AM_AUTOMAKE_VERSION([1.13.4])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -248,7 +300,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -274,22 +326,19 @@ am_aux_dir=`cd $ac_aux_dir && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -308,16 +357,14 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, -# 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -327,7 +374,7 @@ fi])]) # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -340,12 +387,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -353,8 +401,8 @@ AC_CACHE_CHECK([dependency style of $depcc], # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -394,16 +442,16 @@ AC_CACHE_CHECK([dependency style of $depcc], : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -412,8 +460,8 @@ AC_CACHE_CHECK([dependency style of $depcc], test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -421,7 +469,7 @@ AC_CACHE_CHECK([dependency style of $depcc], fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -469,7 +517,7 @@ AM_CONDITIONAL([am__fastdep$1], [ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -479,9 +527,13 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' @@ -496,20 +548,18 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -522,7 +572,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -534,21 +584,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -566,7 +614,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -576,15 +624,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -600,7 +645,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -629,31 +674,40 @@ AC_SUBST([CYGPATH_W]) # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -664,28 +718,32 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl ]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], @@ -713,15 +771,12 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, -# Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -735,16 +790,14 @@ if test x"${install_sh}" != xset; then install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -761,20 +814,17 @@ AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_MAINTAINER_MODE([DEFAULT-MODE]) # ---------------------------------- # Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless `enable' is passed literally. -# For symmetry, `disable' may be passed as well. Anyway, the user +# Default is to disable them, unless 'enable' is passed literally. +# For symmetry, 'disable' may be passed as well. Anyway, the user # can override the default with the --enable/--disable switch. AC_DEFUN([AM_MAINTAINER_MODE], [m4_case(m4_default([$1], [disable]), @@ -785,10 +835,11 @@ AC_DEFUN([AM_MAINTAINER_MODE], AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], -[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], + am_maintainer_other[ make rules and dependencies not useful + (and sometimes confusing) to the casual installer])], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) AC_MSG_RESULT([$USE_MAINTAINER_MODE]) AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) MAINT=$MAINTAINER_MODE_TRUE @@ -796,18 +847,14 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) ] ) -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -825,7 +872,7 @@ am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -850,15 +897,12 @@ AC_MSG_RESULT([$_am_result]) rm -f confinc confmf ]) -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # AM_PROG_CC_C_O # -------------- # Like AC_PROG_CC_C_O, but changed for automake. @@ -887,15 +931,12 @@ m4_define([AC_PROG_CC], # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -903,11 +944,10 @@ AC_DEFUN([AM_MISSING_PROG], $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -920,29 +960,32 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, -# Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_PROG_MKDIR_P # --------------- -# Check for `mkdir -p'. +# Check for 'mkdir -p'. AC_DEFUN([AM_PROG_MKDIR_P], [AC_PREREQ([2.60])dnl AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl FIXME we are no longer going to remove this! adjust warning +dnl FIXME message accordingly. +AC_DIAGNOSE([obsolete], +[$0: this macro is deprecated, and will soon be removed. +You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead, +and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.]) dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, dnl while keeping a definition of mkdir_p for backward compatibility. dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. @@ -959,15 +1002,12 @@ esac # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], @@ -977,7 +1017,7 @@ AC_DEFUN([_AM_MANGLE_OPTION], # -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) # ------------------------ @@ -991,14 +1031,12 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_RUN_LOG(COMMAND) # ------------------- # Run COMMAND, save the exit status in ac_status, and log it. @@ -1012,22 +1050,16 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -1038,32 +1070,40 @@ case `pwd` in esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -1073,31 +1113,50 @@ else AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2009, 2011 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # AM_SILENT_RULES([DEFAULT]) # -------------------------- # Enable less verbose build rules; with the default set to DEFAULT -# (`yes' being less verbose, `no' or empty being verbose). +# ("yes" being less verbose, "no" or empty being verbose). AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], -[ --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0')]) -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; esac dnl -dnl A few `make' implementations (e.g., NonStop OS and NextStep) +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) dnl do not support nested variable expansions. dnl See automake bug#9928 and bug#10237. am_make=${MAKE-make} @@ -1115,7 +1174,7 @@ else am_cv_make_support_nested_variables=no fi]) if test $am_cv_make_support_nested_variables = yes; then - dnl Using `$V' instead of `$(V)' breaks IRIX make. + dnl Using '$V' instead of '$(V)' breaks IRIX make. AM_V='$(V)' AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' else @@ -1132,44 +1191,40 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -1183,18 +1238,16 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -1204,76 +1257,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AC_SUBST([AMTAR], ['$${TAR-tar}']) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 00000000..ef6d20f5 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,24 @@ +#!/bin/sh +# Run this to generate all the initial makefiles, etc. + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. +REQUIRED_AUTOMAKE_VERSION=1.9 +PKG_NAME=NetworkManager + +(test -f $srcdir/configure.ac \ + && test -f $srcdir/src/main.c) || { + echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" + echo " top-level $PKG_NAME directory" + exit 1 +} + +(cd $srcdir; + gtkdocize || exit 1 + autopoint --force + AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose +) + +if test -z "$NOCONFIGURE"; then + $srcdir/configure --enable-maintainer-mode "$@" +fi diff --git a/build-aux/compile b/build-aux/compile index 862a14e8..531136b0 100755 --- a/build-aux/compile +++ b/build-aux/compile @@ -1,10 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-03-05.13; # UTC +scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free -# Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -113,6 +112,11 @@ func_cl_dashl () lib=$dir/$lib.lib break fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi done IFS=$save_IFS diff --git a/build-aux/config.guess b/build-aux/config.guess index d622a44e..1804e9fc 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -2,13 +2,13 @@ # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# 2011, 2012, 2013 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2012-12-29' # This file 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -22,19 +22,17 @@ timestamp='2012-02-10' # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -55,8 +53,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, +2012, 2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -200,6 +198,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -302,7 +304,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -801,6 +803,9 @@ EOF i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; @@ -1201,6 +1206,9 @@ EOF BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1256,7 +1264,7 @@ EOF NEO-?:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1330,9 +1338,6 @@ EOF exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c <. @@ -26,11 +22,12 @@ timestamp='2012-02-10' # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -74,8 +71,8 @@ version="\ GNU config.sub ($timestamp) Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, +2012, 2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,7 +120,7 @@ esac maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) @@ -156,7 +153,7 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -225,6 +222,12 @@ case $os in -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -253,8 +256,10 @@ case $basic_machine in | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | be32 | be64 \ + | arc \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ @@ -267,7 +272,7 @@ case $basic_machine in | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -383,7 +388,8 @@ case $basic_machine in | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -782,9 +788,13 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) basic_machine=i386-pc os=-mingw32 @@ -998,7 +1008,7 @@ case $basic_machine in ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown @@ -1013,7 +1023,11 @@ case $basic_machine in basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1346,15 +1360,15 @@ case $os in | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1537,6 +1551,9 @@ case $basic_machine in c4x-* | tic4x-*) os=-coff ;; + hexagon-*) + os=-elf + ;; tic54x-*) os=-coff ;; diff --git a/build-aux/depcomp b/build-aux/depcomp index 25a39e6c..4ebd5b3a 100755 --- a/build-aux/depcomp +++ b/build-aux/depcomp @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2012-03-27.16; # UTC +scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, 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 @@ -28,9 +27,9 @@ scriptversion=2012-03-27.16; # UTC case $1 in '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -57,11 +56,65 @@ EOF ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + # A tabulation character. tab=' ' # A newline character. nl=' ' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 @@ -75,6 +128,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -86,32 +142,32 @@ if test "$depmode" = hp; then fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp fi if test "$depmode" = msvc7msys; then - # This is just like msvc7 but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvc7 + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 fi if test "$depmode" = xlc; then - # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. - gccflag=-qmakedep=gcc,-MF - depmode=gcc + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -134,8 +190,7 @@ gcc3) done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -143,13 +198,17 @@ gcc3) ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -157,15 +216,14 @@ gcc) fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # The second -e expression handles DOS-style file names with drive + # letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" ## This next piece of magic avoids the "deleted header file" problem. @@ -174,15 +232,15 @@ gcc) ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' "$nl" < "$tmpdepfile" | ## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as ## well. hp depmode also adds that space, but also prefixes the VPATH ## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -200,8 +258,7 @@ sgi) "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -209,7 +266,6 @@ sgi) if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in @@ -217,19 +273,15 @@ sgi) # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr "$nl" ' ' >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" echo >> "$depfile" - # The second pass generates a dummy entry for each header file. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" ;; @@ -247,9 +299,8 @@ aix) # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -262,9 +313,7 @@ aix) "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -273,65 +322,113 @@ aix) do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # Each line is of the form 'foo.o: dependent.h'. - # Do two passes, one to just change these to - # '$object: dependent.h' and one to simply 'dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; -icc) - # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. - # However on - # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using '\': + # and will wrap long lines using '\' : # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - # tcc 0.9.26 (FIXME still under development at the moment of writing) - # will emit a similar output, but also prepend the continuation lines - # with horizontal tabulation characters. - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi + + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" - # Each line is of the form 'foo.o: dependent.h', - # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. + # Each line is of the form `foo.o: dependent.h', + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. # Do two passes, one to just change these to - # '$object: dependent.h' and one to simply 'dependent.h:'. - sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ - < "$tmpdepfile" > "$depfile" - sed ' - s/[ '"$tab"'][ '"$tab"']*/ /g - s/^ *// - s/ *\\*$// - s/^[^:]*: *// - /^$/d - /:$/d - s/$/ :/ - ' < "$tmpdepfile" >> "$depfile" + # `$object: dependent.h' and one to simply `dependent.h:'. + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -342,9 +439,8 @@ hp2) # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -355,8 +451,7 @@ hp2) "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -366,76 +461,61 @@ hp2) test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in 'foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" + + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; msvc7) if test "$libtool" = yes; then @@ -446,8 +526,7 @@ msvc7) "$@" $showIncludes > "$tmpdepfile" stat=$? grep -v '^Note: including file: ' "$tmpdepfile" - if test "$stat" = 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -473,6 +552,7 @@ $ { G p }' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash rm -f "$tmpdepfile" ;; @@ -524,13 +604,14 @@ dashmstdout) # in the target name. This is to cope with DOS-style filenames: # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' "$nl" < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -583,10 +664,12 @@ makedepend) # makedepend may prepend the VPATH from the source file name to the object. # No need to regex-escape $object, excess matching of '.' is harmless. sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -622,10 +705,10 @@ cpp) esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -657,15 +740,15 @@ msvisualcpp) shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | diff --git a/build-aux/install-sh b/build-aux/install-sh index a9244eb0..377bb868 100755 --- a/build-aux/install-sh +++ b/build-aux/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-01-19.21; # UTC +scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,7 +35,7 @@ scriptversion=2011-01-19.21; # UTC # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written @@ -156,7 +156,7 @@ while test $# -ne 0; do -s) stripcmd=$stripprog;; -t) dst_arg=$2 - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -190,7 +190,7 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then fi shift # arg dst_arg=$arg - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -202,7 +202,7 @@ if test $# -eq 0; then echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call `install-sh -d' without argument. + # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi @@ -240,7 +240,7 @@ fi for src do - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $src in -* | [=\(\)!]) src=./$src;; esac @@ -354,7 +354,7 @@ do if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. + # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ls_ld_tmpdir=`ls -ld "$tmpdir"` case $ls_ld_tmpdir in diff --git a/build-aux/missing b/build-aux/missing index 86a8fc31..cdea5149 100755 --- a/build-aux/missing +++ b/build-aux/missing @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.13; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. # 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 @@ -26,68 +25,40 @@ scriptversion=2012-01-06.13; # UTC # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to ." exit $? @@ -99,228 +70,141 @@ Send bug reports to ." ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; +# Run the given program, remember its exit status. +"$@"; st=$? + +# If it succeeded, we are done. +test $st -eq 0 && exit 0 + +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" ;; -esac - -exit 0 + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff --git a/callouts/Makefile.in b/callouts/Makefile.in index 9678642d..073bea10 100644 --- a/callouts/Makefile.in +++ b/callouts/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,7 +83,8 @@ host_triplet = @host@ libexec_PROGRAMS = nm-dhcp-client.action$(EXEEXT) \ nm-dispatcher.action$(EXEEXT) nm-avahi-autoipd.action$(EXEEXT) subdir = callouts -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/build-aux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/gettext.m4 \ @@ -88,6 +116,7 @@ libtest_dispatcher_envp_la_OBJECTS = \ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = am__installdirs = "$(DESTDIR)$(libexecdir)" \ "$(DESTDIR)$(dbusactivationdir)" "$(DESTDIR)$(dbusservicedir)" \ "$(DESTDIR)$(udevrulesdir)" @@ -109,6 +138,18 @@ nm_dispatcher_action_OBJECTS = $(am_nm_dispatcher_action_OBJECTS) nm_dispatcher_action_DEPENDENCIES = \ $(top_builddir)/libnm-util/libnm-util.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles @@ -121,20 +162,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libtest_dispatcher_envp_la_SOURCES) \ $(nm_avahi_autoipd_action_SOURCES) \ $(nm_dhcp_client_action_SOURCES) \ @@ -143,13 +180,14 @@ DIST_SOURCES = $(libtest_dispatcher_envp_la_SOURCES) \ $(nm_avahi_autoipd_action_SOURCES) \ $(nm_dhcp_client_action_SOURCES) \ $(nm_dispatcher_action_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -185,9 +223,29 @@ am__uninstall_files_from_dir = { \ DATA = $(dbusactivation_DATA) $(dbusservice_DATA) $(udevrules_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -358,7 +416,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PKGCONFIG_PATH = @PKGCONFIG_PATH@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -373,6 +430,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@ +SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@ SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@ SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@ SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@ @@ -591,12 +650,15 @@ $(am__aclocal_m4_deps): clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libtest-dispatcher-envp.la: $(libtest_dispatcher_envp_la_OBJECTS) $(libtest_dispatcher_envp_la_DEPENDENCIES) $(EXTRA_libtest_dispatcher_envp_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libtest_dispatcher_envp_la_OBJECTS) $(libtest_dispatcher_envp_la_LIBADD) $(LIBS) install-libexecPROGRAMS: $(libexec_PROGRAMS) @@ -608,10 +670,12 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS) fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -632,7 +696,8 @@ uninstall-libexecPROGRAMS: @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -645,12 +710,15 @@ clean-libexecPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + nm-avahi-autoipd.action$(EXEEXT): $(nm_avahi_autoipd_action_OBJECTS) $(nm_avahi_autoipd_action_DEPENDENCIES) $(EXTRA_nm_avahi_autoipd_action_DEPENDENCIES) @rm -f nm-avahi-autoipd.action$(EXEEXT) $(AM_V_CCLD)$(LINK) $(nm_avahi_autoipd_action_OBJECTS) $(nm_avahi_autoipd_action_LDADD) $(LIBS) + nm-dhcp-client.action$(EXEEXT): $(nm_dhcp_client_action_OBJECTS) $(nm_dhcp_client_action_DEPENDENCIES) $(EXTRA_nm_dhcp_client_action_DEPENDENCIES) @rm -f nm-dhcp-client.action$(EXEEXT) $(AM_V_CCLD)$(LINK) $(nm_dhcp_client_action_OBJECTS) $(nm_dhcp_client_action_LDADD) $(LIBS) + nm-dispatcher.action$(EXEEXT): $(nm_dispatcher_action_OBJECTS) $(nm_dispatcher_action_DEPENDENCIES) $(EXTRA_nm_dispatcher_action_DEPENDENCIES) @rm -f nm-dispatcher.action$(EXEEXT) $(AM_V_CCLD)$(LINK) $(nm_dispatcher_action_OBJECTS) $(nm_dispatcher_action_LDADD) $(LIBS) @@ -821,22 +889,25 @@ uninstall-udevrulesDATA: dir='$(DESTDIR)$(udevrulesdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -851,57 +922,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -917,12 +943,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -934,15 +955,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -951,6 +968,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -1126,26 +1158,25 @@ ps-am: uninstall-am: uninstall-dbusactivationDATA uninstall-dbusserviceDATA \ uninstall-libexecPROGRAMS uninstall-udevrulesDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ - ctags-recursive install install-am install-data-am \ - install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-libexecPROGRAMS clean-libtool clean-noinstLTLIBRARIES \ - ctags ctags-recursive distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-hook \ - install-dbusactivationDATA install-dbusserviceDATA install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecPROGRAMS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip install-udevrulesDATA \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ +.MAKE: $(am__recursive_targets) all check install install-am \ + install-data-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libexecPROGRAMS \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-data-hook install-dbusactivationDATA \ + install-dbusserviceDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-libexecPROGRAMS \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip install-udevrulesDATA installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am \ uninstall-dbusactivationDATA uninstall-dbusserviceDATA \ uninstall-libexecPROGRAMS uninstall-udevrulesDATA diff --git a/callouts/nm-dhcp-client-action.c b/callouts/nm-dhcp-client-action.c index d1a3747c..2553a61a 100644 --- a/callouts/nm-dhcp-client-action.c +++ b/callouts/nm-dhcp-client-action.c @@ -20,11 +20,13 @@ /* for environ */ #define _GNU_SOURCE +#include #include #include #include #include +#include #include @@ -277,6 +279,22 @@ error: return NULL; } +static void +fatal_error (void) +{ + const char *pid_str = getenv ("pid"); + int pid = 0; + + if (pid_str) + pid = strtol (pid_str, NULL, 10); + if (pid) { + fprintf (stderr, "Fatal error occured, killing dhclient instance with pid %d.\n", pid); + kill (pid, SIGTERM); + } + + exit (1); +} + int main (int argc, char *argv[]) { @@ -287,26 +305,26 @@ main (int argc, char *argv[]) /* Get a connection to the system bus */ connection = dbus_init (); if (connection == NULL) - exit (1); + fatal_error (); message = dbus_message_new_signal ("/", NM_DHCP_CLIENT_DBUS_IFACE, "Event"); if (message == NULL) { fprintf (stderr, "Error: Not enough memory to send DHCP Event signal.\n"); - exit (1); + fatal_error (); } /* Dump environment variables into the message */ result = build_message (message); if (result == FALSE) { fprintf (stderr, "Error: Not enough memory to send DHCP Event signal.\n"); - exit (1); + fatal_error (); } /* queue the message */ result = dbus_connection_send (connection, message, NULL); if (!result) { fprintf (stderr, "Error: Could not send send DHCP Event signal.\n"); - exit (1); + fatal_error (); } dbus_message_unref (message); diff --git a/callouts/nm-dispatcher-utils.c b/callouts/nm-dispatcher-utils.c index 887e80dd..8824295d 100644 --- a/callouts/nm-dispatcher-utils.c +++ b/callouts/nm-dispatcher-utils.c @@ -60,25 +60,27 @@ add_domains (GSList *items, const char four_or_six) { GValue *val; - GPtrArray *domains = NULL; + char **domains = NULL; GString *tmp; guint i; /* Search domains */ val = g_hash_table_lookup (hash, "domains"); - if (!val || !G_VALUE_HOLDS (val, DBUS_TYPE_G_ARRAY_OF_STRING)) + if (!val) return items; - domains = (GPtrArray *) g_value_get_boxed (val); - if (!domains || (domains->len == 0)) + g_return_val_if_fail (G_VALUE_HOLDS (val, G_TYPE_STRV), items); + + domains = (char **) g_value_get_boxed (val); + if (!domains || !domains[0]) return items; tmp = g_string_new (NULL); g_string_append_printf (tmp, "%sIP%c_DOMAINS=", prefix, four_or_six); - for (i = 0; i < domains->len; i++) { + for (i = 0; domains[i]; i++) { if (i > 0) g_string_append_c (tmp, ' '); - g_string_append (tmp, (char *) g_ptr_array_index (domains, i)); + g_string_append (tmp, domains[i]); } items = g_slist_prepend (items, tmp->str); g_string_free (tmp, FALSE); diff --git a/callouts/org.freedesktop.nm_dispatcher.service.in b/callouts/org.freedesktop.nm_dispatcher.service.in index b8f5bd1a..9feb3b46 100644 --- a/callouts/org.freedesktop.nm_dispatcher.service.in +++ b/callouts/org.freedesktop.nm_dispatcher.service.in @@ -2,4 +2,5 @@ Name=org.freedesktop.nm_dispatcher Exec=@libexecdir@/nm-dispatcher.action User=root +SystemdService=dbus-org.freedesktop.nm-dispatcher.service diff --git a/callouts/tests/Makefile.in b/callouts/tests/Makefile.in index c35ffaf2..f0810c3d 100644 --- a/callouts/tests/Makefile.in +++ b/callouts/tests/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,7 +80,8 @@ build_triplet = @build@ host_triplet = @host@ @ENABLE_TESTS_TRUE@noinst_PROGRAMS = test-dispatcher-envp$(EXEEXT) subdir = callouts/tests -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/build-aux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/gettext.m4 \ @@ -85,6 +113,19 @@ am__DEPENDENCIES_1 = AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles @@ -97,20 +138,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(test_dispatcher_envp_SOURCES) DIST_SOURCES = $(am__test_dispatcher_envp_SOURCES_DIST) am__can_run_installinfo = \ @@ -118,6 +155,23 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -262,7 +316,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PKGCONFIG_PATH = @PKGCONFIG_PATH@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -277,6 +330,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@ +SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@ SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@ SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@ SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@ @@ -429,6 +484,7 @@ clean-noinstPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + test-dispatcher-envp$(EXEEXT): $(test_dispatcher_envp_OBJECTS) $(test_dispatcher_envp_DEPENDENCIES) $(EXTRA_test_dispatcher_envp_DEPENDENCIES) @rm -f test-dispatcher-envp$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_dispatcher_envp_OBJECTS) $(test_dispatcher_envp_LDADD) $(LIBS) @@ -482,26 +538,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -513,15 +558,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -530,6 +571,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -673,9 +729,9 @@ uninstall-am: .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ - clean-generic clean-libtool clean-noinstPROGRAMS ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ + clean-generic clean-libtool clean-noinstPROGRAMS cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -685,7 +741,7 @@ uninstall-am: installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + tags tags-am uninstall uninstall-am ########################################### diff --git a/callouts/tests/test-dispatcher-envp.c b/callouts/tests/test-dispatcher-envp.c index 67737690..25b5f61d 100644 --- a/callouts/tests/test-dispatcher-envp.c +++ b/callouts/tests/test-dispatcher-envp.c @@ -101,14 +101,14 @@ value_hash_add_uint (GHashTable *hash, static void value_hash_add_strv (GHashTable *hash, - const char *key, - GPtrArray *array) + const char *key, + char **strv) { GValue *value; value = g_slice_new0 (GValue); - g_value_init (value, DBUS_TYPE_G_ARRAY_OF_STRING); - g_value_take_boxed (value, array); + g_value_init (value, G_TYPE_STRV); + g_value_take_boxed (value, strv); value_hash_add (hash, key, value); } @@ -255,13 +255,15 @@ parse_ip4 (GKeyFile *kf, GHashTable **out_props, const char *section, GError **e { char *tmp; char **split, **iter; - GPtrArray *domains; GSList *list; GValue *val; *out_props = value_hash_create (); /* search domains */ + /* Use char** for domains. (DBUS_TYPE_G_ARRAY_OF_STRING of NMIP4Config + * becomes G_TYPE_STRV when sending the value over D-Bus) + */ tmp = g_key_file_get_string (kf, section, "domains", error); if (tmp == NULL) return FALSE; @@ -269,14 +271,10 @@ parse_ip4 (GKeyFile *kf, GHashTable **out_props, const char *section, GError **e g_free (tmp); if (g_strv_length (split) > 0) { - domains = g_ptr_array_sized_new (g_strv_length (split)); - for (iter = split; iter && *iter; iter++) { - if (strlen (g_strstrip (*iter))) - g_ptr_array_add (domains, g_strdup (*iter)); - } - value_hash_add_strv (*out_props, "domains", domains); + for (iter = split; iter && *iter; iter++) + g_strstrip (*iter); + value_hash_add_strv (*out_props, "domains", split); } - g_strfreev (split); /* nameservers */ if (!add_uint_array (kf, *out_props, "ip4", "nameservers", error)) diff --git a/cli/Makefile.in b/cli/Makefile.in index 37b7a595..f2559343 100644 --- a/cli/Makefile.in +++ b/cli/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +78,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = cli -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/gettext.m4 \ @@ -71,21 +98,28 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -93,9 +127,29 @@ am__can_run_installinfo = \ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -266,7 +320,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PKGCONFIG_PATH = @PKGCONFIG_PATH@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -281,6 +334,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@ +SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@ SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@ SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@ SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@ @@ -404,22 +459,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -434,57 +492,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -500,12 +513,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -517,15 +525,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -534,6 +538,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -694,22 +713,20 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/cli/completion/Makefile.in b/cli/completion/Makefile.in index 49c71e12..21dec8a7 100644 --- a/cli/completion/Makefile.in +++ b/cli/completion/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,8 +79,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = cli/completion -DIST_COMMON = $(dist_completion_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(dist_completion_DATA) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/gettext.m4 \ @@ -73,12 +100,18 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -115,6 +148,7 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(completiondir)" DATA = $(dist_completion_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -257,7 +291,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PKGCONFIG_PATH = @PKGCONFIG_PATH@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -272,6 +305,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@ +SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@ SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@ SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@ SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@ @@ -415,11 +450,11 @@ uninstall-dist_completionDATA: @list='$(dist_completion_DATA)'; test -n "$(completiondir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(completiondir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -558,16 +593,17 @@ uninstall-am: uninstall-dist_completionDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_completionDATA \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-dist_completionDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_completionDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-dist_completionDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/cli/src/Makefile.in b/cli/src/Makefile.in index cb37b8db..ef2add85 100644 --- a/cli/src/Makefile.in +++ b/cli/src/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,7 +80,8 @@ build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = nmcli$(EXEEXT) subdir = cli/src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/build-aux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/gettext.m4 \ @@ -87,6 +115,19 @@ nmcli_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles @@ -99,20 +140,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(nmcli_SOURCES) DIST_SOURCES = $(nmcli_SOURCES) am__can_run_installinfo = \ @@ -120,6 +157,23 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -264,7 +318,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PKGCONFIG_PATH = @PKGCONFIG_PATH@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -279,6 +332,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@ +SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@ SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@ SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@ SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@ @@ -438,10 +493,12 @@ install-binPROGRAMS: $(bin_PROGRAMS) fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -462,7 +519,8 @@ uninstall-binPROGRAMS: @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -475,6 +533,7 @@ clean-binPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + nmcli$(EXEEXT): $(nmcli_OBJECTS) $(nmcli_DEPENDENCIES) $(EXTRA_nmcli_DEPENDENCIES) @rm -f nmcli$(EXEEXT) $(AM_V_CCLD)$(LINK) $(nmcli_OBJECTS) $(nmcli_LDADD) $(LIBS) @@ -618,26 +677,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -649,15 +697,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -666,6 +710,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -809,19 +868,19 @@ uninstall-am: uninstall-binPROGRAMS .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-binPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-binPROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/cli/src/devices.c b/cli/src/devices.c index 0cea0188..ffad9801 100644 --- a/cli/src/devices.c +++ b/cli/src/devices.c @@ -909,7 +909,7 @@ show_device_info (gpointer data, gpointer user_data) /* available-connections */ avail_cons = nm_device_get_available_connections (device); ac_paths_str = g_string_new (NULL); - if (avail_cons->len) { + if (avail_cons && avail_cons->len) { ac_arr = g_new (char *, avail_cons->len + 1); ac_arr[avail_cons->len] = NULL; } diff --git a/compile b/compile deleted file mode 100755 index c0096a7b..00000000 --- a/compile +++ /dev/null @@ -1,143 +0,0 @@ -#! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. - -scriptversion=2009-10-06.20; # UTC - -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software -# Foundation, Inc. -# Written by Tom Tromey . -# -# 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, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to or send patches to -# . - -case $1 in - '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: compile [--help] [--version] PROGRAM [ARGS] - -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining -arguments, and rename the output as expected. - -If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. - -Report bugs to . -EOF - exit $? - ;; - -v | --v*) - echo "compile $scriptversion" - exit $? - ;; -esac - -ofile= -cfile= -eat= - -for arg -do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. - eat=1 - case $2 in - *.o | *.obj) - ofile=$2 - ;; - *) - set x "$@" -o "$2" - shift - ;; - esac - ;; - *.c) - cfile=$1 - set x "$@" "$1" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift -done - -if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also - # ok. - exec "$@" -fi - -# Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` - -# Create the lock directory. -# Note: use `[/\\:.-]' here to ensure that we don't use the same name -# that we are using for the .o file. Also, base the name on the expected -# object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d -while true; do - if mkdir "$lockdir" >/dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir '$lockdir'; exit 1" 1 2 15 - -# Run the compile. -"$@" -ret=$? - -if test -f "$cofile"; then - test "$cofile" = "$ofile" || mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" -fi - -rmdir "$lockdir" -exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/config.guess b/config.guess deleted file mode 100755 index dc84c68e..00000000 --- a/config.guess +++ /dev/null @@ -1,1501 +0,0 @@ -#! /bin/sh -# Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. - -timestamp='2009-11-20' - -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. -# -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. -# -# You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] - -Output the configuration name of the system \`$me' is run on. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.guess ($timestamp) - -Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" >&2 - exit 1 ;; - * ) - break ;; - esac -done - -if test $# != 0; then - echo "$me: too many arguments$help" >&2 - exit 1 -fi - -trap 'exit 1' 1 2 15 - -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -# compiler to aid in system detection is discouraged as it requires -# temporary files to be created and, as you can see below, it is a -# headache to deal with in a portable fashion. - -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. - -# Portable tmp directory creation inspired by the Autoconf team. - -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' - -# This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then - PATH=$PATH:/.attbin ; export PATH -fi - -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -# Note: order is significant - the case branches are not exclusive. - -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward - # compatibility and a consistent mechanism for selecting the - # object file format. - # - # Note: NetBSD doesn't particularly care about the vendor - # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in - armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; - sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ELF__ - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? - os=netbsd - else - os=netbsdelf - fi - ;; - *) - os=netbsd - ;; - esac - # The OS release - # Debian GNU/NetBSD machines have a different userland, and - # thus, need a distinct triplet. However, they do not need - # kernel version information, so it can be replaced with a - # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in - Debian*) - release='-gnu' - ;; - *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - ;; - esac - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - exit ;; - *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; - *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} - exit ;; - macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} - exit ;; - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit ;; - alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU - # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in - "EV4 (21064)") - UNAME_MACHINE="alpha" ;; - "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; - "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; - "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; - "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; - "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; - "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; - "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; - "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; - "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; - "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; - "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; - "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; - esac - # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos - exit ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos - exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition - exit ;; - *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) - echo powerpc-ibm-os400 - exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit ;; - DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit ;; - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; - s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux${UNAME_RELEASE} - exit ;; - i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build - SUN_ARCH="i386" - # If there is a compiler, see if it is configured for 64-bit objects. - # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. - # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - SUN_ARCH="x86_64" - fi - fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) - UNAME_RELEASE=`uname -v` - ;; - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} - exit ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 - case "`/bin/arch`" in - sun3) - echo m68k-sun-sunos${UNAME_RELEASE} - ;; - sun4) - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac - exit ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} - exit ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor - # > m68000). The system name ranges from "MiNT" over "FreeMiNT" - # to the lowercase version "mint" (or "freemint"). Finally - # the system name "TOS" denotes a system which is actually not - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} - exit ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} - exit ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} - exit ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -#ifdef __cplusplus -#include /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif - #if defined (host_mips) && defined (MIPSEB) - #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); - #endif - #endif - exit (-1); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && - { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} - exit ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] - then - echo m88k-dg-dgux${UNAME_RELEASE} - else - echo m88k-dg-dguxbcs${UNAME_RELEASE} - fi - else - echo i586-dg-dgux${UNAME_RELEASE} - fi - exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix - exit ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - - main() - { - if (!__power_pc()) - exit(1); - puts("powerpc-ibm-aix3.2.5"); - exit(0); - } -EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` - then - echo "$SYSTEM_NAME" - else - echo rs6000-ibm-aix3.2.5 - fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi - exit ;; - *:AIX:*:[456]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 - else - IBM_ARCH=powerpc - fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit ;; - *:AIX:*:*) - echo rs6000-ibm-aix - exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 - exit ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx - exit ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } -EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa - fi ;; - esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then - eval $set_cc_for_build - - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler - # generating 64-bit code. GNU and HP use different nomenclature: - # - # $ CC_FOR_BUILD=cc ./config.guess - # => hppa2.0w-hp-hpux11.23 - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep -q __LP64__ - then - HP_ARCH="hppa2.0w" - else - HP_ARCH="hppa64" - fi - fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} - exit ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - int - main () - { - long cpu = sysconf (_SC_CPU_VERSION); - /* The order matters, because CPU_IS_HP_MC68K erroneously returns - true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct - results, however. */ - if (CPU_IS_PA_RISC (cpu)) - { - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; - case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; - default: puts ("hppa-hitachi-hiuxwe2"); break; - } - } - else if (CPU_IS_HP_MC68K (cpu)) - puts ("m68k-hitachi-hiuxwe2"); - else puts ("unknown-hitachi-hiuxwe2"); - exit (0); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 - exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd - exit ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac - exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; - *:Interix*:*) - case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; - IA64) - echo ia64-unknown-interix${UNAME_RELEASE} - exit ;; - esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - 8664:Windows_NT:*) - echo x86_64-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin - exit ;; - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - *:GNU:*:*) - # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; - arm*:Linux:*:*) - eval $set_cc_for_build - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_EABI__ - then - echo ${UNAME_MACHINE}-unknown-linux-gnu - else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi - fi - exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) - echo cris-axis-linux-gnu - exit ;; - crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu - exit ;; - frv:Linux:*:*) - echo frv-unknown-linux-gnu - exit ;; - i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef ${UNAME_MACHINE} - #undef ${UNAME_MACHINE}el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=${UNAME_MACHINE}el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=${UNAME_MACHINE} - #else - CPU= - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) - echo or32-unknown-linux-gnu - exit ;; - padre:Linux:*:*) - echo sparc-unknown-linux-gnu - exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac - exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit ;; - sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit ;; - xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 - exit ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit ;; - i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi - exit ;; - i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi - exit ;; - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. - # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that - # this is a cross-build. - echo i586-pc-msdosdjgpp - exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit ;; - i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi - exit ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv - exit ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit ;; - M68*:*:R3V[5678]*:*) - test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; - NCR*:*:4.2:* | MPRAS*:*:4.2:*) - OS_REL='.3' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} - exit ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} - exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit ;; - i*86:VOS:*:*) - # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos - exit ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} - exit ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi - exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} - exit ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit ;; - SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} - exit ;; - SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} - exit ;; - SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} - exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit ;; - *:QNX:*:4*) - echo i386-pc-qnx - exit ;; - NSE-?:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 - # operating systems. - if test "$cputype" = "386"; then - UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 - exit ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex - exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit ;; - *:ITS:*:*) - echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; - *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; - esac ;; - *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; - i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' - exit ;; - i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos - exit ;; - i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros - exit ;; -esac - -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - -cat >&2 < in order to provide the needed -information to handle your system. - -config.guess timestamp = $timestamp - -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` - -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` - -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} -EOF - -exit 1 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/config.h.in b/config.h.in index 2c2902da..e7deb163 100644 --- a/config.h.in +++ b/config.h.in @@ -174,6 +174,9 @@ /* Version number of package */ #undef VERSION +/* Define if you have BlueZ 4 support */ +#undef WITH_BLUEZ4 + /* Define if you want connectivity checking support */ #undef WITH_CONCHECK diff --git a/config.sub b/config.sub deleted file mode 100755 index 2a55a507..00000000 --- a/config.sub +++ /dev/null @@ -1,1705 +0,0 @@ -#! /bin/sh -# Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. - -timestamp='2009-11-20' - -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. -# -# Configuration subroutine to validate and canonicalize a configuration type. -# Supply the specified configuration type as an argument. -# If it is invalid, we print an error message on stderr and exit with code 1. -# Otherwise, we print the canonical config type on stdout and succeed. - -# You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD - -# This file is supposed to be the same for all GNU packages -# and recognize all the CPU types, system types and aliases -# that are meaningful with *any* GNU software. -# Each package is responsible for reporting which valid configurations -# it does not support. The user should be able to distinguish -# a failure to support a valid configuration from a meaningless -# configuration. - -# The goal of this file is to map all the various variations of a given -# machine specification into a single specification in the form: -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or in some cases, the newer four-part form: -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# It is wrong to echo any other type of specification. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS - -Canonicalize a configuration name. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.sub ($timestamp) - -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" - exit 1 ;; - - *local*) - # First pass through any local machine types. - echo $1 - exit ;; - - * ) - break ;; - esac -done - -case $# in - 0) echo "$me: missing argument$help" >&2 - exit 1;; - 1) ;; - *) echo "$me: too many arguments$help" >&2 - exit 1;; -esac - -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac - -### Let's recognize common machines as not being operating systems so -### that things like config.sub decstation-3100 work. We also -### recognize some manufacturers as not being operating systems, so we -### can provide default operating systems below. -case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) - os= - basic_machine=$1 - ;; - -bluegene*) - os=-cnk - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 - ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco6) - os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*) - os=-lynxos - ;; - -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` - ;; - -psos*) - os=-psos - ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; -esac - -# Decode aliases for certain CPU-COMPANY combinations. -case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ - | mips64r5900 | mips64r5900el \ - | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | moxie \ - | mt \ - | msp430 \ - | nios | nios2 \ - | ns16k | ns32k \ - | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ - | rx \ - | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ - | ubicom32 \ - | v850 | v850e \ - | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown - ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; - ms1) - basic_machine=mt-unknown - ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64r5900-* | mips64r5900el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nios-* | nios2-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ - | romp-* | rs6000-* | rx-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ - | tron-* \ - | ubicom32-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) - ;; - # Recognize the basic CPU types without company name, with glob match. - xtensa*) - basic_machine=$basic_machine-unknown - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att - ;; - 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aros) - basic_machine=i386-pc - os=-aros - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - blackfin) - basic_machine=bfin-unknown - os=-linux - ;; - blackfin-*) - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - bluegene*) - basic_machine=powerpc-ibm - os=-cnk - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16) - basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec - ;; - decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 - ;; - decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dicos) - basic_machine=i686-pc - os=-dicos - ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd - ;; - encore | umax | mmax) - basic_machine=ns32k-encore - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose - ;; - fx2800) - basic_machine=i860-alliant - ;; - genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 - ;; - h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp - ;; - hp9k3[2-9][0-9]) - basic_machine=m68k-hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 - ;; - i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 - ;; - i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv - ;; - i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta - ;; - iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) - ;; - *) - os=-irix4 - ;; - esac - ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - m68knommu) - basic_machine=m68k-unknown - os=-linux - ;; - m68knommu-*) - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - microblaze) - basic_machine=microblaze-xilinx - ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; - miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos - ;; - news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv - ;; - next | m*-next ) - basic_machine=m68k-next - case $os in - -nextstep* ) - ;; - -ns2*) - os=-nextstep2 - ;; - *) - os=-nextstep3 - ;; - esac - ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; - np1) - basic_machine=np1-gould - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k - ;; - pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - parisc) - basic_machine=hppa-unknown - os=-linux - ;; - parisc-*) - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pc98) - basic_machine=i386-pc - ;; - pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; - pentium4) - basic_machine=i786-pc - ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc) basic_machine=powerpc-unknown - ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown - ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown - ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ps2) - basic_machine=i386-ibm - ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rdos) - basic_machine=i386-pc - os=-rdos - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff - ;; - rm[46]00) - basic_machine=mips-siemens - ;; - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; - s390 | s390-*) - basic_machine=s390-ibm - ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; - sb1) - basic_machine=mipsisa64sb1-unknown - ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; - sde) - basic_machine=mipsisa32-sde - os=-elf - ;; - sei) - basic_machine=mips-sei - os=-seiux - ;; - sequent) - basic_machine=i386-sequent - ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; - sh5el) - basic_machine=sh5le-unknown - ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; - sps7) - basic_machine=m68k-bull - os=-sysv2 - ;; - spur) - basic_machine=spur-unknown - ;; - st2000) - basic_machine=m68k-tandem - ;; - stratus) - basic_machine=i860-stratus - os=-sysv4 - ;; - sun2) - basic_machine=m68000-sun - ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=-solaris2 - ;; - sun3 | sun3-*) - basic_machine=m68k-sun - ;; - sun4) - basic_machine=sparc-sun - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; - sv1) - basic_machine=sv1-cray - os=-unicos - ;; - symmetry) - basic_machine=i386-sequent - os=-dynix - ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos - ;; - t90) - basic_machine=t90-cray - os=-unicos - ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; - tile*) - basic_machine=tile-unknown - os=-linux-gnu - ;; - tx39) - basic_machine=mipstx39-unknown - ;; - tx39el) - basic_machine=mipstx39el-unknown - ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 - ;; - tower | tower-32) - basic_machine=m68k-ncr - ;; - tpf) - basic_machine=s390x-ibm - os=-tpf - ;; - udi29k) - basic_machine=a29k-amd - os=-udi - ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=-none - ;; - vaxv) - basic_machine=vax-dec - os=-sysv - ;; - vms) - basic_machine=vax-dec - os=-vms - ;; - vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=-vxworks - ;; - w65*) - basic_machine=w65-wdc - os=-none - ;; - w89k-*) - basic_machine=hppa1.1-winbond - os=-proelf - ;; - xbox) - basic_machine=i686-pc - os=-mingw32 - ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; - ymp) - basic_machine=ymp-cray - os=-unicos - ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - z80-*-coff) - basic_machine=z80-unknown - os=-sim - ;; - none) - basic_machine=none-none - os=-none - ;; - -# Here we handle the default manufacturer of certain CPU types. It is in -# some cases the only manufacturer, in others, it is the most popular. - w89k) - basic_machine=hppa1.1-winbond - ;; - op50n) - basic_machine=hppa1.1-oki - ;; - op60c) - basic_machine=hppa1.1-oki - ;; - romp) - basic_machine=romp-ibm - ;; - mmix) - basic_machine=mmix-knuth - ;; - rs6000) - basic_machine=rs6000-ibm - ;; - vax) - basic_machine=vax-dec - ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; - pdp11) - basic_machine=pdp11-dec - ;; - we32k) - basic_machine=we32k-att - ;; - sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; - cydra) - basic_machine=cydra-cydrome - ;; - orion) - basic_machine=orion-highlevel - ;; - orion105) - basic_machine=clipper-highlevel - ;; - mac | mpw | mac-mpw) - basic_machine=m68k-apple - ;; - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. - ;; - *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; -esac - -# Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` - ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` - ;; - *) - ;; -esac - -# Decode manufacturer-specific aliases for certain operating systems. - -if [ x"$os" != x"" ] -then -case $os in - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux - ;; - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; - -solaris) - os=-solaris2 - ;; - -svr4*) - os=-sysv4 - ;; - -unixware*) - os=-sysv4.2uw - ;; - -gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` - ;; - # First accept the basic system types. - # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) - case $basic_machine in - x86-* | i*86-*) - ;; - *) - os=-nto$os - ;; - esac - ;; - -nto-qnx*) - ;; - -nto*) - os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; - -linux-dietlibc) - os=-linux-dietlibc - ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; - -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` - ;; - -opened*) - os=-openedition - ;; - -os400*) - os=-os400 - ;; - -wince*) - os=-wince - ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; - -utek*) - os=-bsd - ;; - -dynix*) - os=-bsd - ;; - -acis*) - os=-aos - ;; - -atheos*) - os=-atheos - ;; - -syllable*) - os=-syllable - ;; - -386bsd) - os=-bsd - ;; - -ctix* | -uts*) - os=-sysv - ;; - -nova*) - os=-rtmk-nova - ;; - -ns2 ) - os=-nextstep2 - ;; - -nsk*) - os=-nsk - ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - -sinix*) - os=-sysv4 - ;; - -tpf*) - os=-tpf - ;; - -triton*) - os=-sysv3 - ;; - -oss*) - os=-sysv3 - ;; - -svr4) - os=-sysv4 - ;; - -svr3) - os=-sysv3 - ;; - -sysvr4) - os=-sysv4 - ;; - # This must come after -sysvr4. - -sysv*) - ;; - -ose*) - os=-ose - ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint - ;; - -aros*) - os=-aros - ;; - -kaos*) - os=-kaos - ;; - -zvmoe) - os=-zvmoe - ;; - -dicos*) - os=-dicos - ;; - -none) - ;; - *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 - exit 1 - ;; -esac -else - -# Here we handle the default operating systems that come with various machines. -# The value should be what the vendor currently ships out the door with their -# machine or put another way, the most popular os provided with the machine. - -# Note that if you're going to try to match "-MANUFACTURER" here (say, -# "-sun"), then you have to tell the case statement up towards the top -# that MANUFACTURER isn't an operating system. Otherwise, code above -# will signal an error saying that MANUFACTURER isn't an operating -# system, and we'll never get to this point. - -case $basic_machine in - score-*) - os=-elf - ;; - spu-*) - os=-elf - ;; - *-acorn) - os=-riscix1.2 - ;; - arm*-rebel) - os=-linux - ;; - arm*-semi) - os=-aout - ;; - c4x-* | tic4x-*) - os=-coff - ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 - ;; - pdp11-*) - os=-none - ;; - *-dec | vax-*) - os=-ultrix4.2 - ;; - m68*-apollo) - os=-domain - ;; - i386-sun) - os=-sunos4.0.2 - ;; - m68000-sun) - os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 - ;; - m68*-cisco) - os=-aout - ;; - mep-*) - os=-elf - ;; - mips*-cisco) - os=-elf - ;; - mips*-*) - os=-elf - ;; - or32-*) - os=-coff - ;; - *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 - ;; - sparc-* | *-sun) - os=-sunos4.1.1 - ;; - *-be) - os=-beos - ;; - *-haiku) - os=-haiku - ;; - *-ibm) - os=-aix - ;; - *-knuth) - os=-mmixware - ;; - *-wec) - os=-proelf - ;; - *-winbond) - os=-proelf - ;; - *-oki) - os=-proelf - ;; - *-hp) - os=-hpux - ;; - *-hitachi) - os=-hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv - ;; - *-cbm) - os=-amigaos - ;; - *-dg) - os=-dgux - ;; - *-dolphin) - os=-sysv3 - ;; - m68k-ccur) - os=-rtu - ;; - m88k-omron*) - os=-luna - ;; - *-next ) - os=-nextstep - ;; - *-sequent) - os=-ptx - ;; - *-crds) - os=-unos - ;; - *-ns) - os=-genix - ;; - i370-*) - os=-mvs - ;; - *-next) - os=-nextstep3 - ;; - *-gould) - os=-sysv - ;; - *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; - *-sgi) - os=-irix - ;; - *-siemens) - os=-sysv4 - ;; - *-masscomp) - os=-rtu - ;; - f30[01]-fujitsu | f700-fujitsu) - os=-uxpv - ;; - *-rom68k) - os=-coff - ;; - *-*bug) - os=-coff - ;; - *-apple) - os=-macos - ;; - *-atari*) - os=-mint - ;; - *) - os=-none - ;; -esac -fi - -# Here we handle the case where we know the os, and the CPU type, but not the -# manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) - vendor=acorn - ;; - -sunos*) - vendor=sun - ;; - -cnk*|-aix*) - vendor=ibm - ;; - -beos*) - vendor=be - ;; - -hpux*) - vendor=hp - ;; - -mpeix*) - vendor=hp - ;; - -hiux*) - vendor=hitachi - ;; - -unos*) - vendor=crds - ;; - -dgux*) - vendor=dg - ;; - -luna*) - vendor=omron - ;; - -genix*) - vendor=ns - ;; - -mvs* | -opened*) - vendor=ibm - ;; - -os400*) - vendor=ibm - ;; - -ptx*) - vendor=sequent - ;; - -tpf*) - vendor=ibm - ;; - -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; - -aux*) - vendor=apple - ;; - -hms*) - vendor=hitachi - ;; - -mpw* | -macos*) - vendor=apple - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - vendor=atari - ;; - -vos*) - vendor=stratus - ;; - esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` - ;; -esac - -echo $basic_machine$os -exit - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/configure b/configure index 575f9691..5f4dcb44 100755 --- a/configure +++ b/configure @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for NetworkManager 0.9.8.0. +# Generated by GNU Autoconf 2.69 for NetworkManager 0.9.8.8. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -136,6 +134,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -222,21 +246,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -340,6 +368,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -461,6 +497,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -495,16 +535,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -516,28 +556,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -571,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='NetworkManager' PACKAGE_TARNAME='NetworkManager' -PACKAGE_VERSION='0.9.8.0' -PACKAGE_STRING='NetworkManager 0.9.8.0' +PACKAGE_VERSION='0.9.8.8' +PACKAGE_STRING='NetworkManager 0.9.8.8' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -616,6 +636,8 @@ gt_needs= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS +INSTALL_PREGEN_MANPAGES_FALSE +INSTALL_PREGEN_MANPAGES_TRUE GTK_DOC_USE_REBASE_FALSE GTK_DOC_USE_REBASE_TRUE GTK_DOC_USE_LIBTOOL_FALSE @@ -632,8 +654,6 @@ HTML_DIR GTKDOC_MKPDF GTKDOC_REBASE GTKDOC_CHECK -ENABLE_DOC_FALSE -ENABLE_DOC_TRUE RUN_ROOT_TESTS_FALSE RUN_ROOT_TESTS_TRUE ENABLE_TESTS_FALSE @@ -676,7 +696,6 @@ LIBGCRYPT_CFLAGS LIBGCRYPT_CONFIG GNUTLS_LIBS GNUTLS_CFLAGS -PKGCONFIG_PATH NSS_LIBS NSS_CFLAGS NM_MODIFY_SYSTEM_POLICY @@ -705,9 +724,15 @@ SESSION_TRACKING_SYSTEMD_FALSE SESSION_TRACKING_SYSTEMD_TRUE SESSION_TRACKING_CK_FALSE SESSION_TRACKING_CK_TRUE +HAVE_SYSTEMD_200_FALSE +HAVE_SYSTEMD_200_TRUE +SYSTEMD_200_LIBS +SYSTEMD_200_CFLAGS systemdsystemunitdir HAVE_SYSTEMD_FALSE HAVE_SYSTEMD_TRUE +WITH_BLUEZ4_FALSE +WITH_BLUEZ4_TRUE UDEV_BASE_DIR WITH_QT_FALSE WITH_QT_TRUE @@ -866,13 +891,13 @@ CPPFLAGS LDFLAGS CFLAGS CC +MAINT +MAINTAINER_MODE_FALSE +MAINTAINER_MODE_TRUE AM_BACKSLASH AM_DEFAULT_VERBOSITY AM_DEFAULT_V AM_V -MAINT -MAINTAINER_MODE_FALSE -MAINTAINER_MODE_TRUE am__untar am__tar AMTAR @@ -937,8 +962,8 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -enable_maintainer_mode enable_silent_rules +enable_maintainer_mode enable_dependency_tracking enable_static enable_shared @@ -961,6 +986,7 @@ with_wext enable_introspection enable_qt with_udev_dir +enable_bluez4 with_systemdsystemunitdir with_session_tracking with_suspend_resume @@ -983,9 +1009,9 @@ enable_concheck enable_more_warnings enable_vala enable_tests -enable_doc with_tests with_docs +enable_doc with_html_dir enable_gtk_doc enable_gtk_doc_html @@ -1015,6 +1041,8 @@ GUDEV_CFLAGS GUDEV_LIBS QT_CFLAGS QT_LIBS +SYSTEMD_200_CFLAGS +SYSTEMD_200_LIBS SYSTEMD_LOGIN_CFLAGS SYSTEMD_LOGIN_LIBS SYSTEMD_INHIBIT_CFLAGS @@ -1492,8 +1520,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1579,7 +1605,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.8.0 to adapt to many kinds of systems. +\`configure' configures NetworkManager 0.9.8.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1649,7 +1675,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager 0.9.8.0:";; + short | recursive ) echo "Configuration of NetworkManager 0.9.8.8:";; esac cat <<\_ACEOF @@ -1657,12 +1683,15 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-maintainer-mode disable make rules and dependencies not useful - (and sometimes confusing) to the casual installer - --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0') - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --disable-maintainer-mode + disable make rules and dependencies not useful (and + sometimes confusing) to the casual installer + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --enable-static[=PKGS] build static libraries [default=no] --enable-shared[=PKGS] build shared libraries [default=yes] --enable-fast-install[=PKGS] @@ -1678,6 +1707,7 @@ Optional Features: --enable-introspection=[no/auto/yes] Enable introspection for this build --enable-qt enable Qt examples + --enable-bluez4 build with BlueZ 4 support instead of BlueZ 5 --enable-wimax enable WiMAX support --enable-polkit enable PolicyKit support --enable-modify-system Allow users to modify system connections @@ -1688,7 +1718,8 @@ Optional Features: build Vala bindings [[default=auto]] --enable-tests=root|yes|no Build NetworkManager tests (default: yes) - --enable-doc Build NetworkManager documentation (default: no) + --enable-doc Build NetworkManager documentation (deprecated, use + --enable-gtk-doc) --enable-gtk-doc use gtk-doc to build documentation [[default=no]] --enable-gtk-doc-html build documentation in html format [[default=yes]] --enable-gtk-doc-pdf build documentation in pdf format [[default=no]] @@ -1740,7 +1771,8 @@ Optional Packages: where kernel firmware directory is (default is /lib/firmware) --with-tests Build NetworkManager tests (deprecated) - --with-docs Build NetworkManager documentation (deprecated) + --with-docs Build NetworkManager documentation (deprecated, use + --enable-gtk-doc) --with-html-dir=PATH path to installed docs Some influential environment variables: @@ -1769,6 +1801,10 @@ Some influential environment variables: GUDEV_LIBS linker flags for GUDEV, overriding pkg-config QT_CFLAGS C compiler flags for QT, overriding pkg-config QT_LIBS linker flags for QT, overriding pkg-config + SYSTEMD_200_CFLAGS + C compiler flags for SYSTEMD_200, overriding pkg-config + SYSTEMD_200_LIBS + linker flags for SYSTEMD_200, overriding pkg-config SYSTEMD_LOGIN_CFLAGS C compiler flags for SYSTEMD_LOGIN, overriding pkg-config SYSTEMD_LOGIN_LIBS @@ -1873,10 +1909,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 0.9.8.0 -generated by GNU Autoconf 2.68 +NetworkManager configure 0.9.8.8 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -2191,7 +2227,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2341,7 +2377,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2417,8 +2453,8 @@ 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.8.0, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by NetworkManager $as_me 0.9.8.8, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2800,7 +2836,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -am__api_version='1.11' +am__api_version='1.13' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2839,7 +2875,7 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2897,9 +2933,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -2910,32 +2943,40 @@ case `pwd` in esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi - + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -2947,6 +2988,16 @@ Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -2969,12 +3020,12 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -2986,10 +3037,10 @@ if test x"${install_sh}" != xset; then esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. @@ -3008,7 +3059,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3048,7 +3099,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3099,7 +3150,7 @@ do test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -3128,12 +3179,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -3152,7 +3197,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3216,6 +3261,45 @@ else fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -3238,7 +3322,7 @@ fi # Define the identity of the package. PACKAGE='NetworkManager' - VERSION='0.9.8.0' + VERSION='0.9.8.8' cat >>confdefs.h <<_ACEOF @@ -3266,6 +3350,12 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used @@ -3273,86 +3363,125 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} AMTAR='$${TAR-tar}' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 -$as_echo_n "checking how to create a ustar tar archive... " >&6; } -# Loop over all known methods to create a tar archive until one works. +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar plaintar pax cpio none' -_am_tools=${am_cv_prog_tar_ustar-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - { echo "$as_me:$LINENO: $_am_tar --version" >&5 + +# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5 +$as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " >&6; } + if test $am_uid -le $am_max_uid; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + _am_tools=none + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5 +$as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " >&6; } + if test $am_gid -le $am_max_gid; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + _am_tools=none + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 +$as_echo_n "checking how to create a ustar tar archive... " >&6; } + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_ustar-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + { echo "$as_me:$LINENO: $_am_tar --version" >&5 ($_am_tar --version) >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && break - done - am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x ustar -w "$$tardir"' - am__tar_='pax -L -x ustar -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H ustar -L' - am__tar_='find "$tardir" -print | cpio -o -H ustar -L' - am__untar='cpio -i -H ustar -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac + done + am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x ustar -w "$$tardir"' + am__tar_='pax -L -x ustar -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H ustar -L' + am__tar_='find "$tardir" -print | cpio -o -H ustar -L' + am__untar='cpio -i -H ustar -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_ustar}" && break + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_ustar}" && break - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } - rm -rf conftest.dir - if test -s conftest.tar; then - { echo "$as_me:$LINENO: $am__untar &5 + rm -rf conftest.dir + if test -s conftest.tar; then + { echo "$as_me:$LINENO: $am__untar &5 ($am__untar &5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break - fi -done -rm -rf conftest.dir + { echo "$as_me:$LINENO: cat conftest.dir/file" >&5 + (cat conftest.dir/file) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi + done + rm -rf conftest.dir -if ${am_cv_prog_tar_ustar+:} false; then : + if ${am_cv_prog_tar_ustar+:} false; then : $as_echo_n "(cached) " >&6 else am_cv_prog_tar_ustar=$_am_tool fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 $as_echo "$am_cv_prog_tar_ustar" >&6; } @@ -3360,6 +3489,7 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -3387,10 +3517,10 @@ if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; fi -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=0;; +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=0;; esac am_make=${MAKE-make} { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 @@ -3441,7 +3571,7 @@ am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -3507,7 +3637,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3547,7 +3677,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3600,7 +3730,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3641,7 +3771,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3699,7 +3829,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3743,7 +3873,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4189,8 +4319,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -4286,8 +4415,8 @@ else # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -4322,16 +4451,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -4340,8 +4469,8 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -4349,7 +4478,7 @@ else fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -4558,7 +4687,7 @@ do for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4624,7 +4753,7 @@ do for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -4831,8 +4960,8 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# define __EXTENSIONS__ 1 - $ac_includes_default +# define __EXTENSIONS__ 1 + $ac_includes_default int main () { @@ -4885,7 +5014,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4925,7 +5054,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4978,7 +5107,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5019,7 +5148,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -5077,7 +5206,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5121,7 +5250,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5317,8 +5446,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -5414,8 +5542,8 @@ else # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -5450,16 +5578,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -5468,8 +5596,8 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -5477,7 +5605,7 @@ else fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -5688,7 +5816,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5732,7 +5860,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5928,8 +6056,8 @@ else # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -5964,16 +6092,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -5982,8 +6110,8 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -5991,7 +6119,7 @@ else fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -6234,7 +6362,7 @@ do for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -6313,7 +6441,7 @@ do for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -6569,7 +6697,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6613,7 +6741,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7037,7 +7165,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7077,7 +7205,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7383,7 +7511,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7423,7 +7551,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7526,7 +7654,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7570,7 +7698,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7695,7 +7823,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7735,7 +7863,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7794,7 +7922,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7834,7 +7962,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8483,7 +8611,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8523,7 +8651,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8603,7 +8731,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8643,7 +8771,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8695,7 +8823,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8735,7 +8863,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8787,7 +8915,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8827,7 +8955,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8879,7 +9007,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8919,7 +9047,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8971,7 +9099,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9011,7 +9139,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16441,7 +16569,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu NM_MAJOR_VERSION=0 NM_MINOR_VERSION=9 NM_MICRO_VERSION=8 -NM_VERSION=0.9.8.0 +NM_VERSION=0.9.8.8 @@ -16802,7 +16930,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16842,7 +16970,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16882,7 +17010,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -17066,7 +17194,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -17106,7 +17234,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -17146,7 +17274,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -17186,7 +17314,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -17237,7 +17365,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -17329,6 +17457,13 @@ fi +mkdir_p="$MKDIR_P" +case $mkdir_p in + [\\/$]* | ?:[\\/]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac + + GETTEXT_MACRO_VERSION=0.17 @@ -17422,7 +17557,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -19709,7 +19844,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LCOV="lcov" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -19746,7 +19881,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_GENHTML="genhtml" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -20218,6 +20353,7 @@ fi + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -20238,7 +20374,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -20281,7 +20417,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -20346,6 +20482,7 @@ if test -n "$DBUS_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 1.1 dbus-glib-1 >= 0.94" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -20362,6 +20499,7 @@ if test -n "$DBUS_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 1.1 dbus-glib-1 >= 0.94" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -20381,9 +20519,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1 >= 1.1 dbus-glib-1 >= 0.94" 2>&1` + DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1 >= 1.1 dbus-glib-1 >= 0.94" 2>&1` else - DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1 >= 1.1 dbus-glib-1 >= 0.94" 2>&1` + DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1 >= 1.1 dbus-glib-1 >= 0.94" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DBUS_PKG_ERRORS" >&5 @@ -20398,7 +20536,6 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables DBUS_CFLAGS and DBUS_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; } @@ -20414,7 +20551,6 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS DBUS_LIBS=$pkg_cv_DBUS_LIBS @@ -20447,6 +20583,7 @@ if test -n "$GLIB_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gio-unix-2.0 >= 2.22 gmodule-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -20463,6 +20600,7 @@ if test -n "$GLIB_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "gio-unix-2.0 >= 2.22 gmodule-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -20482,9 +20620,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-unix-2.0 >= 2.22 gmodule-2.0" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-unix-2.0 >= 2.22 gmodule-2.0" 2>&1` else - GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-unix-2.0 >= 2.22 gmodule-2.0" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-unix-2.0 >= 2.22 gmodule-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GLIB_PKG_ERRORS" >&5 @@ -20499,7 +20637,6 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables GLIB_CFLAGS and GLIB_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; } @@ -20515,7 +20652,6 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS GLIB_LIBS=$pkg_cv_GLIB_LIBS @@ -20542,6 +20678,7 @@ if test -n "$GUDEV_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GUDEV_CFLAGS=`$PKG_CONFIG --cflags "gudev-1.0 >= 165" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -20558,6 +20695,7 @@ if test -n "$GUDEV_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GUDEV_LIBS=`$PKG_CONFIG --libs "gudev-1.0 >= 165" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -20577,9 +20715,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GUDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gudev-1.0 >= 165" 2>&1` + GUDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gudev-1.0 >= 165" 2>&1` else - GUDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors "gudev-1.0 >= 165" 2>&1` + GUDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gudev-1.0 >= 165" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GUDEV_PKG_ERRORS" >&5 @@ -20594,7 +20732,6 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables GUDEV_CFLAGS and GUDEV_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; } @@ -20610,7 +20747,6 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else GUDEV_CFLAGS=$pkg_cv_GUDEV_CFLAGS GUDEV_LIBS=$pkg_cv_GUDEV_LIBS @@ -20725,12 +20861,13 @@ if test -n "$QT_CFLAGS"; then pkg_cv_QT_CFLAGS="$QT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt >= 4 QtCore QtDBus QtNetwork\""; } >&5 - ($PKG_CONFIG --exists --print-errors "Qt >= 4 QtCore QtDBus QtNetwork") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore >= 4 QtDBus QtNetwork\""; } >&5 + ($PKG_CONFIG --exists --print-errors "QtCore >= 4 QtDBus QtNetwork") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_QT_CFLAGS=`$PKG_CONFIG --cflags "Qt >= 4 QtCore QtDBus QtNetwork" 2>/dev/null` + pkg_cv_QT_CFLAGS=`$PKG_CONFIG --cflags "QtCore >= 4 QtDBus QtNetwork" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -20741,12 +20878,13 @@ if test -n "$QT_LIBS"; then pkg_cv_QT_LIBS="$QT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt >= 4 QtCore QtDBus QtNetwork\""; } >&5 - ($PKG_CONFIG --exists --print-errors "Qt >= 4 QtCore QtDBus QtNetwork") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore >= 4 QtDBus QtNetwork\""; } >&5 + ($PKG_CONFIG --exists --print-errors "QtCore >= 4 QtDBus QtNetwork") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_QT_LIBS=`$PKG_CONFIG --libs "Qt >= 4 QtCore QtDBus QtNetwork" 2>/dev/null` + pkg_cv_QT_LIBS=`$PKG_CONFIG --libs "QtCore >= 4 QtDBus QtNetwork" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -20766,9 +20904,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - QT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "Qt >= 4 QtCore QtDBus QtNetwork" 2>&1` + QT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "QtCore >= 4 QtDBus QtNetwork" 2>&1` else - QT_PKG_ERRORS=`$PKG_CONFIG --print-errors "Qt >= 4 QtCore QtDBus QtNetwork" 2>&1` + QT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "QtCore >= 4 QtDBus QtNetwork" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$QT_PKG_ERRORS" >&5 @@ -20799,7 +20937,7 @@ if (test "${enable_qt}" = "yes"); then # Check for moc-qt4 and if not found then moc - QT4_BINDIR=`$PKG_CONFIG Qt --variable bindir` + QT4_BINDIR=`$PKG_CONFIG QtCore --variable moc_location` for ac_prog in moc-qt4 moc do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -20819,7 +20957,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MOC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -20867,6 +21005,31 @@ else fi +# BlueZ +# Check whether --enable-bluez4 was given. +if test "${enable_bluez4+set}" = set; then : + enableval=$enable_bluez4; enable_bluez4=${enableval} +fi + +if (test "${enable_bluez4}" = "yes"); then + +$as_echo "#define WITH_BLUEZ4 1" >>confdefs.h + +else + +$as_echo "#define WITH_BLUEZ4 0" >>confdefs.h + + enable_bluez4=no +fi + if test "${enable_bluez4}" = "yes"; then + WITH_BLUEZ4_TRUE= + WITH_BLUEZ4_FALSE='#' +else + WITH_BLUEZ4_TRUE='#' + WITH_BLUEZ4_FALSE= +fi + + # systemd unit support # Check whether --with-systemdsystemunitdir was given. @@ -20895,6 +21058,86 @@ if test "$with_systemdsystemunitdir" != no; then fi + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_200" >&5 +$as_echo_n "checking for SYSTEMD_200... " >&6; } + +if test -n "$SYSTEMD_200_CFLAGS"; then + pkg_cv_SYSTEMD_200_CFLAGS="$SYSTEMD_200_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 200\""; } >&5 + ($PKG_CONFIG --exists --print-errors "systemd >= 200") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SYSTEMD_200_CFLAGS=`$PKG_CONFIG --cflags "systemd >= 200" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$SYSTEMD_200_LIBS"; then + pkg_cv_SYSTEMD_200_LIBS="$SYSTEMD_200_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 200\""; } >&5 + ($PKG_CONFIG --exists --print-errors "systemd >= 200") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SYSTEMD_200_LIBS=`$PKG_CONFIG --libs "systemd >= 200" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +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 + SYSTEMD_200_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "systemd >= 200" 2>&1` + else + SYSTEMD_200_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "systemd >= 200" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$SYSTEMD_200_PKG_ERRORS" >&5 + + have_systemd_200=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + have_systemd_200=no +else + SYSTEMD_200_CFLAGS=$pkg_cv_SYSTEMD_200_CFLAGS + SYSTEMD_200_LIBS=$pkg_cv_SYSTEMD_200_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_systemd_200=yes +fi + if test "${have_systemd_200}" = "yes"; then + HAVE_SYSTEMD_200_TRUE= + HAVE_SYSTEMD_200_FALSE='#' +else + HAVE_SYSTEMD_200_TRUE='#' + HAVE_SYSTEMD_200_FALSE= +fi + + # session tracking support { $as_echo "$as_me:${as_lineno-$LINENO}: checking Session tracking support" >&5 $as_echo_n "checking Session tracking support... " >&6; } @@ -20929,7 +21172,7 @@ else SESSION_TRACKING_CK_FALSE= fi - if test "xwith_session_tracking" = "systemd"; then + if test "$with_session_tracking" = "systemd"; then SESSION_TRACKING_SYSTEMD_TRUE= SESSION_TRACKING_SYSTEMD_FALSE='#' else @@ -20953,6 +21196,7 @@ if test -n "$SYSTEMD_LOGIN_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_LOGIN_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-login" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -20969,6 +21213,7 @@ if test -n "$SYSTEMD_LOGIN_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_LOGIN_LIBS=`$PKG_CONFIG --libs "libsystemd-login" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -20988,9 +21233,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libsystemd-login" 2>&1` + SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-login" 2>&1` else - SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors "libsystemd-login" 2>&1` + SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-login" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$SYSTEMD_LOGIN_PKG_ERRORS" >&5 @@ -21005,7 +21250,6 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables SYSTEMD_LOGIN_CFLAGS and SYSTEMD_LOGIN_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; } @@ -21021,7 +21265,6 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else SYSTEMD_LOGIN_CFLAGS=$pkg_cv_SYSTEMD_LOGIN_CFLAGS SYSTEMD_LOGIN_LIBS=$pkg_cv_SYSTEMD_LOGIN_LIBS @@ -21047,8 +21290,8 @@ fi if test "z$with_suspend_resume" = "z"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 183\""; } >&5 - ($PKG_CONFIG --exists --print-errors "systemd >= 183") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login >= 183\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsystemd-login >= 183") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then @@ -21077,12 +21320,13 @@ if test -n "$SYSTEMD_INHIBIT_CFLAGS"; then pkg_cv_SYSTEMD_INHIBIT_CFLAGS="$SYSTEMD_INHIBIT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 183\""; } >&5 - ($PKG_CONFIG --exists --print-errors "systemd >= 183") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login >= 183\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsystemd-login >= 183") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_SYSTEMD_INHIBIT_CFLAGS=`$PKG_CONFIG --cflags "systemd >= 183" 2>/dev/null` + pkg_cv_SYSTEMD_INHIBIT_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-login >= 183" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -21093,12 +21337,13 @@ if test -n "$SYSTEMD_INHIBIT_LIBS"; then pkg_cv_SYSTEMD_INHIBIT_LIBS="$SYSTEMD_INHIBIT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 183\""; } >&5 - ($PKG_CONFIG --exists --print-errors "systemd >= 183") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login >= 183\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsystemd-login >= 183") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_SYSTEMD_INHIBIT_LIBS=`$PKG_CONFIG --libs "systemd >= 183" 2>/dev/null` + pkg_cv_SYSTEMD_INHIBIT_LIBS=`$PKG_CONFIG --libs "libsystemd-login >= 183" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -21118,14 +21363,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SYSTEMD_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "systemd >= 183" 2>&1` + SYSTEMD_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-login >= 183" 2>&1` else - SYSTEMD_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "systemd >= 183" 2>&1` + SYSTEMD_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-login >= 183" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$SYSTEMD_INHIBIT_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (systemd >= 183) were not met: + as_fn_error $? "Package requirements (libsystemd-login >= 183) were not met: $SYSTEMD_INHIBIT_PKG_ERRORS @@ -21135,7 +21380,6 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables SYSTEMD_INHIBIT_CFLAGS and SYSTEMD_INHIBIT_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; } @@ -21151,7 +21395,6 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else SYSTEMD_INHIBIT_CFLAGS=$pkg_cv_SYSTEMD_INHIBIT_CFLAGS SYSTEMD_INHIBIT_LIBS=$pkg_cv_SYSTEMD_INHIBIT_LIBS @@ -21197,6 +21440,7 @@ if test -n "$LIBNL_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBNL_CFLAGS=`$PKG_CONFIG --cflags "libnl-3.0 >= 3.2.7 libnl-route-3.0 libnl-genl-3.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -21213,6 +21457,7 @@ if test -n "$LIBNL_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBNL_LIBS=`$PKG_CONFIG --libs "libnl-3.0 >= 3.2.7 libnl-route-3.0 libnl-genl-3.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -21232,9 +21477,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBNL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnl-3.0 >= 3.2.7 libnl-route-3.0 libnl-genl-3.0" 2>&1` + LIBNL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnl-3.0 >= 3.2.7 libnl-route-3.0 libnl-genl-3.0" 2>&1` else - LIBNL_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnl-3.0 >= 3.2.7 libnl-route-3.0 libnl-genl-3.0" 2>&1` + LIBNL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnl-3.0 >= 3.2.7 libnl-route-3.0 libnl-genl-3.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBNL_PKG_ERRORS" >&5 @@ -21249,7 +21494,6 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables LIBNL_CFLAGS and LIBNL_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; } @@ -21265,7 +21509,6 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else LIBNL_CFLAGS=$pkg_cv_LIBNL_CFLAGS LIBNL_LIBS=$pkg_cv_LIBNL_LIBS @@ -21292,6 +21535,7 @@ if test -n "$UUID_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_UUID_CFLAGS=`$PKG_CONFIG --cflags "uuid" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -21308,6 +21552,7 @@ if test -n "$UUID_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_UUID_LIBS=`$PKG_CONFIG --libs "uuid" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -21327,9 +21572,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - UUID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "uuid" 2>&1` + UUID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "uuid" 2>&1` else - UUID_PKG_ERRORS=`$PKG_CONFIG --print-errors "uuid" 2>&1` + UUID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "uuid" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$UUID_PKG_ERRORS" >&5 @@ -21344,7 +21589,6 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables UUID_CFLAGS and UUID_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; } @@ -21360,7 +21604,6 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else UUID_CFLAGS=$pkg_cv_UUID_CFLAGS UUID_LIBS=$pkg_cv_UUID_LIBS @@ -21387,6 +21630,7 @@ if test -n "$IWMX_SDK_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_IWMX_SDK_CFLAGS=`$PKG_CONFIG --cflags "libiWmxSdk-0 >= 1.5.1" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -21403,6 +21647,7 @@ if test -n "$IWMX_SDK_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_IWMX_SDK_LIBS=`$PKG_CONFIG --libs "libiWmxSdk-0 >= 1.5.1" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -21422,9 +21667,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - IWMX_SDK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libiWmxSdk-0 >= 1.5.1" 2>&1` + IWMX_SDK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libiWmxSdk-0 >= 1.5.1" 2>&1` else - IWMX_SDK_PKG_ERRORS=`$PKG_CONFIG --print-errors "libiWmxSdk-0 >= 1.5.1" 2>&1` + IWMX_SDK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libiWmxSdk-0 >= 1.5.1" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$IWMX_SDK_PKG_ERRORS" >&5 @@ -21453,6 +21698,15 @@ if (test "${enable_wimax}" = "yes"); then as_fn_error $? "Intel WiMAX SDK is required" "$LINENO" 5 fi + # Ensure the WiMAX stack is built with libnl3; otherwise crashes happen + # due to symbol conflicts + WMX_LIB_PATH=`$PKG_CONFIG --variable=libdir libiWmxSdk-0` + FOO=`ldd $WMX_LIB_PATH/libiWmxSdk.so.0.0.0 | grep libnl-3 2>&1` + if test "$?" != "0"; then + as_fn_error $? "Intel WiMAX stack built with incompatible libnl version!" "$LINENO" 5 + fi + + $as_echo "#define WITH_WIMAX 1" >>confdefs.h @@ -21486,6 +21740,7 @@ if test -n "$POLKIT_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_POLKIT_CFLAGS=`$PKG_CONFIG --cflags "polkit-gobject-1 >= 0.97" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -21502,6 +21757,7 @@ if test -n "$POLKIT_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_POLKIT_LIBS=`$PKG_CONFIG --libs "polkit-gobject-1 >= 0.97" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -21521,9 +21777,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - POLKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "polkit-gobject-1 >= 0.97" 2>&1` + POLKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "polkit-gobject-1 >= 0.97" 2>&1` else - POLKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "polkit-gobject-1 >= 0.97" 2>&1` + POLKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "polkit-gobject-1 >= 0.97" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$POLKIT_PKG_ERRORS" >&5 @@ -21612,6 +21868,7 @@ if test -n "$NSS_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "nss >= 3.11" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -21628,6 +21885,7 @@ if test -n "$NSS_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "nss >= 3.11" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -21647,9 +21905,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "nss >= 3.11" 2>&1` + NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "nss >= 3.11" 2>&1` else - NSS_PKG_ERRORS=`$PKG_CONFIG --print-errors "nss >= 3.11" 2>&1` + NSS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "nss >= 3.11" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$NSS_PKG_ERRORS" >&5 @@ -21664,7 +21922,6 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables NSS_CFLAGS and NSS_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; } @@ -21680,7 +21937,6 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else NSS_CFLAGS=$pkg_cv_NSS_CFLAGS NSS_LIBS=$pkg_cv_NSS_LIBS @@ -21690,54 +21946,9 @@ $as_echo "yes" >&6; } fi # Work around a pkg-config bug (fdo #29801) where exists != usable - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKGCONFIG_PATH+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PKGCONFIG_PATH in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKGCONFIG_PATH="$PKGCONFIG_PATH" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PKGCONFIG_PATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path_PKGCONFIG_PATH" && ac_cv_path_PKGCONFIG_PATH="no" - ;; -esac -fi -PKGCONFIG_PATH=$ac_cv_path_PKGCONFIG_PATH -if test -n "$PKGCONFIG_PATH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG_PATH" >&5 -$as_echo "$PKGCONFIG_PATH" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - if test x"$PKGCONFIG_PATH" = xno; then - as_fn_error $? "pkgconfig required but not found" "$LINENO" 5 - else - FOO=`$PKGCONFIG_PATH --cflags --libs nss` - if test x"$?" != "x0"; then - as_fn_error $? "No usable NSS found" "$LINENO" 5 - fi + FOO=`$PKG_CONFIG --cflags --libs nss` + if test x"$?" != "x0"; then + as_fn_error $? "No usable NSS found" "$LINENO" 5 fi @@ -21762,6 +21973,7 @@ if test -n "$GNUTLS_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GNUTLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= 1.2" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -21778,6 +21990,7 @@ if test -n "$GNUTLS_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= 1.2" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -21797,9 +22010,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnutls >= 1.2" 2>&1` + GNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnutls >= 1.2" 2>&1` else - GNUTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnutls >= 1.2" 2>&1` + GNUTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnutls >= 1.2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GNUTLS_PKG_ERRORS" >&5 @@ -21814,7 +22027,6 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables GNUTLS_CFLAGS and GNUTLS_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; } @@ -21830,7 +22042,6 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } - else GNUTLS_CFLAGS=$pkg_cv_GNUTLS_CFLAGS GNUTLS_LIBS=$pkg_cv_GNUTLS_LIBS @@ -21856,7 +22067,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_LIBGCRYPT_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -22011,12 +22222,13 @@ if test -n "$MM_GLIB_CFLAGS"; then pkg_cv_MM_GLIB_CFLAGS="$MM_GLIB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mm-glib\""; } >&5 - ($PKG_CONFIG --exists --print-errors "mm-glib") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mm-glib >= 0.7.991\""; } >&5 + ($PKG_CONFIG --exists --print-errors "mm-glib >= 0.7.991") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_MM_GLIB_CFLAGS=`$PKG_CONFIG --cflags "mm-glib" 2>/dev/null` + pkg_cv_MM_GLIB_CFLAGS=`$PKG_CONFIG --cflags "mm-glib >= 0.7.991" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -22027,12 +22239,13 @@ if test -n "$MM_GLIB_LIBS"; then pkg_cv_MM_GLIB_LIBS="$MM_GLIB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mm-glib\""; } >&5 - ($PKG_CONFIG --exists --print-errors "mm-glib") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mm-glib >= 0.7.991\""; } >&5 + ($PKG_CONFIG --exists --print-errors "mm-glib >= 0.7.991") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_MM_GLIB_LIBS=`$PKG_CONFIG --libs "mm-glib" 2>/dev/null` + pkg_cv_MM_GLIB_LIBS=`$PKG_CONFIG --libs "mm-glib >= 0.7.991" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -22052,9 +22265,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - MM_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "mm-glib" 2>&1` + MM_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mm-glib >= 0.7.991" 2>&1` else - MM_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "mm-glib" 2>&1` + MM_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mm-glib >= 0.7.991" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$MM_GLIB_PKG_ERRORS" >&5 @@ -22077,6 +22290,8 @@ fi if (test "${have_libmm_glib}" = "no"); then if (test "${with_modem_manager_1}" = "yes"); then as_fn_error $? "Couldn't find libmm-glib" "$LINENO" 5 + else + with_modem_manager_1="no" fi else with_modem_manager_1="yes" @@ -22144,7 +22359,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_with_dhclient="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -22200,7 +22415,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_with_dhcpcd="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -22227,9 +22442,9 @@ done test -n "$with_dhcpcd" || with_dhcpcd="no" if test "$with_dhcpcd" != "no"; then - if ! $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [45]\."; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot use dhcpcd, version 4.x or 5.x is required" >&5 -$as_echo "$as_me: WARNING: Cannot use dhcpcd, version 4.x or 5.x is required" >&2;} + if ! $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [456789]\."; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot use dhcpcd, version 4.x or higher is required" >&5 +$as_echo "$as_me: WARNING: Cannot use dhcpcd, version 4.x or higher is required" >&2;} with_dhcpcd=no fi fi @@ -22315,7 +22530,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_with_resolvconf="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -22364,7 +22579,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_with_netconfig="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -22434,7 +22649,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_IPTABLES_PATH="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -22522,6 +22737,7 @@ if test -n "$LIBSOUP_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBSOUP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4 >= 2.26" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -22538,6 +22754,7 @@ if test -n "$LIBSOUP_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBSOUP_LIBS=`$PKG_CONFIG --libs "libsoup-2.4 >= 2.26" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -22557,9 +22774,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libsoup-2.4 >= 2.26" 2>&1` + LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsoup-2.4 >= 2.26" 2>&1` else - LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --print-errors "libsoup-2.4 >= 2.26" 2>&1` + LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsoup-2.4 >= 2.26" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBSOUP_PKG_ERRORS" >&5 @@ -22729,6 +22946,7 @@ fi + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -22749,7 +22967,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -22792,7 +23010,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -22912,44 +23130,24 @@ if test "${enable_tests+set}" = set; then : enableval=$enable_tests; fi -# Check whether --enable-doc was given. -if test "${enable_doc+set}" = set; then : - enableval=$enable_doc; -fi - -# Fallback to --with-tests and with-docs +# Fallback to --with-tests # Check whether --with-tests was given. if test "${with_tests+set}" = set; then : withval=$with_tests; fi - -# Check whether --with-docs was given. -if test "${with_docs+set}" = set; then : - withval=$with_docs; -fi - if test -n "$with_tests"; then : enable_tests="$with_tests" fi -if test -n "$with_docs"; then : - enable_doc="$with_docs" -fi -# Default to --enable-tests and --disable-docs +# Default to --enable-tests if test -z "$enable_tests"; then : enable_tests="yes" fi -if test -z "$enable_doc"; then : - enable_doc="no" -fi # Normalize values if test "$enable_tests" != "yes" -a "$enable_tests" != "root"; then : enable_tests="no" fi -if test "$enable_doc" != "yes"; then : - enable_doc="no" -fi # Add conditionals if test "$enable_tests" != "no"; then ENABLE_TESTS_TRUE= @@ -22967,16 +23165,25 @@ else RUN_ROOT_TESTS_FALSE= fi - if test "$enable_doc" = "yes"; then - ENABLE_DOC_TRUE= - ENABLE_DOC_FALSE='#' -else - ENABLE_DOC_TRUE='#' - ENABLE_DOC_FALSE= + +# Backwards compatible documentation enable/disable + +# Check whether --with-docs was given. +if test "${with_docs+set}" = set; then : + withval=$with_docs; +fi + +# Check whether --enable-doc was given. +if test "${enable_doc+set}" = set; then : + enableval=$enable_doc; fi -# Add gtk-doc conditionals -enable_gtk_doc="$enable_doc" +if test "$with_docs" = "yes"; then : + enable_gtk_doc="yes" +fi +if test "$enable_doc" = "yes"; then : + enable_gtk_doc="yes" +fi @@ -22998,7 +23205,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -23040,7 +23247,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -23084,7 +23291,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -23153,6 +23360,7 @@ if test -n "$GTKDOC_DEPS_CFLAGS"; then $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` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -23169,6 +23377,7 @@ if test -n "$GTKDOC_DEPS_LIBS"; then $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` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -23188,40 +23397,18 @@ 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` + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "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` + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "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 @@ -23256,6 +23443,10 @@ fi enable_gtk_doc_pdf=no fi + if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 + fi + if test x$enable_gtk_doc = xyes; then ENABLE_GTK_DOC_TRUE= @@ -23299,6 +23490,21 @@ fi +# check for pregenerated manpages to be installed +install_pregen_manpages=no +if test "$enable_gtk_doc" != "yes" -a -f man/nm-settings.5; then + install_pregen_manpages=yes +fi + if test "x${install_pregen_manpages}" = "xyes"; then + INSTALL_PREGEN_MANPAGES_TRUE= + INSTALL_PREGEN_MANPAGES_FALSE='#' +else + INSTALL_PREGEN_MANPAGES_TRUE='#' + INSTALL_PREGEN_MANPAGES_FALSE= +fi + + + ac_config_files="$ac_config_files Makefile include/Makefile include/nm-version.h src/Makefile src/tests/Makefile src/generated/Makefile src/logging/Makefile src/posix-signals/Makefile src/dns-manager/Makefile src/vpn-manager/Makefile src/dhcp-manager/Makefile src/dhcp-manager/tests/Makefile src/ip6-manager/Makefile src/supplicant-manager/Makefile src/supplicant-manager/tests/Makefile src/ppp-manager/Makefile src/dnsmasq-manager/Makefile src/modem-manager/Makefile src/bluez-manager/Makefile src/wifi/Makefile src/firewall-manager/Makefile src/settings/Makefile src/settings/plugins/Makefile src/settings/plugins/ifupdown/Makefile src/settings/plugins/ifupdown/tests/Makefile src/settings/plugins/ifnet/Makefile src/settings/plugins/ifnet/tests/Makefile src/settings/plugins/ifcfg-rh/Makefile src/settings/plugins/ifcfg-rh/tests/Makefile src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile src/settings/plugins/ifcfg-suse/Makefile src/settings/plugins/keyfile/Makefile src/settings/plugins/keyfile/tests/Makefile src/settings/plugins/keyfile/tests/keyfiles/Makefile src/settings/plugins/example/Makefile src/settings/tests/Makefile src/wimax/Makefile libnm-util/libnm-util.pc libnm-util/Makefile libnm-util/tests/Makefile libnm-util/tests/certs/Makefile libnm-glib/libnm-glib.pc libnm-glib/libnm-glib-vpn.pc libnm-glib/Makefile libnm-glib/tests/Makefile callouts/Makefile callouts/tests/Makefile tools/Makefile cli/Makefile cli/src/Makefile cli/completion/Makefile test/Makefile initscript/RedHat/NetworkManager initscript/Debian/NetworkManager initscript/Slackware/rc.networkmanager initscript/SUSE/networkmanager initscript/Arch/networkmanager initscript/paldo/NetworkManager initscript/Mandriva/networkmanager initscript/linexa/networkmanager introspection/Makefile introspection/all.xml man/Makefile man/NetworkManager.8 man/NetworkManager.conf.5 man/nm-system-settings.conf.5 man/nm-tool.1 man/nm-online.1 man/nmcli.1 po/Makefile.in policy/Makefile policy/org.freedesktop.NetworkManager.policy.in data/Makefile docs/Makefile docs/api/Makefile docs/api/version.xml docs/libnm-glib/Makefile docs/libnm-glib/version.xml docs/libnm-util/Makefile docs/libnm-util/version.xml NetworkManager.pc examples/Makefile examples/shell/Makefile examples/python/Makefile examples/ruby/Makefile examples/C/Makefile examples/C/glib/Makefile examples/C/qt/Makefile examples/dispatcher/Makefile vapi/Makefile" cat >confcache <<\_ACEOF @@ -23410,6 +23616,14 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -23475,10 +23689,18 @@ if test -z "${WITH_QT_TRUE}" && test -z "${WITH_QT_FALSE}"; then as_fn_error $? "conditional \"WITH_QT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${WITH_BLUEZ4_TRUE}" && test -z "${WITH_BLUEZ4_FALSE}"; then + as_fn_error $? "conditional \"WITH_BLUEZ4\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${HAVE_SYSTEMD_TRUE}" && test -z "${HAVE_SYSTEMD_FALSE}"; then as_fn_error $? "conditional \"HAVE_SYSTEMD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_SYSTEMD_200_TRUE}" && test -z "${HAVE_SYSTEMD_200_FALSE}"; then + as_fn_error $? "conditional \"HAVE_SYSTEMD_200\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${SESSION_TRACKING_CK_TRUE}" && test -z "${SESSION_TRACKING_CK_FALSE}"; then as_fn_error $? "conditional \"SESSION_TRACKING_CK\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -23535,10 +23757,6 @@ if test -z "${RUN_ROOT_TESTS_TRUE}" && test -z "${RUN_ROOT_TESTS_FALSE}"; then as_fn_error $? "conditional \"RUN_ROOT_TESTS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${ENABLE_DOC_TRUE}" && test -z "${ENABLE_DOC_FALSE}"; then - as_fn_error $? "conditional \"ENABLE_DOC\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -23559,6 +23777,10 @@ if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}" as_fn_error $? "conditional \"GTK_DOC_USE_REBASE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${INSTALL_PREGEN_MANPAGES_TRUE}" && test -z "${INSTALL_PREGEN_MANPAGES_FALSE}"; then + as_fn_error $? "conditional \"INSTALL_PREGEN_MANPAGES\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -23857,16 +24079,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -23926,28 +24148,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -23968,8 +24178,8 @@ 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.8.0, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by NetworkManager $as_me 0.9.8.8, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -24034,11 +24244,11 @@ _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.8.0 -configured by $0, generated by GNU Autoconf 2.68, +NetworkManager config.status 0.9.8.8 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -24129,7 +24339,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -25236,7 +25446,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -25249,7 +25459,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -25283,21 +25493,19 @@ $as_echo X"$mf" | continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || @@ -26332,6 +26540,7 @@ echo " wimax: $enable_wimax" echo " ppp: $enable_ppp" echo " modemmanager-1: $with_modem_manager_1" echo " concheck: $enable_concheck" +echo " bluez 4: $enable_bluez4" echo echo "Configuration plugins" @@ -26352,8 +26561,7 @@ echo " dhcpcd: $with_dhcpcd" echo echo "Miscellaneous:" -echo " documentation: $enable_doc" +echo " documentation: $enable_gtk_doc" echo " tests: $enable_tests" echo " code coverage: $enable_code_coverage" echo - diff --git a/configure.ac b/configure.ac index cc66e9bc..6f40badb 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl The NM version number m4_define([nm_major_version], [0]) m4_define([nm_minor_version], [9]) m4_define([nm_micro_version], [8]) -m4_define([nm_nano_version], [0]) +m4_define([nm_nano_version], [8]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version.nm_nano_version]) @@ -231,7 +231,7 @@ AC_SUBST(GUDEV_LIBS) GOBJECT_INTROSPECTION_CHECK([0.9.6]) # Qt4 -PKG_CHECK_MODULES(QT, [Qt >= 4 QtCore QtDBus QtNetwork], [have_qt=yes],[have_qt=no]) +PKG_CHECK_MODULES(QT, [QtCore >= 4 QtDBus QtNetwork], [have_qt=yes],[have_qt=no]) AC_ARG_ENABLE(qt, AS_HELP_STRING([--enable-qt], [enable Qt examples]), [enable_qt=${enableval}], [enable_qt=${have_qt}]) if (test "${enable_qt}" = "yes"); then @@ -241,7 +241,7 @@ if (test "${enable_qt}" = "yes"); then AC_SUBST(QT_CFLAGS) AC_SUBST(QT_LIBS) # Check for moc-qt4 and if not found then moc - QT4_BINDIR=`$PKG_CONFIG Qt --variable bindir` + QT4_BINDIR=`$PKG_CONFIG QtCore --variable moc_location` AC_CHECK_PROGS(MOC, [moc-qt4 moc],, [$QT4_BINDIR:$PATH]) fi AM_CONDITIONAL(WITH_QT, test "${enable_qt}" = "yes") @@ -255,6 +255,18 @@ else fi AC_SUBST(UDEV_BASE_DIR) +# BlueZ +AC_ARG_ENABLE(bluez4, AS_HELP_STRING([--enable-bluez4], + [build with BlueZ 4 support instead of BlueZ 5]), + [enable_bluez4=${enableval}]) +if (test "${enable_bluez4}" = "yes"); then + AC_DEFINE(WITH_BLUEZ4, 1, [Define if you have BlueZ 4 support]) +else + AC_DEFINE(WITH_BLUEZ4, 0, [Define if you have BlueZ 4 support]) + enable_bluez4=no +fi +AM_CONDITIONAL(WITH_BLUEZ4, test "${enable_bluez4}" = "yes") + # systemd unit support AC_ARG_WITH([systemdsystemunitdir], AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])) @@ -268,6 +280,9 @@ if test "$with_systemdsystemunitdir" != no; then AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) fi +PKG_CHECK_MODULES(SYSTEMD_200, [systemd >= 200], [have_systemd_200=yes],[have_systemd_200=no]) +AM_CONDITIONAL(HAVE_SYSTEMD_200, test "${have_systemd_200}" = "yes") + # session tracking support AC_MSG_CHECKING([Session tracking support]) AC_ARG_WITH(session-tracking, AS_HELP_STRING([--with-session-tracking=systemd|consolekit|no], @@ -281,7 +296,7 @@ AS_IF([! (echo "$with_session_tracking" | grep -q -E "^(systemd|consolekit|no)$" AC_MSG_ERROR([--with-session-tracking must be systemd/consolekit/no, not $with_session_tracking])) # add conditionals and subtitutions AM_CONDITIONAL(SESSION_TRACKING_CK, test "$with_session_tracking" = "consolekit") -AM_CONDITIONAL(SESSION_TRACKING_SYSTEMD, test "xwith_session_tracking" = "systemd") +AM_CONDITIONAL(SESSION_TRACKING_SYSTEMD, test "$with_session_tracking" = "systemd") if test "$with_session_tracking" = "systemd"; then PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login]) AC_SUBST(SYSTEMD_LOGIN_CFLAGS) @@ -294,7 +309,7 @@ AC_MSG_RESULT($with_session_tracking) AC_ARG_WITH(suspend-resume, AS_HELP_STRING([--with-suspend-resume=upower|systemd], [Build NetworkManager with specific suspend/resume support])) if test "z$with_suspend_resume" = "z"; then - PKG_CHECK_EXISTS([systemd >= 183], [have_systemd_inhibit=yes], [have_systemd_inhibit=no]) + PKG_CHECK_EXISTS([libsystemd-login >= 183], [have_systemd_inhibit=yes], [have_systemd_inhibit=no]) if test "z${have_systemd_inhibit}" = "zyes"; then # Use systemd if it's new enough with_suspend_resume="systemd" @@ -307,7 +322,7 @@ fi case $with_suspend_resume in upower) ;; systemd) - PKG_CHECK_MODULES(SYSTEMD_INHIBIT, [systemd >= 183]) + PKG_CHECK_MODULES(SYSTEMD_INHIBIT, [libsystemd-login >= 183]) ;; *) AC_MSG_ERROR(--with-suspend-resume must be one of [upower, systemd]) @@ -334,6 +349,15 @@ if (test "${enable_wimax}" = "yes"); then if test x"$have_wimax" = x"no"; then AC_MSG_ERROR(Intel WiMAX SDK is required) fi + + # Ensure the WiMAX stack is built with libnl3; otherwise crashes happen + # due to symbol conflicts + WMX_LIB_PATH=`$PKG_CONFIG --variable=libdir libiWmxSdk-0` + FOO=`ldd $WMX_LIB_PATH/libiWmxSdk.so.0.0.0 | grep libnl-3 2>&1` + if test "$?" != "0"; then + AC_MSG_ERROR([Intel WiMAX stack built with incompatible libnl version!]) + fi + AC_SUBST(IWMX_SDK_CFLAGS) AC_SUBST(IWMX_SDK_LIBS) AC_DEFINE(WITH_WIMAX, 1, [Define if you have WiMAX support]) @@ -377,14 +401,9 @@ if test x"$ac_crypto" = xnss; then PKG_CHECK_MODULES(NSS, [nss >= 3.11]) # Work around a pkg-config bug (fdo #29801) where exists != usable - AC_PATH_PROG(PKGCONFIG_PATH, pkg-config, no) - if test x"$PKGCONFIG_PATH" = xno; then - AC_MSG_ERROR([pkgconfig required but not found]) - else - FOO=`$PKGCONFIG_PATH --cflags --libs nss` - if test x"$?" != "x0"; then - AC_MSG_ERROR([No usable NSS found]) - fi + FOO=`$PKG_CONFIG --cflags --libs nss` + if test x"$?" != "x0"; then + AC_MSG_ERROR([No usable NSS found]) fi AC_SUBST(NSS_CFLAGS) @@ -457,7 +476,7 @@ AC_SUBST(PPPD_PLUGIN_DIR) AC_ARG_WITH(modem-manager-1, AS_HELP_STRING([--with-modem-manager-1], [Enable new ModemManager1 interface support]),,[with_modem_manager_1=auto]) if (test "${with_modem_manager_1}" != "no"); then PKG_CHECK_MODULES(MM_GLIB, - [mm-glib], + [mm-glib >= 0.7.991], [have_libmm_glib=yes], [have_libmm_glib=no]) AC_SUBST(MM_GLIB_CFLAGS) @@ -466,6 +485,8 @@ if (test "${with_modem_manager_1}" != "no"); then if (test "${have_libmm_glib}" = "no"); then if (test "${with_modem_manager_1}" = "yes"); then AC_MSG_ERROR([Couldn't find libmm-glib]) + else + with_modem_manager_1="no" fi else with_modem_manager_1="yes" @@ -498,8 +519,8 @@ fi if test "$with_dhcpcd" = "yes"; then AC_PATH_PROGS(with_dhcpcd, dhcpcd, no, /sbin:/usr/sbin:/usr/local/sbin) if test "$with_dhcpcd" != "no"; then - if ! $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [[45]]\."; then - AC_MSG_WARN([Cannot use dhcpcd, version 4.x or 5.x is required]) + if ! $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [[456789]]\."; then + AC_MSG_WARN([Cannot use dhcpcd, version 4.x or higher is required]) with_dhcpcd=no fi fi @@ -598,26 +619,32 @@ VAPIGEN_CHECK(0.17.1.24) # Tests, utilities and documentation AC_ARG_ENABLE(tests, AS_HELP_STRING([--enable-tests=root|yes|no], [Build NetworkManager tests (default: yes)])) -AC_ARG_ENABLE(doc, AS_HELP_STRING([--enable-doc], [Build NetworkManager documentation (default: no)])) -# Fallback to --with-tests and with-docs +# Fallback to --with-tests AC_ARG_WITH(tests, AS_HELP_STRING([--with-tests], [Build NetworkManager tests (deprecated)])) -AC_ARG_WITH(docs, AS_HELP_STRING([--with-docs], [Build NetworkManager documentation (deprecated)])) AS_IF([test -n "$with_tests"], enable_tests="$with_tests") -AS_IF([test -n "$with_docs"], enable_doc="$with_docs") -# Default to --enable-tests and --disable-docs +# Default to --enable-tests AS_IF([test -z "$enable_tests"], enable_tests="yes") -AS_IF([test -z "$enable_doc"], enable_doc="no") # Normalize values AS_IF([test "$enable_tests" != "yes" -a "$enable_tests" != "root"], enable_tests="no") -AS_IF([test "$enable_doc" != "yes"], enable_doc="no") # Add conditionals AM_CONDITIONAL(ENABLE_TESTS, test "$enable_tests" != "no") AM_CONDITIONAL(RUN_ROOT_TESTS, test "$enable_tests" == "root") -AM_CONDITIONAL(ENABLE_DOC, test "$enable_doc" = "yes") -# Add gtk-doc conditionals -enable_gtk_doc="$enable_doc" + +# Backwards compatible documentation enable/disable +AC_ARG_WITH(docs, AS_HELP_STRING([--with-docs], [Build NetworkManager documentation (deprecated, use --enable-gtk-doc)])) +AC_ARG_ENABLE(doc, AS_HELP_STRING([--enable-doc], [Build NetworkManager documentation (deprecated, use --enable-gtk-doc)])) +AS_IF([test "$with_docs" = "yes"], enable_gtk_doc="yes") +AS_IF([test "$enable_doc" = "yes"], enable_gtk_doc="yes") GTK_DOC_CHECK(1.0) +# check for pregenerated manpages to be installed +install_pregen_manpages=no +if test "$enable_gtk_doc" != "yes" -a -f man/nm-settings.5; then + install_pregen_manpages=yes +fi +AM_CONDITIONAL(INSTALL_PREGEN_MANPAGES, test "x${install_pregen_manpages}" = "xyes") + + AC_CONFIG_FILES([ Makefile include/Makefile @@ -745,6 +772,7 @@ echo " wimax: $enable_wimax" echo " ppp: $enable_ppp" echo " modemmanager-1: $with_modem_manager_1" echo " concheck: $enable_concheck" +echo " bluez 4: $enable_bluez4" echo echo "Configuration plugins" @@ -765,8 +793,7 @@ echo " dhcpcd: $with_dhcpcd" echo echo "Miscellaneous:" -echo " documentation: $enable_doc" +echo " documentation: $enable_gtk_doc" echo " tests: $enable_tests" echo " code coverage: $enable_code_coverage" echo - diff --git a/data/Makefile.am b/data/Makefile.am index 2a1d1cf4..71a390d5 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -2,13 +2,22 @@ if HAVE_SYSTEMD systemdsystemunit_DATA = \ NetworkManager.service \ - NetworkManager-wait-online.service + NetworkManager-wait-online.service \ + NetworkManager-dispatcher.service NetworkManager.service: NetworkManager.service.in $(edit) $< >$@ +if HAVE_SYSTEMD_200 NetworkManager-wait-online.service: NetworkManager-wait-online.service.in $(edit) $< >$@ +else +NetworkManager-wait-online.service: NetworkManager-wait-online-systemd-pre200.service.in + $(edit) $< >$@ +endif + +NetworkManager-dispatcher.service: NetworkManager-dispatcher.service.in + $(edit) $< >$@ servicedir = $(datadir)/dbus-1/system-services service_in_files = org.freedesktop.NetworkManager.service.in @@ -22,11 +31,19 @@ edit = sed \ -e 's|@bindir[@]|$(bindir)|g' \ -e 's|@sbindir[@]|$(sbindir)|g' \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ - -e 's|@localstatedir[@]|$(localstatedir)|g' + -e 's|@localstatedir[@]|$(localstatedir)|g' \ + -e 's|@libexecdir[@]|$(libexecdir)|g' EXTRA_DIST = \ NetworkManager.service.in \ NetworkManager-wait-online.service.in \ + NetworkManager-wait-online-systemd-pre200.service.in \ + NetworkManager-dispatcher.service.in \ org.freedesktop.NetworkManager.service.in -CLEANFILES = NetworkManager.service NetworkManager-wait-online.service org.freedesktop.NetworkManager.service +CLEANFILES = \ + NetworkManager.service \ + NetworkManager-wait-online.service \ + NetworkManager-dispatcher.service \ + org.freedesktop.NetworkManager.service + diff --git a/data/Makefile.in b/data/Makefile.in index f4d85b41..35b1a3c4 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +79,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/gettext.m4 \ @@ -72,12 +99,18 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -115,6 +148,7 @@ am__uninstall_files_from_dir = { \ am__installdirs = "$(DESTDIR)$(servicedir)" \ "$(DESTDIR)$(systemdsystemunitdir)" DATA = $(service_DATA) $(systemdsystemunit_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -257,7 +291,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PKGCONFIG_PATH = @PKGCONFIG_PATH@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -272,6 +305,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@ +SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@ SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@ SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@ SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@ @@ -355,7 +390,8 @@ with_netconfig = @with_netconfig@ with_resolvconf = @with_resolvconf@ @HAVE_SYSTEMD_TRUE@systemdsystemunit_DATA = \ @HAVE_SYSTEMD_TRUE@ NetworkManager.service \ -@HAVE_SYSTEMD_TRUE@ NetworkManager-wait-online.service +@HAVE_SYSTEMD_TRUE@ NetworkManager-wait-online.service \ +@HAVE_SYSTEMD_TRUE@ NetworkManager-dispatcher.service @HAVE_SYSTEMD_TRUE@servicedir = $(datadir)/dbus-1/system-services @HAVE_SYSTEMD_TRUE@service_in_files = org.freedesktop.NetworkManager.service.in @@ -364,14 +400,22 @@ edit = sed \ -e 's|@bindir[@]|$(bindir)|g' \ -e 's|@sbindir[@]|$(sbindir)|g' \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ - -e 's|@localstatedir[@]|$(localstatedir)|g' + -e 's|@localstatedir[@]|$(localstatedir)|g' \ + -e 's|@libexecdir[@]|$(libexecdir)|g' EXTRA_DIST = \ NetworkManager.service.in \ NetworkManager-wait-online.service.in \ + NetworkManager-wait-online-systemd-pre200.service.in \ + NetworkManager-dispatcher.service.in \ org.freedesktop.NetworkManager.service.in -CLEANFILES = NetworkManager.service NetworkManager-wait-online.service org.freedesktop.NetworkManager.service +CLEANFILES = \ + NetworkManager.service \ + NetworkManager-wait-online.service \ + NetworkManager-dispatcher.service \ + org.freedesktop.NetworkManager.service + all: all-am .SUFFIXES: @@ -453,11 +497,11 @@ uninstall-systemdsystemunitDATA: @list='$(systemdsystemunit_DATA)'; test -n "$(systemdsystemunitdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(systemdsystemunitdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: + +cscope cscopelist: distdir: $(DISTFILES) @@ -597,23 +641,29 @@ uninstall-am: uninstall-serviceDATA uninstall-systemdsystemunitDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-serviceDATA \ - install-strip install-systemdsystemunitDATA installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-serviceDATA uninstall-systemdsystemunitDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-serviceDATA install-strip \ + install-systemdsystemunitDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-serviceDATA \ + uninstall-systemdsystemunitDATA @HAVE_SYSTEMD_TRUE@NetworkManager.service: NetworkManager.service.in @HAVE_SYSTEMD_TRUE@ $(edit) $< >$@ -@HAVE_SYSTEMD_TRUE@NetworkManager-wait-online.service: NetworkManager-wait-online.service.in +@HAVE_SYSTEMD_200_TRUE@@HAVE_SYSTEMD_TRUE@NetworkManager-wait-online.service: NetworkManager-wait-online.service.in +@HAVE_SYSTEMD_200_TRUE@@HAVE_SYSTEMD_TRUE@ $(edit) $< >$@ +@HAVE_SYSTEMD_200_FALSE@@HAVE_SYSTEMD_TRUE@NetworkManager-wait-online.service: NetworkManager-wait-online-systemd-pre200.service.in +@HAVE_SYSTEMD_200_FALSE@@HAVE_SYSTEMD_TRUE@ $(edit) $< >$@ + +@HAVE_SYSTEMD_TRUE@NetworkManager-dispatcher.service: NetworkManager-dispatcher.service.in @HAVE_SYSTEMD_TRUE@ $(edit) $< >$@ @HAVE_SYSTEMD_TRUE@$(service_DATA): $(service_in_files) Makefile diff --git a/data/NetworkManager-dispatcher.service.in b/data/NetworkManager-dispatcher.service.in new file mode 100644 index 00000000..442f67aa --- /dev/null +++ b/data/NetworkManager-dispatcher.service.in @@ -0,0 +1,11 @@ +[Unit] +Description=Network Manager Script Dispatcher Service + +[Service] +Type=dbus +BusName=org.freedesktop.nm_dispatcher +ExecStart=@libexecdir@/nm-dispatcher.action + +[Install] +Alias=dbus-org.freedesktop.nm-dispatcher.service + diff --git a/data/NetworkManager-wait-online-systemd-pre200.service.in b/data/NetworkManager-wait-online-systemd-pre200.service.in new file mode 100644 index 00000000..fd9be418 --- /dev/null +++ b/data/NetworkManager-wait-online-systemd-pre200.service.in @@ -0,0 +1,13 @@ +[Unit] +Description=Network Manager Wait Online +Requisite=NetworkManager.service +After=NetworkManager.service +Wants=network.target +Before=network.target + +[Service] +Type=oneshot +ExecStart=@bindir@/nm-online -q --timeout=30 + +[Install] +WantedBy=network.target diff --git a/data/NetworkManager-wait-online.service.in b/data/NetworkManager-wait-online.service.in index fd9be418..b81c5b02 100644 --- a/data/NetworkManager-wait-online.service.in +++ b/data/NetworkManager-wait-online.service.in @@ -3,11 +3,11 @@ Description=Network Manager Wait Online Requisite=NetworkManager.service After=NetworkManager.service Wants=network.target -Before=network.target +Before=network.target network-online.target [Service] Type=oneshot ExecStart=@bindir@/nm-online -q --timeout=30 [Install] -WantedBy=network.target +WantedBy=multi-user.target diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in index 16b53b68..ddc16275 100644 --- a/data/NetworkManager.service.in +++ b/data/NetworkManager.service.in @@ -1,6 +1,5 @@ [Unit] Description=Network Manager -After=syslog.target Wants=network.target Before=network.target @@ -18,5 +17,5 @@ KillMode=process [Install] WantedBy=multi-user.target Alias=dbus-org.freedesktop.NetworkManager.service -Also=NetworkManager-wait-online.service +Also=NetworkManager-dispatcher.service diff --git a/depcomp b/depcomp deleted file mode 100755 index df8eea7e..00000000 --- a/depcomp +++ /dev/null @@ -1,630 +0,0 @@ -#! /bin/sh -# depcomp - compile a program generating dependencies as side-effects - -scriptversion=2009-04-28.21; # UTC - -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, 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, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Originally written by Alexandre Oliva . - -case $1 in - '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: depcomp [--help] [--version] PROGRAM [ARGS] - -Run PROGRAMS ARGS to compile a file, generating dependencies -as side-effects. - -Environment variables: - depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. - DEPDIR directory where to store dependencies. - depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. - libtool Whether libtool is used (yes/no). - -Report bugs to . -EOF - exit $? - ;; - -v | --v*) - echo "depcomp $scriptversion" - exit $? - ;; -esac - -if test -z "$depmode" || test -z "$source" || test -z "$object"; then - echo "depcomp: Variables source, object and depmode must be set" 1>&2 - exit 1 -fi - -# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. -depfile=${depfile-`echo "$object" | - sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} -tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} - -rm -f "$tmpdepfile" - -# Some modes work just like other modes, but use different flags. We -# parameterize here, but still list the modes in the big case below, -# to make depend.m4 easier to write. Note that we *cannot* use a case -# here, because this file can only contain one case statement. -if test "$depmode" = hp; then - # HP compiler uses -M and no extra arg. - gccflag=-M - depmode=gcc -fi - -if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout -fi - -cygpath_u="cygpath -u -f -" -if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" - depmode=msvisualcpp -fi - -case "$depmode" in -gcc3) -## gcc 3 implements dependency tracking that does exactly what -## we want. Yay! Note: for some reason libtool 1.4 doesn't like -## it if -MD -MP comes after the -MF stuff. Hmm. -## Unfortunately, FreeBSD c89 acceptance of flags depends upon -## the command line argument order; so add the flags where they -## appear in depend2.am. Note that the slowdown incurred here -## affects only configure: in makefiles, %FASTDEP% shortcuts this. - for arg - do - case $arg in - -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; - *) set fnord "$@" "$arg" ;; - esac - shift # fnord - shift # $arg - done - "$@" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - mv "$tmpdepfile" "$depfile" - ;; - -gcc) -## There are various ways to get dependency output from gcc. Here's -## why we pick this rather obscure method: -## - Don't want to use -MD because we'd like the dependencies to end -## up in a subdir. Having to rename by hand is ugly. -## (We might end up doing this anyway to support other compilers.) -## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). -## - Using -M directly means running the compiler twice (even worse -## than renaming). - if test -z "$gccflag"; then - gccflag=-MD, - fi - "$@" -Wp,"$gccflag$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. - sed -e 's/^[^:]*: / /' \ - -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. -## The problem is that when a header file which appears in a .P file -## is deleted, the dependency causes make to die (because there is -## typically no way to rebuild the header). We avoid this by adding -## dummy dependencies for each header file. Too bad gcc doesn't do -## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory -## that the space means something, we add a space to the output as -## well. -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -sgi) - if test "$libtool" = yes; then - "$@" "-Wp,-MDupdate,$tmpdepfile" - else - "$@" -MDupdate "$tmpdepfile" - fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - - if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files - echo "$object : \\" > "$depfile" - - # Clip off the initial element (the dependent). Don't try to be - # clever and replace this with sed code, as IRIX sed won't handle - # lines with more than a fixed number of characters (4096 in - # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the - # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" - echo >> "$depfile" - - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -aix) - # The C for AIX Compiler uses -M and outputs the dependencies - # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the - # start of each line; $object doesn't have directory information. - # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - if test "$libtool" = yes; then - tmpdepfile1=$dir$base.u - tmpdepfile2=$base.u - tmpdepfile3=$dir.libs/$base.u - "$@" -Wc,-M - else - tmpdepfile1=$dir$base.u - tmpdepfile2=$dir$base.u - tmpdepfile3=$dir$base.u - "$@" -M - fi - stat=$? - - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want: - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output - # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : - # foo.o: sub/foo.c ... \ - # sub/foo.h ... \ - # ... - - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp2) - # The "hp" stanza above does not work with aCC (C++) and HP's ia64 - # compilers, which have integrated preprocessors. The correct option - # to use with these is +Maked; it writes dependencies to a file named - # 'foo.d', which lands next to the object file, wherever that - # happens to be. - # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - if test "$libtool" = yes; then - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir.libs/$base.d - "$@" -Wc,+Maked - else - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir$base.d - "$@" +Maked - fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. - sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" "$tmpdepfile2" - ;; - -tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -#nosideeffect) - # This comment above is used by automake to tell side-effect - # dependency tracking mechanisms from slower ones. - -dashmstdout) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do - shift - done - shift - fi - - # Remove `-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' - # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. - "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -dashXmstdout) - # This case only exists to satisfy depend.m4. It is never actually - # run, as this mode is specially recognized in the preamble. - exit 1 - ;; - -makedepend) - "$@" || exit $? - # Remove any Libtool call - if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do - shift - done - shift - fi - # X makedepend - shift - cleared=no eat=no - for arg - do - case $cleared in - no) - set ""; shift - cleared=yes ;; - esac - if test $eat = yes; then - eat=no - continue - fi - case "$arg" in - -D*|-I*) - set fnord "$@" "$arg"; shift ;; - # Strip any option that makedepend may not understand. Remove - # the object too, otherwise makedepend will parse it as a source file. - -arch) - eat=yes ;; - -*|$object) - ;; - *) - set fnord "$@" "$arg"; shift ;; - esac - done - obj_suffix=`echo "$object" | sed 's/^.*\././'` - touch "$tmpdepfile" - ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" "$tmpdepfile".bak - ;; - -cpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do - shift - done - shift - fi - - # Remove `-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - cat < "$tmpdepfile" >> "$depfile" - sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvisualcpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do - shift - done - shift - fi - - IFS=" " - for arg - do - case "$arg" in - -o) - shift - ;; - $object) - shift - ;; - "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; - *) - set fnord "$@" "$arg" - shift - shift - ;; - esac - done - "$@" -E 2>/dev/null | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvcmsys) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -none) - exec "$@" - ;; - -*) - echo "Unknown depmode $depmode" 1>&2 - exit 1 - ;; -esac - -exit 0 - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/docs/Makefile.am b/docs/Makefile.am index ee889220..fd2c82c8 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,5 +1,2 @@ -if ENABLE_DOC +SUBDIRS = libnm-glib libnm-util api -SUBDIRS = api libnm-glib libnm-util - -endif diff --git a/docs/Makefile.in b/docs/Makefile.in index 6eb2b23c..71584bae 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +78,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = docs -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/gettext.m4 \ @@ -71,21 +98,28 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -93,12 +127,32 @@ am__can_run_installinfo = \ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = api libnm-glib libnm-util +DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -266,7 +320,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PKGCONFIG_PATH = @PKGCONFIG_PATH@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -281,6 +334,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@ +SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@ SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@ SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@ SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@ @@ -362,7 +417,7 @@ with_dhclient = @with_dhclient@ with_dhcpcd = @with_dhcpcd@ with_netconfig = @with_netconfig@ with_resolvconf = @with_resolvconf@ -@ENABLE_DOC_TRUE@SUBDIRS = api libnm-glib libnm-util +SUBDIRS = libnm-glib libnm-util api all: all-recursive .SUFFIXES: @@ -404,22 +459,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -434,57 +492,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -500,12 +513,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -517,15 +525,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -534,6 +538,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -694,22 +713,20 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am index 98dd3de7..3ca46033 100644 --- a/docs/api/Makefile.am +++ b/docs/api/Makefile.am @@ -1,7 +1,5 @@ AUTOMAKE_OPTIONS = 1.7 -if ENABLE_DOC - XSLTPROC = xsltproc --xinclude --nonet XMLS = $(wildcard $(top_srcdir)/introspection/nm-*.xml) @@ -15,21 +13,24 @@ OTHER_FILES= \ GENERATED_FILES = spec.html settings-spec.xml +if ENABLE_GTK_DOC + spec.html: $(XMLS) $(OTHER_FILES) html-build.stamp - $(XSLTPROC) --path "$(top_builddir)/introspection:$(top_srcdir)/introspection" $(top_srcdir)/tools/doc-generator.xsl $(top_builddir)/introspection/all.xml > $@ + $(XSLTPROC) --path "$(top_builddir)/introspection:$(top_srcdir)/introspection" $(top_srcdir)/tools/doc-generator.xsl $(top_builddir)/introspection/all.xml > spec.html mkdir -p $(builddir)/html/ - cp $@ $(builddir)/html/ + cp spec.html $(builddir)/html/ -# settings-spec.xml should *not* be DISTed because it must be regenerated -# whenever the libnm-util source changes settings-spec.xml: $(top_builddir)/tools/generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la - $(top_builddir)/tools/generate-settings-spec book $@ + rm -f $(builddir)/settings-spec.xml + $(top_builddir)/tools/generate-settings-spec book $(builddir)/settings-spec.xml + +all: $(GENERATED_FILES) + +endif # Top-level SGML file includes (depends on) settings-spec.xml $(DOC_MAIN_SGML_FILE): settings-spec.xml -all: $(GENERATED_FILES) - #################################### # The name of the module. @@ -56,17 +57,9 @@ include $(top_srcdir)/gtk-doc.make #################################### -EXTRA_DIST += spec.html -CLEANFILES += $(GENERATED_FILES) - -else - -EXTRA_DIST = -CLEANFILES = - -endif - -EXTRA_DIST += version.xml.in +EXTRA_DIST += version.xml.in $(GENERATED_FILES) CLEANFILES += html/* tmpl/* xml/* \ NetworkManager-sections.txt \ - NetworkManager-overrides.txt + NetworkManager-overrides.txt \ + $(GENERATED_FILES) + diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in index caa59cfd..a9ee52e0 100644 --- a/docs/api/Makefile.in +++ b/docs/api/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.13.4 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,23 +20,51 @@ # Everything below here is generic # #################################### VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,8 +83,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.make +DIST_COMMON = $(top_srcdir)/gtk-doc.make $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(srcdir)/version.xml.in subdir = docs/api ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ @@ -78,12 +105,18 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = version.xml CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -91,6 +124,7 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -233,7 +267,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PKGCONFIG_PATH = @PKGCONFIG_PATH@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ @@ -248,6 +281,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@ +SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@ SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@ SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@ SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@ @@ -330,91 +365,122 @@ with_dhcpcd = @with_dhcpcd@ with_netconfig = @with_netconfig@ with_resolvconf = @with_resolvconf@ AUTOMAKE_OPTIONS = 1.7 -@ENABLE_DOC_TRUE@XSLTPROC = xsltproc --xinclude --nonet -@ENABLE_DOC_TRUE@XMLS = $(wildcard $(top_srcdir)/introspection/nm-*.xml) -@ENABLE_DOC_TRUE@OTHER_FILES = \ -@ENABLE_DOC_TRUE@ $(top_builddir)/introspection/all.xml \ -@ENABLE_DOC_TRUE@ $(top_srcdir)/introspection/generic-types.xml \ -@ENABLE_DOC_TRUE@ $(top_srcdir)/introspection/errors.xml \ -@ENABLE_DOC_TRUE@ $(top_srcdir)/introspection/vpn-errors.xml \ -@ENABLE_DOC_TRUE@ $(top_srcdir)/tools/doc-generator.xsl \ -@ENABLE_DOC_TRUE@ $(top_srcdir)/introspection/generic-types.xml - -@ENABLE_DOC_TRUE@GENERATED_FILES = spec.html settings-spec.xml +XSLTPROC = xsltproc --xinclude --nonet +XMLS = $(wildcard $(top_srcdir)/introspection/nm-*.xml) +OTHER_FILES = \ + $(top_builddir)/introspection/all.xml \ + $(top_srcdir)/introspection/generic-types.xml \ + $(top_srcdir)/introspection/errors.xml \ + $(top_srcdir)/introspection/vpn-errors.xml \ + $(top_srcdir)/tools/doc-generator.xsl \ + $(top_srcdir)/introspection/generic-types.xml + +GENERATED_FILES = spec.html settings-spec.xml #################################### # The name of the module. -@ENABLE_DOC_TRUE@DOC_MODULE = NetworkManager +DOC_MODULE = NetworkManager # The top-level SGML file. -@ENABLE_DOC_TRUE@DOC_MAIN_SGML_FILE = network-manager-docs.xml -@ENABLE_DOC_TRUE@DOC_SOURCE_DIR = $(srcdir) +DOC_MAIN_SGML_FILE = network-manager-docs.xml +DOC_SOURCE_DIR = $(srcdir) # Extra options to supply to gtkdoc-mkdb -@ENABLE_DOC_TRUE@MKDB_OPTIONS = --sgml-mode --output-format=xml +MKDB_OPTIONS = --sgml-mode --output-format=xml # Extra options to supply to gtkdoc-mktmpl -@ENABLE_DOC_TRUE@MKTMPL_OPTIONS = +MKTMPL_OPTIONS = # Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE) -@ENABLE_DOC_TRUE@content_files = \ -@ENABLE_DOC_TRUE@ version.xml \ -@ENABLE_DOC_TRUE@ migrating-to-09.xml \ -@ENABLE_DOC_TRUE@ $(NULL) - -@ENABLE_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@ENABLE_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@ENABLE_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@ENABLE_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -@ENABLE_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = -@ENABLE_DOC_TRUE@@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute +content_files = \ + version.xml \ + migrating-to-09.xml \ + $(NULL) + +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute # We set GPATH here; this gives us semantics for GNU make # which are more like other make's VPATH, when it comes to # whether a source that is a target of one rule is then # searched for in VPATH/GPATH. # -@ENABLE_DOC_TRUE@GPATH = $(srcdir) -@ENABLE_DOC_TRUE@TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) -@ENABLE_DOC_TRUE@SETUP_FILES = \ -@ENABLE_DOC_TRUE@ $(content_files) \ -@ENABLE_DOC_TRUE@ $(DOC_MAIN_SGML_FILE) \ -@ENABLE_DOC_TRUE@ $(DOC_MODULE)-sections.txt \ -@ENABLE_DOC_TRUE@ $(DOC_MODULE)-overrides.txt +GPATH = $(srcdir) +TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) +SETUP_FILES = \ + $(content_files) \ + $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE)-sections.txt \ + $(DOC_MODULE)-overrides.txt -@ENABLE_DOC_FALSE@EXTRA_DIST = version.xml.in #################################### -@ENABLE_DOC_TRUE@EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) spec.html \ -@ENABLE_DOC_TRUE@ version.xml.in -@ENABLE_DOC_TRUE@DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ -@ENABLE_DOC_TRUE@ html-build.stamp pdf-build.stamp \ -@ENABLE_DOC_TRUE@ tmpl.stamp sgml.stamp html.stamp pdf.stamp - -@ENABLE_DOC_TRUE@SCANOBJ_FILES = \ -@ENABLE_DOC_TRUE@ $(DOC_MODULE).args \ -@ENABLE_DOC_TRUE@ $(DOC_MODULE).hierarchy \ -@ENABLE_DOC_TRUE@ $(DOC_MODULE).interfaces \ -@ENABLE_DOC_TRUE@ $(DOC_MODULE).prerequisites \ -@ENABLE_DOC_TRUE@ $(DOC_MODULE).signals - -@ENABLE_DOC_TRUE@REPORT_FILES = \ -@ENABLE_DOC_TRUE@ $(DOC_MODULE)-undocumented.txt \ -@ENABLE_DOC_TRUE@ $(DOC_MODULE)-undeclared.txt \ -@ENABLE_DOC_TRUE@ $(DOC_MODULE)-unused.txt - -@ENABLE_DOC_FALSE@CLEANFILES = html/* tmpl/* xml/* \ -@ENABLE_DOC_FALSE@ NetworkManager-sections.txt \ -@ENABLE_DOC_FALSE@ NetworkManager-overrides.txt -@ENABLE_DOC_TRUE@CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) \ -@ENABLE_DOC_TRUE@ $(DOC_STAMPS) $(GENERATED_FILES) html/* \ -@ENABLE_DOC_TRUE@ tmpl/* xml/* NetworkManager-sections.txt \ -@ENABLE_DOC_TRUE@ NetworkManager-overrides.txt -@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = -@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp -@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = -@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp +EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in \ + $(GENERATED_FILES) +DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ + html-build.stamp pdf-build.stamp \ + tmpl.stamp sgml.stamp html.stamp pdf.stamp + +SCANOBJ_FILES = \ + $(DOC_MODULE).args \ + $(DOC_MODULE).hierarchy \ + $(DOC_MODULE).interfaces \ + $(DOC_MODULE).prerequisites \ + $(DOC_MODULE).signals + +REPORT_FILES = \ + $(DOC_MODULE)-undocumented.txt \ + $(DOC_MODULE)-undeclared.txt \ + $(DOC_MODULE)-unused.txt + +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) html/* \ + tmpl/* xml/* NetworkManager-sections.txt \ + NetworkManager-overrides.txt $(GENERATED_FILES) +@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = +@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp +@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = +@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp + +#### setup #### +GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V)) +GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SETUP_0 = @echo " DOC Preparing build"; + +#### scan #### +GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V)) +GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SCAN_0 = @echo " DOC Scanning header files"; +GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V)) +GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_INTROSPECT_0 = @echo " DOC Introspecting gobjects"; + +#### templates #### +GTK_DOC_V_TMPL = $(GTK_DOC_V_TMPL_$(V)) +GTK_DOC_V_TMPL_ = $(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_TMPL_0 = @echo " DOC Rebuilding template files"; + +#### xml #### +GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V)) +GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XML_0 = @echo " DOC Building XML"; + +#### html #### +GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V)) +GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_HTML_0 = @echo " DOC Building HTML"; +GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V)) +GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XREF_0 = @echo " DOC Fixing cross-references"; + +#### pdf #### +GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V)) +GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_PDF_0 = @echo " DOC Building PDF"; all: all-am .SUFFIXES: @@ -457,13 +523,12 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: -@ENABLE_DOC_FALSE@dist-hook: distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -500,7 +565,6 @@ distdir: $(DISTFILES) dist-hook check-am: all-am check: check-am -@ENABLE_DOC_FALSE@all-local: all-am: Makefile all-local installdirs: install: install-am @@ -534,11 +598,6 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@ENABLE_DOC_FALSE@uninstall-local: -@ENABLE_DOC_FALSE@distclean-local: -@ENABLE_DOC_FALSE@install-data-local: -@ENABLE_DOC_FALSE@maintainer-clean-local: -@ENABLE_DOC_FALSE@clean-local: clean: clean-am clean-am: clean-generic clean-libtool clean-local mostlyclean-am @@ -609,245 +668,222 @@ uninstall-am: uninstall-local .MAKE: install-am install-strip .PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool clean-local dist-hook distclean \ - distclean-generic distclean-libtool distclean-local distdir \ - dvi dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-local install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic \ + clean-libtool clean-local cscopelist-am ctags-am dist-hook \ + distclean distclean-generic distclean-libtool distclean-local \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-data-local \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ maintainer-clean-local mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-local - - -@ENABLE_DOC_TRUE@spec.html: $(XMLS) $(OTHER_FILES) html-build.stamp -@ENABLE_DOC_TRUE@ $(XSLTPROC) --path "$(top_builddir)/introspection:$(top_srcdir)/introspection" $(top_srcdir)/tools/doc-generator.xsl $(top_builddir)/introspection/all.xml > $@ -@ENABLE_DOC_TRUE@ mkdir -p $(builddir)/html/ -@ENABLE_DOC_TRUE@ cp $@ $(builddir)/html/ - -# settings-spec.xml should *not* be DISTed because it must be regenerated -# whenever the libnm-util source changes -@ENABLE_DOC_TRUE@settings-spec.xml: $(top_builddir)/tools/generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la -@ENABLE_DOC_TRUE@ $(top_builddir)/tools/generate-settings-spec book $@ - -# Top-level SGML file includes (depends on) settings-spec.xml -@ENABLE_DOC_TRUE@$(DOC_MAIN_SGML_FILE): settings-spec.xml - -@ENABLE_DOC_TRUE@all: $(GENERATED_FILES) - -@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) -@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_FALSE@all-local: - -@ENABLE_DOC_TRUE@docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) - -@ENABLE_DOC_TRUE@$(REPORT_FILES): sgml-build.stamp + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-local -#### setup #### -@ENABLE_DOC_TRUE@setup-build.stamp: -@ENABLE_DOC_TRUE@ -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ -@ENABLE_DOC_TRUE@ echo ' DOC Preparing build'; \ -@ENABLE_DOC_TRUE@ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ -@ENABLE_DOC_TRUE@ if test "x$$files" != "x" ; then \ -@ENABLE_DOC_TRUE@ for file in $$files ; do \ -@ENABLE_DOC_TRUE@ test -f $(abs_srcdir)/$$file && \ -@ENABLE_DOC_TRUE@ cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ -@ENABLE_DOC_TRUE@ done; \ -@ENABLE_DOC_TRUE@ fi; \ -@ENABLE_DOC_TRUE@ test -d $(abs_srcdir)/tmpl && \ -@ENABLE_DOC_TRUE@ { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ -@ENABLE_DOC_TRUE@ chmod -R u+w $(abs_builddir)/tmpl; } \ -@ENABLE_DOC_TRUE@ fi -@ENABLE_DOC_TRUE@ @touch setup-build.stamp +@ENABLE_GTK_DOC_TRUE@spec.html: $(XMLS) $(OTHER_FILES) html-build.stamp +@ENABLE_GTK_DOC_TRUE@ $(XSLTPROC) --path "$(top_builddir)/introspection:$(top_srcdir)/introspection" $(top_srcdir)/tools/doc-generator.xsl $(top_builddir)/introspection/all.xml > spec.html +@ENABLE_GTK_DOC_TRUE@ mkdir -p $(builddir)/html/ +@ENABLE_GTK_DOC_TRUE@ cp spec.html $(builddir)/html/ -#### scan #### +@ENABLE_GTK_DOC_TRUE@settings-spec.xml: $(top_builddir)/tools/generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la +@ENABLE_GTK_DOC_TRUE@ rm -f $(builddir)/settings-spec.xml +@ENABLE_GTK_DOC_TRUE@ $(top_builddir)/tools/generate-settings-spec book $(builddir)/settings-spec.xml -@ENABLE_DOC_TRUE@scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) -@ENABLE_DOC_TRUE@ @echo ' DOC Scanning header files' -@ENABLE_DOC_TRUE@ @_source_dir='' ; \ -@ENABLE_DOC_TRUE@ for i in $(DOC_SOURCE_DIR) ; do \ -@ENABLE_DOC_TRUE@ _source_dir="$${_source_dir} --source-dir=$$i" ; \ -@ENABLE_DOC_TRUE@ done ; \ -@ENABLE_DOC_TRUE@ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) -@ENABLE_DOC_TRUE@ @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ -@ENABLE_DOC_TRUE@ echo " DOC Introspecting gobjects"; \ -@ENABLE_DOC_TRUE@ scanobj_options=""; \ -@ENABLE_DOC_TRUE@ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ -@ENABLE_DOC_TRUE@ if test "$(?)" = "0"; then \ -@ENABLE_DOC_TRUE@ if test "x$(V)" = "x1"; then \ -@ENABLE_DOC_TRUE@ scanobj_options="--verbose"; \ -@ENABLE_DOC_TRUE@ fi; \ -@ENABLE_DOC_TRUE@ fi; \ -@ENABLE_DOC_TRUE@ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ -@ENABLE_DOC_TRUE@ gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ -@ENABLE_DOC_TRUE@ else \ -@ENABLE_DOC_TRUE@ for i in $(SCANOBJ_FILES) ; do \ -@ENABLE_DOC_TRUE@ test -f $$i || touch $$i ; \ -@ENABLE_DOC_TRUE@ done \ -@ENABLE_DOC_TRUE@ fi -@ENABLE_DOC_TRUE@ @touch scan-build.stamp - -@ENABLE_DOC_TRUE@$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp -@ENABLE_DOC_TRUE@ @true +@ENABLE_GTK_DOC_TRUE@all: $(GENERATED_FILES) -#### templates #### +# Top-level SGML file includes (depends on) settings-spec.xml +$(DOC_MAIN_SGML_FILE): settings-spec.xml -@ENABLE_DOC_TRUE@tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt -@ENABLE_DOC_TRUE@ @echo ' DOC Rebuilding template files' -@ENABLE_DOC_TRUE@ @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) -@ENABLE_DOC_TRUE@ @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ -@ENABLE_DOC_TRUE@ if test -w $(abs_srcdir) ; then \ -@ENABLE_DOC_TRUE@ cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ -@ENABLE_DOC_TRUE@ fi \ -@ENABLE_DOC_TRUE@ fi -@ENABLE_DOC_TRUE@ @touch tmpl-build.stamp +@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +@ENABLE_GTK_DOC_FALSE@all-local: -@ENABLE_DOC_TRUE@tmpl.stamp: tmpl-build.stamp -@ENABLE_DOC_TRUE@ @true +docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) -@ENABLE_DOC_TRUE@$(srcdir)/tmpl/*.sgml: -@ENABLE_DOC_TRUE@ @true +$(REPORT_FILES): sgml-build.stamp -#### xml #### +setup-build.stamp: + -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ + if test "x$$files" != "x" ; then \ + for file in $$files ; do \ + test -f $(abs_srcdir)/$$file && \ + cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ + done; \ + fi; \ + test -d $(abs_srcdir)/tmpl && \ + { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ + chmod -R u+w $(abs_builddir)/tmpl; } \ + fi + $(AM_V_at)touch setup-build.stamp + +scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) + $(GTK_DOC_V_SCAN)_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ + done ; \ + gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) + $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ + scanobj_options=""; \ + gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + scanobj_options="--verbose"; \ + fi; \ + fi; \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ + gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ + else \ + for i in $(SCANOBJ_FILES) ; do \ + test -f $$i || touch $$i ; \ + done \ + fi + $(AM_V_at)touch scan-build.stamp -@ENABLE_DOC_TRUE@sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) -@ENABLE_DOC_TRUE@ @echo ' DOC Building XML' -@ENABLE_DOC_TRUE@ @-chmod -R u+w $(srcdir) -@ENABLE_DOC_TRUE@ @_source_dir='' ; \ -@ENABLE_DOC_TRUE@ for i in $(DOC_SOURCE_DIR) ; do \ -@ENABLE_DOC_TRUE@ _source_dir="$${_source_dir} --source-dir=$$i" ; \ -@ENABLE_DOC_TRUE@ done ; \ -@ENABLE_DOC_TRUE@ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) -@ENABLE_DOC_TRUE@ @touch sgml-build.stamp +$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true -@ENABLE_DOC_TRUE@sgml.stamp: sgml-build.stamp -@ENABLE_DOC_TRUE@ @true +tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt + $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + if test -w $(abs_srcdir) ; then \ + cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ + fi \ + fi + $(AM_V_at)touch tmpl-build.stamp + +tmpl.stamp: tmpl-build.stamp + @true + +$(srcdir)/tmpl/*.sgml: + @true + +sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) + $(GTK_DOC_V_XML)-chmod -R u+w $(srcdir) && _source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ + done ; \ + gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) + $(AM_V_at)touch sgml-build.stamp + +sgml.stamp: sgml-build.stamp + @true + +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ + mkhtml_options=""; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkhtml_options="$$mkhtml_options --verbose"; \ + fi; \ + fi; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ + if test "$(?)" = "0"; then \ + mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ + fi; \ + cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + -@test "x$(HTML_IMAGES)" = "x" || \ + for file in $(HTML_IMAGES) ; do \ + if test -f $(abs_srcdir)/$$file ; then \ + cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ + fi; \ + if test -f $(abs_builddir)/$$file ; then \ + cp $(abs_builddir)/$$file $(abs_builddir)/html; \ + fi; \ + done; + $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + $(AM_V_at)touch html-build.stamp + +pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ + mkpdf_options=""; \ + gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$(?)" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkpdf_options="$$mkpdf_options --verbose"; \ + fi; \ + fi; \ + if test "x$(HTML_IMAGES)" != "x"; then \ + for img in $(HTML_IMAGES); do \ + part=`dirname $$img`; \ + echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \ + if test $$? != 0; then \ + mkpdf_options="$$mkpdf_options --imgdir=$$part"; \ + fi; \ + done; \ + fi; \ + gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) + $(AM_V_at)touch pdf-build.stamp -#### html #### +############## -@ENABLE_DOC_TRUE@html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) -@ENABLE_DOC_TRUE@ @echo ' DOC Building HTML' -@ENABLE_DOC_TRUE@ @rm -rf html -@ENABLE_DOC_TRUE@ @mkdir html -@ENABLE_DOC_TRUE@ @mkhtml_options=""; \ -@ENABLE_DOC_TRUE@ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ -@ENABLE_DOC_TRUE@ if test "$(?)" = "0"; then \ -@ENABLE_DOC_TRUE@ if test "x$(V)" = "x1"; then \ -@ENABLE_DOC_TRUE@ mkhtml_options="$$mkhtml_options --verbose"; \ -@ENABLE_DOC_TRUE@ fi; \ -@ENABLE_DOC_TRUE@ fi; \ -@ENABLE_DOC_TRUE@ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ -@ENABLE_DOC_TRUE@ if test "$(?)" = "0"; then \ -@ENABLE_DOC_TRUE@ mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ -@ENABLE_DOC_TRUE@ fi; \ -@ENABLE_DOC_TRUE@ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) -@ENABLE_DOC_TRUE@ -@test "x$(HTML_IMAGES)" = "x" || \ -@ENABLE_DOC_TRUE@ for file in $(HTML_IMAGES) ; do \ -@ENABLE_DOC_TRUE@ if test -f $(abs_srcdir)/$$file ; then \ -@ENABLE_DOC_TRUE@ cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ -@ENABLE_DOC_TRUE@ fi; \ -@ENABLE_DOC_TRUE@ if test -f $(abs_builddir)/$$file ; then \ -@ENABLE_DOC_TRUE@ cp $(abs_builddir)/$$file $(abs_builddir)/html; \ -@ENABLE_DOC_TRUE@ fi; \ -@ENABLE_DOC_TRUE@ done; -@ENABLE_DOC_TRUE@ @echo ' DOC Fixing cross-references' -@ENABLE_DOC_TRUE@ @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) -@ENABLE_DOC_TRUE@ @touch html-build.stamp +clean-local: + @rm -f *~ *.bak + @rm -rf .libs -#### pdf #### +distclean-local: + @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ + rm -rf tmpl; \ + fi -@ENABLE_DOC_TRUE@pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) -@ENABLE_DOC_TRUE@ @echo ' DOC Building PDF' -@ENABLE_DOC_TRUE@ @rm -f $(DOC_MODULE).pdf -@ENABLE_DOC_TRUE@ @mkpdf_options=""; \ -@ENABLE_DOC_TRUE@ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ -@ENABLE_DOC_TRUE@ if test "$(?)" = "0"; then \ -@ENABLE_DOC_TRUE@ if test "x$(V)" = "x1"; then \ -@ENABLE_DOC_TRUE@ mkpdf_options="$$mkpdf_options --verbose"; \ -@ENABLE_DOC_TRUE@ fi; \ -@ENABLE_DOC_TRUE@ fi; \ -@ENABLE_DOC_TRUE@ if test "x$(HTML_IMAGES)" != "x"; then \ -@ENABLE_DOC_TRUE@ for img in $(HTML_IMAGES); do \ -@ENABLE_DOC_TRUE@ part=`dirname $$img`; \ -@ENABLE_DOC_TRUE@ echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \ -@ENABLE_DOC_TRUE@ if test $$? != 0; then \ -@ENABLE_DOC_TRUE@ mkpdf_options="$$mkpdf_options --imgdir=$$part"; \ -@ENABLE_DOC_TRUE@ fi; \ -@ENABLE_DOC_TRUE@ done; \ -@ENABLE_DOC_TRUE@ fi; \ -@ENABLE_DOC_TRUE@ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) -@ENABLE_DOC_TRUE@ @touch pdf-build.stamp +maintainer-clean-local: + @rm -rf xml html -############## +install-data-local: + @installfiles=`echo $(builddir)/html/*`; \ + if test "$$installfiles" = '$(builddir)/html/*'; \ + then echo 1>&2 'Nothing to install' ; \ + else \ + if test -n "$(DOC_MODULE_VERSION)"; then \ + installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ + else \ + installdir="$(DESTDIR)$(TARGET_DIR)"; \ + fi; \ + $(mkinstalldirs) $${installdir} ; \ + for i in $$installfiles; do \ + echo ' $(INSTALL_DATA) '$$i ; \ + $(INSTALL_DATA) $$i $${installdir}; \ + done; \ + if test -n "$(DOC_MODULE_VERSION)"; then \ + mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ + $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ + fi; \ + $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ + fi -@ENABLE_DOC_TRUE@clean-local: -@ENABLE_DOC_TRUE@ @rm -f *~ *.bak -@ENABLE_DOC_TRUE@ @rm -rf .libs - -@ENABLE_DOC_TRUE@distclean-local: -@ENABLE_DOC_TRUE@ @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ -@ENABLE_DOC_TRUE@ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt -@ENABLE_DOC_TRUE@ @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ -@ENABLE_DOC_TRUE@ rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ -@ENABLE_DOC_TRUE@ rm -rf tmpl; \ -@ENABLE_DOC_TRUE@ fi - -@ENABLE_DOC_TRUE@maintainer-clean-local: clean -@ENABLE_DOC_TRUE@ @rm -rf xml html - -@ENABLE_DOC_TRUE@install-data-local: -@ENABLE_DOC_TRUE@ @installfiles=`echo $(builddir)/html/*`; \ -@ENABLE_DOC_TRUE@ if test "$$installfiles" = '$(builddir)/html/*'; \ -@ENABLE_DOC_TRUE@ then echo 1>&2 'Nothing to install' ; \ -@ENABLE_DOC_TRUE@ else \ -@ENABLE_DOC_TRUE@ if test -n "$(DOC_MODULE_VERSION)"; then \ -@ENABLE_DOC_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ -@ENABLE_DOC_TRUE@ else \ -@ENABLE_DOC_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)"; \ -@ENABLE_DOC_TRUE@ fi; \ -@ENABLE_DOC_TRUE@ $(mkinstalldirs) $${installdir} ; \ -@ENABLE_DOC_TRUE@ for i in $$installfiles; do \ -@ENABLE_DOC_TRUE@ echo ' $(INSTALL_DATA) '$$i ; \ -@ENABLE_DOC_TRUE@ $(INSTALL_DATA) $$i $${installdir}; \ -@ENABLE_DOC_TRUE@ done; \ -@ENABLE_DOC_TRUE@ if test -n "$(DOC_MODULE_VERSION)"; then \ -@ENABLE_DOC_TRUE@ mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ -@ENABLE_DOC_TRUE@ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ -@ENABLE_DOC_TRUE@ fi; \ -@ENABLE_DOC_TRUE@ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ -@ENABLE_DOC_TRUE@ fi - -@ENABLE_DOC_TRUE@uninstall-local: -@ENABLE_DOC_TRUE@ @if test -n "$(DOC_MODULE_VERSION)"; then \ -@ENABLE_DOC_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ -@ENABLE_DOC_TRUE@ else \ -@ENABLE_DOC_TRUE@ installdir="$(DESTDIR)$(TARGET_DIR)"; \ -@ENABLE_DOC_TRUE@ fi; \ -@ENABLE_DOC_TRUE@ rm -rf $${installdir} +uninstall-local: + @if test -n "$(DOC_MODULE_VERSION)"; then \ + installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ + else \ + installdir="$(DESTDIR)$(TARGET_DIR)"; \ + fi; \ + rm -rf $${installdir} # # Require gtk-doc when making dist # -@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: -@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc: -@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" -@ENABLE_DOC_TRUE@@ENABLE_GTK_DOC_FALSE@ @false - -@ENABLE_DOC_TRUE@dist-hook: dist-check-gtkdoc dist-hook-local -@ENABLE_DOC_TRUE@ @mkdir $(distdir)/tmpl -@ENABLE_DOC_TRUE@ @mkdir $(distdir)/html -@ENABLE_DOC_TRUE@ @-cp ./tmpl/*.sgml $(distdir)/tmpl -@ENABLE_DOC_TRUE@ @cp ./html/* $(distdir)/html -@ENABLE_DOC_TRUE@ @-cp ./$(DOC_MODULE).pdf $(distdir)/ -@ENABLE_DOC_TRUE@ @-cp ./$(DOC_MODULE).types $(distdir)/ -@ENABLE_DOC_TRUE@ @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/ -@ENABLE_DOC_TRUE@ @cd $(distdir) && rm -f $(DISTCLEANFILES) -@ENABLE_DOC_TRUE@ @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html - -@ENABLE_DOC_TRUE@.PHONY : dist-hook-local docs +@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: docs +@ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc: +@ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" +@ENABLE_GTK_DOC_FALSE@ @false + +dist-hook: dist-check-gtkdoc dist-hook-local + @mkdir $(distdir)/tmpl + @mkdir $(distdir)/html + @-cp ./tmpl/*.sgml $(distdir)/tmpl + @cp ./html/* $(distdir)/html + @-cp ./$(DOC_MODULE).pdf $(distdir)/ + @-cp ./$(DOC_MODULE).types $(distdir)/ + @-cp ./$(DOC_MODULE)-sections.txt $(distdir)/ + @cd $(distdir) && rm -f $(DISTCLEANFILES) + @$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html + +.PHONY : dist-hook-local docs # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2 index 1b7a72cf..79421726 100644 --- a/docs/api/html/NetworkManager.devhelp2 +++ b/docs/api/html/NetworkManager.devhelp2 @@ -4,23 +4,23 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/docs/api/html/index.html b/docs/api/html/index.html index d9d82eb4..aab8e218 100644 --- a/docs/api/html/index.html +++ b/docs/api/html/index.html @@ -3,10 +3,10 @@ NetworkManager D-Bus Reference Manual - + - + @@ -14,11 +14,11 @@
-

Version 0.9.8.0 +

Version 0.9.8.8

Copyright © 2012 The NetworkManager Authors

-

+

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

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

-Index

+

+Index

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

-Appendix A. License

+

+Appendix A. License

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

-D-Bus API Reference

+

+D-Bus API Reference

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

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

-Migrating from NetworkManager 0.8 to NetworkManager 0.9

-
-
Architecture and D-Bus API Changes in 0.9
+

+Migrating from NetworkManager 0.8 to NetworkManager 0.9

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

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

-Architecture and D-Bus API Changes in 0.9

+Architecture and D-Bus API Changes in 0.9

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

-Elimination of the User Settings Service

+Elimination of the User Settings Service

Previously there were two "settings services", or D-Bus services that provided and saved network configuration information. NetworkManager @@ -74,7 +74,7 @@ Elimination of the user settings service provides the following advantages for clients of NetworkManager:

-
    +
    • Simpler discovery of network configuration and change tracking
    • Simpler storage of user-level network secrets by control applets
    • Correct operation of fast-user switching and multi-seat configurations
      • @@ -103,7 +103,7 @@

    -User Secret Agents

    +User Secret Agents

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

-Settings Service Interface Changes

+Settings Service Interface Changes

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

-Connection Object Interface Changes

+Connection Object Interface Changes

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

-Permissions Methods Consolidation

+Permissions Methods Consolidation

Previously there were two D-Bus method calls to retrieve the list of operations that a user client could perform, and two signals notifying callers that they should recheck permissions. Those two calls were:

-
    +
    • org.freedesktop.NetworkManagerSettings.System.GetPermissions which returned a bitfield of operations the caller was allowed to @@ -256,7 +256,7 @@ are now string-based permissions. The mapping is as follows:

      -

      Table 23. 

      +

      Table 23. 

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

      -AddConnection Returns Object Path of New Connection

      +AddConnection Returns Object Path of New Connection

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

      -Support for WiMAX Devices

      +Support for WiMAX Devices

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

      -New Device States

      +New Device States

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

      -New Active Connection State

      +New Active Connection State

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

      -Consolidated Modem Devices

      +Consolidated Modem Devices

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

      -Secret Property Flags

      +Secret Property Flags

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

      -

      Table 24. 

      +

      Table 24. 

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

      -Deprecated Methods Removed

      +Deprecated Methods Removed

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

      -

      Table 25. 

      +

      Table 25. 

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

      -Network Configuration Setting Specification

      -
      -
      Configuration Settings
      +

      +Network Configuration Setting Specification

      +
      +
      Configuration Settings
      Secret flag types

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

      -Configuration Settings

      +Configuration Settings

      -

      Table 1. 802-1x setting

      +

      Table 1. 802-1x setting

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


      -

      Table 2. adsl setting

      +

      Table 2. adsl setting

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

      method
      		
 
      string
      		
 
      		IPv6 configuration method.  If 'auto' is specified then the appropriate automatic method (PPP, router advertisement, etc) is used for the device and most other properties can be left unset.  To force the use of DHCP only, specify 'dhcp'; this method is only valid for ethernet-based hardware.  If 'link-local' is specified, then an IPv6 link-local address will be assigned to the interface.  If 'manual' is specified, static IP addressing is used and at least one IP address must be given in  the 'addresses' property.  If 'ignored' is specified, IPv6 configuration is not done. This property must be set.  NOTE: the 'shared' methodis not yet supported.IPv6 configuration method.  If 'auto' is specified then the appropriate automatic method (PPP, router advertisement, etc) is used for the device and most other properties can be left unset.  To force the use of DHCP only, specify 'dhcp'; this method is only valid for ethernet-based hardware.  If 'link-local' is specified, then an IPv6 link-local address will be assigned to the interface.  If 'manual' is specified, static IP addressing is used and at least one IP address must be given in  the 'addresses' property.  If 'ignore' is specified, IPv6 configuration is not done. This property must be set.  NOTE: the 'shared' methodis not yet supported.
 
      
 
      
 
      dhcp-hostname
      		
 
      @@ -1026,7 +1038,7 @@
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

      pairwise
      		
 
      array of string
      		
 
      []
      		If specified, will only connect to WPA networks that provide the specified pairwise encryption capabilities.  Each element may be one of 'wep40', 'wep104', 'tkip', or 'ccmp'.A list of pairwise encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list. For maximum compatibility leave this property empty.  Each list element may be one of 'wep40', 'wep104', 'tkip' or 'ccmp'.
 
      
 
      
 
      group
      		
 
      array of string
      		
 
      []
      		If specified, will only connect to WPA networks that provide the specified group/multicast encryption capabilities.  Each element may be one of 'wep40', 'wep104', 'tkip', or 'ccmp'.A list of group/broadcast encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list.  For maximum compatibility leave this property empty.  Each list element may be one  of 'wep40', 'wep104', 'tkip', or 'ccmp'.
 
      
 
      
 
      leap-username
      		
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
      
+  802-1x setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        802-1x
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        eap
+        array of string
+        []
+        The allowed EAP method to be used when authenticating to the network with 802.1x. Valid methods are: 'leap', 'md5', 'tls', 'peap', 'ttls', and 'fast'. Each method requires different configuration using the properties of this setting; refer to wpa_supplicant documentation for the allowed combinations.
+      
+      
+        identity
+        string
+        
+        Identity string for EAP authentication methods.  Often the user's user or login name.
+      
+      
+        anonymous-identity
+        string
+        
+        Anonymous identity string for EAP authentication methods.  Used as the unencrypted identity with EAP types that support different tunneled identity like EAP-TTLS.
+      
+      
+        pac-file
+        string
+        
+        UTF-8 encoded file path containing PAC for EAP-FAST.
+      
+      
+        ca-cert
+        byte array
+        []
+        Contains the CA certificate if used by the EAP method specified in the 'eap' property.  Certificate data is specified using a 'scheme'; two are currently supported: blob and path.  When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data.  When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.  This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.
+      
+      
+        ca-path
+        string
+        
+        UTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the 'ca-cert' property.
+      
+      
+        subject-match
+        string
+        
+        Substring to be matched against the subject of the certificate presented by the authentication server. When unset, no verification of the authentication server certificate's subject is performed.
+      
+      
+        altsubject-matches
+        array of string
+        []
+        List of strings to be matched against the altSubjectName of the certificate presented by the authentication server. If the list is empty, no verification of the server certificate's altSubjectName is performed.
+      
+      
+        client-cert
+        byte array
+        []
+        Contains the client certificate if used by the EAP method specified in the 'eap' property.  Certificate data is specified using a 'scheme'; two are currently supported: blob and path.  When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data.  When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.
+      
+      
+        phase1-peapver
+        string
+        
+        Forces which PEAP version is used when PEAP is set as the EAP method in 'eap' property.  When unset, the version reported by the server will be used.  Sometimes when using older RADIUS servers, it is necessary to force the client to use a particular PEAP version.  To do so, this property may be set to '0' or '1' to force that specific PEAP version.
+      
+      
+        phase1-peaplabel
+        string
+        
+        Forces use of the new PEAP label during key derivation.  Some RADIUS servers may require forcing the new PEAP label to interoperate with PEAPv1.  Set to '1' to force use of the new PEAP label.  See the wpa_supplicant documentation for more details.
+      
+      
+        phase1-fast-provisioning
+        string
+        
+        Enables or disables in-line provisioning of EAP-FAST credentials when FAST is specified as the EAP method in the #NMSetting8021x:eap property. Allowed values are '0' (disabled), '1' (allow unauthenticated provisioning), '2' (allow authenticated provisioning), and '3' (allow both authenticated and unauthenticated provisioning).  See the wpa_supplicant documentation for more details.
+      
+      
+        phase2-auth
+        string
+        
+        Specifies the allowed 'phase 2' inner non-EAP authentication methods when an EAP method that uses an inner TLS tunnel is specified in the 'eap' property. Recognized non-EAP phase2 methods are 'pap', 'chap', 'mschap', 'mschapv2', 'gtc', 'otp', 'md5', and 'tls'.  Each 'phase 2' inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.
+      
+      
+        phase2-autheap
+        string
+        
+        Specifies the allowed 'phase 2' inner EAP-based authentication methods when an EAP method that uses an inner TLS tunnel is specified in the 'eap' property. Recognized EAP-based 'phase 2' methods are 'md5', 'mschapv2', 'otp', 'gtc', and 'tls'. Each 'phase 2' inner method requires specific parameters for successful authentication; see the wpa_supplicant documentation for more details.
+      
+      
+        phase2-ca-cert
+        byte array
+        []
+        Contains the 'phase 2' CA certificate if used by the EAP method specified in the 'phase2-auth' or 'phase2-autheap' properties.  Certificate data is specified using a 'scheme'; two are currentlysupported: blob and path. When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data. When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.  This property can be unset even if the EAP method supports CA certificates, but this allows man-in-the-middle attacks and is NOT recommended.
+      
+      
+        phase2-ca-path
+        string
+        
+        UTF-8 encoded path to a directory containing PEM or DER formatted certificates to be added to the verification chain in addition to the certificate specified in the 'phase2-ca-cert' property.
+      
+      
+        phase2-subject-match
+        string
+        
+        Substring to be matched against the subject of the certificate presented by the authentication server during the inner 'phase2' authentication. When unset, no verification of the authentication server certificate's subject is performed.
+      
+      
+        phase2-altsubject-matches
+        array of string
+        []
+        List of strings to be matched against List of strings to be matched against the altSubjectName of the certificate presented by the authentication server during the inner 'phase 2' authentication. If the list is empty, no verification of the server certificate's altSubjectName is performed.
+      
+      
+        phase2-client-cert
+        byte array
+        []
+        Contains the 'phase 2' client certificate if used by the EAP method specified in the 'phase2-auth' or 'phase2-autheap' properties. Certificate data is specified using a 'scheme'; two are currently supported: blob and path.  When using the blob scheme (which is backwards compatible with NM 0.7.x) this property should be set to the certificate's DER encoded data.  When using the path scheme, this property should be set to the full UTF-8 encoded path of the certificate, prefixed with the string 'file://' and ending with a terminating NULL byte.
+      
+      
+        password
+        string
+        
+        UTF-8 encoded password used for EAP authentication methods.
+      
+      
+        password-flags
+        uint32
+        0
+        Flags indicating how to handle the 802.1x password. (see  for flag values)
+      
+      
+        password-raw
+        byte array
+        []
+        Password used for EAP authentication methods, given as a byte array to allow passwords in other encodings than UTF-8 to be used.  If both 'password' and 'password-raw' are given, 'password' is preferred.
+      
+      
+        password-raw-flags
+        uint32
+        0
+        Flags indicating how to handle the 802.1x password byte array. (see  for flag values)
+      
+      
+        private-key
+        byte array
+        []
+        Contains the private key when the 'eap' property is set to 'tls'.  Key data is specified using a 'scheme'; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and ending with a terminating NULL byte.  When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the 'private-key-password' property must be set to password used to decrypt the PKCS#12 certificate and key.  When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and and ending with a terminating NULL byte, and as with the blob scheme the 'private-key-password' property must be set to the password used to decode the PKCS#12 private key and certificate.
+      
+      
+        private-key-password
+        string
+        
+        The password used to decrypt the private key specified in the 'private-key' property when the private key either uses the path scheme, or if the private key is a PKCS#12 format key.
+      
+      
+        private-key-password-flags
+        uint32
+        0
+        Flags indicating how to handle the 802.1x private key password. (see  for flag values)
+      
+      
+        phase2-private-key
+        byte array
+        []
+        Contains the 'phase 2' inner private key when the 'phase2-auth' or 'phase2-autheap' property is set to 'tls'.  Key data is specified using a 'scheme'; two are currently supported: blob and path. When using the blob scheme and private keys, this property should be set to the key's encrypted PEM encoded data. When using private keys with the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and ending with a terminating NULL byte.  When using PKCS#12 format private keys and the blob scheme, this property should be set to the PKCS#12 data and the 'phase2-private-key-password' property must be set to password used to decrypt the PKCS#12 certificate and key.  When using PKCS#12 files and the path scheme, this property should be set to the full UTF-8 encoded path of the key, prefixed with the string 'file://' and and ending with a terminating NULL byte, and as with the blob scheme the 'phase2-private-key-password' property must be set to the password used to decode the PKCS#12 private key and certificate.
+      
+      
+        phase2-private-key-password
+        string
+        
+        The password used to decrypt the 'phase 2' private key specified in the 'private-key' property when the phase2 private key either uses the path scheme, or if the phase2 private key is a PKCS#12 format key.
+      
+      
+        phase2-private-key-password-flags
+        uint32
+        0
+        Flags indicating how to handle the 802.1x phase2 private key password. (see  for flag values)
+      
+      
+        pin
+        string
+        
+        PIN used for EAP authentication methods.
+      
+      
+        pin-flags
+        uint32
+        0
+        Flags indicating how to handle the 802.1x PIN. (see  for flag values)
+      
+      
+        system-ca-certs
+        boolean
+        FALSE
+        When TRUE, overrides 'ca-path' and 'phase2-ca-path' properties using the system CA directory specified at configure time with the --system-ca-path switch.  The certificates in this directory are added to the verification chain in addition to any certificates specified by the 'ca-cert' and 'phase2-ca-cert' properties.
+      
+    
+  
+
      
+
+  adsl setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        adsl
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        username
+        string
+        
+        Username used to authenticate with the pppoa service.
+      
+      
+        password
+        string
+        
+        Password used to authenticate with the pppoa service.
+      
+      
+        password-flags
+        uint32
+        0
+        Flags indicating how to handle the ADSL password. (see  for flag values)
+      
+      
+        protocol
+        string
+        
+        ADSL connection protocol.
+      
+      
+        encapsulation
+        string
+        
+        Encapsulation of ADSL connection
+      
+      
+        vpi
+        uint32
+        0
+        VPI of ADSL connection
+      
+      
+        vci
+        uint32
+        0
+        VCI of ADSL connection
+      
+    
+  
+
      
+
+  bluetooth setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        bluetooth
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        bdaddr
+        byte array
+        []
+        The Bluetooth address of the device
+      
+      
+        type
+        string
+        
+        Either 'dun' for Dial-Up Networking connections or 'panu' for Personal Area Networking connections.
+      
+    
+  
+
      
+
+  bond setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        bond
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        interface-name
+        string
+        
+        The name of the virtual in-kernel bonding network interface
+      
+      
+        options
+        dict of (string::string)
+        [ ]
+        Dictionary of key/value pairs of bonding options.  Both keys and values must be strings.  Option names must contain only alphanumeric characters (ie, [a-zA-Z0-9]).
+      
+    
+  
+
      
+
+  bridge setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        bridge
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        interface-name
+        string
+        
+        The name of the virtual in-kernel bridging network interface
+      
+      
+        stp
+        boolean
+        TRUE
+        Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.
+      
+      
+        priority
+        uint32
+        128
+        Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower values are 'better'; the lowest priority bridge will be elected the root bridge.
+      
+      
+        forward-delay
+        uint32
+        15
+        The Spanning Tree Protocol (STP) forwarding delay, in seconds.
+      
+      
+        hello-time
+        uint32
+        2
+        The Spanning Tree Protocol (STP) hello time, in seconds.
+      
+      
+        max-age
+        uint32
+        20
+        The Spanning Tree Protocol (STP) maximum message age, in seconds.
+      
+      
+        ageing-time
+        uint32
+        300
+        The ethernet MAC address aging time, in seconds.
+      
+    
+  
+
      
+
+  bridge-port setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        bridge-port
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        priority
+        uint32
+        32
+        The Spanning Tree Protocol (STP) priority of this bridge port
+      
+      
+        path-cost
+        uint32
+        100
+        The Spanning Tree Protocol (STP) port cost for destinations via this port.
+      
+      
+        hairpin-mode
+        boolean
+        FALSE
+        Enables or disabled 'hairpin mode' for the port, which allows frames to be sent back out through the port the frame was received on.
+      
+    
+  
+
      
+
+  cdma setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        cdma
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        number
+        string
+        
+        Number to dial when establishing a PPP data session with the CDMA-based mobile broadband network.  If not specified, the default number (#777) is used when required.
+      
+      
+        username
+        string
+        
+        Username used to authenticate with the network, if required.  Note that many providers do not require a username or accept any username.
+      
+      
+        password
+        string
+        
+        Password used to authenticate with the network, if required.  Note that many providers do not require a password or accept any password.
+      
+      
+        password-flags
+        uint32
+        0
+        Flags indicating how to handle the CDMA password. (see  for flag values)
+      
+    
+  
+
      
+
+  connection setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        connection
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        id
+        string
+        
+        User-readable connection identifier/name.  Must be one or more characters and may change over the lifetime of the connection if the user decides to rename it.
+      
+      
+        uuid
+        string
+        
+        Universally unique connection identifier.  Must be in the format '2815492f-7e56-435e-b2e9-246bd7cdc664' (ie, contains only hexadecimal characters and '-'). The UUID should be assigned when the connection is created and never changed as long as the connection still applies to the same network.  For example, it should not be changed when the user changes the connection's 'id', but should be recreated when the WiFi SSID, mobile broadband network provider, or the connection type changes.
+      
+      
+        type
+        string
+        
+        Base type of the connection.  For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, '802-3-ethernet' or '802-11-wireless' or 'bluetooth', etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, 'vpn' or 'bridge', etc).
+      
+      
+        permissions
+        array of string
+        []
+        An array of strings defining what access a given user has to this connection.  If this is NULL or empty, all users are allowed to access this connection.  Otherwise a user is allowed to access this connection if and only if they are in this array. Each entry is of the form "[type]:[id]:[reserved]", for example: "user:dcbw:blah"  At this time only the 'user' [type] is allowed.  Any other values are ignored and reserved for future use.  [id] is the username that this permission refers to, which may not contain the ':' character.  Any [reserved] information (if present) must be ignored and is reserved for future use.  All of [type], [id], and [reserved] must be valid UTF-8.
+      
+      
+        autoconnect
+        boolean
+        TRUE
+        If TRUE, NetworkManager will activate this connection when its network resources are available.  If FALSE, the connection must be manually activated by the user or some other mechanism.
+      
+      
+        timestamp
+        uint64
+        0
+        Timestamp (in seconds since the Unix Epoch) that the connection was last successfully activated.  Settings services should update the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp.
+      
+      
+        read-only
+        boolean
+        FALSE
+        If TRUE, the connection is read-only and cannot be changed by the user or any other mechanism.  This is normally set for system connections whose plugin cannot yet write updated connections back out.
+      
+      
+        zone
+        string
+        
+        The trust level of a the connection.Free form case-insensitive string (for example "Home", "Work", "Public").  NULL or unspecified zone means the connection will be placed in the default zone as defined by the firewall.
+      
+      
+        master
+        string
+        
+        Interface name of the master device or UUID of the master connection
+      
+      
+        slave-type
+        string
+        
+        Setting name describing the type of slave this connection is (ie, 'bond') or NULL if this connection is not a slave.
+      
+      
+        secondaries
+        array of string
+        []
+        List of connection UUIDs that should be activated when the base connection itself is activated.
+      
+    
+  
+
      
+
+  gsm setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        gsm
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        number
+        string
+        
+        Number to dial when establishing a PPP data session with the GSM-based mobile broadband network.  Many modems do not require PPP for connections to the mobile network and thus this property should be left blank, which allows NetworkManager to select the appropriate settings automatically.
+      
+      
+        username
+        string
+        
+        Username used to authenticate with the network, if required.  Note that many providers do not require a username or accept any username.
+      
+      
+        password
+        string
+        
+        Password used to authenticate with the network, if required.  Note that many providers do not require a password or accept any password.
+      
+      
+        password-flags
+        uint32
+        0
+        Flags indicating how to handle the GSM password. (see  for flag values)
+      
+      
+        apn
+        string
+        
+        The GPRS Access Point Name specifying the APN used when establishing a data session with the GSM-based network.  The APN often determines how the user will be billed for their network usage and whether the user has access to the Internet or just a provider-specific walled-garden, so it is important to use the correct APN for the user's mobile broadband plan.  The APN may only be composed of the characters a-z, 0-9, ., and - per GSM 03.60 Section 14.9.
+      
+      
+        network-id
+        string
+        
+        The Network ID (GSM LAI format, ie MCC-MNC) to force specific network registration.  If the Network ID is specified, NetworkManager will attempt to force the device to register only on the specified network.  This can be used to ensure that the device does not roam when direct roaming control of the device is not otherwise possible.
+      
+      
+        network-type
+        int32
+        -1
+        Network preference to force the device to only use specific network technologies.  The permitted values are: -1: any, 0: 3G only, 1: GPRS/EDGE only, 2: prefer 3G, 3: prefer 2G, 4: prefer 4G/LTE, 5: 4G/LTE only. Note that not all devices allow network preference control.
+      
+      
+        pin
+        string
+        
+        If the SIM is locked with a PIN it must be unlocked before any other operations are requested.  Specify the PIN here to allow operation of the device.
+      
+      
+        pin-flags
+        uint32
+        0
+        Flags indicating how to handle the GSM SIM PIN. (see  for flag values)
+      
+      
+        allowed-bands
+        uint32
+        1
+        Bitfield of allowed frequency bands.  Note that not all devices allow frequency band control.
+      
+      
+        home-only
+        boolean
+        FALSE
+        When TRUE, only connections to the home network will be allowed.  Connections to roaming networks will not be made.
+      
+    
+  
+
      
+
+  infiniband setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        infiniband
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        mac-address
+        byte array
+        []
+        If specified, this connection will only apply to the IPoIB device whose permanent MAC address matches.  This property does not change the MAC address of the device (i.e. MAC spoofing).
+      
+      
+        mtu
+        uint32
+        0
+        If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.
+      
+      
+        transport-mode
+        string
+        
+        The IPoIB transport mode. Either 'datagram' or 'connected'.
+      
+    
+  
+
      
+
+  ipv4 setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        ipv4
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        method
+        string
+        
+        IPv4 configuration method.  If 'auto' is specified then the appropriate automatic method (DHCP, PPP, etc) is used for the interface and most other properties can be left unset.  If 'link-local' is specified, then a link-local address in the 169.254/16 range will be assigned to the interface.  If 'manual' is specified, static IP addressing is used and at least one IP address must be given in the 'addresses' property.  If 'shared' is specified (indicating that this connection will provide network access to other computers) then the interface is assigned an address in the 10.42.x.1/24 range and a DHCP and forwarding DNS server are started, and the interface is NAT-ed to the current default network connection.  'disabled' means IPv4 will not be used on this connection.  This property must be set.
+      
+      
+        dns
+        array of uint32
+        []
+        List of DNS servers (network byte order). For the 'auto' method, these DNS servers are appended to those (if any) returned by automatic configuration.  DNS servers cannot be used with the 'shared', 'link-local', or 'disabled' methods as there is no upstream network.  In all other methods, these DNS servers are used as the only DNS servers for this connection.
+      
+      
+        dns-search
+        array of string
+        []
+        List of DNS search domains.  For the 'auto' method, these search domains are appended to those returned by automatic configuration. Search domains cannot be used with the 'shared', 'link-local', or 'disabled' methods as there is no upstream network.  In all other methods, these search domains are used as the only search domains for this connection.
+      
+      
+        addresses
+        array of array of uint32
+        []
+        Array of IPv4 address structures.  Each IPv4 address structure is composed of 3 32-bit values; the first being the IPv4 address (network byte order), the second the prefix (1 - 32), and last the IPv4 gateway (network byte order). The gateway may be left as 0 if no gateway exists for that subnet.  For the 'auto' method, given IP addresses are appended to those returned by automatic configuration.  Addresses cannot be used with the 'shared', 'link-local', or 'disabled' methods as addressing is either automatic or disabled with these methods.
+      
+      
+        routes
+        array of array of uint32
+        []
+        Array of IPv4 route structures.  Each IPv4 route structure is composed of 4 32-bit values; the first being the destination IPv4 network or address (network byte order), the second the destination network or address prefix (1 - 32), the third being the next-hop (network byte order) if any, and the fourth being the route metric. For the 'auto' method, given IP routes are appended to those returned by automatic configuration.  Routes cannot be used with the 'shared', 'link-local', or 'disabled', methods as there is no upstream network.
+      
+      
+        ignore-auto-routes
+        boolean
+        FALSE
+        When the method is set to 'auto' and this property to TRUE, automatically configured routes are ignored and only routes specified in the 'routes' property, if any, are used.
+      
+      
+        ignore-auto-dns
+        boolean
+        FALSE
+        When the method is set to 'auto' and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the 'dns' and 'dns-search' properties, if any, are used.
+      
+      
+        dhcp-client-id
+        string
+        
+        A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options.
+      
+      
+        dhcp-send-hostname
+        boolean
+        TRUE
+        If TRUE, a hostname is sent to the DHCP server when acquiring a lease.  Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer.  If the 'dhcp-hostname' property is empty and this property is TRUE, the current persistent hostname of the computer is sent.
+      
+      
+        dhcp-hostname
+        string
+        
+        If the 'dhcp-send-hostname' property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease.
+      
+      
+        never-default
+        boolean
+        FALSE
+        If TRUE, this connection will never be the default IPv4 connection, meaning it will never be assigned the default route by NetworkManager.
+      
+      
+        may-fail
+        boolean
+        TRUE
+        If TRUE, allow overall network configuration to proceed even if IPv4 configuration times out. Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv6-only networks, setting this property to TRUE allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.
+      
+    
+  
+
      
+
+  ipv6 setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        ipv6
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        method
+        string
+        
+        IPv6 configuration method.  If 'auto' is specified then the appropriate automatic method (PPP, router advertisement, etc) is used for the device and most other properties can be left unset.  To force the use of DHCP only, specify 'dhcp'; this method is only valid for ethernet-based hardware.  If 'link-local' is specified, then an IPv6 link-local address will be assigned to the interface.  If 'manual' is specified, static IP addressing is used and at least one IP address must be given in  the 'addresses' property.  If 'ignore' is specified, IPv6 configuration is not done. This property must be set.  NOTE: the 'shared' methodis not yet supported.
+      
+      
+        dhcp-hostname
+        string
+        
+        The specified name will be sent to the DHCP server when acquiring a lease.
+      
+      
+        dns
+        array of byte array
+        []
+        Array of DNS servers, where each member of the array is a byte array containing the IPv6 address of the DNS server (in network byte order). For the 'auto' method, these DNS servers are appended to those (if any) returned by automatic configuration.  DNS servers cannot be used with the 'shared' or 'link-local' methods as there is no usptream network.  In all other methods, these DNS servers are used as the only DNS servers for this connection.
+      
+      
+        dns-search
+        array of string
+        []
+        List of DNS search domains.  For the 'auto' method, these search domains are appended to those returned by automatic configuration. Search domains cannot be used with the 'shared' or 'link-local' methods as there is no upstream network.  In all other methods, these search domains are used as the only search domains for this connection.
+      
+      
+        addresses
+        array of (byte array, uint32, byte array)
+        []
+        Array of IPv6 address structures.  Each IPv6 address structure is composed of 3 members, the first being a byte array containing the IPv6 address (network byte order), the second a 32-bit integer containing the IPv6 address prefix, and the third a byte array containing the IPv6 address (network byte order) of the gateway associated with this address, if any. If no gateway is given, the third element should be given as all zeros.  For the 'auto' method, given IP addresses are appended to those returned by automatic configuration.  Addresses cannot be used with the 'shared' or 'link-local' methods as the interface is automatically assigned an address with these methods.
+      
+      
+        routes
+        array of (byte array, uint32, byte array, uint32)
+        []
+        Array of IPv6 route structures.  Each IPv6 route structure is composed of 4 members; the first being the destination IPv6 network or address (network byte order) as a byte array, the second the destination network or address IPv6 prefix, the third being the next-hop IPv6 address (network byte order) if any, and the fourth being the route metric. For the 'auto' method, given IP routes are appended to those returned by automatic configuration.  Routes cannot be used with the 'shared' or 'link-local' methods because there is no upstream network.
+      
+      
+        ignore-auto-routes
+        boolean
+        FALSE
+        When the method is set to 'auto' or 'dhcp' and this property is set to TRUE, automatically configured routes are ignored and only routes specified in the 'routes' property, if any, are used.
+      
+      
+        ignore-auto-dns
+        boolean
+        FALSE
+        When the method is set to 'auto' or 'dhcp' and this property is set to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the 'dns' and 'dns-search' properties, if any, are used.
+      
+      
+        never-default
+        boolean
+        FALSE
+        If TRUE, this connection will never be the default IPv6 connection, meaning it will never be assigned the default IPv6 route by NetworkManager.
+      
+      
+        may-fail
+        boolean
+        TRUE
+        If TRUE, allow overall network configuration to proceed even if IPv6 configuration times out. Note that at least one IP configuration must succeed or overall network configuration will still fail.  For example, in IPv4-only networks, setting this property to TRUE allows the overall network configuration to succeed if IPv6 configuration fails but IPv4 configuration completes successfully.
+      
+      
+        ip6-privacy
+        int32
+        -1
+        Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If enabled, it makes the kernel generate a temporary IPv6 address in addition to the public one generated from MAC address via modified EUI-64.  This enhances privacy, but could cause problems in some applications, on the other hand.  The permitted values are: 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary addresses).
+      
+    
+  
+
      
+
+  802-11-olpc-mesh setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        802-11-olpc-mesh
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        ssid
+        byte array
+        []
+        SSID of the mesh network to join.
+      
+      
+        channel
+        uint32
+        0
+        Channel on which the mesh network to join is located.
+      
+      
+        dhcp-anycast-address
+        byte array
+        []
+        Anycast DHCP MAC address used when requesting an IP address via DHCP.  The specific anycast address used determines which DHCP server class answers the the request.
+      
+    
+  
+
      
+
+  ppp setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        ppp
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        noauth
+        boolean
+        TRUE
+        If TRUE, do not require the other side (usually the PPP server) to authenticate itself to the client.  If FALSE, require authentication from the remote side.  In almost all cases, this should be TRUE.
+      
+      
+        refuse-eap
+        boolean
+        FALSE
+        If TRUE, the EAP authentication method will not be used.
+      
+      
+        refuse-pap
+        boolean
+        FALSE
+        If TRUE, the PAP authentication method will not be used.
+      
+      
+        refuse-chap
+        boolean
+        FALSE
+        If TRUE, the CHAP authentication method will not be used.
+      
+      
+        refuse-mschap
+        boolean
+        FALSE
+        If TRUE, the MSCHAP authentication method will not be used.
+      
+      
+        refuse-mschapv2
+        boolean
+        FALSE
+        If TRUE, the MSCHAPv2 authentication method will not be used.
+      
+      
+        nobsdcomp
+        boolean
+        FALSE
+        If TRUE, BSD compression will not be requested.
+      
+      
+        nodeflate
+        boolean
+        FALSE
+        If TRUE, 'deflate' compression will not be requested.
+      
+      
+        no-vj-comp
+        boolean
+        FALSE
+        If TRUE, Van Jacobsen TCP header compression will not be requested.
+      
+      
+        require-mppe
+        boolean
+        FALSE
+        If TRUE, MPPE (Microsoft Point-to-Point Encrpytion) will be required for the PPP session.  If either 64-bit or 128-bit MPPE is not available the session will fail.  Note that MPPE is not used on mobile broadband connections.
+      
+      
+        require-mppe-128
+        boolean
+        FALSE
+        If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encrpytion) will be required for the PPP session, and the 'require-mppe' property must also be set to TRUE.  If 128-bit MPPE is not available the session will fail.
+      
+      
+        mppe-stateful
+        boolean
+        FALSE
+        If TRUE, stateful MPPE is used.  See pppd documentation for more information on stateful MPPE.
+      
+      
+        crtscts
+        boolean
+        FALSE
+        If TRUE, specify that pppd should set the serial port to use hardware flow control with RTS and CTS signals.  This value should normally be set to FALSE.
+      
+      
+        baud
+        uint32
+        0
+        If non-zero, instruct pppd to set the serial port to the specified baudrate.  This value should normally be left as 0 to automatically choose the speed.
+      
+      
+        mru
+        uint32
+        0
+        If non-zero, instruct pppd to request that the peer send packets no larger than the specified size.  If non-zero, the MRU should be between 128 and 16384.
+      
+      
+        mtu
+        uint32
+        0
+        If non-zero, instruct pppd to send packets no larger than the specified size.
+      
+      
+        lcp-echo-failure
+        uint32
+        0
+        If non-zero, instruct pppd to presume the connection to the peer has failed if the specified number of LCP echo-requests go unanswered by the peer.  The 'lcp-echo-interval' property must also be set to a non-zero value if this property is used.
+      
+      
+        lcp-echo-interval
+        uint32
+        0
+        If non-zero, instruct pppd to send an LCP echo-request frame to the peer every n seconds (where n is the specified value).  Note that some PPP peers will respond to echo requests and some will not, and it is not possible to autodetect this.
+      
+    
+  
+
      
+
+  pppoe setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        pppoe
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        service
+        string
+        
+        If specified, instruct PPPoE to only initiate sessions with access concentrators that provide the specified serivce.  For most providers, this should be left blank.  It is only required if there are multiple access concentrators or a specific service is known to be required.
+      
+      
+        username
+        string
+        
+        Username used to authenticate with the PPPoE service.
+      
+      
+        password
+        string
+        
+        Password used to authenticate with the PPPoE service.
+      
+      
+        password-flags
+        uint32
+        0
+        Flags indicating how to handle the PPPoE password. (see  for flag values)
+      
+    
+  
+
      
+
+  serial setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        serial
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        baud
+        uint32
+        57600
+        Speed to use for communication over the serial port.  Note that this value usually has no effect for mobile broadband modems as they generally ignore speed settings and use the highest available speed.
+      
+      
+        bits
+        uint32
+        8
+        Byte-width of the serial communication.  The 8 in '8n1' for example.
+      
+      
+        parity
+        gchar
+        110
+        Parity setting of the serial port.  Either 'E' for even parity, 'o' for odd parity, or 'n' for no parity.
+      
+      
+        stopbits
+        uint32
+        1
+        Number of stop bits for communication on the serial port.  Either 1 or 2.  The 1 in '8n1' for example.
+      
+      
+        send-delay
+        uint64
+        0
+        Time to delay between each byte sent to the modem, in microseconds.
+      
+    
+  
+
      
+
+  vlan setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        vlan
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        interface-name
+        string
+        
+        If given, specifies the kernel name of the VLAN interface. If not given, a default name will be constructed from the interface described by the parent interface and the 'id' property, ex 'eth2.1'. The parent interface may be given by the 'parent' property or by a hardware address property, eg the 'wired' settings' 'mac-address' property.
+      
+      
+        parent
+        string
+        
+        If given, specifies the parent interface name or parent connection UUID from which this VLAN interface should be created.  If this property is not specified, the connection must contain a hardware address in a hardware-specific setting, like the 'wired' settings' 'mac-address' property.
+      
+      
+        id
+        uint32
+        0
+        The VLAN indentifier the interface created by this connection should be assigned.
+      
+      
+        flags
+        uint32
+        0
+        One or more flags which control the behavior and features of the VLAN interface.  Flags include reordering of output packet headers (0x01), use of the GVRP protocol (0x02), and loose binding of the interface to its master device's operating state (0x04).
+      
+      
+        ingress-priority-map
+        array of string
+        []
+        For incoming packets, a list of mappings from 802.1p priorities to Linux SKB priorities.  The mapping is given in the format 'from:to' where both 'from' and 'to' are unsigned integers, ie '7:3'.
+      
+      
+        egress-priority-map
+        array of string
+        []
+        For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p priorities.  The mapping is given in the format 'from:to' where both 'from' and 'to' are unsigned integers, ie '7:3'.
+      
+    
+  
+
      
+
+  vpn setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        vpn
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        service-type
+        string
+        
+        D-Bus service name of the VPN plugin that this setting uses to connect to its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc plugin.
+      
+      
+        user-name
+        string
+        
+        If the VPN connection requires a user name for authentication, that name should be provided here.  If the connection is available to more than one user, and the VPN requires each user to supply a different name, then leave this property empty.  If this property is empty, NetworkManager will automatically supply the username of the user which requested the VPN connection.
+      
+      
+        data
+        dict of (string::string)
+        [ ]
+        Dictionary of key/value pairs of VPN plugin specific data.  Both keys and values must be strings.
+      
+      
+        secrets
+        dict of (string::string)
+        [ ]
+        Dictionary of key/value pairs of VPN plugin specific secrets like passwords or private keys.  Both keys and values must be strings.
+      
+    
+  
+
      
+
+  wimax setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        wimax
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        network-name
+        string
+        
+        Network Service Provider (NSP) name of the WiMAX network this connection should use.
+      
+      
+        mac-address
+        byte array
+        []
+        If specified, this connection will only apply to the WiMAX device whose MAC address matches.  This property does not change the MAC address of the device (known as MAC spoofing).
+      
+    
+  
+
      
+
+  802-3-ethernet setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        802-3-ethernet
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        port
+        string
+        
+        Specific port type to use if multiple the device supports multiple attachment methods.  One of 'tp' (Twisted Pair), 'aui' (Attachment Unit Interface), 'bnc' (Thin Ethernet) or 'mii' (Media Independent Interface.  If the device supports only one port type, this setting is ignored.
+      
+      
+        speed
+        uint32
+        0
+        If non-zero, request that the device use only the specified speed.  In Mbit/s, ie 100 == 100Mbit/s.
+      
+      
+        duplex
+        string
+        
+        If specified, request that the device only use the specified duplex mode.  Either 'half' or 'full'.
+      
+      
+        auto-negotiate
+        boolean
+        TRUE
+        If TRUE, allow auto-negotiation of port speed and duplex mode.  If FALSE, do not allow auto-negotiation,in which case the 'speed' and 'duplex' properties should be set.
+      
+      
+        mac-address
+        byte array
+        []
+        If specified, this connection will only apply to the ethernet device whose permanent MAC address matches.  This property does not change the MAC address of the device (i.e. MAC spoofing).
+      
+      
+        cloned-mac-address
+        byte array
+        []
+        If specified, request that the device use this MAC address instead of its permanent MAC address.  This is known as MAC cloning or spoofing.
+      
+      
+        mac-address-blacklist
+        array of string
+        []
+        If specified, this connection will never apply to the ethernet device whose permanent MAC address matches an address in the list.  Each MAC address is in the standard hex-digits-and-colons notation (00:11:22:33:44:55).
+      
+      
+        mtu
+        uint32
+        0
+        If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.
+      
+      
+        s390-subchannels
+        array of string
+        []
+        Identifies specific subchannels that this network device uses for communcation with z/VM or s390 host.  Like the 'mac-address' property for non-z/VM devices, this property can be used to ensure this connection only applies to the network device that uses these subchannels. The list should contain exactly 3 strings, and each string may only be composed of hexadecimal characters and the period (.) character.
+      
+      
+        s390-nettype
+        string
+        
+        s390 network device type; one of 'qeth', 'lcs', or 'ctc', representing the different types of virtual network devices available on s390 systems.
+      
+      
+        s390-options
+        dict of (string::string)
+        [ ]
+        Dictionary of key/value pairs of s390-specific device options.  Both keys and values must be strings.  Allowed keys include 'portno', 'layer2', 'portname', 'protocol', among others.
+      
+    
+  
+
      
+
+  802-11-wireless setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        802-11-wireless
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        ssid
+        byte array
+        []
+        SSID of the WiFi network.  Must be specified.
+      
+      
+        mode
+        string
+        
+        WiFi network mode; one of 'infrastructure', 'adhoc' or 'ap'.  If blank, infrastructure is assumed.
+      
+      
+        band
+        string
+        
+        802.11 frequency band of the network.  One of 'a' for 5GHz 802.11a or 'bg' for 2.4GHz 802.11.  This will lock associations to the WiFi network to the specific band, i.e. if 'a' is specified, the device will not associate with the same network in the 2.4GHz band even if the network's settings are compatible.  This setting depends on specific driver capability and may not work with all drivers.
+      
+      
+        channel
+        uint32
+        0
+        Wireless channel to use for the WiFi connection.  The device will only join (or create for Ad-Hoc networks) a WiFi network on the specified channel.  Because channel numbers overlap between bands, this property also requires the 'band' property to be set.
+      
+      
+        bssid
+        byte array
+        []
+        If specified, directs the device to only associate with the given access point.  This capability is highly driver dependent and not supported by all devices.  Note: this property does not control the BSSID used when creating an Ad-Hoc network and is unlikely to in the future.
+      
+      
+        rate
+        uint32
+        0
+        If non-zero, directs the device to only use the specified bitrate for communication with the access point.  Units are in Kb/s, ie 5500 = 5.5 Mbit/s.  This property is highly driver dependent and not all devices support setting a static bitrate.
+      
+      
+        tx-power
+        uint32
+        0
+        If non-zero, directs the device to use the specified transmit power.  Units are dBm.  This property is highly driver dependent and not all devices support setting a static transmit power.
+      
+      
+        mac-address
+        byte array
+        []
+        If specified, this connection will only apply to the WiFi device whose permanent MAC address matches.  This property does not change the MAC address of the device (i.e. MAC spoofing).
+      
+      
+        cloned-mac-address
+        byte array
+        []
+        If specified, request that the WiFi device use this MAC address instead of its permanent MAC address.  This is known as MAC cloning or spoofing.
+      
+      
+        mac-address-blacklist
+        array of string
+        []
+        A list of permanent MAC addresses of Wi-Fi devices to which this connection should never apply.  Each MAC address should be given in the standard hex-digits-and-colons notation (eg '00:11:22:33:44:55').
+      
+      
+        mtu
+        uint32
+        0
+        If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.
+      
+      
+        seen-bssids
+        array of string
+        []
+        A list of BSSIDs (each BSSID formatted as a MAC address like 00:11:22:33:44:55') that have been detected as part of the WiFI network. NetworkManager internally tracks previously seen BSSIDs. The property is only meant for reading and reflects the BBSID list of NetworkManager. The changes you make to this property will not be preserved.
+      
+      
+        security
+        string
+        
+        If the wireless connection has any security restrictions, like 802.1x, WEP, or WPA, set this property to '802-11-wireless-security' and ensure the connection contains a valid 802-11-wireless-security setting.
+      
+      
+        hidden
+        boolean
+        FALSE
+        If TRUE, indicates this network is a non-broadcasting network that hides its SSID.  In this case various workarounds may take place, such as probe-scanning the SSID for more reliable network discovery.  However, these workarounds expose inherent insecurities with hidden SSID networks, and thus hidden SSID networks should be used with caution.
+      
+    
+  
+
      
+
+  802-11-wireless-security setting
+  
+    
+      
+        Key Name
+        Value Type
+        Default Value
+        Value Description
+      
+    
+    
+      
+        name
+        string
+        802-11-wireless-security
+        The setting's name; these names are defined by the specification and cannot be changed after the object has been created.  Each setting class has a name, and all objects of that class share the same name.
+      
+      
+        key-mgmt
+        string
+        
+        Key management used for the connection.  One of 'none' (WEP), 'ieee8021x' (Dynamic WEP), 'wpa-none' (WPA-PSK Ad-Hoc), 'wpa-psk' (infrastructure WPA-PSK), or 'wpa-eap' (WPA-Enterprise).  This property must be set for any WiFi connection that uses security.
+      
+      
+        wep-tx-keyidx
+        uint32
+        0
+        When static WEP is used (ie, key-mgmt = 'none') and a non-default WEP key index is used by the AP, put that WEP key index here.  Valid values are 0 (default key) through 3.  Note that some consumer access points (like the Linksys WRT54G) number the keys 1 - 4.
+      
+      
+        auth-alg
+        string
+        
+        When WEP is used (ie, key-mgmt = 'none' or 'ieee8021x') indicate the 802.11 authentication algorithm required by the AP here.  One of 'open' for Open System, 'shared' for Shared Key, or 'leap' for Cisco LEAP.  When using Cisco LEAP (ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap') the 'leap-username' and 'leap-password' properties must be specified.
+      
+      
+        proto
+        array of string
+        []
+        List of strings specifying the allowed WPA protocol versions to use.  Each element may be one 'wpa' (allow WPA) or 'rsn' (allow WPA2/RSN).  If not specified, both WPA and RSN connections are allowed.
+      
+      
+        pairwise
+        array of string
+        []
+        A list of pairwise encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list. For maximum compatibility leave this property empty.  Each list element may be one of 'wep40', 'wep104', 'tkip' or 'ccmp'.
+      
+      
+        group
+        array of string
+        []
+        A list of group/broadcast encryption algorithms which prevents connections to Wi-Fi networks that do not utilize one of the algorithms in the list.  For maximum compatibility leave this property empty.  Each list element may be one  of 'wep40', 'wep104', 'tkip', or 'ccmp'.
+      
+      
+        leap-username
+        string
+        
+        The login username for legacy LEAP connections (ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap').
+      
+      
+        wep-key0
+        string
+        
+        Index 0 WEP key.  This is the WEP key used in most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.
+      
+      
+        wep-key1
+        string
+        
+        Index 1 WEP key.  This WEP index is not used by most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.
+      
+      
+        wep-key2
+        string
+        
+        Index 2 WEP key.  This WEP index is not used by most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.
+      
+      
+        wep-key3
+        string
+        
+        Index 3 WEP key.  This WEP index is not used by most networks.  See the 'wep-key-type' property for a description of how this key is interpreted.
+      
+      
+        wep-key-flags
+        uint32
+        0
+        Flags indicating how to handle the WEP keys. (see  for flag values)
+      
+      
+        wep-key-type
+        uint32
+        0
+        Controls the interpretation of WEP keys.  Allowed values are 1 (interpret WEP keys as hexadecimal or ASCII keys) or 2 (interpret WEP keys as WEP Passphrases).  If set to 1 and the keys are hexadecimal, they must be either 10 or 26 characters in length.  If set to 1 and the keys are ASCII keys, they must be either 5 or 13 characters in length.  If set to 2, the passphrase is hashed using  the de-facto MD5 method to derive the actual WEP key.
+      
+      
+        psk
+        string
+        
+        Pre-Shared-Key for WPA networks.  If the key is 64-characters long, it must contain only hexadecimal characters and is interpreted as a hexadecimal WPA key.  Otherwise, the key must be between 8 and 63 ASCII characters (as specified in the 802.11i standard) and is interpreted as a WPA passphrase, and is hashed to derive the actual WPA-PSK used when connecting to the WiFi network.
+      
+      
+        psk-flags
+        uint32
+        0
+        Flags indicating how to handle the WPA PSK key. (see  for flag values)
+      
+      
+        leap-password
+        string
+        
+        The login password for legacy LEAP connections (ie, key-mgmt = 'ieee8021x' and auth-alg = 'leap').
+      
+      
+        leap-password-flags
+        uint32
+        0
+        Flags indicating how to handle the LEAP password. (see  for flag values)
+      
+    
+  
+
      
+  
+
diff --git a/docs/api/spec.html b/docs/api/spec.html
index 5e3559da..25c3f8a9 100644
--- a/docs/api/spec.html
+++ b/docs/api/spec.html
@@ -1,5 +1,4 @@
-
-NetworkManager D-Bus Interface Specification version 0.9.8.0
      NetworkManager D-Bus Interface Specification
      Version 0.9.8.0
      Copyright (C) 2008 - 2011 Red Hat, Inc.
      Copyright (C) 2008 - 2009 Novell, Inc.
      
+        
      NetworkManager D-Bus Interface Specification
      Version 0.9.8.8
      Copyright (C) 2008 - 2011 Red Hat, Inc.
      Copyright (C) 2008 - 2009 Novell, Inc.
      
 
      This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
@@ -273,6 +272,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
      domains -
       s
      
           For available domains see SetLogging() call.
+        
      CheckConnectivity (
+        
+        ) →
+        u
      
+	Re-check the network connectivity state.
+      
      Returns
      connectivity -
+      u
+      (NM_CONNECTIVITY)
+    
      
+          The current connectivity state.
         
      state (
         
         ) →
@@ -352,6 +361,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.ao -
       (read)
      
         List of active connection object paths.
+      
      PrimaryConnection -
+      o -
+      (read)
      
+        The object path of the "primary" active connection being used
+        to access the network. In particular, if there is no VPN
+        active, or the VPN does not have the default route, then this
+        indicates the connection that has the default route. If there
+        is a VPN active with the default route, then this indicates
+        the connection that contains the route to the VPN endpoint.
+      
      ActivatingConnection -
+      o -
+      (read)
      
+        The object path of an active connection that is currently
+        being activated and which is expected to become the new
+        PrimaryConnection when it finishes activating.
       
      Version -
       s -
       (read)
      
@@ -362,6 +386,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.NM_STATE)
     
      
         The overall state of the NetworkManager daemon.
+      
      Connectivity -
+      u -
+      (read)
+      (NM_CONNECTIVITY)
+    
      
+        The network connectivity state.
       
      Enumerated types:
      NM_STATE
      
         Describes the overall state of the daemon.
       
      NM_STATE_UNKNOWN = 0
      
@@ -381,6 +411,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
      NM_STATE_CONNECTED_GLOBAL = 70
      
           A network device is connected, with global network connectivity.
+        
      NM_CONNECTIVITY
      
+        Describes the network-connectivity state.
+      
      NM_CONNECTIVITY_UNKNOWN = 0
      
+          Network connectivity is unknown.
+        
      NM_CONNECTIVITY_NONE = 1
      
+          The host is not connected to any network.
+        
      NM_CONNECTIVITY_PORTAL = 2
      
+          The host is behind a captive portal and cannot reach the
+          full Internet.
+        
      NM_CONNECTIVITY_LIMITED = 3
      
+          The host is connected to a network, but does not appear to
+	  be able to reach the full Internet.
+        
      NM_CONNECTIVITY_FULL = 4
      
+	  The host is connected to a network, and appears to be able
+	  to reach the full Internet
         
      
 
   
      org.freedesktop.NetworkManager.AccessPoint
      Interface has no methods.
      Signals:
      PropertiesChanged (
@@ -1162,7 +1207,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
      
-        List the connections stored by this Settings object.
+        List the saved network connections known to NetworkManager.
       
      Returns
      connections -
       ao
      
           List of connections.
@@ -1181,7 +1226,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
      
-        Add new connection.
+        Add new connection and save it to disk.  This operation does not start
+        the network connection unless (1) device is idle and able to connect to
+        the network described by the new connection, and (2) the connection
+        is allowed to be started automatically.
       
      Parameters
      connection -
       a{sa{sv}}
      
           Connection settings and properties.
@@ -1206,7 +1254,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
      NewConnection (
         o: connection
         )
      
-        Emitted when a new connection has been added.
+        Emitted when a new connection has been added after NetworkManager has
+        started up and initialized.  This signal is not emitted for connections
+        read while starting up, because NetworkManager's D-Bus service is only
+        available after all connections have been read, and to prevent spamming
+        listeners with too many signals at one time.  To retrieve the initial
+        connection list, call the ListConnections() method once, and then listen
+        for individual Settings.NewConnection and Settings.Connection.Deleted
+        signals for further updates.
       
      Parameters
      connection -
       o
      
           Object path of the new connection.
@@ -1303,7 +1358,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.o -
       (read)
      The path of the connection.
      SpecificObject -
       o -
-      (read)
      A specific object associated with the active connection.
      Uuid -
+      (read)
      
+        A specific object associated with the active connection.  This property
+        reflects the specific object used during connection activation, and will
+        not change over the lifetime of the ActiveConnection once set.
+      
      Uuid -
       s -
       (read)
      
         The UUID of the connection, provided as a convenience so that clients
@@ -1373,7 +1432,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
      
                 Retrieve and return stored secrets, if any, or request new
-                secrets from the agent's user.
+                secrets from the agent's user.  If user interaction is allowed
+                and the user enters new secrets, the agent is expected to save
+                the new secrets to persistent storage (if the secret's flags
+                include AGENT_OWNED) as NetworkManager will not send these
+                secrets back to the same agent via a SaveSecrets() call.
             
      Parameters
      connection -
       a{sa{sv}}
       (String_String_Variant_Map_Map)
@@ -1395,7 +1458,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
      
                 Cancel a pending GetSecrets request for secrets of the given
-                connection.  Any matching request should be canceled.
+                connection.  Any GetSecrets request with the same
+                'connection_path' and 'setting_name' that are given in a
+                CancelGetSecrets request should be canceled.
             
      Parameters
      connection_path -
       o
      
-                    Object path of the connection for which, if secrets are being
-                    requested, the request should be canceled.
+                    Object path of the connection for which, if secrets for
+                    the given 'setting_name' are being requested, the request
+                    should be canceled.
                 
      setting_name -
       s
      
                     Setting name for which secrets for this connection were
@@ -1754,6 +1822,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
    • NM_802_11_MODE
     - u
    • NM_ACTIVE_CONNECTION_STATE
     - u
    • NM_BT_CAPABILITIES
+    - u
    • NM_CONNECTIVITY
     - u
    • NM_DEVICE_CAP
     - u
    • NM_DEVICE_MODEM_CAPABILITIES
     - u
    • NM_DEVICE_STATE
@@ -1773,4 +1842,4 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
    • String_Variant_Map
     - a{ s → v }
-  
    
+  

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

 

 
Synopsis

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

 

 

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

 
Details

 

-
NMAccessPoint

-
typedef struct _NMAccessPoint NMAccessPoint;

+
NM_ACCESS_POINT_FLAGS

+
#define NM_ACCESS_POINT_FLAGS       "flags"
+

 

 

 

 

 

-
NMAccessPointClass

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

+
#define NM_ACCESS_POINT_WPA_FLAGS   "wpa-flags"
 

 

 

 

 

 

-
NM_ACCESS_POINT_BSSID

-
#define NM_ACCESS_POINT_BSSID       "bssid"
+
NM_ACCESS_POINT_RSN_FLAGS

+
#define NM_ACCESS_POINT_RSN_FLAGS   "rsn-flags"
 

 

 

 

 

 

-
NM_ACCESS_POINT_FLAGS

-
#define NM_ACCESS_POINT_FLAGS       "flags"
+
NM_ACCESS_POINT_SSID

+
#define NM_ACCESS_POINT_SSID        "ssid"
 

 

 

 

 

 

-
NM_ACCESS_POINT_FREQUENCY

-
#define NM_ACCESS_POINT_FREQUENCY   "frequency"
+
NM_ACCESS_POINT_BSSID

+
#define NM_ACCESS_POINT_BSSID       "bssid"
 

 

 

 

 

 

-
NM_ACCESS_POINT_HW_ADDRESS

-
#define NM_ACCESS_POINT_HW_ADDRESS  "hw-address"
+
NM_ACCESS_POINT_FREQUENCY

+
#define NM_ACCESS_POINT_FREQUENCY   "frequency"
 

 

 

 

 

 

-
NM_ACCESS_POINT_MAX_BITRATE

-
#define NM_ACCESS_POINT_MAX_BITRATE "max-bitrate"
+
NM_ACCESS_POINT_MODE

+
#define NM_ACCESS_POINT_MODE        "mode"
 

 

 

 

 

 

-
NM_ACCESS_POINT_MODE

-
#define NM_ACCESS_POINT_MODE        "mode"
+
NM_ACCESS_POINT_MAX_BITRATE

+
#define NM_ACCESS_POINT_MAX_BITRATE "max-bitrate"
 

 

 

 

 

 

-
NM_ACCESS_POINT_RSN_FLAGS

-
#define NM_ACCESS_POINT_RSN_FLAGS   "rsn-flags"
+
NM_ACCESS_POINT_STRENGTH

+
#define NM_ACCESS_POINT_STRENGTH    "strength"
 

 

 

 

 

 

-
NM_ACCESS_POINT_SSID

-
#define NM_ACCESS_POINT_SSID        "ssid"
+
NM_ACCESS_POINT_HW_ADDRESS

+
#define NM_ACCESS_POINT_HW_ADDRESS  "hw-address"
 

 

 

 

 

 

-
NM_ACCESS_POINT_STRENGTH

-
#define NM_ACCESS_POINT_STRENGTH    "strength"
-

+
NMAccessPoint

+
typedef struct _NMAccessPoint NMAccessPoint;

 

 

 

 

 

-
NM_ACCESS_POINT_WPA_FLAGS

-
#define NM_ACCESS_POINT_WPA_FLAGS   "wpa-flags"
+
NMAccessPointClass

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

 

 

 

 

 

-
nm_access_point_connection_valid ()

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

+
nm_access_point_new ()

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

 

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

-

+

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

 


 
 
ap :
an NMAccessPoint to validate connection against

 
connection :
an NMConnection to validate against ap
+the DBusGConnection
 
 

 
path :
the DBusobject path of the access point

 
Returns :

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

 
 

 

 

 

-
nm_access_point_filter_connections ()

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

-

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

+
nm_access_point_get_flags ()

+
NM80211ApFlags      nm_access_point_get_flags           (NMAccessPoint *ap);

 

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

-

+

+++
-
-
-
-
-
-
+

 


 
 

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

 

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

 
 

 

 

 

-
nm_access_point_get_bssid ()

-
const char *        nm_access_point_get_bssid           (NMAccessPoint *ap);

+
nm_access_point_get_wpa_flags ()

+
NM80211ApSecurityFlags nm_access_point_get_wpa_flags    (NMAccessPoint *ap);

 

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

-

+

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

 


 
 

 
ap :

 

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

 
 

 

 

 

-
nm_access_point_get_flags ()

-
NM80211ApFlags      nm_access_point_get_flags           (NMAccessPoint *ap);

+
nm_access_point_get_rsn_flags ()

+
NM80211ApSecurityFlags nm_access_point_get_rsn_flags    (NMAccessPoint *ap);

 

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

-

+

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

 


 
 

 
ap :

 

 
Returns :
the flagsthe RSN flags
 

 
 

 

 

 

-
nm_access_point_get_frequency ()

-
guint32             nm_access_point_get_frequency       (NMAccessPoint *ap);

+
nm_access_point_get_ssid ()

+
const GByteArray *  nm_access_point_get_ssid            (NMAccessPoint *ap);

 

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

-

+

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

 


 
 

 
ap :

 

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

 
 

 

 

 

-
nm_access_point_get_hw_address ()

-
const char *        nm_access_point_get_hw_address      (NMAccessPoint *ap);

-

-
Warning

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

-

+
nm_access_point_get_bssid ()

+
const char *        nm_access_point_get_bssid           (NMAccessPoint *ap);

 

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

-

+

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

 


 
 

 
ap :

 

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

 
 

 

 

 

-
nm_access_point_get_max_bitrate ()

-
guint32             nm_access_point_get_max_bitrate     (NMAccessPoint *ap);

+
nm_access_point_get_frequency ()

+
guint32             nm_access_point_get_frequency       (NMAccessPoint *ap);

 

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

-

+

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

 


 
 

 
ap :

 

 
Returns :
the maximum bit ratethe frequency
 

 
 

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

 Gets the mode of the access point.
 

-

+

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

-
nm_access_point_get_rsn_flags ()

-
NM80211ApSecurityFlags nm_access_point_get_rsn_flags    (NMAccessPoint *ap);

+
nm_access_point_get_max_bitrate ()

+
guint32             nm_access_point_get_max_bitrate     (NMAccessPoint *ap);

 

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

-

 


 
 

 
ap :

 
 

+

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

 


 
 

 
ap :

 

 
Returns :
the RSN flagsthe maximum bit rate
 

 
 

 

 

 

-
nm_access_point_get_ssid ()

-
const GByteArray *  nm_access_point_get_ssid            (NMAccessPoint *ap);

+
nm_access_point_get_strength ()

+
guint8              nm_access_point_get_strength        (NMAccessPoint *ap);

 

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

-

+

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

 


 
 

 
ap :

 

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

 
 

 

 

 

-
nm_access_point_get_strength ()

-
guint8              nm_access_point_get_strength        (NMAccessPoint *ap);

+
nm_access_point_filter_connections ()

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

 

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

-

+

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

+

+++
-
+
+
+
+
-
+

 


 
 

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

 

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

 
 

 

 

 

-
nm_access_point_get_wpa_flags ()

-
NM80211ApSecurityFlags nm_access_point_get_wpa_flags    (NMAccessPoint *ap);

+
nm_access_point_connection_valid ()

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

 

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

-

+

+++
-
+
+
+
+
-
+

 


 
 

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

 

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

 
 

 

 

 

-
nm_access_point_new ()

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

+
nm_access_point_get_hw_address ()

+
const char *        nm_access_point_get_hw_address      (NMAccessPoint *ap);

+

+
Warning

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

+

 

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

-

+

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

 


 
 
connection :
the DBusGConnection
+
ap :
a NMAccessPoint
 
 

 
path :
the DBusobject path of the access point

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

 
 

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

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

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

 

 
Synopsis

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

 

 

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

 
Details

 

-
NMActiveConnection

-
typedef struct _NMActiveConnection NMActiveConnection;

+
NM_ACTIVE_CONNECTION_CONNECTION

+
#define NM_ACTIVE_CONNECTION_CONNECTION          "connection"
+

 

 

 

 

 

-
NMActiveConnectionClass

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

+
#define NM_ACTIVE_CONNECTION_UUID                "uuid"
 

 

 

 

 

 

-
NM_ACTIVE_CONNECTION_CONNECTION

-
#define NM_ACTIVE_CONNECTION_CONNECTION          "connection"
+
NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT

+
#define NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT     "specific-object"
 

 

 

 

 

 

-
NM_ACTIVE_CONNECTION_DEFAULT

-
#define NM_ACTIVE_CONNECTION_DEFAULT             "default"
+
NM_ACTIVE_CONNECTION_DEVICES

+
#define NM_ACTIVE_CONNECTION_DEVICES             "devices"
 

 

 

 

 

 

-
NM_ACTIVE_CONNECTION_DEFAULT6

-
#define NM_ACTIVE_CONNECTION_DEFAULT6            "default6"
+
NM_ACTIVE_CONNECTION_STATE

+
#define NM_ACTIVE_CONNECTION_STATE               "state"
 

 

 

 

 

 

-
NM_ACTIVE_CONNECTION_DEVICES

-
#define NM_ACTIVE_CONNECTION_DEVICES             "devices"
+
NM_ACTIVE_CONNECTION_DEFAULT

+
#define NM_ACTIVE_CONNECTION_DEFAULT             "default"
 

 

 

 

 

 

-
NM_ACTIVE_CONNECTION_MASTER

-
#define NM_ACTIVE_CONNECTION_MASTER              "master"
+
NM_ACTIVE_CONNECTION_DEFAULT6

+
#define NM_ACTIVE_CONNECTION_DEFAULT6            "default6"
 

 

 

 

 

 

-
NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT

-
#define NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT     "specific-object"
+
NM_ACTIVE_CONNECTION_MASTER

+
#define NM_ACTIVE_CONNECTION_MASTER              "master"
 

 

 

 

 

 

-
NM_ACTIVE_CONNECTION_STATE

-
#define NM_ACTIVE_CONNECTION_STATE               "state"
-

+
NMActiveConnection

+
typedef struct _NMActiveConnection NMActiveConnection;

 

 

 

 

 

-
NM_ACTIVE_CONNECTION_UUID

-
#define NM_ACTIVE_CONNECTION_UUID                "uuid"
+
NMActiveConnectionClass

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

 

 

 

 

 

-
nm_active_connection_get_connection ()

-
const char *        nm_active_connection_get_connection (NMActiveConnection *connection);

+
nm_active_connection_new ()

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

 

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

-

+

+++
-
+
+
+
+
-
+

 


 
 

 
connection :
a NMActiveConnection
+the DBusGConnection
 
 

 
path :
the DBus object path of the device

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

 
 

 

 

 

-
nm_active_connection_get_default ()

-
gboolean            nm_active_connection_get_default    (NMActiveConnection *connection);

+
nm_active_connection_get_connection ()

+
const char *        nm_active_connection_get_connection (NMActiveConnection *connection);

 

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

-

+

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

 


 
 

 
connection :

 

 
Returns :

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

 
 

 

 

 

-
nm_active_connection_get_default6 ()

-
gboolean            nm_active_connection_get_default6   (NMActiveConnection *connection);

+
nm_active_connection_get_uuid ()

+
const char *        nm_active_connection_get_uuid       (NMActiveConnection *connection);

 

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

-

+

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

 


 
 

 
connection :

 

 
Returns :

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

 
 

 

 

 

-
nm_active_connection_get_devices ()

-
const GPtrArray *   nm_active_connection_get_devices    (NMActiveConnection *connection);

+
nm_active_connection_get_specific_object ()

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

 

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

-

+

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

-
+

 


 
 

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

 
 

 

 

 

-
nm_active_connection_get_master ()

-
const char *        nm_active_connection_get_master     (NMActiveConnection *connection);

+
nm_active_connection_get_devices ()

+
const GPtrArray *   nm_active_connection_get_devices    (NMActiveConnection *connection);

 

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

-

+

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

-
+

 


 
 

 
connection :
the path of the master NMDevice of the NMActiveConnection.
-This is the internal string used by the connection, and must not be modified.the GPtrArray containing NMDevices.
+This is the internal copy used by the connection, and must not be modified. [element-type NMClient.Device]
+
 

 
 

 

 

 

-
nm_active_connection_get_specific_object ()

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

+
nm_active_connection_get_state ()

+
NMActiveConnectionState nm_active_connection_get_state  (NMActiveConnection *connection);

 

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

-

+

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

 


 
 

 
connection :

 

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

 
 

 

 

 

-
nm_active_connection_get_state ()

-
NMActiveConnectionState nm_active_connection_get_state  (NMActiveConnection *connection);

+
nm_active_connection_get_default ()

+
gboolean            nm_active_connection_get_default    (NMActiveConnection *connection);

 

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

-

+

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

 


 
 

 
connection :

 

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

 
 

 

 

 

-
nm_active_connection_get_uuid ()

-
const char *        nm_active_connection_get_uuid       (NMActiveConnection *connection);

+
nm_active_connection_get_default6 ()

+
gboolean            nm_active_connection_get_default6   (NMActiveConnection *connection);

 

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

-

+

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

-
+

 


 
 

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

 
 

 

 

 

-
nm_active_connection_new ()

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

+
nm_active_connection_get_master ()

+
const char *        nm_active_connection_get_master     (NMActiveConnection *connection);

 

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

-

+

+++
-
-
-
-
-
-
+

 


 
 

 
connection :
the DBusGConnection
+a NMActiveConnection
 
 

 
path :
the DBus object path of the device

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

 
 

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

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

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

 

 
Synopsis

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

 

 

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

 
Properties

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

 
Details

 

-
NMClient

-
typedef struct _NMClient NMClient;

+
NM_CLIENT_VERSION

+
#define NM_CLIENT_VERSION "version"
+

 

 

 

 

 

-
NMClientActivateFn ()

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

+
NM_CLIENT_STATE

+
#define NM_CLIENT_STATE "state"
+

 

 

 

 

 

-
NMClientAddActivateFn ()

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

+
NM_CLIENT_MANAGER_RUNNING

+
#define NM_CLIENT_MANAGER_RUNNING "manager-running"
+

 

 

 

 

 

-
NMClientClass

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

+
#define NM_CLIENT_NETWORKING_ENABLED "networking-enabled"
+

+

+

+

+

+

+
NM_CLIENT_WIRELESS_ENABLED

+
#define NM_CLIENT_WIRELESS_ENABLED "wireless-enabled"
+

+

+

+

+

+

+
NM_CLIENT_WIRELESS_HARDWARE_ENABLED

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

+

+

+

+

+

+
NM_CLIENT_WWAN_ENABLED

+
#define NM_CLIENT_WWAN_ENABLED "wwan-enabled"
+

+

+

+

+

+

+
NM_CLIENT_WWAN_HARDWARE_ENABLED

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

+

+

+

+

+

+
NM_CLIENT_WIMAX_ENABLED

+
#define NM_CLIENT_WIMAX_ENABLED "wimax-enabled"
+

+

+

+

+

+

+
NM_CLIENT_WIMAX_HARDWARE_ENABLED

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

+

+

+

+

+

+
NM_CLIENT_ACTIVE_CONNECTIONS

+
#define NM_CLIENT_ACTIVE_CONNECTIONS "active-connections"
+

+

+

+

+

+

+
NM_CLIENT_CONNECTIVITY

+
#define NM_CLIENT_CONNECTIVITY "connectivity"
+

+

+

+

+

+

+
NM_CLIENT_PRIMARY_CONNECTION

+
#define NM_CLIENT_PRIMARY_CONNECTION "primary-connection"
+

+

+

+

+

+

+
NM_CLIENT_ACTIVATING_CONNECTION

+
#define NM_CLIENT_ACTIVATING_CONNECTION "activating-connection"
 

 

 

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

-

+

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

-

 


 
 

 
NM_CLIENT_PERMISSION_NONE

 

+

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

-
#define NM_CLIENT_ACTIVE_CONNECTIONS "active-connections"
-

+
NMClient

+
typedef struct _NMClient NMClient;

 

-
NM_CLIENT_MANAGER_RUNNING

-
#define NM_CLIENT_MANAGER_RUNNING "manager-running"
+
NMClientClass

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

 

 

 

-
NM_CLIENT_NETWORKING_ENABLED

-
#define NM_CLIENT_NETWORKING_ENABLED "networking-enabled"
-

+
nm_client_new ()

+
NMClient *          nm_client_new                       (void);

 

+Creates a new NMClient.
 

-

-

-

-
NM_CLIENT_STATE

-
#define NM_CLIENT_STATE "state"
-

 

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

-

-

-

-
NM_CLIENT_VERSION

-
#define NM_CLIENT_VERSION "version"
-

 

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

+

 


 
 

 
NM_CLIENT_PERMISSION_RESULT_UNKNOWN

 
 
 
 
 
 

++++
+
+
+
+
+




Returns :
a new NMClient
+

 

 

 

-
NM_CLIENT_WIMAX_ENABLED

-
#define NM_CLIENT_WIMAX_ENABLED "wimax-enabled"
-

+
nm_client_new_async ()

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

 

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

+

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

+

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




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

 

 

 

-
NM_CLIENT_WIMAX_HARDWARE_ENABLED

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

+
nm_client_new_finish ()

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

 

+Gets the result of an nm_client_new_async() call.
 

+

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




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

 

 

 

-
NM_CLIENT_WIRELESS_ENABLED

-
#define NM_CLIENT_WIRELESS_ENABLED "wireless-enabled"
-

+
nm_client_get_devices ()

+
const GPtrArray *   nm_client_get_devices               (NMClient *client);

 

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

+

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




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

 

 

 

-
NM_CLIENT_WIRELESS_HARDWARE_ENABLED

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

+
nm_client_get_device_by_path ()

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

 

+Gets a NMDevice from a NMClient.
 

+

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




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

 

 

 

-
NM_CLIENT_WWAN_ENABLED

-
#define NM_CLIENT_WWAN_ENABLED "wwan-enabled"
-

+
nm_client_get_device_by_iface ()

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

 

+Gets a NMDevice from a NMClient.
 

+

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




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

 

 

 

-
NM_CLIENT_WWAN_HARDWARE_ENABLED

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

+
NMClientActivateFn ()

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

 

 

 

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

-

+

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

 

 Gets all the options contained in the configuration.
 

-

 


 
 

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

 

+
NMClientAddActivateFn ()

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

+

+

+

+

+

 
nm_client_add_and_activate_connection ()

 
void                nm_client_add_and_activate_connection
                                                         (NMClient *client,
@@ -540,8 +785,11 @@ automatically filling in missing settings with the capabilities of the
 given device and specific object.  The new connection is then activated.
 Cannot be used for VPN connections at this time.
 

-

+

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

 

 Gets all the options contained in the configuration.
 

-

 


 
 

 
client :

 
partial :

 an NMConnection to add; the connection may be
-partially filled (or even NULL) and will be completed by NetworkManager
+partially filled (or even NULL) and will be completed by NetworkManager
 using the given device and specific_object before being added. [allow-none]
 
 
the object path of a connection-type-specific
 object this activation should use. This parameter is currently ignored for
-wired and mobile broadband connections, and the value of NULL should be used
+wired and mobile broadband connections, and the value of NULL should be used
 (ie, no specific object).  For WiFi or WiMAX connections, pass the object
 path of a NMAccessPoint or NMWimaxNsp owned by device, which you can
 get using nm_object_get_path(), and which will be used to complete the
@@ -592,8 +840,11 @@ details of the newly added connection. [
 Deactivates an active NMActiveConnection.
 

-

+

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

-
const GPtrArray *   nm_client_get_active_connections    (NMClient *client);

+
nm_client_networking_get_enabled ()

+
gboolean            nm_client_networking_get_enabled    (NMClient *client);

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

-

 


 
 

 
client :

 

+

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

 


 
 

 
client :

 

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

 
 

 
 

 

-
nm_client_get_device_by_iface ()

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

+
nm_client_networking_set_enabled ()

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

 

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

-

+

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

 


 
 

 
client :

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

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

 
 

 

 

 

-
nm_client_get_device_by_path ()

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

+
nm_client_wireless_get_enabled ()

+
gboolean            nm_client_wireless_get_enabled      (NMClient *client);

 

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

-

+

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

 


 
 

 
client :

 
object_path :
the object path to search for

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

 
 

 

 

 

-
nm_client_get_devices ()

-
const GPtrArray *   nm_client_get_devices               (NMClient *client);

+
nm_client_wireless_set_enabled ()

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

 

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

-

+

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

 


 
 

 
client :

 

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

+TRUE to enable wireless
 

 
 

 

 

 

-
nm_client_get_logging ()

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

+
nm_client_wireless_hardware_get_enabled ()

+
gboolean            nm_client_wireless_hardware_get_enabled
+                                                        (NMClient *client);

 

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

-

+

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

 


 
 

 
client :

 

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

-TRUE on success, FALSE otherwise
Returns :

+TRUE if the wireless hardware is enabled
 

 
 

-
Since 0.9.8

 

 

 

-
nm_client_get_manager_running ()

-
gboolean            nm_client_get_manager_running       (NMClient *client);

+
nm_client_wwan_get_enabled ()

+
gboolean            nm_client_wwan_get_enabled          (NMClient *client);

 

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

-

+

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

 


 
 

 
client :

 
Returns :

 
-TRUE if the daemon is running
 

 
 

 

 

 

-
nm_client_get_permission_result ()

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

+
nm_client_wwan_set_enabled ()

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

 

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

-

+

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

 


 
 

 
client :

 

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

+TRUE to enable WWAN
 

 
 

 

 

 

-
nm_client_get_state ()

-
NMState             nm_client_get_state                 (NMClient *client);

+
nm_client_wwan_hardware_get_enabled ()

+
gboolean            nm_client_wwan_hardware_get_enabled (NMClient *client);

 

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

-

+

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

 


 
 

 
client :

 

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

 
 

 

 

 

-
nm_client_get_version ()

-
const char *        nm_client_get_version               (NMClient *client);

+
nm_client_wimax_get_enabled ()

+
gboolean            nm_client_wimax_get_enabled         (NMClient *client);

 

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

-

+

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

 


 
 

 
client :

 

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

 
 

 

 

 

-
nm_client_networking_get_enabled ()

-
gboolean            nm_client_networking_get_enabled    (NMClient *client);

+
nm_client_wimax_set_enabled ()

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

 

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

-

+

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

 


 
 

 
client :

 

 
Returns :
enabled :

 
-TRUE if networking is enabled, FALSE if networking is disabled
 

 
 

 

 

 

-
nm_client_networking_set_enabled ()

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

+
nm_client_wimax_hardware_get_enabled ()

+
gboolean            nm_client_wimax_hardware_get_enabled
+                                                        (NMClient *client);

 

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

-

+

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

 


 
 

 
client :

 

 
enabled :
Returns :

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

 
 

 

 

 

-
nm_client_new ()

-
NMClient *          nm_client_new                       (void);

-

-Creates a new NMClient.
-

-

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

+
nm_client_get_version ()

+
const char *        nm_client_get_version               (NMClient *client);

 

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

-

+

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

 

Returns :
a new NMClient
+


client :
a NMClient
 
Returns :
string with the version

 

 

 

 

-
nm_client_new_async ()

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

-

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

+
nm_client_get_state ()

+
NMState             nm_client_get_state                 (NMClient *client);

 

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

-

+

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

-
nm_client_new_finish ()

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

+
nm_client_get_manager_running ()

+
gboolean            nm_client_get_manager_running       (NMClient *client);

 

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

-

 


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

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

 
 
 

+

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

 


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

 

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

 
 

 

 

 

-
nm_client_set_logging ()

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

+
nm_client_get_active_connections ()

+
const GPtrArray *   nm_client_get_active_connections    (NMClient *client);

 

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

-

+

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

 


 
 

 
client :

 

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

 
Returns :

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

 
 

-
Since 0.9.8

 

 

 

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

-

+

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

-
gboolean            nm_client_wimax_get_enabled         (NMClient *client);

+
nm_client_get_permission_result ()

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

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

-

 


 
 

 
client :

 

+

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

 


 
 

 
client :

 

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

 
Returns :

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

 
 

 

 

 

-
nm_client_wimax_hardware_get_enabled ()

-
gboolean            nm_client_wimax_hardware_get_enabled
-                                                        (NMClient *client);

+
nm_client_get_logging ()

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

 

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

-

+

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

 


 
 

 
client :

 

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

 
Returns :

 
-TRUE if the WiMAX hardware is enabled
 

 
 

+
Since 0.9.8

 

 

 

-
nm_client_wimax_set_enabled ()

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

+
nm_client_set_logging ()

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

 

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

-

+

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

 


 
 

 
client :

 

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

 
-TRUE to enable WiMAX
 

 
 

+
Since 0.9.8

 

 

 

-
nm_client_wireless_get_enabled ()

-
gboolean            nm_client_wireless_get_enabled      (NMClient *client);

+
nm_client_get_connectivity ()

+
NMConnectivityState nm_client_get_connectivity          (NMClient *client);

 

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

-

+

+++
-
-
+

 


 
 

 
client :
a NMClient
+an NMClient
 
 

 

 
Returns :

-TRUE if wireless is enabledthe current connectivity state
 

 
 

+
Since 0.9.8.4

 

 

 

-
nm_client_wireless_hardware_get_enabled ()

-
gboolean            nm_client_wireless_hardware_get_enabled
-                                                        (NMClient *client);

+
nm_client_check_connectivity ()

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

 

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

+

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

-

+

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

 


 
 

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

 

 
Returns :

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

 
 

+
Since 0.9.8.4

 

 

 

-
nm_client_wireless_set_enabled ()

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

+
nm_client_check_connectivity_async ()

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

 

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

-

+

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

 


 
 

 
client :
a NMClient
+an NMClient
 
 

 
enabled :

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

 
 

+
Since 0.9.8.4

 

 

 

-
nm_client_wwan_get_enabled ()

-
gboolean            nm_client_wwan_get_enabled          (NMClient *client);

+
nm_client_check_connectivity_finish ()

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

 

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

-

+

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

 


 
 

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

 

 
Returns :

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

 
 

+
Since 0.9.8.4

 

 

 

-
nm_client_wwan_hardware_get_enabled ()

-
gboolean            nm_client_wwan_hardware_get_enabled (NMClient *client);

+
nm_client_get_primary_connection ()

+
NMActiveConnection * nm_client_get_primary_connection   (NMClient *client);

 

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

+

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

-

+

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

+

+++
-
-
+

 


 
 

 
client :
a NMClient
+an NMClient
 
 

 

 
Returns :

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

 
 

+
Since 0.9.8.4

 

 

 

-
nm_client_wwan_set_enabled ()

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

+
nm_client_get_activating_connection ()

+
NMActiveConnection * nm_client_get_activating_connection
+                                                        (NMClient *client);

 

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

-

+

+++
-
-
-
+
+

 


 
 

 
client :
a NMClient
+an NMClient
 
 

 
enabled :

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

 
 

+
Since 0.9.8.4

 

 
 

 
Property Details

 

+
The "activating-connection" property

+
  "activating-connection"    NMActiveConnection*   : Read

+

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

+
Since 0.9.8.4

+

+

+

 
The "active-connections" property

 
  "active-connections"       NMObjectArray*        : Read

 
Active connections.

 

 

 

+
The "connectivity" property

+
  "connectivity"             guint                 : Read

+

+The network connectivity state.
+

+
Allowed values: <= 4

+
Default value: 0

+
Since 0.9.8.4

+

+

+

 
The "manager-running" property

 
  "manager-running"          gboolean              : Read

 
Whether NetworkManager is running.

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

 

 

+
The "primary-connection" property

+
  "primary-connection"       NMActiveConnection*   : Read

+

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

+
Since 0.9.8.4

+

+

+

 
The "state" property

 
  "state"                    guint                 : Read

 

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

 Notifies that a NMDevice is added.
 

-

+

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

-

 


 
 

 
client :

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

 

+

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

-

 


 
 

 
client :

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

 

+

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

 

-          Generated by GTK-Doc V1.18

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

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

-
nm_dhcp4_config_get_one_option ()

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

+
nm_dhcp4_config_new ()

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

 

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

-

 


 

 
client :

 
 
 
 

+

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

 


 
 
config :
a NMDHCP4Config
+
connection :
the DBusGConnection
 
 

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

 

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

 
 

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

 

+

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

 

-
nm_dhcp4_config_new ()

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

+
nm_dhcp4_config_get_one_option ()

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

 

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

-

 


 

 
config :

+

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

 


 
connection :
the DBusGConnection
+
config :
a NMDHCP4Config
 
 

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

 

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

 
 

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

 

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

 

 
 
 

 

-          Generated by GTK-Doc V1.18

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

 
 

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

 

 

-
nm_dhcp6_config_get_one_option ()

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

+
nm_dhcp6_config_new ()

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

 

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

-

+

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

 


 
 
config :
a NMDHCP6Config
+
connection :
the DBusGConnection
 
 

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

 

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

 
 

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

 

+

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

 

-
nm_dhcp6_config_new ()

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

+
nm_dhcp6_config_get_one_option ()

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

 

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

-

 


 

 
config :

+

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

 


 
connection :
the DBusGConnection
+
config :
a NMDHCP6Config
 
 

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

 

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

 
 

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

 

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

 

 

 

 

 

-          Generated by GTK-Doc V1.18

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

 
Synopsis

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

 

 

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

 
Details

 

-
NMDevice

-
typedef struct _NMDevice NMDevice;

-

-

-

-

-

-
NMDeviceClass

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

+
#define NM_DEVICE_DEVICE_TYPE "device-type"
 

 

 

 

 

 

-
NMDeviceDeactivateFn ()

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

+
NM_DEVICE_UDI

+
#define NM_DEVICE_UDI "udi"
+

 

 

 

 

 

-
NM_DEVICE_ACTIVE_CONNECTION

-
#define NM_DEVICE_ACTIVE_CONNECTION "active-connection"
+
NM_DEVICE_INTERFACE

+
#define NM_DEVICE_INTERFACE "interface"
 

 

 

 

 

 

-
NM_DEVICE_AUTOCONNECT

-
#define NM_DEVICE_AUTOCONNECT "autoconnect"
+
NM_DEVICE_IP_INTERFACE

+
#define NM_DEVICE_IP_INTERFACE "ip-interface"
 

 

 

 

 

 

-
NM_DEVICE_AVAILABLE_CONNECTIONS

-
#define NM_DEVICE_AVAILABLE_CONNECTIONS "available-connections"
+
NM_DEVICE_DRIVER

+
#define NM_DEVICE_DRIVER "driver"
 

 

 

 

 

 

-
NM_DEVICE_CAPABILITIES

-
#define NM_DEVICE_CAPABILITIES "capabilities"
+
NM_DEVICE_DRIVER_VERSION

+
#define NM_DEVICE_DRIVER_VERSION "driver-version"
 

 

 

 

 

 

-
NM_DEVICE_DEVICE_TYPE

-
#define NM_DEVICE_DEVICE_TYPE "device-type"
+
NM_DEVICE_FIRMWARE_VERSION

+
#define NM_DEVICE_FIRMWARE_VERSION "firmware-version"
 

 

 

 

 

 

-
NM_DEVICE_DHCP4_CONFIG

-
#define NM_DEVICE_DHCP4_CONFIG "dhcp4-config"
+
NM_DEVICE_CAPABILITIES

+
#define NM_DEVICE_CAPABILITIES "capabilities"
 

 

 

 

 

 

-
NM_DEVICE_DHCP6_CONFIG

-
#define NM_DEVICE_DHCP6_CONFIG "dhcp6-config"
+
NM_DEVICE_MANAGED

+
#define NM_DEVICE_MANAGED "managed"
 

 

 

 

 

 

-
NM_DEVICE_DRIVER

-
#define NM_DEVICE_DRIVER "driver"
+
NM_DEVICE_AUTOCONNECT

+
#define NM_DEVICE_AUTOCONNECT "autoconnect"
 

 

 

 

 

 

-
NM_DEVICE_DRIVER_VERSION

-
#define NM_DEVICE_DRIVER_VERSION "driver-version"
+
NM_DEVICE_FIRMWARE_MISSING

+
#define NM_DEVICE_FIRMWARE_MISSING "firmware-missing"
 

 

 

 

 

 

-
NM_DEVICE_FIRMWARE_MISSING

-
#define NM_DEVICE_FIRMWARE_MISSING "firmware-missing"
+
NM_DEVICE_IP4_CONFIG

+
#define NM_DEVICE_IP4_CONFIG "ip4-config"
 

 

 

 

 

 

-
NM_DEVICE_FIRMWARE_VERSION

-
#define NM_DEVICE_FIRMWARE_VERSION "firmware-version"
+
NM_DEVICE_DHCP4_CONFIG

+
#define NM_DEVICE_DHCP4_CONFIG "dhcp4-config"
 

 

 

 

 

 

-
NM_DEVICE_INTERFACE

-
#define NM_DEVICE_INTERFACE "interface"
+
NM_DEVICE_IP6_CONFIG

+
#define NM_DEVICE_IP6_CONFIG "ip6-config"
 

 

 

 

 

 

-
NM_DEVICE_IP4_CONFIG

-
#define NM_DEVICE_IP4_CONFIG "ip4-config"
+
NM_DEVICE_DHCP6_CONFIG

+
#define NM_DEVICE_DHCP6_CONFIG "dhcp6-config"
 

 

 

 

 

 

-
NM_DEVICE_IP6_CONFIG

-
#define NM_DEVICE_IP6_CONFIG "ip6-config"
+
NM_DEVICE_STATE

+
#define NM_DEVICE_STATE "state"
 

 

 

 

 

 

-
NM_DEVICE_IP_INTERFACE

-
#define NM_DEVICE_IP_INTERFACE "ip-interface"
+
NM_DEVICE_STATE_REASON

+
#define NM_DEVICE_STATE_REASON "state-reason"
 

 

 

 

 

 

-
NM_DEVICE_MANAGED

-
#define NM_DEVICE_MANAGED "managed"
+
NM_DEVICE_ACTIVE_CONNECTION

+
#define NM_DEVICE_ACTIVE_CONNECTION "active-connection"
 

 

 

 

 

 

-
NM_DEVICE_PRODUCT

-
#define NM_DEVICE_PRODUCT "product"
+
NM_DEVICE_AVAILABLE_CONNECTIONS

+
#define NM_DEVICE_AVAILABLE_CONNECTIONS "available-connections"
 

 

 

 

 

 

-
NM_DEVICE_STATE

-
#define NM_DEVICE_STATE "state"
+
NM_DEVICE_VENDOR

+
#define NM_DEVICE_VENDOR "vendor"
 

 

 

 

 

 

-
NM_DEVICE_STATE_REASON

-
#define NM_DEVICE_STATE_REASON "state-reason"
+
NM_DEVICE_PRODUCT

+
#define NM_DEVICE_PRODUCT "product"
 

 

 

 

 

 

-
NM_DEVICE_UDI

-
#define NM_DEVICE_UDI "udi"
-

+
NMDevice

+
typedef struct _NMDevice NMDevice;

 

 

 

 

 

-
NM_DEVICE_VENDOR

-
#define NM_DEVICE_VENDOR "vendor"
+
NMDeviceClass

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

 

 

 

 

 

-
nm_device_connection_compatible ()

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

-

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

+
nm_device_new ()

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

 

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

-

+

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

 


 
 
device :
an NMDevice to validate connection against

 
connection :
an NMConnection to validate against device
+the DBusGConnection
 
 

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

 

 
Returns :

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

-

-

-

-
nm_device_connection_valid ()

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

-

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

-

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


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

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

 
 

 

 

 

-
nm_device_disconnect ()

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

+
nm_device_get_iface ()

+
const char *        nm_device_get_iface                 (NMDevice *device);

 

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

-

+

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

 


 
 

 
device :

 

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

 
 

 

 

 

-
nm_device_filter_connections ()

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

+
nm_device_get_ip_iface ()

+
const char *        nm_device_get_ip_iface              (NMDevice *device);

 

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

-

+

+++
-
-
-
-
-
-
+

 


 
 

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

 

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

 
 

 

 

 

-
nm_device_get_active_connection ()

-
NMActiveConnection * nm_device_get_active_connection    (NMDevice *device);

+
nm_device_get_device_type ()

+
NMDeviceType        nm_device_get_device_type           (NMDevice *device);

 

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

-

+

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

-
+

 


 
 

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

 
 

 

 

 

-
nm_device_get_autoconnect ()

-
gboolean            nm_device_get_autoconnect           (NMDevice *device);

+
nm_device_get_udi ()

+
const char *        nm_device_get_udi                   (NMDevice *device);

 

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

-

+

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

-
+

 


 
 

 
device :

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

 
 

 

 

 

-
nm_device_get_available_connections ()

-
const GPtrArray *   nm_device_get_available_connections (NMDevice *device);

+
nm_device_get_driver ()

+
const char *        nm_device_get_driver                (NMDevice *device);

 

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

-

+

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

 


 
 

 
device :

 

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

 
 

-
Since 0.9.8

 

 

 

-
nm_device_get_capabilities ()

-
NMDeviceCapabilities nm_device_get_capabilities         (NMDevice *device);

+
nm_device_get_driver_version ()

+
const char *        nm_device_get_driver_version        (NMDevice *device);

 

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

-

+

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

 


 
 

 
device :

 

 
Returns :
the capabilitiesthe version of the device driver. This is the internal string used by the
+device, and must not be modified.
 

 
 

 

 

 

-
nm_device_get_device_type ()

-
NMDeviceType        nm_device_get_device_type           (NMDevice *device);

+
nm_device_get_firmware_version ()

+
const char *        nm_device_get_firmware_version      (NMDevice *device);

 

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

-

+

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

-
+

 


 
 

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

 
 

 

 

 

-
nm_device_get_dhcp4_config ()

-
NMDHCP4Config *     nm_device_get_dhcp4_config          (NMDevice *device);

+
nm_device_get_capabilities ()

+
NMDeviceCapabilities nm_device_get_capabilities         (NMDevice *device);

 

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

-

+

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

 


 
 

 
device :

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

 
 

 

 

 

-
nm_device_get_dhcp6_config ()

-
NMDHCP6Config *     nm_device_get_dhcp6_config          (NMDevice *device);

+
nm_device_get_managed ()

+
gboolean            nm_device_get_managed               (NMDevice *device);

 

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

-

+

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

 


 
 

 
device :

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

 
 

 

 

 

-
nm_device_get_driver ()

-
const char *        nm_device_get_driver                (NMDevice *device);

+
nm_device_get_autoconnect ()

+
gboolean            nm_device_get_autoconnect           (NMDevice *device);

 

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

-

+

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

 


 
 

 
device :

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

 
 

 

 

 

-
nm_device_get_driver_version ()

-
const char *        nm_device_get_driver_version        (NMDevice *device);

+
nm_device_set_autoconnect ()

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

 

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

-

+

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

-
+
+

 


 
 

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

+TRUE to enable autoconnecting
 

 
 

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

-

+

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

-
nm_device_get_firmware_version ()

-
const char *        nm_device_get_firmware_version      (NMDevice *device);

+
nm_device_get_ip4_config ()

+
NMIP4Config *       nm_device_get_ip4_config            (NMDevice *device);

 

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

-

 


 
 

 
device :

 
 
 

+

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

-
+

 


 
 

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

 
 

 

 

 

-
nm_device_get_iface ()

-
const char *        nm_device_get_iface                 (NMDevice *device);

+
nm_device_get_dhcp4_config ()

+
NMDHCP4Config *     nm_device_get_dhcp4_config          (NMDevice *device);

 

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

-

+

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

-
+

 


 
 

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

 
 

 

 

 

-
nm_device_get_ip4_config ()

-
NMIP4Config *       nm_device_get_ip4_config            (NMDevice *device);

+
nm_device_get_ip6_config ()

+
NMIP6Config *       nm_device_get_ip6_config            (NMDevice *device);

 

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

-

+

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

 

-
nm_device_get_ip6_config ()

-
NMIP6Config *       nm_device_get_ip6_config            (NMDevice *device);

+
nm_device_get_dhcp6_config ()

+
NMDHCP6Config *     nm_device_get_dhcp6_config          (NMDevice *device);

 

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

-

 


 
 

 
device :

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

 

+

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

 

-
nm_device_get_ip_iface ()

-
const char *        nm_device_get_ip_iface              (NMDevice *device);

+
nm_device_get_state ()

+
NMDeviceState       nm_device_get_state                 (NMDevice *device);

 

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

-

 


 
 

 
device :

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

 

+

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

 


 
 

 
device :

 

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

 
 

 

 

 

-
nm_device_get_managed ()

-
gboolean            nm_device_get_managed               (NMDevice *device);

+
nm_device_get_state_reason ()

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

 

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

-

+

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

+
+
+
-
+

 


 
 

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

 
Returns :

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

 
 

 

 

 

-
nm_device_get_product ()

-
const char *        nm_device_get_product               (NMDevice *device);

+
nm_device_get_active_connection ()

+
NMActiveConnection * nm_device_get_active_connection    (NMDevice *device);

 

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

-

+

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

-
+

 


 
 

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

 
 

 

 

 

-
nm_device_get_state ()

-
NMDeviceState       nm_device_get_state                 (NMDevice *device);

+
nm_device_get_available_connections ()

+
const GPtrArray *   nm_device_get_available_connections (NMDevice *device);

 

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

-

+

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

 


 
 

 
device :

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

 
 

+
Since 0.9.8

 

 

 

-
nm_device_get_state_reason ()

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

+
nm_device_get_product ()

+
const char *        nm_device_get_product               (NMDevice *device);

 

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

-

+

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

 


 
 

 
device :

 

 
reason :
location to store reason (NMDeviceStateReason), or NULL. [out][allow-none]
+
Returns :
the product name of the device. This is the internal string used by the
+device, and must not be modified.

+

+

+

+
nm_device_get_vendor ()

+
const char *        nm_device_get_vendor                (NMDevice *device);

+

+Gets the vendor string of the NMDevice.
+

+

++++
+
+
+
+
-
+




device :
a NMDevice
 
 

 

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

 
 

 

 

 

-
nm_device_get_udi ()

-
const char *        nm_device_get_udi                   (NMDevice *device);

+
NMDeviceDeactivateFn ()

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

 

-Gets the Unique Device Identifier of the NMDevice.
 

-

+
+

+

+
nm_device_disconnect ()

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

+

+Disconnects the device if currently connected, and prevents the device from
+automatically connecting to networks until the next manual network connection
+request.
+

+

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

 


 
 

 
device :

 
Returns :
the Unique Device Identifier of the device.  This identifier may be
-used to gather more information about the device from various operating
-system services like udev or sysfs.
callback :
callback to be called when disconnect
+operation completes. [scope async][allow-none]
+
user_data :
caller-specific data passed to callback. [closure]
+
 

 
 

 

 

 

-
nm_device_get_vendor ()

-
const char *        nm_device_get_vendor                (NMDevice *device);

+
nm_device_filter_connections ()

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

 

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

-

+

+++
-
+
+
+
+
-
+

 


 
 

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

 

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

 
 

 

 

 

-
nm_device_new ()

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

+
nm_device_connection_valid ()

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

 

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

-

+

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

 


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

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

 

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

 
 

 

 

 

-
nm_device_set_autoconnect ()

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

+
nm_device_connection_compatible ()

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

 

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

+

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

-

+

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

 


 
 

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

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

 
-TRUE to enable autoconnecting
 

 
 

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

 Notifies the state change of a NMDevice.
 

-

+

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

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

 


 
 

 
device :

 

 
Synopsis

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

 

 

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

 
Details

 

-
NMDeviceAdsl

-
typedef struct _NMDeviceAdsl NMDeviceAdsl;

-

-

-

-

-

-
NMDeviceAdslClass

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

-

-

-

-

-

 
enum NMDeviceAdslError

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

-

+

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

-
NM_DEVICE_ADSL_CARRIER

-
#define NM_DEVICE_ADSL_CARRIER "carrier"
-

-

-

-

-

-

 
NM_DEVICE_ADSL_ERROR

 
#define NM_DEVICE_ADSL_ERROR nm_device_adsl_error_quark ()
 

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

 Registers an error quark for NMDeviceAdsl if necessary.
 

-

 


 
 

 
NM_DEVICE_ADSL_ERROR_UNKNOWN

 
 

+

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

-
gboolean            nm_device_adsl_get_carrier          (NMDeviceAdsl *device);

+
NM_DEVICE_ADSL_CARRIER

+
#define NM_DEVICE_ADSL_CARRIER "carrier"
+

+

+

+
+

+

+
NMDeviceAdsl

+
typedef struct _NMDeviceAdsl NMDeviceAdsl;

+

+

+

+

+

+
NMDeviceAdslClass

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

 

-Whether the device has carrier.
 

-

 


 

 
Returns :

 the error quark used for NMDeviceAdsl errors.

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


device :
a NMDeviceAdsl
-
Returns :

-TRUE if the device has carrier

 

 

 

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

 Creates a new NMDeviceAdsl.
 

-

+

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

 


 
 

 
connection :

 

+

+

+
nm_device_adsl_get_carrier ()

+
gboolean            nm_device_adsl_get_carrier          (NMDeviceAdsl *device);

+

+Whether the device has carrier.
+

+

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




device :
a NMDeviceAdsl
+
Returns :

+TRUE if the device has carrier

+

 

 

 
Property Details

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

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

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

 

 
Synopsis

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

 

 

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

 
Details

 

-
NMDeviceBond

-
typedef struct _NMDeviceBond NMDeviceBond;

-

-

-

-

-

-
NMDeviceBondClass

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

-

-

-

-

-

 
enum NMDeviceBondError

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

-

+

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

-
NM_DEVICE_BOND_CARRIER

-
#define NM_DEVICE_BOND_CARRIER     "carrier"
+
NM_DEVICE_BOND_ERROR

+
#define NM_DEVICE_BOND_ERROR nm_device_bond_error_quark ()
 

 

 

 

-
NM_DEVICE_BOND_ERROR

-
#define NM_DEVICE_BOND_ERROR nm_device_bond_error_quark ()
-

+
nm_device_bond_error_quark ()

+
GQuark              nm_device_bond_error_quark          (void);

 

+Registers an error quark for NMDeviceBond if necessary.
 

+

 


 
 

 
NM_DEVICE_BOND_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMDeviceBond errors.

 

 

 

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

 

 

+
NM_DEVICE_BOND_CARRIER

+
#define NM_DEVICE_BOND_CARRIER     "carrier"
+

+

+

+

+

+

 
NM_DEVICE_BOND_SLAVES

 
#define NM_DEVICE_BOND_SLAVES      "slaves"
 

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

 

 

-
nm_device_bond_error_quark ()

-
GQuark              nm_device_bond_error_quark          (void);

+
NMDeviceBond

+
typedef struct _NMDeviceBond NMDeviceBond;

 

-Registers an error quark for NMDeviceBond if necessary.
 

-

--
-
-
-
-


Returns :
the error quark used for NMDeviceBond errors.

 

 

 

-
nm_device_bond_get_carrier ()

-
gboolean            nm_device_bond_get_carrier          (NMDeviceBond *device);

+
NMDeviceBondClass

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

 

-Whether the device has carrier.
 

-

+
+

+

+
nm_device_bond_new ()

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

+

+Creates a new NMDeviceBond.
+

+

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

 


 
 
device :
a NMDeviceBond
+
connection :
the DBusGConnection
 
 

 
path :
the DBus object path of the device

 
Returns :

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

 
 

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

 Gets the hardware (MAC) address of the NMDeviceBond
 

-

+

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

-
nm_device_bond_get_slaves ()

-
const GPtrArray *   nm_device_bond_get_slaves           (NMDeviceBond *device);

+
nm_device_bond_get_carrier ()

+
gboolean            nm_device_bond_get_carrier          (NMDeviceBond *device);

 

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

-

 


 
 

 
device :

 
 
 

+

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

 


 
 

 
device :

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

 
 

-
Since 0.9.6.4

 

 

 

-
nm_device_bond_new ()

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

+
nm_device_bond_get_slaves ()

+
const GPtrArray *   nm_device_bond_get_slaves           (NMDeviceBond *device);

 

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

-

+

+++
-
-
+
-
-
-
-
-

 


 
 
connection :
the DBusGConnection
+
device :
a NMDeviceBond
 
 

 
path :
the DBus object path of the device

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

 
 

+
Since 0.9.6.4

 

 

 

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

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

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

 

 
Synopsis

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

 

 

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

 
Details

 

-
NMDeviceBridge

-
typedef struct _NMDeviceBridge NMDeviceBridge;

-

-

-

-

-

-
NMDeviceBridgeClass

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

-

-

-

-

-

 
enum NMDeviceBridgeError

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

-

+

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

-
NM_DEVICE_BRIDGE_CARRIER

-
#define NM_DEVICE_BRIDGE_CARRIER     "carrier"
+
NM_DEVICE_BRIDGE_ERROR

+
#define NM_DEVICE_BRIDGE_ERROR nm_device_bridge_error_quark ()
 

 

 

 

-
NM_DEVICE_BRIDGE_ERROR

-
#define NM_DEVICE_BRIDGE_ERROR nm_device_bridge_error_quark ()
-

+
nm_device_bridge_error_quark ()

+
GQuark              nm_device_bridge_error_quark        (void);

 

+Registers an error quark for NMDeviceBridge if necessary.
 

+

 


 
 

 
NM_DEVICE_BRIDGE_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMDeviceBridge errors.

+
Since 0.9.8

 

 

 

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

 

 

+
NM_DEVICE_BRIDGE_CARRIER

+
#define NM_DEVICE_BRIDGE_CARRIER     "carrier"
+

+

+

+

+

+

 
NM_DEVICE_BRIDGE_SLAVES

 
#define NM_DEVICE_BRIDGE_SLAVES      "slaves"
 

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

 

 

-
nm_device_bridge_error_quark ()

-
GQuark              nm_device_bridge_error_quark        (void);

+
NMDeviceBridge

+
typedef struct _NMDeviceBridge NMDeviceBridge;

 

-Registers an error quark for NMDeviceBridge if necessary.
 

-

--
-
-
-
-


Returns :
the error quark used for NMDeviceBridge errors.

-
Since 0.9.8

 

 

 

-
nm_device_bridge_get_carrier ()

-
gboolean            nm_device_bridge_get_carrier        (NMDeviceBridge *device);

+
NMDeviceBridgeClass

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

 

-Whether the device has carrier.
 

-

+
+

+

+
nm_device_bridge_new ()

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

+

+Creates a new NMDeviceBridge.
+

+

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

 


 
 
device :
a NMDeviceBridge
+
connection :
the DBusGConnection
 
 

 
path :
the DBus object path of the device

 
Returns :

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

 
 

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

 Gets the hardware (MAC) address of the NMDeviceBridge
 

-

+

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

-
nm_device_bridge_get_slaves ()

-
const GPtrArray *   nm_device_bridge_get_slaves         (NMDeviceBridge *device);

+
nm_device_bridge_get_carrier ()

+
gboolean            nm_device_bridge_get_carrier        (NMDeviceBridge *device);

 

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

-

 


 
 

 
device :

 
 
 

+

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

 


 
 

 
device :

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

 
 

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

 

-
nm_device_bridge_new ()

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

+
nm_device_bridge_get_slaves ()

+
const GPtrArray *   nm_device_bridge_get_slaves         (NMDeviceBridge *device);

 

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

-

+

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

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

 


 
 
connection :
the DBusGConnection
+
device :
a NMDeviceBridge
 
 

 
path :
the DBus object path of the device

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

 

 

 
Synopsis

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

 

 

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

 
Details

 

-
NMDeviceBt

-
typedef struct _NMDeviceBt NMDeviceBt;

-

-

-

-

-

-
NMDeviceBtClass

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

-

-

-

-

-

 
enum NMDeviceBtError

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

-

+

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

-
NM_DEVICE_BT_CAPABILITIES

-
#define NM_DEVICE_BT_CAPABILITIES "bt-capabilities"
+
NM_DEVICE_BT_ERROR

+
#define NM_DEVICE_BT_ERROR nm_device_bt_error_quark ()
 

 

 

 

-
NM_DEVICE_BT_ERROR

-
#define NM_DEVICE_BT_ERROR nm_device_bt_error_quark ()
-

+
nm_device_bt_error_quark ()

+
GQuark              nm_device_bt_error_quark            (void);

 

+Registers an error quark for NMDeviceBt if necessary.
 

+

 


 
 

 
NM_DEVICE_BT_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMDeviceBt errors.

 

 

 

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

 

 

-
nm_device_bt_error_quark ()

-
GQuark              nm_device_bt_error_quark            (void);

+
NM_DEVICE_BT_CAPABILITIES

+
#define NM_DEVICE_BT_CAPABILITIES "bt-capabilities"
+

 

-Registers an error quark for NMDeviceBt if necessary.
 

-

--
-
-
-
-


Returns :
the error quark used for NMDeviceBt errors.

 

 

 

-
nm_device_bt_get_capabilities ()

-
NMBluetoothCapabilities nm_device_bt_get_capabilities   (NMDeviceBt *device);

+
NMDeviceBt

+
typedef struct _NMDeviceBt NMDeviceBt;

 

-Returns the Bluetooth device's usable capabilities.
 

-

+
+

+

+
NMDeviceBtClass

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

+

+

+

+

+

+
nm_device_bt_new ()

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

+

+Creates a new NMDeviceBt.
+

+

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

 Gets the hardware (MAC) address of the NMDeviceBt
 

-

 


 
 
device :
a NMDeviceBt
+
connection :
the DBusGConnection
 
 

 
path :
the DBus object path of the device

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

 

+

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

 Gets the name of the NMDeviceBt.
 

-

 


 
 

 
device :

 

+

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

 

-
nm_device_bt_new ()

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

+
nm_device_bt_get_capabilities ()

+
NMBluetoothCapabilities nm_device_bt_get_capabilities   (NMDeviceBt *device);

 

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

-

 


 
 

 
device :

+

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

 

-          Generated by GTK-Doc V1.18

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

 


 
 
connection :
the DBusGConnection
+
device :
a NMDeviceBt
 
 

 
path :
the DBus object path of the device

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

 
 
 
 
 
 
 
 
 
 
 
 
 

 

 
Synopsis

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

 

 

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

 
Details

 

-
NMDeviceEthernet

-
typedef struct _NMDeviceEthernet NMDeviceEthernet;

-

-

-

-

-

-
NMDeviceEthernetClass

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

-

-

-

-

-

 
enum NMDeviceEthernetError

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

-

+

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

-
NM_DEVICE_ETHERNET_CARRIER

-
#define NM_DEVICE_ETHERNET_CARRIER     "carrier"
+
NM_DEVICE_ETHERNET_ERROR

+
#define NM_DEVICE_ETHERNET_ERROR nm_device_ethernet_error_quark ()
 

 

 

 

-
NM_DEVICE_ETHERNET_ERROR

-
#define NM_DEVICE_ETHERNET_ERROR nm_device_ethernet_error_quark ()
-

+
nm_device_ethernet_error_quark ()

+
GQuark              nm_device_ethernet_error_quark      (void);

 

+Registers an error quark for NMDeviceEthernet if necessary.
 

+

 


 
 

 
NM_DEVICE_ETHERNET_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMDeviceEthernet errors.

 

 

 

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

 

 

-
nm_device_ethernet_error_quark ()

-
GQuark              nm_device_ethernet_error_quark      (void);

+
NM_DEVICE_ETHERNET_CARRIER

+
#define NM_DEVICE_ETHERNET_CARRIER     "carrier"
+

 

-Registers an error quark for NMDeviceEthernet if necessary.
 

-

--
-
-
-
-


Returns :
the error quark used for NMDeviceEthernet errors.

 

 

 

-
nm_device_ethernet_get_carrier ()

-
gboolean            nm_device_ethernet_get_carrier      (NMDeviceEthernet *device);

+
NMDeviceEthernet

+
typedef struct _NMDeviceEthernet NMDeviceEthernet;

 

-Whether the device has carrier.
 

-

+
+

+

+
NMDeviceEthernetClass

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

+

+

+

+

+

+
nm_device_ethernet_new ()

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

+

+Creates a new NMDeviceEthernet.
+

+

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

 


 
 
device :
a NMDeviceEthernet
+
connection :
the DBusGConnection
 
 

 
path :
the DBus object path of the device

 
Returns :

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

 
 

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

 Gets the active hardware (MAC) address of the NMDeviceEthernet
 

-

+

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

 Gets the permanent hardware (MAC) address of the NMDeviceEthernet
 

-

 


 
 

 
device :

 

+

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

 Gets the speed of the NMDeviceEthernet.
 

-

 


 
 

 
device :

 

+

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

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

+
nm_device_ethernet_get_carrier ()

+
gboolean            nm_device_ethernet_get_carrier      (NMDeviceEthernet *device);

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

-

 


 
 

 
device :

 

+

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

 


 
 
connection :
the DBusGConnection
+
device :
a NMDeviceEthernet
 
 

 
path :
the DBus object path of the device

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

 
 

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

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

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

 

 
Synopsis

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

 

 

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

 
Details

 

-
NMDeviceInfiniband

-
typedef struct _NMDeviceInfiniband NMDeviceInfiniband;

-

-

-

-

-

-
NMDeviceInfinibandClass

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

-

-

-

-

-

 
enum NMDeviceInfinibandError

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

-

+

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

-
NM_DEVICE_INFINIBAND_CARRIER

-
#define NM_DEVICE_INFINIBAND_CARRIER     "carrier"
+
NM_DEVICE_INFINIBAND_ERROR

+
#define NM_DEVICE_INFINIBAND_ERROR nm_device_infiniband_error_quark ()
 

 

 

 

-
NM_DEVICE_INFINIBAND_ERROR

-
#define NM_DEVICE_INFINIBAND_ERROR nm_device_infiniband_error_quark ()
-

+
nm_device_infiniband_error_quark ()

+
GQuark              nm_device_infiniband_error_quark    (void);

 

+Registers an error quark for NMDeviceInfiniband if necessary.
 

+

 


 
 

 
NM_DEVICE_INFINIBAND_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMDeviceInfiniband errors.

 

 

 

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

 

 

-
nm_device_infiniband_error_quark ()

-
GQuark              nm_device_infiniband_error_quark    (void);

+
NM_DEVICE_INFINIBAND_CARRIER

+
#define NM_DEVICE_INFINIBAND_CARRIER     "carrier"
+

 

-Registers an error quark for NMDeviceInfiniband if necessary.
 

-

--
-
-
-
-


Returns :
the error quark used for NMDeviceInfiniband errors.

 

 

 

-
nm_device_infiniband_get_carrier ()

-
gboolean            nm_device_infiniband_get_carrier    (NMDeviceInfiniband *device);

+
NMDeviceInfiniband

+
typedef struct _NMDeviceInfiniband NMDeviceInfiniband;

 

-Whether the device has carrier.
 

-

+
+

+

+
NMDeviceInfinibandClass

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

+

+

+

+

+

+
nm_device_infiniband_new ()

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

+

+Creates a new NMDeviceInfiniband.
+

+

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

 


 
 
device :
a NMDeviceInfiniband
+
connection :
the DBusGConnection
 
 

 
path :
the DBus object path of the device

 
Returns :

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

 
 

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

 Gets the hardware (MAC) address of the NMDeviceInfiniband
 

-

+

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

-
nm_device_infiniband_new ()

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

+
nm_device_infiniband_get_carrier ()

+
gboolean            nm_device_infiniband_get_carrier    (NMDeviceInfiniband *device);

 

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

-

 


 
 

 
device :

 
 
 

+

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

 


 
 
connection :
the DBusGConnection
+
device :
a NMDeviceInfiniband
 
 

 
path :
the DBus object path of the device

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

 
 

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

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

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

 

 
Synopsis

-
                    NMDeviceModem;
-                    NMDeviceModemClass;
-enum                NMDeviceModemError;
-#define             NM_DEVICE_MODEM_CURRENT_CAPABILITIES
+
enum                NMDeviceModemError;
 #define             NM_DEVICE_MODEM_ERROR
-#define             NM_DEVICE_MODEM_MODEM_CAPABILITIES
 GQuark              nm_device_modem_error_quark         (void);
-NMDeviceModemCapabilities nm_device_modem_get_current_capabilities
-                                                        (NMDeviceModem *self);
+#define             NM_DEVICE_MODEM_MODEM_CAPABILITIES
+#define             NM_DEVICE_MODEM_CURRENT_CAPABILITIES
+                    NMDeviceModem;
+                    NMDeviceModemClass;
 NMDeviceModemCapabilities nm_device_modem_get_modem_capabilities
                                                         (NMDeviceModem *self);
+NMDeviceModemCapabilities nm_device_modem_get_current_capabilities
+                                                        (NMDeviceModem *self);
 

 

 

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

 
Details

 

-
NMDeviceModem

-
typedef struct _NMDeviceModem NMDeviceModem;

-

-

-

-

-

-
NMDeviceModemClass

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

-

-

-

-

-

 
enum NMDeviceModemError

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

-

+

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

-
NM_DEVICE_MODEM_CURRENT_CAPABILITIES

-
#define NM_DEVICE_MODEM_CURRENT_CAPABILITIES "current-capabilities"
+
NM_DEVICE_MODEM_ERROR

+
#define NM_DEVICE_MODEM_ERROR nm_device_modem_error_quark ()
 

 

 

 

-
NM_DEVICE_MODEM_ERROR

-
#define NM_DEVICE_MODEM_ERROR nm_device_modem_error_quark ()
-

+
nm_device_modem_error_quark ()

+
GQuark              nm_device_modem_error_quark         (void);

 

+Registers an error quark for NMDeviceModem if necessary.
 

+

 


 
 

 
NM_DEVICE_MODEM_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMDeviceModem errors.

 

 

 

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

 

 

-
nm_device_modem_error_quark ()

-
GQuark              nm_device_modem_error_quark         (void);

+
NM_DEVICE_MODEM_CURRENT_CAPABILITIES

+
#define NM_DEVICE_MODEM_CURRENT_CAPABILITIES "current-capabilities"
+

 

-Registers an error quark for NMDeviceModem if necessary.
 

-

--
-
-
-
-


Returns :
the error quark used for NMDeviceModem errors.

 

 

 

-
nm_device_modem_get_current_capabilities ()

-
NMDeviceModemCapabilities nm_device_modem_get_current_capabilities
+
NMDeviceModem

+
typedef struct _NMDeviceModem NMDeviceModem;

+

+

+

+

+

+
NMDeviceModemClass

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

+

+

+

+

+

+
nm_device_modem_get_modem_capabilities ()

+
NMDeviceModemCapabilities nm_device_modem_get_modem_capabilities
                                                         (NMDeviceModem *self);

 

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

-

+

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

 


 
 

 
self :

 

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

 
 

 

 

 

-
nm_device_modem_get_modem_capabilities ()

-
NMDeviceModemCapabilities nm_device_modem_get_modem_capabilities
+
nm_device_modem_get_current_capabilities ()

+
NMDeviceModemCapabilities nm_device_modem_get_current_capabilities
                                                         (NMDeviceModem *self);

 

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

-

+

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

 


 
 

 
self :

 

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

 
 

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

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

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

 

 
Synopsis

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

 

 

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

 
Details

 

-
NMDeviceOlpcMesh

-
typedef struct _NMDeviceOlpcMesh NMDeviceOlpcMesh;

-

-

-

-

-

-
NMDeviceOlpcMeshClass

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

-

-

-

-

-

 
enum NMDeviceOlpcMeshError

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

-

+

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

-
NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL

-
#define NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL "active-channel"
+
NM_DEVICE_OLPC_MESH_ERROR

+
#define NM_DEVICE_OLPC_MESH_ERROR nm_device_olpc_mesh_error_quark ()
+

+

+

+

+

+

+
nm_device_olpc_mesh_error_quark ()

+
GQuark              nm_device_olpc_mesh_error_quark     (void);

+

+Registers an error quark for NMDeviceOlpcMesh if necessary.
+

+

 


 
 

 
NM_DEVICE_OLPC_MESH_ERROR_UNKNOWN

 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMDeviceOlpcMesh errors.

+

+

+

+
NM_DEVICE_OLPC_MESH_HW_ADDRESS

+
#define NM_DEVICE_OLPC_MESH_HW_ADDRESS     "hw-address"
 

 

 

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

 

 

-
NM_DEVICE_OLPC_MESH_ERROR

-
#define NM_DEVICE_OLPC_MESH_ERROR nm_device_olpc_mesh_error_quark ()
+
NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL

+
#define NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL "active-channel"
 

 

 

 

 

 

-
NM_DEVICE_OLPC_MESH_HW_ADDRESS

-
#define NM_DEVICE_OLPC_MESH_HW_ADDRESS     "hw-address"
-

+
NMDeviceOlpcMesh

+
typedef struct _NMDeviceOlpcMesh NMDeviceOlpcMesh;

 

 

 

 

 

-
nm_device_olpc_mesh_error_quark ()

-
GQuark              nm_device_olpc_mesh_error_quark     (void);

+
NMDeviceOlpcMeshClass

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

 

-Registers an error quark for NMDeviceOlpcMesh if necessary.
 

-

--
-
-
-
-


Returns :
the error quark used for NMDeviceOlpcMesh errors.

 

 

 

-
nm_device_olpc_mesh_get_active_channel ()

-
guint32             nm_device_olpc_mesh_get_active_channel
-                                                        (NMDeviceOlpcMesh *device);

+
nm_device_olpc_mesh_new ()

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

 

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

-

+

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

 


 
 
device :
a NMDeviceOlpcMesh
+
connection :
the DBusGConnection
 
 

 
path :
the DBus object path of the device

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

 
 

 

 

 

-
nm_device_olpc_mesh_get_companion ()

-
NMDeviceWifi *      nm_device_olpc_mesh_get_companion   (NMDeviceOlpcMesh *device);

+
nm_device_olpc_mesh_get_hw_address ()

+
const char *        nm_device_olpc_mesh_get_hw_address  (NMDeviceOlpcMesh *device);

 

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

-

+

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

 


 
 

 
device :

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

 
 

 

 

 

-
nm_device_olpc_mesh_get_hw_address ()

-
const char *        nm_device_olpc_mesh_get_hw_address  (NMDeviceOlpcMesh *device);

+
nm_device_olpc_mesh_get_companion ()

+
NMDeviceWifi *      nm_device_olpc_mesh_get_companion   (NMDeviceOlpcMesh *device);

 

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

-

+

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

-
+

 


 
 

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

 
 

 

 

 

-
nm_device_olpc_mesh_new ()

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

+
nm_device_olpc_mesh_get_active_channel ()

+
guint32             nm_device_olpc_mesh_get_active_channel
+                                                        (NMDeviceOlpcMesh *device);

 

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

-

+

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

 


 
 
connection :
the DBusGConnection
+
device :
a NMDeviceOlpcMesh
 
 

 
path :
the DBus object path of the device

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

 
 

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

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

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

 

 
Synopsis

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

 

 

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

 
Details

 

-
NMDeviceVlan

-
typedef struct _NMDeviceVlan NMDeviceVlan;

-

-

-

-

-

-
NMDeviceVlanClass

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

-

-

-

-

-

 
enum NMDeviceVlanError

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

-

+

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

-
NM_DEVICE_VLAN_CARRIER

-
#define NM_DEVICE_VLAN_CARRIER     "carrier"
+
NM_DEVICE_VLAN_ERROR

+
#define NM_DEVICE_VLAN_ERROR nm_device_vlan_error_quark ()
 

 

 

 

-
NM_DEVICE_VLAN_ERROR

-
#define NM_DEVICE_VLAN_ERROR nm_device_vlan_error_quark ()
-

+
nm_device_vlan_error_quark ()

+
GQuark              nm_device_vlan_error_quark          (void);

 

+Registers an error quark for NMDeviceVlan if necessary.
 

+

 


 
 

 
NM_DEVICE_VLAN_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMDeviceVlan errors.

 

 

 

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

 

 

+
NM_DEVICE_VLAN_CARRIER

+
#define NM_DEVICE_VLAN_CARRIER     "carrier"
+

+

+

+

+

+

 
NM_DEVICE_VLAN_VLAN_ID

 
#define NM_DEVICE_VLAN_VLAN_ID     "vlan-id"
 

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

 

 

-
nm_device_vlan_error_quark ()

-
GQuark              nm_device_vlan_error_quark          (void);

+
NMDeviceVlan

+
typedef struct _NMDeviceVlan NMDeviceVlan;

 

-Registers an error quark for NMDeviceVlan if necessary.
 

-

--
-
-
-
-


Returns :
the error quark used for NMDeviceVlan errors.

 

 

 

-
nm_device_vlan_get_carrier ()

-
gboolean            nm_device_vlan_get_carrier          (NMDeviceVlan *device);

+
NMDeviceVlanClass

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

 

-Whether the device has carrier.
 

-

+
+

+

+
nm_device_vlan_new ()

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

+

+Creates a new NMDeviceVlan.
+

+

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

 


 
 
device :
a NMDeviceVlan
+
connection :
the DBusGConnection
 
 

 
path :
the DBus object path of the device

 
Returns :

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

 
 

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

 Gets the hardware (MAC) address of the NMDeviceVlan
 

-

+

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

-
nm_device_vlan_get_vlan_id ()

-
guint               nm_device_vlan_get_vlan_id          (NMDeviceVlan *device);

-

 


 
 

 
device :

 
 
 

+
nm_device_vlan_get_carrier ()

+
gboolean            nm_device_vlan_get_carrier          (NMDeviceVlan *device);

+

+Whether the device has carrier.
+

+

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

 


 
 

 
device :

 

 

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

 
 

 

 

 

-
nm_device_vlan_new ()

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

-

-Creates a new NMDeviceVlan.
-

-

+
nm_device_vlan_get_vlan_id ()

+
guint               nm_device_vlan_get_vlan_id          (NMDeviceVlan *device);

+

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

 


 
 
connection :
the DBusGConnection
+
device :
a NMDeviceVlan
 
 

 
path :
the DBus object path of the device

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

 
 

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

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

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

 

 
Synopsis

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

 
Details

 

-
NMDeviceWifi

-
typedef struct _NMDeviceWifi NMDeviceWifi;

-

-

-

-

-

-
NMDeviceWifiClass

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

-

-

-

-

-

 
enum NMDeviceWifiError

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

-

+

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

-
NMDeviceWifiRequestScanFn ()

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

+
NM_DEVICE_WIFI_ERROR

+
#define NM_DEVICE_WIFI_ERROR nm_device_wifi_error_quark ()
+

 

 

 

-
NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT

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

+
nm_device_wifi_error_quark ()

+
GQuark              nm_device_wifi_error_quark          (void);

 

+Registers an error quark for NMDeviceWifi if necessary.
 

+

 


 
 

 
NM_DEVICE_WIFI_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMDeviceWifi errors.

 

 

 

-
NM_DEVICE_WIFI_BITRATE

-
#define NM_DEVICE_WIFI_BITRATE             "bitrate"
+
NM_DEVICE_WIFI_HW_ADDRESS

+
#define NM_DEVICE_WIFI_HW_ADDRESS          "hw-address"
 

 

 

 

 

 

-
NM_DEVICE_WIFI_CAPABILITIES

-
#define NM_DEVICE_WIFI_CAPABILITIES        "wireless-capabilities"
+
NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS

+
#define NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS "perm-hw-address"
 

 

 

 

 

 

-
NM_DEVICE_WIFI_ERROR

-
#define NM_DEVICE_WIFI_ERROR nm_device_wifi_error_quark ()
+
NM_DEVICE_WIFI_MODE

+
#define NM_DEVICE_WIFI_MODE                "mode"
 

 

 

 

 

 

-
NM_DEVICE_WIFI_HW_ADDRESS

-
#define NM_DEVICE_WIFI_HW_ADDRESS          "hw-address"
+
NM_DEVICE_WIFI_BITRATE

+
#define NM_DEVICE_WIFI_BITRATE             "bitrate"
 

 

 

 

 

 

-
NM_DEVICE_WIFI_MODE

-
#define NM_DEVICE_WIFI_MODE                "mode"
+
NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT

+
#define NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT "active-access-point"
 

 

 

 

 

 

-
NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS

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

+
#define NM_DEVICE_WIFI_CAPABILITIES        "wireless-capabilities"
 

 

 

 

 

 

-
nm_device_wifi_error_quark ()

-
GQuark              nm_device_wifi_error_quark          (void);

+
NMDeviceWifi

+
typedef struct _NMDeviceWifi NMDeviceWifi;

 

-Registers an error quark for NMDeviceWifi if necessary.
 

-

--
-
-
-
-


Returns :
the error quark used for NMDeviceWifi errors.

 

 

 

-
nm_device_wifi_get_access_point_by_path ()

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

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

+

+

+

+

+

+
nm_device_wifi_new ()

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

 

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

-

+

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

 

-
nm_device_wifi_get_access_points ()

-
const GPtrArray *   nm_device_wifi_get_access_points    (NMDeviceWifi *device);

+
nm_device_wifi_get_hw_address ()

+
const char *        nm_device_wifi_get_hw_address       (NMDeviceWifi *device);

 

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

-

 


 
 
device :
a NMDeviceWifi
+
connection :
the DBusGConnection
 
 

 

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

 

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

 

+

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

-
+

 


 
 

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

 
 

 

 

 

-
nm_device_wifi_get_active_access_point ()

-
NMAccessPoint *     nm_device_wifi_get_active_access_point
+
nm_device_wifi_get_permanent_hw_address ()

+
const char *        nm_device_wifi_get_permanent_hw_address
                                                         (NMDeviceWifi *device);

 

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

-

+

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

 


 
 

 
device :

 

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

 
 

 

 

 

-
nm_device_wifi_get_bitrate ()

-
guint32             nm_device_wifi_get_bitrate          (NMDeviceWifi *device);

+
nm_device_wifi_get_mode ()

+
NM80211Mode         nm_device_wifi_get_mode             (NMDeviceWifi *device);

 

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

-

+

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

-
+

 


 
 

 
device :
the bit ratethe mode
 

 
 

 

 

 

-
nm_device_wifi_get_capabilities ()

-
NMDeviceWifiCapabilities nm_device_wifi_get_capabilities
-                                                        (NMDeviceWifi *device);

+
nm_device_wifi_get_bitrate ()

+
guint32             nm_device_wifi_get_bitrate          (NMDeviceWifi *device);

 

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

-

+

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

 


 
 

 
device :

 
Returns :
the capabilitiesthe bit rate
 

 
 

 

 

 

-
nm_device_wifi_get_hw_address ()

-
const char *        nm_device_wifi_get_hw_address       (NMDeviceWifi *device);

+
nm_device_wifi_get_capabilities ()

+
NMDeviceWifiCapabilities nm_device_wifi_get_capabilities
+                                                        (NMDeviceWifi *device);

 

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

-

+

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

-
+

 


 
 

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

 
 

 

 

 

-
nm_device_wifi_get_mode ()

-
NM80211Mode         nm_device_wifi_get_mode             (NMDeviceWifi *device);

+
nm_device_wifi_get_active_access_point ()

+
NMAccessPoint *     nm_device_wifi_get_active_access_point
+                                                        (NMDeviceWifi *device);

 

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

-

+

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

 


 
 

 
device :

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

 
 

 

 

 

-
nm_device_wifi_get_permanent_hw_address ()

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

+
nm_device_wifi_get_access_point_by_path ()

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

 

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

-

+

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

+
+
+
-
+

 


 
 

 
device :
the object path of the access point

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

 
 

 

 

 

-
nm_device_wifi_new ()

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

+
nm_device_wifi_get_access_points ()

+
const GPtrArray *   nm_device_wifi_get_access_points    (NMDeviceWifi *device);

 

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

-

+

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

 

+
NMDeviceWifiRequestScanFn ()

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

+

+

+

+

+

 
nm_device_wifi_request_scan_simple ()

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

-

 


 
 
connection :
the DBusGConnection
+
device :
a NMDeviceWifi
 
 

 
path :
the DBus object path of the device

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

 

+

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

 Notifies that a NMAccessPoint is added to the wifi device.
 

-

 


 
 

 
device :

+

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

 Notifies that a NMAccessPoint is removed from the wifi device.
 

-

 


 
 

 
device :

+

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

 

-          Generated by GTK-Doc V1.18

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

 


 
 

 
device :

 

 
Synopsis

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

 

 

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

 
Details

 

-
NMDeviceWimax

-
typedef struct _NMDeviceWimax NMDeviceWimax;

-

-

-

-

-

-
NMDeviceWimaxClass

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

-

-

-

-

-

 
enum NMDeviceWimaxError

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

-

+

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

-
NM_DEVICE_WIMAX_ACTIVE_NSP

-
#define NM_DEVICE_WIMAX_ACTIVE_NSP       "active-nsp"
+
NM_DEVICE_WIMAX_ERROR

+
#define NM_DEVICE_WIMAX_ERROR nm_device_wimax_error_quark ()
 

 

 

 

-
NM_DEVICE_WIMAX_BSID

-
#define NM_DEVICE_WIMAX_BSID             "bsid"
-

+
nm_device_wimax_error_quark ()

+
GQuark              nm_device_wimax_error_quark         (void);

 

+Registers an error quark for NMDeviceWimax if necessary.
 

+

 


 
 

 
NM_DEVICE_WIMAX_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMDeviceWimax errors.

 

 

 

-
NM_DEVICE_WIMAX_CENTER_FREQUENCY

-
#define NM_DEVICE_WIMAX_CENTER_FREQUENCY "center-frequency"
+
NM_DEVICE_WIMAX_HW_ADDRESS

+
#define NM_DEVICE_WIMAX_HW_ADDRESS       "hw-address"
 

 

 

 

 

 

-
NM_DEVICE_WIMAX_CINR

-
#define NM_DEVICE_WIMAX_CINR             "cinr"
+
NM_DEVICE_WIMAX_ACTIVE_NSP

+
#define NM_DEVICE_WIMAX_ACTIVE_NSP       "active-nsp"
 

 

 

 

 

 

-
NM_DEVICE_WIMAX_ERROR

-
#define NM_DEVICE_WIMAX_ERROR nm_device_wimax_error_quark ()
+
NM_DEVICE_WIMAX_CENTER_FREQUENCY

+
#define NM_DEVICE_WIMAX_CENTER_FREQUENCY "center-frequency"
 

 

 

 

 

 

-
NM_DEVICE_WIMAX_HW_ADDRESS

-
#define NM_DEVICE_WIMAX_HW_ADDRESS       "hw-address"
+
NM_DEVICE_WIMAX_RSSI

+
#define NM_DEVICE_WIMAX_RSSI             "rssi"
 

 

 

 

 

 

-
NM_DEVICE_WIMAX_RSSI

-
#define NM_DEVICE_WIMAX_RSSI             "rssi"
+
NM_DEVICE_WIMAX_CINR

+
#define NM_DEVICE_WIMAX_CINR             "cinr"
 

 

 

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

 

 

-
nm_device_wimax_error_quark ()

-
GQuark              nm_device_wimax_error_quark         (void);

+
NM_DEVICE_WIMAX_BSID

+
#define NM_DEVICE_WIMAX_BSID             "bsid"
+

 

-Registers an error quark for NMDeviceWimax if necessary.
 

-

--
-
-
-
-


Returns :
the error quark used for NMDeviceWimax errors.

 

 

 

-
nm_device_wimax_get_active_nsp ()

-
NMWimaxNsp *        nm_device_wimax_get_active_nsp      (NMDeviceWimax *wimax);

+
NMDeviceWimax

+
typedef struct _NMDeviceWimax NMDeviceWimax;

 

-Gets the active NMWimaxNsp.
 

-

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


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

 

 

 

-
nm_device_wimax_get_bsid ()

-
const char *        nm_device_wimax_get_bsid            (NMDeviceWimax *self);

+
NMDeviceWimaxClass

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

 

-Gets the ID of the serving Base Station when the device is connected.
 

-

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


self :
a NMDeviceWimax
-
Returns :
the ID of the serving Base Station, or NULL

 

 

 

-
nm_device_wimax_get_center_frequency ()

-
guint               nm_device_wimax_get_center_frequency
-                                                        (NMDeviceWimax *self);

+
nm_device_wimax_new ()

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

 

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

-

+

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

 


 
 
self :
a NMDeviceWimax
+
connection :
the DBusGConnection
 
 

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

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

 
 

 

 

 

-
nm_device_wimax_get_cinr ()

-
gint                nm_device_wimax_get_cinr            (NMDeviceWimax *self);

+
nm_device_wimax_get_hw_address ()

+
const char *        nm_device_wimax_get_hw_address      (NMDeviceWimax *wimax);

 

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

-

+

+++
-
+
-
+

 


 
 
self :
wimax :

 a NMDeviceWimax
 
 

 

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

 
 

 

 

 

-
nm_device_wimax_get_hw_address ()

-
const char *        nm_device_wimax_get_hw_address      (NMDeviceWimax *wimax);

+
nm_device_wimax_get_active_nsp ()

+
NMWimaxNsp *        nm_device_wimax_get_active_nsp      (NMDeviceWimax *wimax);

 

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

-

+

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

 


 
 

 
wimax :

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

 
 

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

 Gets a NMWimaxNsp by path.
 

-

+

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

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

-

 


 
 

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

 

+

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

 

+
nm_device_wimax_get_center_frequency ()

+
guint               nm_device_wimax_get_center_frequency
+                                                        (NMDeviceWimax *self);

+

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

+

 


 
 

 
wimax :

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




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

+

+

+

 
nm_device_wimax_get_rssi ()

 
gint                nm_device_wimax_get_rssi            (NMDeviceWimax *self);

 

@@ -434,8 +440,11 @@ strong the raw received RF signal from the base station is, but does not
 indicate the overall quality of the radio link.  Has no meaning when the
 device is not connected.
 

-

+

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

+
nm_device_wimax_get_cinr ()

+
gint                nm_device_wimax_get_cinr            (NMDeviceWimax *self);

+

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

+

 


 
 

 
self :

 
 

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




self :
a NMDeviceWimax
+
Returns :
the CINR in dB, or 0

+

+

+

 
nm_device_wimax_get_tx_power ()

 
gint                nm_device_wimax_get_tx_power        (NMDeviceWimax *self);

 

@@ -458,8 +494,11 @@ Average power of the last burst transmitted by the device, in units of
 0.5 dBm.  i.e. a TxPower of -11 represents an actual device TX power of
 -5.5 dBm.  Has no meaning when the device is not connected.
 

-

+

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

-
nm_device_wimax_new ()

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

+
nm_device_wimax_get_bsid ()

+
const char *        nm_device_wimax_get_bsid            (NMDeviceWimax *self);

 

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

-

 


 
 

 
self :

 
 

+

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

 Notifies that a NMWimaxNsp is added to the wimax device.
 

-

 


 
 
connection :
the DBusGConnection
+
self :
a NMDeviceWimax
 
 

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

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

 

+

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

-

 


 
 

 
self :

+

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

 

-          Generated by GTK-Doc V1.18

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

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

-
NM_IP4_CONFIG_DOMAINS

-
#define NM_IP4_CONFIG_DOMAINS "domains"
+
NM_IP4_CONFIG_NAMESERVERS

+
#define NM_IP4_CONFIG_NAMESERVERS "nameservers"
 

 

 

 

-
NM_IP4_CONFIG_NAMESERVERS

-
#define NM_IP4_CONFIG_NAMESERVERS "nameservers"
+
NM_IP4_CONFIG_DOMAINS

+
#define NM_IP4_CONFIG_DOMAINS "domains"
 

 

 

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

-
nm_ip4_config_get_addresses ()

-
const GSList *      nm_ip4_config_get_addresses         (NMIP4Config *config);

+
nm_ip4_config_new ()

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

 

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

-

 


 
 

 
self :

 
 
 
 
 
 
 
 

+

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

 

-
nm_ip4_config_get_domains ()

-
const GPtrArray *   nm_ip4_config_get_domains           (NMIP4Config *config);

+
nm_ip4_config_get_addresses ()

+
const GSList *      nm_ip4_config_get_addresses         (NMIP4Config *config);

 

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

-

 


 
 
config :
a NMIP4Config
+
connection :
the DBusGConnection
 
 

 
object_path :
the DBus object path of the device

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

 

+

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

 


 

 
config :

 

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

 

+

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

 

-
nm_ip4_config_get_routes ()

-
const GSList *      nm_ip4_config_get_routes            (NMIP4Config *config);

+
nm_ip4_config_get_domains ()

+
const GPtrArray *   nm_ip4_config_get_domains           (NMIP4Config *config);

 

-Gets the routes.
+Gets the domain names.
 

-

 


 

 
config :

+

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

-
const GArray *      nm_ip4_config_get_wins_servers      (NMIP4Config *config);

+
nm_ip4_config_get_routes ()

+
const GSList *      nm_ip4_config_get_routes            (NMIP4Config *config);

 

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

-

 


 

 
config :

 

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

 

+

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

 

-
nm_ip4_config_new ()

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

+
nm_ip4_config_get_wins_servers ()

+
const GArray *      nm_ip4_config_get_wins_servers      (NMIP4Config *config);

 

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

-

 


 

 
config :

 

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

 

+

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

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

 
 

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

 

 

-
NM_IP6_CONFIG_DOMAINS

-
#define NM_IP6_CONFIG_DOMAINS "domains"
+
NM_IP6_CONFIG_NAMESERVERS

+
#define NM_IP6_CONFIG_NAMESERVERS "nameservers"
 

 

 

 

 

 

-
NM_IP6_CONFIG_NAMESERVERS

-
#define NM_IP6_CONFIG_NAMESERVERS "nameservers"
+
NM_IP6_CONFIG_DOMAINS

+
#define NM_IP6_CONFIG_DOMAINS "domains"
 

 

 

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

 

 

-
nm_ip6_config_get_addresses ()

-
const GSList *      nm_ip6_config_get_addresses         (NMIP6Config *config);

+
nm_ip6_config_new ()

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

 

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

-

 


 
connection :
the DBusGConnection
+
config :
a NMIP4Config
 
 

 
object_path :
the DBus object path of the device

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

 

+

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

-
const GPtrArray *   nm_ip6_config_get_domains           (NMIP6Config *config);

+
nm_ip6_config_get_addresses ()

+
const GSList *      nm_ip6_config_get_addresses         (NMIP6Config *config);

 

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

-

 


 
config :
a NMIP6Config
+
connection :
the DBusGConnection
 
 

 
object_path :
the DBus object path of the device

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

 

+

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

 Gets the domain name servers (DNS).
 

-

 


 

 
config :

 

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

 

+

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

 


 

 
config :

 

 
Returns :
a GSList containing elements of type
-'struct in6_addr' which contain the addresses of nameservers of the configuration.
-This is the internal copy used by the configuration and must not be modified. [element-type Posix.in6_addr]
-a GSList containing elements of type 'struct in6_addr' which
+contain the addresses of nameservers of the configuration.  This is the
+internal copy used by the configuration and must not be modified.
 

 
 

 

 

 

-
nm_ip6_config_get_routes ()

-
const GSList *      nm_ip6_config_get_routes            (NMIP6Config *config);

+
nm_ip6_config_get_domains ()

+
const GPtrArray *   nm_ip6_config_get_domains           (NMIP6Config *config);

 

-Gets the routes.
+Gets the domain names.
 

-

+

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

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

+
nm_ip6_config_get_routes ()

+
const GSList *      nm_ip6_config_get_routes            (NMIP6Config *config);

 

-Creates a new NMIP6Config.
+Gets the routes.
 

-

 


 
 

 
config :

 

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

 

+

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

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

 


 
 
connection :
the DBusGConnection
+
config :
a NMIP6Config
 
 

 
object_path :
the DBus object path of the device

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

 

 

 
Synopsis

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

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

 
Details

 

-
NMObject

-
typedef struct _NMObject NMObject;

-

-

-

-

-

-
NMObjectClass

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

-

-

-

-

-

 
enum NMObjectError

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

 Describes errors that may result from operations involving a NMObject.
 

-

+

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

 

+
NM_OBJECT_ERROR

+
#define NM_OBJECT_ERROR nm_object_error_quark ()
+

+

+

+

+

+

+
nm_object_error_quark ()

+
GQuark              nm_object_error_quark               (void);

+

+Registers an error quark for NMObject if necessary.
+

+

 


 
 

 
NM_OBJECT_ERROR_UNKNOWN

++++
+
+
+
+
+




Returns :
the error quark used for NMObject errors.

+

+

+

 
NM_OBJECT_DBUS_CONNECTION

 
#define NM_OBJECT_DBUS_CONNECTION "dbus-connection"
 

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

 

-
NM_OBJECT_ERROR

-
#define NM_OBJECT_ERROR nm_object_error_quark ()
-

+
NMObject

+
typedef struct _NMObject NMObject;

 

 

 

 

 

-
nm_object_error_quark ()

-
GQuark              nm_object_error_quark               (void);

+
NMObjectClass

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

 

-Registers an error quark for NMObject if necessary.
 

-

--
-
-
-
-


Returns :
the error quark used for NMObject errors.

 

 

 

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

-

+

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

-

 


 
 

 
object :

+

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

 


 
 

 
object :

+

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

 

-          Generated by GTK-Doc V1.18

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

 


 
 

 
master_object :

 
 
 
 
 
 
 
 
 
 
 
 

 

 
Synopsis

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

 

 

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

 
Details

 

+
NM_REMOTE_CONNECTION_UPDATED

+
#define NM_REMOTE_CONNECTION_UPDATED         "updated"
+

+

+

+

+

+

+
NM_REMOTE_CONNECTION_REMOVED

+
#define NM_REMOTE_CONNECTION_REMOVED         "removed"
+

+

+

+

+

+

 
NMRemoteConnection

 
typedef struct _NMRemoteConnection NMRemoteConnection;

 

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

-

+

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

-

 


 
 

 
connection :

+

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

-

 


 
 

 
connection :

+

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

-
#define NM_REMOTE_CONNECTION_REMOVED         "removed"
-

-

-

-
-

-

-
NM_REMOTE_CONNECTION_UPDATED

-
#define NM_REMOTE_CONNECTION_UPDATED         "updated"
-

+
nm_remote_connection_new ()

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

 

+Creates a new object representing the remote connection.
 

+

 


 
 

 
connection :

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




bus :
a valid and connected D-Bus connection
path :
the D-Bus path of the connection as exported by the settings service
Returns :
the new remote connection object on success, or NULL on failure

 

 

 

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

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

 


 
 

 
connection :

+

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

 Request the connection's secrets.
 

-

 


 
 

 
connection :

+

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

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

-

-Creates a new object representing the remote connection.
-

-

 


 
 

 
connection :

 
callback :

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

 

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


bus :
a valid and connected D-Bus connection
path :
the D-Bus path of the connection as exported by the settings service
Returns :
the new remote connection object on success, or NULL on failure

-

 

 

 
Property Details

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

-

+

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

-

 


 
 

 
connection :

+

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

 

-

 


 
 

 
connection :

 

+

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

 

-          Generated by GTK-Doc V1.18

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

 


 
 

 
nmremoteconnection :

 
 
 
 
 
 
 
 
 
 
 
 

 

 
Synopsis

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

 
Details

 

-
struct NMRemoteSettings

-
struct NMRemoteSettings;

-

-

-

-

-

-
NMRemoteSettingsAddConnectionFunc ()

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

-

-

-

-

-

-
struct NMRemoteSettingsClass

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

-

-

-

-

-

 
enum NMRemoteSettingsError

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

 Describes errors that may result from operations involving a NMRemoteSettings.
 

-

+

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

 

-
NMRemoteSettingsSaveHostnameFunc ()

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

+
NM_REMOTE_SETTINGS_ERROR

+
#define NM_REMOTE_SETTINGS_ERROR nm_remote_settings_error_quark ()
+

 

 

 

+
nm_remote_settings_error_quark ()

+
GQuark              nm_remote_settings_error_quark      (void);

+

+Registers an error quark for NMRemoteSettings if necessary.
+

+

 


 
 

 
NM_REMOTE_SETTINGS_ERROR_UNKNOWN

 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMRemoteSettings errors.

+

+

+

 
NM_REMOTE_SETTINGS_BUS

 
#define NM_REMOTE_SETTINGS_BUS             "bus"
 

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

 

+
NM_REMOTE_SETTINGS_SERVICE_RUNNING

+
#define NM_REMOTE_SETTINGS_SERVICE_RUNNING "service-running"
+

+

+

+

+

+

+
NM_REMOTE_SETTINGS_HOSTNAME

+
#define NM_REMOTE_SETTINGS_HOSTNAME        "hostname"
+

+

+

+

+

+

 
NM_REMOTE_SETTINGS_CAN_MODIFY

 
#define NM_REMOTE_SETTINGS_CAN_MODIFY      "can-modify"
 

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

 

+
NM_REMOTE_SETTINGS_NEW_CONNECTION

+
#define NM_REMOTE_SETTINGS_NEW_CONNECTION    "new-connection"
+

+

+

+

+

+

 
NM_REMOTE_SETTINGS_CONNECTIONS_READ

 
#define NM_REMOTE_SETTINGS_CONNECTIONS_READ  "connections-read"
 

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

 

-
NM_REMOTE_SETTINGS_ERROR

-
#define NM_REMOTE_SETTINGS_ERROR nm_remote_settings_error_quark ()
-

+
NMRemoteSettingsAddConnectionFunc ()

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

 

 

 

 

 

-
NM_REMOTE_SETTINGS_HOSTNAME

-
#define NM_REMOTE_SETTINGS_HOSTNAME        "hostname"
-

+
NMRemoteSettingsSaveHostnameFunc ()

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

 

 

 

 

 

-
NM_REMOTE_SETTINGS_NEW_CONNECTION

-
#define NM_REMOTE_SETTINGS_NEW_CONNECTION    "new-connection"
-

+
struct NMRemoteSettings

+
struct NMRemoteSettings;

 

 

 

 

 

-
NM_REMOTE_SETTINGS_SERVICE_RUNNING

-
#define NM_REMOTE_SETTINGS_SERVICE_RUNNING "service-running"
+
struct NMRemoteSettingsClass

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

 

 

 

 

 

-
nm_remote_settings_add_connection ()

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

+
nm_remote_settings_new ()

+
NMRemoteSettings *  nm_remote_settings_new              (DBusGConnection *bus);

 

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

-

+

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

+

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

 


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

 

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

 
 

 

 

 

-
nm_remote_settings_error_quark ()

-
GQuark              nm_remote_settings_error_quark      (void);

-

-Registers an error quark for NMRemoteSettings if necessary.
-

-

--
-
-
-
-


Returns :
the error quark used for NMRemoteSettings errors.

-

-

-

-
nm_remote_settings_get_connection_by_path ()

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

+
nm_remote_settings_new_async ()

+
void                nm_remote_settings_new_async        (DBusGConnection *bus,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);

 

-Returns the NMRemoteConnection representing the connection at path.
+Creates a new object representing the remote settings service and
+begins asynchronously initializing it. callback will be called
+when it is done; use nm_remote_settings_new_finish() to get the
+result.
 

-

+

+++
-
-
+
-
-
+
+
-
-
+
+
+
+
+
@@ -353,30 +359,31 @@ not known. [
-
nm_remote_settings_get_connection_by_uuid ()

-
NMRemoteConnection * nm_remote_settings_get_connection_by_uuid
-                                                        (NMRemoteSettings *settings,
-                                                         const char *uuid);

+
nm_remote_settings_new_finish ()

+
NMRemoteSettings *  nm_remote_settings_new_finish       (GAsyncResult *result,
+                                                         GError **error);

 

-Returns the NMRemoteConnection identified by uuid.
+Gets the result of an nm_remote_settings_new_async() call.
 

-

 


 
 
settings :
the NMRemoteSettings
+
bus :
a valid and connected D-Bus connection. [allow-none]
 
 

 
path :
the D-Bus object path of the remote connection
cancellable :
a GCancellable, or NULL
+
 

 
Returns :
the remote connection object on success, or NULL if the object was
-not known. [transfer none]
+
callback :
callback to call when the settings object is created
user_data :
data for callback
 
 

 

+

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

 


 
 
settings :
the NMRemoteSettings
+
result :
a GAsyncResult
 
 

 
uuid :
the UUID of the remote connection
error :
location for a GError, or NULL
+
 

 

 
Returns :
the remote connection object on success, or NULL if the object was
-not known. [transfer none]
-a new NMRemoteSettings object, or NULL on error
 

 
 

@@ -385,8 +392,11 @@ not known. [
 
nm_remote_settings_list_connections ()

 
GSList *            nm_remote_settings_list_connections (NMRemoteSettings *settings);

-

+

+++
@@ -408,64 +418,65 @@ using 
-
nm_remote_settings_new ()

-
NMRemoteSettings *  nm_remote_settings_new              (DBusGConnection *bus);

-

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

+
nm_remote_settings_get_connection_by_path ()

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

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

-

 


 
 

 
settings :

 

+

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

 


 
 
bus :
a valid and connected D-Bus connection. [allow-none]
+
settings :
the NMRemoteSettings
 
 

 
path :
the D-Bus object path of the remote connection

 
Returns :
the new remote settings object on success, or NULL on failurethe remote connection object on success, or NULL if the object was
+not known. [transfer none]
+
 

 
 

 

 

 

-
nm_remote_settings_new_async ()

-
void                nm_remote_settings_new_async        (DBusGConnection *bus,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);

+
nm_remote_settings_get_connection_by_uuid ()

+
NMRemoteConnection * nm_remote_settings_get_connection_by_uuid
+                                                        (NMRemoteSettings *settings,
+                                                         const char *uuid);

 

-Creates a new object representing the remote settings service and
-begins asynchronously initializing it. callback will be called
-when it is done; use nm_remote_settings_new_finish() to get the
-result.
+Returns the NMRemoteConnection identified by uuid.
 

-

+

+++
-
-
-
-
-
-
+
-
-
+
+
-
-
+
@@ -473,28 +484,44 @@ result.
 

-
nm_remote_settings_new_finish ()

-
NMRemoteSettings *  nm_remote_settings_new_finish       (GAsyncResult *result,
-                                                         GError **error);

+
nm_remote_settings_add_connection ()

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

 

-Gets the result of an nm_remote_settings_new_async() call.
+Requests that the remote settings service add the given settings to a new
+connection.
 

-

 


 
 
bus :
a valid and connected D-Bus connection. [allow-none]
-
cancellable :
a GCancellable, or NULL
+
settings :
the NMRemoteSettings
 
 

 
callback :
callback to call when the settings object is created
uuid :
the UUID of the remote connection
 

 
user_data :
data for callback
+
Returns :
the remote connection object on success, or NULL if the object was
+not known. [transfer none]
 
 

 
 
 

+

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

 


 
 
result :
a GAsyncResult
+
settings :
the NMRemoteSettings
 
 

 
error :
location for a GError, or NULL
+
connection :
the connection to add. Note that this object's settings will be
+added, not the object itself
callback :
callback to be called when the add operation completes. [scope async]
+
user_data :
caller-specific data passed to callback. [closure]
 
 

 

 
Returns :
a new NMRemoteSettings object, or NULL on errorTRUE if the request was successful, FALSE if it failed
 

 
 

@@ -510,8 +537,11 @@ Gets the result of an 
+

+++
@@ -520,7 +550,7 @@ or cleared.
 
-
@@ -579,8 +609,11 @@ hostname operation completes. [gpointer          user_data)             : Run First
 

 

-

 


 
 

 
settings :

 

 
hostname :
the new persistent hostname to set, or NULL to clear any existing
+the new persistent hostname to set, or NULL to clear any existing
 persistent hostname
 

 

+

+++
@@ -601,8 +634,11 @@ hostname operation completes. [gpointer          user_data)             : Run First
 

 

-

 


 
 

 
nmremotesettings :

+

+++
@@ -619,6 +655,6 @@ hostname operation completes. [
 

-          Generated by GTK-Doc V1.18
+          Generated by GTK-Doc V1.19
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html
index b5b050f7..671cd029 100644
--- a/docs/libnm-glib/html/NMSecretAgent.html
+++ b/docs/libnm-glib/html/NMSecretAgent.html
@@ -3,12 +3,12 @@
 
 
 NMSecretAgent
-
+
 
 
 
 
-
+
 
 
 
@@ -43,14 +43,15 @@
 

 


 
 

 
nmremotesettings :

 

 
Synopsis

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

 

 

@@ -115,121 +115,18 @@ enum                
 
Details

 

-
NMSecretAgent

-
typedef struct _NMSecretAgent NMSecretAgent;

-

-

-

-

-

-
NMSecretAgentClass

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

+
#define NM_SECRET_AGENT_ERROR         (nm_secret_agent_error_quark ())
 

 

 

 

 

 

-
NMSecretAgentDeleteSecretsFunc ()

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

+
nm_secret_agent_error_quark ()

+
GQuark              nm_secret_agent_error_quark         (void);

 

-Called as a result of a request by NM to delete secrets.  When the
-NMSecretAgent subclass has finished deleting the secrets, this function
-should be called.
 

-

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


agent :
the secret agent object
connection :
the connection for which secrets were to be deleted,
-note that this object will be unrefed after the callback has returned, use
-g_object_ref()/g_object_unref() if you want to use this object after the callback
-has returned. [transfer none]
-
error :
if the deleting secrets failed, give a descriptive error here
user_data :
caller-specific data to be passed to the function

 

 

 

@@ -247,8 +144,11 @@ has returned. [NMSecretAgentError values are passed by secret agents back to NetworkManager
 when they encounter problems retrieving secrets on behalf of NM.
 

-

+

+++
@@ -301,8 +201,11 @@ when they encounter problems retrieving secrets on behalf of NM.
 

 NMSecretAgentGetSecretsFlags values modify the behavior of a GetSecrets request.
 

-

 


 
 

 
NM_SECRET_AGENT_ERROR_NOT_AUTHORIZED

+

+++
@@ -339,6 +242,45 @@ results or carrier changes.
 

+
NM_SECRET_AGENT_IDENTIFIER

+
#define NM_SECRET_AGENT_IDENTIFIER          "identifier"
+

+

+

+

+

+

+
NM_SECRET_AGENT_AUTO_REGISTER

+
#define NM_SECRET_AGENT_AUTO_REGISTER       "auto-register"
+

+

+

+

+

+

+
NM_SECRET_AGENT_REGISTERED

+
#define NM_SECRET_AGENT_REGISTERED          "registered"
+

+

+

+

+

+

+
NM_SECRET_AGENT_REGISTRATION_RESULT

+
#define NM_SECRET_AGENT_REGISTRATION_RESULT "registration-result"
+

+

+

+

+

+

+
NMSecretAgent

+
typedef struct _NMSecretAgent NMSecretAgent;

+

+

+

+

+

 
NMSecretAgentGetSecretsFunc ()

 
void                (*NMSecretAgentGetSecretsFunc)      (NMSecretAgent *agent,
                                                          NMConnection *connection,
@@ -356,7 +298,7 @@ To easily create the hash table to return the WiFi PSK, you could do
 something like this:
 

 

-
Example 1. Creating a secrets hash

+
Example 1. Creating a secrets hash

 

   

 


 
 

 
NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE

 
 

@@ -385,7 +327,7 @@ something like this:
 s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();g_object_set (G_OBJECT (s_wsec),              NM_SETTING_WIRELESS_SECURITY_PSK, "my really cool PSK",
-              NULL);
+              NULL);nm_connection_add_setting (secrets, NM_SETTING (s_wsec));secrets_hash = nm_connection_to_hash (secrets, NM_SETTING_HASH_FLAG_ALL);
 
@@ -401,8 +343,11 @@ something like this:
 


 

-

     
 
 
 
 
 

+

+++
@@ -450,8 +395,11 @@ Called as a result of a request by NM to save secrets.  When the
 NMSecretAgent subclass has finished saving the secrets, this function
 should be called.
 

-

 


 
 

 
agent :

+

+++
@@ -478,60 +426,134 @@ has returned. [
-
NM_SECRET_AGENT_AUTO_REGISTER

-
#define NM_SECRET_AGENT_AUTO_REGISTER       "auto-register"
-

-

-

-
-

-

-
NM_SECRET_AGENT_ERROR

-
#define NM_SECRET_AGENT_ERROR         (nm_secret_agent_error_quark ())
-

-

-

-

-

-

-
NM_SECRET_AGENT_IDENTIFIER

-
#define NM_SECRET_AGENT_IDENTIFIER          "identifier"
-

-

-

-

-

-

-
NM_SECRET_AGENT_REGISTERED

-
#define NM_SECRET_AGENT_REGISTERED          "registered"
-

+
NMSecretAgentDeleteSecretsFunc ()

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

 

+Called as a result of a request by NM to delete secrets.  When the
+NMSecretAgent subclass has finished deleting the secrets, this function
+should be called.
 

+

 


 
 

 
agent :

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




agent :
the secret agent object
connection :
the connection for which secrets were to be deleted,
+note that this object will be unrefed after the callback has returned, use
+g_object_ref()/g_object_unref() if you want to use this object after the callback
+has returned. [transfer none]
+
error :
if the deleting secrets failed, give a descriptive error here
user_data :
caller-specific data to be passed to the function

 

 

 

-
NM_SECRET_AGENT_REGISTRATION_RESULT

-
#define NM_SECRET_AGENT_REGISTRATION_RESULT "registration-result"
+
NMSecretAgentClass

+
typedef struct {
+	GObjectClass parent;
+
+	/* Virtual methods for subclasses */
+
+	/* Called when the subclass should retrieve and return secrets.  Subclass
+	 * must copy or reference any arguments it may require after returning from
+	 * this method, as the arguments will freed (except for 'self', 'callback',
+	 * and 'user_data' of course).  If the request is canceled, the callback
+	 * should still be called, but with the NM_SECRET_AGENT_ERROR_AGENT_CANCELED
+	 * error.
+	 */
+	void (*get_secrets) (NMSecretAgent *self,
+	                     NMConnection *connection,
+	                     const char *connection_path,
+	                     const char *setting_name,
+	                     const char **hints,
+	                     NMSecretAgentGetSecretsFlags flags,
+	                     NMSecretAgentGetSecretsFunc callback,
+	                     gpointer user_data);
+
+	/* Called when the subclass should cancel an outstanding request to
+	 * get secrets for a given connection.  Canceling the request MUST
+	 * call the callback that was passed along with the initial get_secrets
+	 * call, sending the NM_SECRET_AGENT_ERROR/NM_SECRET_AGENT_ERROR_AGENT_CANCELED
+	 * error to that callback.
+	 */
+	void (*cancel_get_secrets) (NMSecretAgent *self,
+	                            const char *connection_path,
+	                            const char *setting_name);
+
+	/* Called when the subclass should save the secrets contained in the
+	 * connection to backing storage.  Subclass must copy or reference any
+	 * arguments it may require after returning from this method, as the
+	 * arguments will freed (except for 'self', 'callback', and 'user_data'
+	 * of course).
+	 */
+	void (*save_secrets) (NMSecretAgent *self,
+	                      NMConnection *connection,
+	                      const char *connection_path,
+	                      NMSecretAgentSaveSecretsFunc callback,
+	                      gpointer user_data);
+
+	/* Called when the subclass should delete the secrets contained in the
+	 * connection from backing storage.  Subclass must copy or reference any
+	 * arguments it may require after returning from this method, as the
+	 * arguments will freed (except for 'self', 'callback', and 'user_data'
+	 * of course).
+	 */
+	void (*delete_secrets) (NMSecretAgent *self,
+	                        NMConnection *connection,
+	                        const char *connection_path,
+	                        NMSecretAgentDeleteSecretsFunc callback,
+	                        gpointer user_data);
+
+	/* Signals */
+	void (*registration_result) (NMSecretAgent *agent, GError *error);
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+	void (*_reserved5) (void);
+	void (*_reserved6) (void);
+} NMSecretAgentClass;
 

 

 

 

 

 

-
nm_secret_agent_delete_secrets ()

-
void                nm_secret_agent_delete_secrets      (NMSecretAgent *self,
-                                                         NMConnection *connection,
-                                                         NMSecretAgentDeleteSecretsFunc callback,
-                                                         gpointer user_data);

-

-Asynchronously ask the agent to delete all saved secrets belonging to
-connection.
-

+
nm_secret_agent_register ()

+
gboolean            nm_secret_agent_register            (NMSecretAgent *self);

 

-VFunc: delete_secrets
+Registers the NMSecretAgent with the NetworkManager secret manager,
+indicating to NetworkManager that the agent is able to provide and save
+secrets for connections on behalf of its user.  Registration is an
+asynchronous operation and its success or failure is indicated via the
+'registration-result' signal.
 

-

+

+++
@@ -539,36 +561,50 @@ VFunc: delete_secrets
 
-
-
-
-
-
-
-
-
-
-
+
+

 


 
 

 
self :

 

 
connection :
a NMConnection
-
callback :
a callback, to be invoked when the operation is done. [scope async]
-
user_data :
caller-specific data to be passed to callback. [closure]
-
Returns :
a new TRUE if registration was successfully requested (this does
+not mean registration itself was successful), FALSE if registration was not
+successfully requested.
 

 
 

 

 

 

-
nm_secret_agent_error_quark ()

-
GQuark              nm_secret_agent_error_quark         (void);

+
nm_secret_agent_unregister ()

+
gboolean            nm_secret_agent_unregister          (NMSecretAgent *self);

 

+Unregisters the NMSecretAgent with the NetworkManager secret manager,
+indicating to NetworkManager that the agent is will no longer provide or
+store secrets on behalf of this user.
 

+

++++
+
+
+
+
+
+
+
+
+
+
+




self :
a NMSecretAgent
+
Returns :
a new TRUE if unregistration was successful, FALSE if it was not.

 

 

 

 
nm_secret_agent_get_registered ()

 
gboolean            nm_secret_agent_get_registered      (NMSecretAgent *self);

-

+

+++
@@ -600,10 +636,13 @@ existing secrets without user interaction, or requesting entirely new
 secrets from the user.
 

-VFunc: get_secrets
+Virtual: get_secrets
 

-

 


 
 

 
self :

 

+

+++
@@ -642,34 +681,6 @@ VFunc: get_secrets
 

-
nm_secret_agent_register ()

-
gboolean            nm_secret_agent_register            (NMSecretAgent *self);

-

-Registers the NMSecretAgent with the NetworkManager secret manager,
-indicating to NetworkManager that the agent is able to provide and save
-secrets for connections on behalf of its user.  Registration is an
-asynchronous operation and its success or failure is indicated via the
-'registration-result' signal.
-

-

 


 
 

 
self :

 
 

--
-
-
-
-
-
-
-
-
-
-


self :
a NMSecretAgent
-
Returns :
a new TRUE if registration was successfully requested (this does
-not mean registration itself was successful), FALSE if registration was not
-successfully requested.

-

-

-

 
nm_secret_agent_save_secrets ()

 
void                nm_secret_agent_save_secrets        (NMSecretAgent *self,
                                                          NMConnection *connection,
@@ -680,10 +691,13 @@ Asyncronously ensure that all secrets inside connect
 are stored to disk.
 

 

-VFunc: save_secrets
+Virtual: save_secrets
 

-

+

+++
@@ -710,15 +724,23 @@ VFunc: save_secrets
 

-
nm_secret_agent_unregister ()

-
gboolean            nm_secret_agent_unregister          (NMSecretAgent *self);

+
nm_secret_agent_delete_secrets ()

+
void                nm_secret_agent_delete_secrets      (NMSecretAgent *self,
+                                                         NMConnection *connection,
+                                                         NMSecretAgentDeleteSecretsFunc callback,
+                                                         gpointer user_data);

 

-Unregisters the NMSecretAgent with the NetworkManager secret manager,
-indicating to NetworkManager that the agent is will no longer provide or
-store secrets on behalf of this user.
+Asynchronously ask the agent to delete all saved secrets belonging to
+connection.
+

+

+Virtual: delete_secrets
 

-

 


 
 

 
self :

 
 

+

+++
@@ -726,8 +748,19 @@ store secrets on behalf of this user.
 
-
-
+
+
+
+
+
+
+
+
+
+

 


 
 

 
self :

 

 
Returns :
a new TRUE if unregistration was successful, FALSE if it was not.
connection :
a NMConnection
+
callback :
a callback, to be invoked when the operation is done. [scope async]
+
user_data :
caller-specific data to be passed to callback. [closure]
+
 

 
 

@@ -785,8 +818,11 @@ of 3 characters.  An example valid identifier is 'org.gnome.nm-applet'
 Indicates the result of a registration request; if error is NULL the
 request was successful.
 

-

+

+++
@@ -807,6 +843,6 @@ request was successful.
 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMVPNConnection.html b/docs/libnm-glib/html/NMVPNConnection.html
index cd6d107e..4241b467 100644
--- a/docs/libnm-glib/html/NMVPNConnection.html
+++ b/docs/libnm-glib/html/NMVPNConnection.html
@@ -3,12 +3,12 @@
 NMVPNConnection
-
+
-
+
@@ -45,14 +45,14 @@
 

 


 
 

 
agent :

 
 
 
 
 
 
 
 
 
 
 
 

 

 
Synopsis

-
                    NMVPNConnection;
-                    NMVPNConnectionClass;
+
#define             NM_VPN_CONNECTION_VPN_STATE
 #define             NM_VPN_CONNECTION_BANNER
-#define             NM_VPN_CONNECTION_VPN_STATE
-const char *        nm_vpn_connection_get_banner        (NMVPNConnection *vpn);
-NMVPNConnectionState nm_vpn_connection_get_vpn_state    (NMVPNConnection *vpn);
+                    NMVPNConnection;
+                    NMVPNConnectionClass;
 GObject *           nm_vpn_connection_new               (DBusGConnection *connection,
                                                          const char *path);
+NMVPNConnectionState nm_vpn_connection_get_vpn_state    (NMVPNConnection *vpn);
+const char *        nm_vpn_connection_get_banner        (NMVPNConnection *vpn);
 

 

 

@@ -91,6 +91,22 @@ NMVPNConnection implements
 

 
Details

 

+
NM_VPN_CONNECTION_VPN_STATE

+
#define NM_VPN_CONNECTION_VPN_STATE "vpn-state"
+

+

+

+

+

+

+
NM_VPN_CONNECTION_BANNER

+
#define NM_VPN_CONNECTION_BANNER "banner"
+

+

+

+

+

+

 
NMVPNConnection

 
typedef struct _NMVPNConnection NMVPNConnection;

 

@@ -121,39 +137,31 @@ NMVPNConnection implements
 

 

 

-
NM_VPN_CONNECTION_BANNER

-
#define NM_VPN_CONNECTION_BANNER "banner"
-

-

-

-

-

-

-
NM_VPN_CONNECTION_VPN_STATE

-
#define NM_VPN_CONNECTION_VPN_STATE "vpn-state"
-

-

-

-

-

-

-
nm_vpn_connection_get_banner ()

-
const char *        nm_vpn_connection_get_banner        (NMVPNConnection *vpn);

+
nm_vpn_connection_new ()

+
GObject *           nm_vpn_connection_new               (DBusGConnection *connection,
+                                                         const char *path);

 

-Gets the VPN login banner of the active NMVPNConnection.
+Creates a new NMVPNConnection.
 

-

+

+++
-
-
+
+
+
+
+
-
+

 


 
 
vpn :
a NMVPNConnection
+
connection :
the DBusGConnection
 
 

 
path :
the DBus object path of the new connection

 
Returns :
the VPN login banner of the VPN connection. This is the internal
-string used by the connection, and must not be modified.a new connection object. [transfer full]
+
 

 
 

@@ -165,8 +173,11 @@ string used by the connection, and must not be modified.
 

 Gets the current NMVPNConnection state.
 

-

+

+++
@@ -182,28 +193,26 @@ Gets the current 
-
nm_vpn_connection_new ()

-
GObject *           nm_vpn_connection_new               (DBusGConnection *connection,
-                                                         const char *path);

+
nm_vpn_connection_get_banner ()

+
const char *        nm_vpn_connection_get_banner        (NMVPNConnection *vpn);

-Creates a new NMVPNConnection.
+Gets the VPN login banner of the active NMVPNConnection.
 

-

 


 
 

 
vpn :

 

+

+++
-
-
+
-
-
-
-
-
+

 


 
 
connection :
the DBusGConnection
+
vpn :
a NMVPNConnection
 
 

 
path :
the DBus object path of the new connection

 
Returns :
a new connection object. [transfer full]
-the VPN login banner of the VPN connection. This is the internal
+string used by the connection, and must not be modified.
 

 
 

@@ -240,8 +249,11 @@ The VPN state of the active VPN connection.
                                                         gpointer         user_data)            : Run First

 

 

-

+

+++
@@ -258,6 +270,6 @@ The VPN state of the active VPN connection.
 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMWimaxNsp.html b/docs/libnm-glib/html/NMWimaxNsp.html
index 9a233d35..34933aaa 100644
--- a/docs/libnm-glib/html/NMWimaxNsp.html
+++ b/docs/libnm-glib/html/NMWimaxNsp.html
@@ -3,12 +3,12 @@
 NMWimaxNsp
-
+
-
+
@@ -43,21 +43,21 @@
 

 


 
 

 
nmvpnconnection :

 
 
 
 
 
 
 
 
 
 
 
 

 

 
Synopsis

-
                    NMWimaxNsp;
-                    NMWimaxNspClass;
-enum                NMWimaxNspNetworkType;
-#define             NM_WIMAX_NSP_NAME
-#define             NM_WIMAX_NSP_NETWORK_TYPE
+
#define             NM_WIMAX_NSP_NAME
 #define             NM_WIMAX_NSP_SIGNAL_QUALITY
-gboolean            nm_wimax_nsp_connection_valid       (NMWimaxNsp *nsp,
-                                                         NMConnection *connection);
-GSList *            nm_wimax_nsp_filter_connections     (NMWimaxNsp *nsp,
-                                                         const GSList *connections);
-const char *        nm_wimax_nsp_get_name               (NMWimaxNsp *nsp);
-NMWimaxNspNetworkType nm_wimax_nsp_get_network_type     (NMWimaxNsp *nsp);
-guint32             nm_wimax_nsp_get_signal_quality     (NMWimaxNsp *nsp);
+#define             NM_WIMAX_NSP_NETWORK_TYPE
+enum                NMWimaxNspNetworkType;
+                    NMWimaxNsp;
+                    NMWimaxNspClass;
 GObject *           nm_wimax_nsp_new                    (DBusGConnection *connection,
                                                          const char *path);
+const char *        nm_wimax_nsp_get_name               (NMWimaxNsp *nsp);
+guint32             nm_wimax_nsp_get_signal_quality     (NMWimaxNsp *nsp);
+NMWimaxNspNetworkType nm_wimax_nsp_get_network_type     (NMWimaxNsp *nsp);
+GSList *            nm_wimax_nsp_filter_connections     (NMWimaxNsp *nsp,
+                                                         const GSList *connections);
+gboolean            nm_wimax_nsp_connection_valid       (NMWimaxNsp *nsp,
+                                                         NMConnection *connection);
 

 

 

@@ -90,25 +90,24 @@ NMWimaxNsp implements
 

 
Details

 

-
NMWimaxNsp

-
typedef struct _NMWimaxNsp NMWimaxNsp;

+
NM_WIMAX_NSP_NAME

+
#define NM_WIMAX_NSP_NAME           "name"
+

 

 

 

 

 

-
NMWimaxNspClass

-
typedef struct {
-	NMObjectClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-} NMWimaxNspClass;
+
NM_WIMAX_NSP_SIGNAL_QUALITY

+
#define NM_WIMAX_NSP_SIGNAL_QUALITY "signal-quality"
+

+

+

+

+

+

+
NM_WIMAX_NSP_NETWORK_TYPE

+
#define NM_WIMAX_NSP_NETWORK_TYPE   "network-type"
 

 

 

@@ -125,106 +124,128 @@ NMWimaxNsp implements
 

 

 

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN

+
NM_WIMAX_NSP_NETWORK_TYPE_HOME

+
NM_WIMAX_NSP_NETWORK_TYPE_PARTNER

+
NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER

+

 

 

 

-
NM_WIMAX_NSP_NAME

-
#define NM_WIMAX_NSP_NAME           "name"
-

-

-

-

-

-

-
NM_WIMAX_NSP_NETWORK_TYPE

-
#define NM_WIMAX_NSP_NETWORK_TYPE   "network-type"
-

+
NMWimaxNsp

+
typedef struct _NMWimaxNsp NMWimaxNsp;

 

 

 

 

 

-
NM_WIMAX_NSP_SIGNAL_QUALITY

-
#define NM_WIMAX_NSP_SIGNAL_QUALITY "signal-quality"
+
NMWimaxNspClass

+
typedef struct {
+	NMObjectClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+	void (*_reserved5) (void);
+	void (*_reserved6) (void);
+} NMWimaxNspClass;
 

 

 

 

 

 

-
nm_wimax_nsp_connection_valid ()

-
gboolean            nm_wimax_nsp_connection_valid       (NMWimaxNsp *nsp,
-                                                         NMConnection *connection);

+
nm_wimax_nsp_new ()

+
GObject *           nm_wimax_nsp_new                    (DBusGConnection *connection,
+                                                         const char *path);

 

-Validates a given connection against a given WiMAX NSP to ensure that the
-connection may be activated with that NSP.  The connection must match the
-nsp's network name and other attributes.
+Creates a new NMWimaxNsp.
 

-

+

+++
-
-
-
-
-
+
+
+
+
-
+

 


 
 
nsp :
an NMWimaxNsp to validate connection against

 
connection :
an NMConnection to validate against nsp
+the DBusGConnection
 
 

 
path :
the D-Bus object path of the WiMAX NSP

 
Returns :

-TRUE if the connection may be activated with this WiMAX NSP,
-FALSE if it cannot be.a new WiMAX NSP. [transfer full]
+
 

 
 

 

 

 

-
nm_wimax_nsp_filter_connections ()

-
GSList *            nm_wimax_nsp_filter_connections     (NMWimaxNsp *nsp,
-                                                         const GSList *connections);

+
nm_wimax_nsp_get_name ()

+
const char *        nm_wimax_nsp_get_name               (NMWimaxNsp *nsp);

 

-Filters a given list of connections for a given NMWimaxNsp object and
-return connections which may be activated with the access point.  Any
-returned connections will match the nsp's network name and other attributes.
+Gets the name of the wimax NSP
 

-

+

+++
-
-
-
-
-
-
+

 


 
 

 
nsp :
an NMWimaxNsp to filter connections for
connections :
a list of
-NMConnection objects to filter. [element-type NetworkManager.Connection]
+a NMWimaxNsp
 
 

 

 
Returns :
a
-list of NMConnection objects that could be activated with the given nsp.
-The elements of the list are owned by their creator and should not be freed
-by the caller, but the returned list itself is owned by the caller and should
-be freed with g_slist_free() when it is no longer required. [transfer container][element-type NetworkManager.Connection]
-the name
 

 
 

 

 

 

-
nm_wimax_nsp_get_name ()

-
const char *        nm_wimax_nsp_get_name               (NMWimaxNsp *nsp);

+
nm_wimax_nsp_get_signal_quality ()

+
guint32             nm_wimax_nsp_get_signal_quality     (NMWimaxNsp *nsp);

 

-Gets the name of the wimax NSP
+Gets the WPA signal quality of the wimax NSP.
 

-

+

+++
@@ -233,7 +254,7 @@ Gets the name of the wimax NSP
 
-
+

 


 
 

 
nsp :

 

 
Returns :
the namethe signal quality
 

 
 

@@ -245,8 +266,11 @@ Gets the name of the wimax NSP
 

 Gets the network type of the wimax NSP.
 

-

+

+++
@@ -262,50 +286,72 @@ Gets the network type of the wimax NSP.
 

-
nm_wimax_nsp_get_signal_quality ()

-
guint32             nm_wimax_nsp_get_signal_quality     (NMWimaxNsp *nsp);

+
nm_wimax_nsp_filter_connections ()

+
GSList *            nm_wimax_nsp_filter_connections     (NMWimaxNsp *nsp,
+                                                         const GSList *connections);

 

-Gets the WPA signal quality of the wimax NSP.
+Filters a given list of connections for a given NMWimaxNsp object and
+return connections which may be activated with the access point.  Any
+returned connections will match the nsp's network name and other attributes.
 

-

 


 
 

 
nsp :

 
 

+

+++
-
+
+
+
+
-
+

 


 
 

 
nsp :
a NMWimaxNsp
+an NMWimaxNsp to filter connections for
connections :
a list of
+NMConnection objects to filter. [element-type NetworkManager.Connection]
 
 

 

 
Returns :
the signal qualitya
+list of NMConnection objects that could be activated with the given nsp.
+The elements of the list are owned by their creator and should not be freed
+by the caller, but the returned list itself is owned by the caller and should
+be freed with g_slist_free() when it is no longer required. [transfer container][element-type NetworkManager.Connection]
+
 

 
 

 

 

 

-
nm_wimax_nsp_new ()

-
GObject *           nm_wimax_nsp_new                    (DBusGConnection *connection,
-                                                         const char *path);

+
nm_wimax_nsp_connection_valid ()

+
gboolean            nm_wimax_nsp_connection_valid       (NMWimaxNsp *nsp,
+                                                         NMConnection *connection);

 

-Creates a new NMWimaxNsp.
+Validates a given connection against a given WiMAX NSP to ensure that the
+connection may be activated with that NSP.  The connection must match the
+nsp's network name and other attributes.
 

-

+

+++
-
-
+
+
-
-
+
+
-
+

 


 
 
connection :
the DBusGConnection
-
nsp :
an NMWimaxNsp to validate connection against
 

 
path :
the D-Bus object path of the WiMAX NSP
connection :
an NMConnection to validate against nsp
+
 

 

 
Returns :
a new WiMAX NSP. [transfer full]
-
+TRUE if the connection may be activated with this WiMAX NSP,
+FALSE if it cannot be.
 

 
 

@@ -344,6 +390,6 @@ The signal quality of the WiMAX NSP.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/annotation-glossary.html b/docs/libnm-glib/html/annotation-glossary.html
index 7555a67a..b8c851e4 100644
--- a/docs/libnm-glib/html/annotation-glossary.html
+++ b/docs/libnm-glib/html/annotation-glossary.html
@@ -3,11 +3,11 @@
 
 
 Annotation Glossary
-
+
 
 
 
-
+
 
 
 
@@ -20,67 +20,63 @@
  
 
 
-O
+C
                       | 
-                   S
+                   T
                       | 
                    A
                       | 
-                   C
+                   S
+                      | 
+                   E
                       | 
                    T
                       | 
                    A
                       | 
-                   E
+                   T
+                      | 
+                   O
                       | 
                    T
 
 
 

-

-Annotation Glossary

-
O

-

-out

-
Parameter for returning results. Default is transfer full.

-
S

-

-scope async

-
The callback is valid until first called.

-
A

-

-allow-none

-
NULL is ok, both for passing and for returning.

+

+Annotation Glossary

 
C

-

-closure

-
This parameter is a 'user_data', for callbacks; many bindings can pass NULL here.

+
closure

+
This parameter is a 'user_data', for callbacks; many bindings can pass NULL here.

 
T

-

-transfer none

-
Don't free data after the code is done.

+
transfer container

+
Free data container after the code is done.

 
A

-

-array

-
Parameter points to an array of items.

+
allow-none

+
NULL is ok, both for passing and for returning.

+
S

+
scope async

+
The callback is valid until first called.

 
E

-

-element-type

-
Generics and defining elements of containers and arrays.

+
element-type

+
Generics and defining elements of containers and arrays.

+
T

+
transfer none

+
Don't free data after the code is done.

+
A

+
array

+
Parameter points to an array of items.

+
T

+
type

+
Override the parsed C type with given type.

+
O

+
out

+
Parameter for returning results. Default is transfer full.

 
T

-

-transfer container

-
Free data container after the code is done.

-

-transfer full

-
Free data after the code is done.

-

-type

-
Override the parsed C type with given type

+
transfer full

+
Free data after the code is done.

 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/api-index-full.html b/docs/libnm-glib/html/api-index-full.html
index bd62549a..fd9de82b 100644
--- a/docs/libnm-glib/html/api-index-full.html
+++ b/docs/libnm-glib/html/api-index-full.html
@@ -3,12 +3,12 @@
 
 
 API Index
-
+
 
 
 
 
-
+
 
 
 
@@ -41,8 +41,8 @@
 
 
 

-

-API Index

+

+API Index

 
A

 

 NMAccessPoint, struct in NMAccessPoint
@@ -310,10 +310,18 @@
 

 

 

+NMClient:activating-connection, object property in NMClient
+

+

+

 NMClient:active-connections, object property in NMClient
 

 

 

+NMClient:connectivity, object property in NMClient
+

+

+

 NMClient:manager-running, object property in NMClient
 

 

@@ -322,6 +330,10 @@
 
 

 

+NMClient:primary-connection, object property in NMClient
+

+

+

 NMClient:state, object property in NMClient
 

 

@@ -378,6 +390,10 @@
 
 

 

+NM_CLIENT_ACTIVATING_CONNECTION, macro in NMClient
+

+

+

 NM_CLIENT_ACTIVE_CONNECTIONS, macro in NMClient
 

 

@@ -386,14 +402,38 @@
 
 

 

+nm_client_check_connectivity, function in NMClient
+

+

+

+nm_client_check_connectivity_async, function in NMClient
+

+

+

+nm_client_check_connectivity_finish, function in NMClient
+

+

+

+NM_CLIENT_CONNECTIVITY, macro in NMClient
+

+

+

 nm_client_deactivate_connection, function in NMClient
 

 

 

+nm_client_get_activating_connection, function in NMClient
+

+

+

 nm_client_get_active_connections, function in NMClient
 

 

 

+nm_client_get_connectivity, function in NMClient
+

+

+

 nm_client_get_devices, function in NMClient
 

 

@@ -418,6 +458,10 @@
 
 

 

+nm_client_get_primary_connection, function in NMClient
+

+

+

 nm_client_get_state, function in NMClient
 

 

@@ -454,6 +498,10 @@
 
 

 

+NM_CLIENT_PRIMARY_CONNECTION, macro in NMClient
+

+

+

 nm_client_set_logging, function in NMClient
 

 

@@ -2108,23 +2156,23 @@
 
 

 

-NMVpnPluginUiCapability, enum in NMVpnPluginUiWidget
+NMVpnPluginUiCapability, enum in NMVpnPluginUi
 

 

 

-NMVpnPluginUiFactory, user_function in NMVpnPluginUiWidget
+NMVpnPluginUiFactory, user_function in NMVpnPluginUi
 

 

 

-NMVpnPluginUiInterface, struct in NMVpnPluginUiWidget
+NMVpnPluginUiInterface, struct in NMVpnPluginUi
 

 

 

-NMVpnPluginUiInterfaceProp, enum in NMVpnPluginUiWidget
+NMVpnPluginUiInterfaceProp, enum in NMVpnPluginUi
 

 

 

-NMVpnPluginUiWidgetInterface, struct in NMVpnPluginUiWidget
+NMVpnPluginUiWidgetInterface, struct in NMVpnPluginUi
 

 

 

@@ -2196,55 +2244,55 @@
 

 

 

-nm_vpn_plugin_ui_factory, function in NMVpnPluginUiWidget
+nm_vpn_plugin_ui_factory, function in NMVpnPluginUi
 

 

 

-nm_vpn_plugin_ui_interface_delete_connection, function in NMVpnPluginUiWidget
+nm_vpn_plugin_ui_interface_delete_connection, function in NMVpnPluginUi
 

 

 

-NM_VPN_PLUGIN_UI_INTERFACE_DESC, macro in NMVpnPluginUiWidget
+NM_VPN_PLUGIN_UI_INTERFACE_DESC, macro in NMVpnPluginUi
 

 

 

-nm_vpn_plugin_ui_interface_export, function in NMVpnPluginUiWidget
+nm_vpn_plugin_ui_interface_export, function in NMVpnPluginUi
 

 

 

-nm_vpn_plugin_ui_interface_get_capabilities, function in NMVpnPluginUiWidget
+nm_vpn_plugin_ui_interface_get_capabilities, function in NMVpnPluginUi
 

 

 

-nm_vpn_plugin_ui_interface_get_suggested_name, function in NMVpnPluginUiWidget
+nm_vpn_plugin_ui_interface_get_suggested_name, function in NMVpnPluginUi
 

 

 

-nm_vpn_plugin_ui_interface_import, function in NMVpnPluginUiWidget
+nm_vpn_plugin_ui_interface_import, function in NMVpnPluginUi
 

 

 

-NM_VPN_PLUGIN_UI_INTERFACE_NAME, macro in NMVpnPluginUiWidget
+NM_VPN_PLUGIN_UI_INTERFACE_NAME, macro in NMVpnPluginUi
 

 

 

-NM_VPN_PLUGIN_UI_INTERFACE_SERVICE, macro in NMVpnPluginUiWidget
+NM_VPN_PLUGIN_UI_INTERFACE_SERVICE, macro in NMVpnPluginUi
 

 

 

-nm_vpn_plugin_ui_interface_ui_factory, function in NMVpnPluginUiWidget
+nm_vpn_plugin_ui_interface_ui_factory, function in NMVpnPluginUi
 

 

 

-nm_vpn_plugin_ui_widget_interface_get_widget, function in NMVpnPluginUiWidget
+nm_vpn_plugin_ui_widget_interface_get_widget, function in NMVpnPluginUi
 

 

 

-nm_vpn_plugin_ui_widget_interface_save_secrets, function in NMVpnPluginUiWidget
+nm_vpn_plugin_ui_widget_interface_save_secrets, function in NMVpnPluginUi
 

 

 

-nm_vpn_plugin_ui_widget_interface_update_connection, function in NMVpnPluginUiWidget
+nm_vpn_plugin_ui_widget_interface_update_connection, function in NMVpnPluginUi
 

 

 

@@ -2319,6 +2367,6 @@
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/ch02.html b/docs/libnm-glib/html/ch02.html
index a739d343..a14eec19 100644
--- a/docs/libnm-glib/html/ch02.html
+++ b/docs/libnm-glib/html/ch02.html
@@ -3,12 +3,12 @@
 
 
 libnm-glib API Reference
-
+
 
 
 
 
-
+
 
 
 
@@ -20,9 +20,9 @@
 Next
 
 

-

-libnm-glib API Reference

-

+

+libnm-glib API Reference

+

 

 NMClient
 

@@ -105,7 +105,7 @@
 NMVPNPlugin
 
 

-NMVpnPluginUiWidget
+NMVpnPluginUi
 

 

 nm-vpn-plugin-utils
@@ -114,6 +114,6 @@
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html
index aec8180a..36d9df96 100644
--- a/docs/libnm-glib/html/index.html
+++ b/docs/libnm-glib/html/index.html
@@ -3,10 +3,10 @@
 
 
 libnm-glib Reference Manual
-
+
 
 
-
+
 
 
 
@@ -15,14 +15,14 @@
 

 

 

-      for libnm-glib 0.9.8.0
+      for libnm-glib 0.9.8.8
 
       The latest version of this documentation can be found on-line at
       http://projects.gnome.org/NetworkManager/developers/libnm-glib/09/.
     

 
Copyright © 2012 The NetworkManager Authors

 

-

+

 	Permission is granted to copy, distribute and/or modify this
 	document under the terms of the GNU Free
 	Documentation License, Version 1.1 or any later
@@ -46,7 +46,7 @@
 

 

 

-

+

 
Object Overview

 
libnm-glib API Reference

 

@@ -132,7 +132,7 @@
 NMVPNPlugin
 
 

-NMVpnPluginUiWidget
+NMVpnPluginUi
 

 

 nm-vpn-plugin-utils
@@ -145,6 +145,6 @@
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/index.sgml b/docs/libnm-glib/html/index.sgml
index a839322b..993d7c9a 100644
--- a/docs/libnm-glib/html/index.sgml
+++ b/docs/libnm-glib/html/index.sgml
@@ -7,10 +7,20 @@
 
 
 
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -30,49 +40,51 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
 
+
 
 
-
-
-
-
-
-
-
-
-
 
 
-
-
-
-
-
-
-
-
 
-
 
+
 
-
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
+
 
+
 
 
+
 
 
 
@@ -92,25 +104,25 @@
 
 
 
-
-
 
+
+
+
+
 
 
-
 
-
-
-
+
+
+
 
+
+
+
+
 
 
-
 
-
-
-
-
 
 
 
@@ -128,57 +140,57 @@
 
 
 
-
-
-
-
-
-
-
 
-
-
+
+
+
 
 
-
 
-
+
+
+
+
 
+
 
-
-
-
+
 
 
-
+
+
 
-
-
-
-
-
-
-
-
+
+
+
+
+
+
 
-
-
+
 
 
-
 
-
+
+
+
+
+
 
+
 
-
-
-
+
 
 
-
+
+
+
 
-
-
+
+
+
+
+
 
 
 
@@ -210,25 +222,25 @@
 
 
 
-
-
 
 
 
 
 
 
-
 
+
 
 
 
-
-
+
+
+
+
 
 
 
-
+
 
 
 
@@ -242,8 +254,6 @@
 
 
 
-
-
 
 
 
@@ -252,24 +262,26 @@
 
 
 
-
-
-
-
 
+
 
-
 
-
-
-
-
-
-
+
+
+
+
+
+
+
 
-
 
-
+
+
+
+
+
+
+
 
 
 
@@ -288,19 +300,19 @@
 
 
 
-
-
 
 
 
 
 
-
 
-
 
-
+
+
+
+
 
+
 
 
 
@@ -311,8 +323,6 @@
 
 
 
-
-
 
 
 
@@ -320,15 +330,17 @@
 
 
 
-
 
+
 
 
-
-
+
+
+
+
 
 
-
+
 
 
 
@@ -341,33 +353,33 @@
 
 
 
-
-
 
 
 
 
 
 
-
-
-
-
 
+
 
+
+
 
+
 
-
-
-
-
-
+
+
+
+
 
+
 
 
+
 
+
 
-
+
 
 
 
@@ -386,17 +398,17 @@
 
 
 
-
-
 
 
 
 
-
 
 
-
+
+
+
 
+
 
 
 
@@ -406,22 +418,22 @@
 
 
 
-
-
 
 
 
 
 
-
 
+
 
+
 
-
-
+
+
+
 
+
 
-
 
 
 
@@ -433,22 +445,22 @@
 
 
 
-
-
 
 
 
 
 
-
 
+
 
+
 
-
-
+
+
+
 
+
 
-
 
 
 
@@ -460,21 +472,21 @@
 
 
 
-
-
 
 
 
 
 
 
-
 
-
 
-
-
+
+
+
+
 
+
+
 
 
 
@@ -485,23 +497,23 @@
 
 
 
-
-
 
 
 
 
 
 
-
 
+
 
+
 
-
-
+
+
+
 
+
 
-
 
 
 
@@ -513,21 +525,21 @@
 
 
 
-
-
 
 
 
 
-
-
 
-
 
-
-
-
+
+
+
+
+
 
+
+
+
 
 
 
@@ -539,18 +551,22 @@
 
 
 
-
-
-
 
-
 
-
-
+
+
+
+
+
+
+
+
+
 
-
 
-
+
+
+
 
 
 
@@ -562,31 +578,31 @@
 
 
 
-
-
-
 
-
-
-
-
+
 
 
+
+
+
+
 
-
-
-
-
+
+
+
+
 
-
-
-
-
+
 
 
+
+
+
+
 
-
-
+
+
+
 
 
 
@@ -608,16 +624,16 @@
 
 
 
-
 
+
 
 
+
 
-
 
+
 
 
-
 
 
 
@@ -634,14 +650,14 @@
 
 
 
-
 
+
 
+
 
-
 
+
 
-
 
 
 
@@ -657,9 +673,9 @@
 
 
 
-
-
 
+
+
 
 
 
@@ -672,9 +688,9 @@
 
 
 
-
-
 
+
+
 
 
 
@@ -685,15 +701,15 @@
 
 
 
-
-
 
 
 
-
-
 
 
+
+
+
+
 
 
 
@@ -709,17 +725,17 @@
 
 
 
+
+
 
 
 
 
 
-
-
+
 
 
 
-
 
 
 
@@ -736,29 +752,29 @@
 
 
 
-
-
-
 
 
 
 
-
-
-
-
 
+
+
+
 
+
 
-
-
-
-
-
-
+
+
+
+
+
 
 
 
+
+
+
+
 
 
 
@@ -779,9 +795,8 @@
 
 
 
-
-
-
+
+
 
 
 
@@ -794,20 +809,21 @@
 
 
 
-
-
-
-
 
+
 
 
-
-
+
+
+
+
+
+
+
 
 
-
 
-
+
 
 
 
@@ -822,13 +838,13 @@
 
 
 
+
+
 
 
-
-
-
-
 
+
+
 
 
 
@@ -838,8 +854,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -850,60 +866,60 @@
 
 
 
-
-
-
+
+
 
-
 
 
+
+
+
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
 
-
 
-
-
-
+
 
+
+
+
+
 
 
-
-
-
 
+
+
diff --git a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
index c98b390a..f283bae7 100644
--- a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
+++ b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
@@ -3,12 +3,12 @@
 
 
 NMVPNPlugin
-
+
 
 
 
-
-
+
+
 
 
 
@@ -18,7 +18,7 @@
 Up
 Home
 libnm-glib Reference Manual
-Next
+Next
 
 
 Top
@@ -37,28 +37,28 @@
 

 

 
Synopsis

-
                    NMVPNPlugin;
-                    NMVPNPluginClass;
-enum                NMVPNPluginError;
-#define             NM_VPN_PLUGIN_DBUS_SERVICE_NAME
+
#define             NM_VPN_PLUGIN_DBUS_SERVICE_NAME
 #define             NM_VPN_PLUGIN_STATE
-gboolean            nm_vpn_plugin_disconnect            (NMVPNPlugin *plugin,
-                                                         GError **err);
+enum                NMVPNPluginError;
+                    NMVPNPlugin;
+                    NMVPNPluginClass;
 GQuark              nm_vpn_plugin_error_quark           (void);
-void                nm_vpn_plugin_failure               (NMVPNPlugin *plugin,
-                                                         NMVPNPluginFailure reason);
 DBusGConnection *   nm_vpn_plugin_get_connection        (NMVPNPlugin *plugin);
 NMVPNServiceState   nm_vpn_plugin_get_state             (NMVPNPlugin *plugin);
+void                nm_vpn_plugin_set_state             (NMVPNPlugin *plugin,
+                                                         NMVPNServiceState state);
+void                nm_vpn_plugin_set_login_banner      (NMVPNPlugin *plugin,
+                                                         const char *banner);
+void                nm_vpn_plugin_failure               (NMVPNPlugin *plugin,
+                                                         NMVPNPluginFailure reason);
 void                nm_vpn_plugin_set_config            (NMVPNPlugin *plugin,
                                                          GHashTable *config);
 void                nm_vpn_plugin_set_ip4_config        (NMVPNPlugin *plugin,
                                                          GHashTable *ip4_config);
 void                nm_vpn_plugin_set_ip6_config        (NMVPNPlugin *plugin,
                                                          GHashTable *ip6_config);
-void                nm_vpn_plugin_set_login_banner      (NMVPNPlugin *plugin,
-                                                         const char *banner);
-void                nm_vpn_plugin_set_state             (NMVPNPlugin *plugin,
-                                                         NMVPNServiceState state);
+gboolean            nm_vpn_plugin_disconnect            (NMVPNPlugin *plugin,
+                                                         GError **err);
 

 

 

@@ -69,60 +69,16 @@ enum                
 
Details

 

-
NMVPNPlugin

-
typedef struct {
-	GObject parent;
-} NMVPNPlugin;
+
NM_VPN_PLUGIN_DBUS_SERVICE_NAME

+
#define NM_VPN_PLUGIN_DBUS_SERVICE_NAME "service-name"
 

 

 

 

 

 

-
NMVPNPluginClass

-
typedef struct {
-	GObjectClass parent;
-
-	/* virtual methods */
-	gboolean (*connect)      (NMVPNPlugin   *plugin,
-	                          NMConnection  *connection,
-	                          GError       **err);
-
-	gboolean (*need_secrets) (NMVPNPlugin *plugin,
-	                          NMConnection *connection,
-	                          char **setting_name,
-	                          GError **error);
-
-	gboolean (*disconnect)   (NMVPNPlugin   *plugin,
-	                          GError       **err);
-
-	/* Signals */
-	void (*state_changed)  (NMVPNPlugin *plugin,
-	                        NMVPNServiceState state);
-
-	void (*ip4_config)     (NMVPNPlugin *plugin,
-	                        GHashTable  *ip4_config);
-
-	void (*login_banner)   (NMVPNPlugin *plugin,
-	                        const char *banner);
-
-	void (*failure)        (NMVPNPlugin *plugin,
-	                        NMVPNPluginFailure reason);
-
-	void (*quit)           (NMVPNPlugin *plugin);
-
-	void (*config)         (NMVPNPlugin *plugin,
-	                        GHashTable  *config);
-
-	void (*ip6_config)     (NMVPNPlugin *plugin,
-	                        GHashTable  *config);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMVPNPluginClass;
+
NM_VPN_PLUGIN_STATE

+
#define NM_VPN_PLUGIN_STATE             "state"
 

 

 

@@ -145,8 +101,11 @@ enum                
+

+++
@@ -208,54 +167,106 @@ Returned by the VPN service plugin to indicate errors.
 

-
NM_VPN_PLUGIN_DBUS_SERVICE_NAME

-
#define NM_VPN_PLUGIN_DBUS_SERVICE_NAME "service-name"
+
NMVPNPlugin

+
typedef struct {
+	GObject parent;
+} NMVPNPlugin;
 

 

 

 

-
NM_VPN_PLUGIN_STATE

-
#define NM_VPN_PLUGIN_STATE             "state"
+
NMVPNPluginClass

+
typedef struct {
+	GObjectClass parent;
+
+	/* virtual methods */
+	gboolean (*connect)      (NMVPNPlugin   *plugin,
+	                          NMConnection  *connection,
+	                          GError       **err);
+
+	gboolean (*need_secrets) (NMVPNPlugin *plugin,
+	                          NMConnection *connection,
+	                          char **setting_name,
+	                          GError **error);
+
+	gboolean (*disconnect)   (NMVPNPlugin   *plugin,
+	                          GError       **err);
+
+	/* Signals */
+	void (*state_changed)  (NMVPNPlugin *plugin,
+	                        NMVPNServiceState state);
+
+	void (*ip4_config)     (NMVPNPlugin *plugin,
+	                        GHashTable  *ip4_config);
+
+	void (*login_banner)   (NMVPNPlugin *plugin,
+	                        const char *banner);
+
+	void (*failure)        (NMVPNPlugin *plugin,
+	                        NMVPNPluginFailure reason);
+
+	void (*quit)           (NMVPNPlugin *plugin);
+
+	void (*config)         (NMVPNPlugin *plugin,
+	                        GHashTable  *config);
+
+	void (*ip6_config)     (NMVPNPlugin *plugin,
+	                        GHashTable  *config);
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMVPNPluginClass;
 

 

 

 

-
nm_vpn_plugin_disconnect ()

-
gboolean            nm_vpn_plugin_disconnect            (NMVPNPlugin *plugin,
-                                                         GError **err);

+
nm_vpn_plugin_error_quark ()

+
GQuark              nm_vpn_plugin_error_quark           (void);

 

 

 

-
nm_vpn_plugin_error_quark ()

-
GQuark              nm_vpn_plugin_error_quark           (void);

+
nm_vpn_plugin_get_connection ()

+
DBusGConnection *   nm_vpn_plugin_get_connection        (NMVPNPlugin *plugin);

 

 

 

-
nm_vpn_plugin_failure ()

-
void                nm_vpn_plugin_failure               (NMVPNPlugin *plugin,
-                                                         NMVPNPluginFailure reason);

+
nm_vpn_plugin_get_state ()

+
NMVPNServiceState   nm_vpn_plugin_get_state             (NMVPNPlugin *plugin);

 

 

 

-
nm_vpn_plugin_get_connection ()

-
DBusGConnection *   nm_vpn_plugin_get_connection        (NMVPNPlugin *plugin);

+
nm_vpn_plugin_set_state ()

+
void                nm_vpn_plugin_set_state             (NMVPNPlugin *plugin,
+                                                         NMVPNServiceState state);

 

 

 

-
nm_vpn_plugin_get_state ()

-
NMVPNServiceState   nm_vpn_plugin_get_state             (NMVPNPlugin *plugin);

+
nm_vpn_plugin_set_login_banner ()

+
void                nm_vpn_plugin_set_login_banner      (NMVPNPlugin *plugin,
+                                                         const char *banner);

+

+

+

+

+

+
nm_vpn_plugin_failure ()

+
void                nm_vpn_plugin_failure               (NMVPNPlugin *plugin,
+                                                         NMVPNPluginFailure reason);

 

 

 

@@ -285,17 +296,9 @@ Returned by the VPN service plugin to indicate errors.
 

-
nm_vpn_plugin_set_login_banner ()

-
void                nm_vpn_plugin_set_login_banner      (NMVPNPlugin *plugin,
-                                                         const char *banner);

-

-

-

-

-

-
nm_vpn_plugin_set_state ()

-
void                nm_vpn_plugin_set_state             (NMVPNPlugin *plugin,
-                                                         NMVPNServiceState state);

+
nm_vpn_plugin_disconnect ()

+
gboolean            nm_vpn_plugin_disconnect            (NMVPNPlugin *plugin,
+                                                         GError **err);

 

 

 

@@ -303,6 +306,6 @@ Returned by the VPN service plugin to indicate errors.
 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html
new file mode 100644
index 00000000..fb13eb06
--- /dev/null
+++ b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUi.html
@@ -0,0 +1,388 @@
+
+
+
+
+NMVpnPluginUi
+
+
+
+
+
+
+
+
+
+

 


 
 

 
NM_VPN_PLUGIN_ERROR_GENERAL

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

+
+
+
+
+
+
+
+
+
+

+

+

+
+
+

+
NMVpnPluginUi

+
NMVpnPluginUi

+

+

+
Synopsis

+
NMVpnPluginUiInterface * (*NMVpnPluginUiFactory)        (GError **error);
+NMVpnPluginUiInterface * nm_vpn_plugin_ui_factory       (GError **error);
+enum                NMVpnPluginUiCapability;
+#define             NM_VPN_PLUGIN_UI_INTERFACE_NAME
+#define             NM_VPN_PLUGIN_UI_INTERFACE_DESC
+#define             NM_VPN_PLUGIN_UI_INTERFACE_SERVICE
+enum                NMVpnPluginUiInterfaceProp;
+struct              NMVpnPluginUiInterface;
+NMVpnPluginUiWidgetInterface * nm_vpn_plugin_ui_interface_ui_factory
+                                                        (NMVpnPluginUiInterface *iface,
+                                                         NMConnection *connection,
+                                                         GError **error);
+guint32             nm_vpn_plugin_ui_interface_get_capabilities
+                                                        (NMVpnPluginUiInterface *iface);
+NMConnection *      nm_vpn_plugin_ui_interface_import   (NMVpnPluginUiInterface *iface,
+                                                         const char *path,
+                                                         GError **error);
+gboolean            nm_vpn_plugin_ui_interface_export   (NMVpnPluginUiInterface *iface,
+                                                         const char *path,
+                                                         NMConnection *connection,
+                                                         GError **error);
+char *              nm_vpn_plugin_ui_interface_get_suggested_name
+                                                        (NMVpnPluginUiInterface *iface,
+                                                         NMConnection *connection);
+gboolean            nm_vpn_plugin_ui_interface_delete_connection
+                                                        (NMVpnPluginUiInterface *iface,
+                                                         NMConnection *connection,
+                                                         GError **error);
+struct              NMVpnPluginUiWidgetInterface;
+GObject *           nm_vpn_plugin_ui_widget_interface_get_widget
+                                                        (NMVpnPluginUiWidgetInterface *iface);
+gboolean            nm_vpn_plugin_ui_widget_interface_update_connection
+                                                        (NMVpnPluginUiWidgetInterface *iface,
+                                                         NMConnection *connection,
+                                                         GError **error);
+gboolean            nm_vpn_plugin_ui_widget_interface_save_secrets
+                                                        (NMVpnPluginUiWidgetInterface *iface,
+                                                         NMConnection *connection,
+                                                         GError **error);
+

+

+

+
Description

+

+

+

+

+
Details

+

+
NMVpnPluginUiFactory ()

+
NMVpnPluginUiInterface * (*NMVpnPluginUiFactory)        (GError **error);

+

+

+

+

+

+
nm_vpn_plugin_ui_factory ()

+
NMVpnPluginUiInterface * nm_vpn_plugin_ui_factory       (GError **error);

+

+

+

+

+

+
enum NMVpnPluginUiCapability

+
typedef enum {
+	NM_VPN_PLUGIN_UI_CAPABILITY_NONE   = 0x00,
+	NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT = 0x01,
+	NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT = 0x02,
+	NM_VPN_PLUGIN_UI_CAPABILITY_IPV6   = 0x04
+} NMVpnPluginUiCapability;
+

+

+Flags that indicate to UI programs certain capabilities of the plugin.
+

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




NM_VPN_PLUGIN_UI_CAPABILITY_NONE
unknown or no capability
+
NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT
the plugin can import new connections
+
NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT
the plugin can export connections
+
NM_VPN_PLUGIN_UI_CAPABILITY_IPV6
the plugin supports IPv6 addressing
+

+

+

+

+
NM_VPN_PLUGIN_UI_INTERFACE_NAME

+
#define NM_VPN_PLUGIN_UI_INTERFACE_NAME "name"
+

+

+

+

+

+

+
NM_VPN_PLUGIN_UI_INTERFACE_DESC

+
#define NM_VPN_PLUGIN_UI_INTERFACE_DESC "desc"
+

+

+

+

+

+

+
NM_VPN_PLUGIN_UI_INTERFACE_SERVICE

+
#define NM_VPN_PLUGIN_UI_INTERFACE_SERVICE "service"
+

+

+

+

+

+

+
enum NMVpnPluginUiInterfaceProp

+
typedef enum {
+	NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME = NM_VPN_PLUGIN_UI_INTERFACE_PROP_FIRST,
+	NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC,
+	NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE
+} NMVpnPluginUiInterfaceProp;
+

+

+GObject property numbers that plugins should override to provide certain
+information to UI programs.
+

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME
the VPN plugin's name
+
NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC
description of the VPN plugin and what
+VPN services it supports
+
NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE
the D-Bus service name used by the
+plugin's VPN service daemon
+

+

+

+

+
struct NMVpnPluginUiInterface

+
struct NMVpnPluginUiInterface {
+	GTypeInterface g_iface;
+
+	/* Plugin's factory function that returns a GObject that implements
+	 * NMVpnPluginUiWidgetInterface, pre-filled with values from 'connection'
+	 * if non-NULL.
+	 */
+	NMVpnPluginUiWidgetInterface * (*ui_factory) (NMVpnPluginUiInterface *iface,
+	                                              NMConnection *connection,
+	                                              GError **error);
+
+	/* Plugin's capabiltity function that returns a bitmask of capabilities
+	 * described by NM_VPN_PLUGIN_UI_CAPABILITY_* defines.
+	 */
+	guint32 (*get_capabilities) (NMVpnPluginUiInterface *iface);
+
+	/* Try to import a connection from the specified path.  On success, return a
+	 * partial NMConnection object.  On error, return NULL and set 'error' with
+	 * additional information.  Note that 'error' can be NULL, in which case no
+	 * additional error information should be provided.
+	 */
+	NMConnection * (*import_from_file) (NMVpnPluginUiInterface *iface,
+	                                    const char *path,
+	                                    GError **error);
+
+	/* Export the given connection to the specified path.  Return TRUE on success.
+	 * On error, return FALSE and set 'error' with additional error information.
+	 * Note that 'error' can be NULL, in which case no additional error information
+	 * should be provided.
+	 */
+	gboolean (*export_to_file) (NMVpnPluginUiInterface *iface,
+	                            const char *path,
+	                            NMConnection *connection,
+	                            GError **error);
+
+	/* For a given connection, return a suggested file name.  Returned value should
+	 * be NULL or a suggested file name allocated via g_malloc/g_new/etc to be freed
+	 * by the caller.
+	 */
+	char * (*get_suggested_name) (NMVpnPluginUiInterface *iface, NMConnection *connection);
+
+	/* Deprecated and no longer used */
+	gboolean (*delete_connection) (NMVpnPluginUiInterface *iface, NMConnection *connection, GError **error);
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+	void (*_reserved5) (void);
+	void (*_reserved6) (void);
+};
+

+

+

+

+

+

+
nm_vpn_plugin_ui_interface_ui_factory ()

+
NMVpnPluginUiWidgetInterface * nm_vpn_plugin_ui_interface_ui_factory
+                                                        (NMVpnPluginUiInterface *iface,
+                                                         NMConnection *connection,
+                                                         GError **error);

+

+

+

+

+

+
nm_vpn_plugin_ui_interface_get_capabilities ()

+
guint32             nm_vpn_plugin_ui_interface_get_capabilities
+                                                        (NMVpnPluginUiInterface *iface);

+

+

+

+

+

+
nm_vpn_plugin_ui_interface_import ()

+
NMConnection *      nm_vpn_plugin_ui_interface_import   (NMVpnPluginUiInterface *iface,
+                                                         const char *path,
+                                                         GError **error);

+

+

+

+

+

+
nm_vpn_plugin_ui_interface_export ()

+
gboolean            nm_vpn_plugin_ui_interface_export   (NMVpnPluginUiInterface *iface,
+                                                         const char *path,
+                                                         NMConnection *connection,
+                                                         GError **error);

+

+

+

+

+

+
nm_vpn_plugin_ui_interface_get_suggested_name ()

+
char *              nm_vpn_plugin_ui_interface_get_suggested_name
+                                                        (NMVpnPluginUiInterface *iface,
+                                                         NMConnection *connection);

+

+

+

+

+

+
nm_vpn_plugin_ui_interface_delete_connection ()

+
gboolean            nm_vpn_plugin_ui_interface_delete_connection
+                                                        (NMVpnPluginUiInterface *iface,
+                                                         NMConnection *connection,
+                                                         GError **error);

+

+

+

+

+

+
struct NMVpnPluginUiWidgetInterface

+
struct NMVpnPluginUiWidgetInterface {
+	GTypeInterface g_iface;
+
+	/* Return the GtkWidget for the VPN's UI */
+	GObject * (*get_widget) (NMVpnPluginUiWidgetInterface *iface);
+
+	/* Called to save the user-entered options to the connection object.  Should
+	 * return FALSE and set 'error' if the current options are invalid.  'error'
+	 * should contain enough information for the plugin to determine which UI
+	 * widget is invalid at a later point in time.  For example, creating unique
+	 * error codes for what error occurred and populating the message field
+	 * of 'error' with the name of the invalid property.
+	 */
+	gboolean (*update_connection) (NMVpnPluginUiWidgetInterface *iface,
+	                               NMConnection *connection,
+	                               GError **error);
+
+	/* Deprecated and no longer used */
+	gboolean (*save_secrets) (NMVpnPluginUiWidgetInterface *iface,
+	                          NMConnection *connection,
+	                          GError **error);
+
+	/* Emitted when the value of a UI widget changes.  May trigger a validity
+	 * check via update_connection() to write values to the connection */
+	void (*changed) (NMVpnPluginUiWidgetInterface *iface);
+};
+

+

+

+

+

+

+
nm_vpn_plugin_ui_widget_interface_get_widget ()

+
GObject *           nm_vpn_plugin_ui_widget_interface_get_widget
+                                                        (NMVpnPluginUiWidgetInterface *iface);

+

+

+

+

+

+
nm_vpn_plugin_ui_widget_interface_update_connection ()

+
gboolean            nm_vpn_plugin_ui_widget_interface_update_connection
+                                                        (NMVpnPluginUiWidgetInterface *iface,
+                                                         NMConnection *connection,
+                                                         GError **error);

+

+

+

+

+

+
nm_vpn_plugin_ui_widget_interface_save_secrets ()

+
gboolean            nm_vpn_plugin_ui_widget_interface_save_secrets
+                                                        (NMVpnPluginUiWidgetInterface *iface,
+                                                         NMConnection *connection,
+                                                         GError **error);

+

+

+

+

+

+

+

+          Generated by GTK-Doc V1.19

+
+
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
deleted file mode 100644
index 4a1f1f8a..00000000
--- a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
+++ /dev/null
@@ -1,382 +0,0 @@
-
-
-
-
-NMVpnPluginUiWidget
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

-

-

-
-
-

-
NMVpnPluginUiWidget

-
NMVpnPluginUiWidget

-

-

-
Synopsis

-
enum                NMVpnPluginUiCapability;
-NMVpnPluginUiInterface * (*NMVpnPluginUiFactory)        (GError **error);
-struct              NMVpnPluginUiInterface;
-enum                NMVpnPluginUiInterfaceProp;
-struct              NMVpnPluginUiWidgetInterface;
-#define             NM_VPN_PLUGIN_UI_INTERFACE_DESC
-#define             NM_VPN_PLUGIN_UI_INTERFACE_NAME
-#define             NM_VPN_PLUGIN_UI_INTERFACE_SERVICE
-NMVpnPluginUiInterface * nm_vpn_plugin_ui_factory       (GError **error);
-gboolean            nm_vpn_plugin_ui_interface_delete_connection
-                                                        (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);
-gboolean            nm_vpn_plugin_ui_interface_export   (NMVpnPluginUiInterface *iface,
-                                                         const char *path,
-                                                         NMConnection *connection,
-                                                         GError **error);
-guint32             nm_vpn_plugin_ui_interface_get_capabilities
-                                                        (NMVpnPluginUiInterface *iface);
-char *              nm_vpn_plugin_ui_interface_get_suggested_name
-                                                        (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection);
-NMConnection *      nm_vpn_plugin_ui_interface_import   (NMVpnPluginUiInterface *iface,
-                                                         const char *path,
-                                                         GError **error);
-NMVpnPluginUiWidgetInterface * nm_vpn_plugin_ui_interface_ui_factory
-                                                        (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);
-GObject *           nm_vpn_plugin_ui_widget_interface_get_widget
-                                                        (NMVpnPluginUiWidgetInterface *iface);
-gboolean            nm_vpn_plugin_ui_widget_interface_save_secrets
-                                                        (NMVpnPluginUiWidgetInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);
-gboolean            nm_vpn_plugin_ui_widget_interface_update_connection
-                                                        (NMVpnPluginUiWidgetInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);
-

-

-

-
Description

-

-

-

-

-
Details

-

-
enum NMVpnPluginUiCapability

-
typedef enum {
-	NM_VPN_PLUGIN_UI_CAPABILITY_NONE   = 0x00,
-	NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT = 0x01,
-	NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT = 0x02,
-	NM_VPN_PLUGIN_UI_CAPABILITY_IPV6   = 0x04
-} NMVpnPluginUiCapability;
-

-

-Flags that indicate to UI programs certain capabilities of the plugin.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


NM_VPN_PLUGIN_UI_CAPABILITY_NONE
unknown or no capability
-
NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT
the plugin can import new connections
-
NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT
the plugin can export connections
-
NM_VPN_PLUGIN_UI_CAPABILITY_IPV6
the plugin supports IPv6 addressing
-

-

-

-

-
NMVpnPluginUiFactory ()

-
NMVpnPluginUiInterface * (*NMVpnPluginUiFactory)        (GError **error);

-

-

-

-

-

-
struct NMVpnPluginUiInterface

-
struct NMVpnPluginUiInterface {
-	GTypeInterface g_iface;
-
-	/* Plugin's factory function that returns a GObject that implements
-	 * NMVpnPluginUiWidgetInterface, pre-filled with values from 'connection'
-	 * if non-NULL.
-	 */
-	NMVpnPluginUiWidgetInterface * (*ui_factory) (NMVpnPluginUiInterface *iface,
-	                                              NMConnection *connection,
-	                                              GError **error);
-
-	/* Plugin's capabiltity function that returns a bitmask of capabilities
-	 * described by NM_VPN_PLUGIN_UI_CAPABILITY_* defines.
-	 */
-	guint32 (*get_capabilities) (NMVpnPluginUiInterface *iface);
-
-	/* Try to import a connection from the specified path.  On success, return a
-	 * partial NMConnection object.  On error, return NULL and set 'error' with
-	 * additional information.  Note that 'error' can be NULL, in which case no
-	 * additional error information should be provided.
-	 */
-	NMConnection * (*import_from_file) (NMVpnPluginUiInterface *iface,
-	                                    const char *path,
-	                                    GError **error);
-
-	/* Export the given connection to the specified path.  Return TRUE on success.
-	 * On error, return FALSE and set 'error' with additional error information.
-	 * Note that 'error' can be NULL, in which case no additional error information
-	 * should be provided.
-	 */
-	gboolean (*export_to_file) (NMVpnPluginUiInterface *iface,
-	                            const char *path,
-	                            NMConnection *connection,
-	                            GError **error);
-
-	/* For a given connection, return a suggested file name.  Returned value should
-	 * be NULL or a suggested file name allocated via g_malloc/g_new/etc to be freed
-	 * by the caller.
-	 */
-	char * (*get_suggested_name) (NMVpnPluginUiInterface *iface, NMConnection *connection);
-
-	/* Deprecated and no longer used */
-	gboolean (*delete_connection) (NMVpnPluginUiInterface *iface, NMConnection *connection, GError **error);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-	void (*_reserved5) (void);
-	void (*_reserved6) (void);
-};
-

-

-

-

-

-

-
enum NMVpnPluginUiInterfaceProp

-
typedef enum {
-	NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME = NM_VPN_PLUGIN_UI_INTERFACE_PROP_FIRST,
-	NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC,
-	NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE
-} NMVpnPluginUiInterfaceProp;
-

-

-GObject property numbers that plugins should override to provide certain
-information to UI programs.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME
the VPN plugin's name
-
NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC
description of the VPN plugin and what
-VPN services it supports
-
NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE
the D-Bus service name used by the
-plugin's VPN service daemon
-

-

-

-

-
struct NMVpnPluginUiWidgetInterface

-
struct NMVpnPluginUiWidgetInterface {
-	GTypeInterface g_iface;
-
-	/* Return the GtkWidget for the VPN's UI */
-	GObject * (*get_widget) (NMVpnPluginUiWidgetInterface *iface);
-
-	/* Called to save the user-entered options to the connection object.  Should
-	 * return FALSE and set 'error' if the current options are invalid.  'error'
-	 * should contain enough information for the plugin to determine which UI
-	 * widget is invalid at a later point in time.  For example, creating unique
-	 * error codes for what error occurred and populating the message field
-	 * of 'error' with the name of the invalid property.
-	 */
-	gboolean (*update_connection) (NMVpnPluginUiWidgetInterface *iface,
-	                               NMConnection *connection,
-	                               GError **error);
-
-	/* Deprecated and no longer used */
-	gboolean (*save_secrets) (NMVpnPluginUiWidgetInterface *iface,
-	                          NMConnection *connection,
-	                          GError **error);
-
-	/* Emitted when the value of a UI widget changes.  May trigger a validity
-	 * check via update_connection() to write values to the connection */
-	void (*changed) (NMVpnPluginUiWidgetInterface *iface);
-};
-

-

-

-

-

-

-
NM_VPN_PLUGIN_UI_INTERFACE_DESC

-
#define NM_VPN_PLUGIN_UI_INTERFACE_DESC "desc"
-

-

-

-

-

-

-
NM_VPN_PLUGIN_UI_INTERFACE_NAME

-
#define NM_VPN_PLUGIN_UI_INTERFACE_NAME "name"
-

-

-

-

-

-

-
NM_VPN_PLUGIN_UI_INTERFACE_SERVICE

-
#define NM_VPN_PLUGIN_UI_INTERFACE_SERVICE "service"
-

-

-

-

-

-

-
nm_vpn_plugin_ui_factory ()

-
NMVpnPluginUiInterface * nm_vpn_plugin_ui_factory       (GError **error);

-

-

-

-

-

-
nm_vpn_plugin_ui_interface_delete_connection ()

-
gboolean            nm_vpn_plugin_ui_interface_delete_connection
-                                                        (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);

-

-

-

-

-

-
nm_vpn_plugin_ui_interface_export ()

-
gboolean            nm_vpn_plugin_ui_interface_export   (NMVpnPluginUiInterface *iface,
-                                                         const char *path,
-                                                         NMConnection *connection,
-                                                         GError **error);

-

-

-

-

-

-
nm_vpn_plugin_ui_interface_get_capabilities ()

-
guint32             nm_vpn_plugin_ui_interface_get_capabilities
-                                                        (NMVpnPluginUiInterface *iface);

-

-

-

-

-

-
nm_vpn_plugin_ui_interface_get_suggested_name ()

-
char *              nm_vpn_plugin_ui_interface_get_suggested_name
-                                                        (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection);

-

-

-

-

-

-
nm_vpn_plugin_ui_interface_import ()

-
NMConnection *      nm_vpn_plugin_ui_interface_import   (NMVpnPluginUiInterface *iface,
-                                                         const char *path,
-                                                         GError **error);

-

-

-

-

-

-
nm_vpn_plugin_ui_interface_ui_factory ()

-
NMVpnPluginUiWidgetInterface * nm_vpn_plugin_ui_interface_ui_factory
-                                                        (NMVpnPluginUiInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);

-

-

-

-

-

-
nm_vpn_plugin_ui_widget_interface_get_widget ()

-
GObject *           nm_vpn_plugin_ui_widget_interface_get_widget
-                                                        (NMVpnPluginUiWidgetInterface *iface);

-

-

-

-

-

-
nm_vpn_plugin_ui_widget_interface_save_secrets ()

-
gboolean            nm_vpn_plugin_ui_widget_interface_save_secrets
-                                                        (NMVpnPluginUiWidgetInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);

-

-

-

-

-

-
nm_vpn_plugin_ui_widget_interface_update_connection ()

-
gboolean            nm_vpn_plugin_ui_widget_interface_update_connection
-                                                        (NMVpnPluginUiWidgetInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);

-

-

-

-

-

-

-

-          Generated by GTK-Doc V1.18

-
-
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-nm-types.html b/docs/libnm-glib/html/libnm-glib-nm-types.html
index 9c4316ee..3793ddcd 100644
--- a/docs/libnm-glib/html/libnm-glib-nm-types.html
+++ b/docs/libnm-glib/html/libnm-glib-nm-types.html
@@ -3,12 +3,12 @@
 
 
 nm-types
-
+
 
 
 
 
-
+
 
 
 
@@ -50,6 +50,6 @@
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html b/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
index a473684c..5bc3027b 100644
--- a/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
+++ b/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
@@ -3,18 +3,18 @@
 
 
 nm-vpn-plugin-utils
-
+
 
 
-
+
 
-
+
 
 
 
 
-
+
@@ -37,14 +37,14 @@
 

 

 
Synopsis

-
gboolean            nm_vpn_plugin_utils_get_secret_flags
-                                                        (GHashTable *data,
-                                                         const char *secret_name,
-                                                         NMSettingSecretFlags *out_flags);
-gboolean            nm_vpn_plugin_utils_read_vpn_details
+
gboolean            nm_vpn_plugin_utils_read_vpn_details
                                                         (int fd,
                                                          GHashTable **out_data,
                                                          GHashTable **out_secrets);
+gboolean            nm_vpn_plugin_utils_get_secret_flags
+                                                        (GHashTable *data,
+                                                         const char *secret_name,
+                                                         NMSettingSecretFlags *out_flags);
 

 

 

@@ -55,75 +55,81 @@
 

 
Details

 

-
nm_vpn_plugin_utils_get_secret_flags ()

-
gboolean            nm_vpn_plugin_utils_get_secret_flags
-                                                        (GHashTable *data,
-                                                         const char *secret_name,
-                                                         NMSettingSecretFlags *out_flags);

+
nm_vpn_plugin_utils_read_vpn_details ()

+
gboolean            nm_vpn_plugin_utils_read_vpn_details
+                                                        (int fd,
+                                                         GHashTable **out_data,
+                                                         GHashTable **out_secrets);

 

-Given a VPN secret key name, attempts to find the corresponding flags data
-item in data.  If found, converts the flags data item to
-NMSettingSecretFlags and returns it.
+Parses key/value pairs from a file descriptor (normally stdin) passed by
+an applet when the applet calls the authentication dialog of the VPN plugin.
 

-

+

+++
-
-
+
+
-
-
+
+
-
-
+
+TRUE if reading values was successful, FALSE if not

 


 
 
data :
hash table containing VPN key/value pair data items
fd :
file descriptor to read from, usually stdin (0)
 

 
secret_name :
VPN secret key name for which to retrieve flags for
out_data :
on successful return, a hash table
+(mapping char*:char*) containing the key/value pairs of VPN data items. [out][transfer full]
+
 

 
out_flags :
on success, the flags associated with secret_name. [out]
+
out_secrets :
on successful return, a hash table
+(mapping char*:char*) containing the key/value pairsof VPN secrets. [out][transfer full]
 
 

 

 
Returns :

 
-TRUE if the flag data item was found and successfully converted
-to flags, FALSE if not
 

 
 

 

 

 

-
nm_vpn_plugin_utils_read_vpn_details ()

-
gboolean            nm_vpn_plugin_utils_read_vpn_details
-                                                        (int fd,
-                                                         GHashTable **out_data,
-                                                         GHashTable **out_secrets);

+
nm_vpn_plugin_utils_get_secret_flags ()

+
gboolean            nm_vpn_plugin_utils_get_secret_flags
+                                                        (GHashTable *data,
+                                                         const char *secret_name,
+                                                         NMSettingSecretFlags *out_flags);

 

-Parses key/value pairs from a file descriptor (normally stdin) passed by
-an applet when the applet calls the authentication dialog of the VPN plugin.
+Given a VPN secret key name, attempts to find the corresponding flags data
+item in data.  If found, converts the flags data item to
+NMSettingSecretFlags and returns it.
 

-

+

+++
-
-
+
+
-
-
+
+
-
-
+
+TRUE if the flag data item was found and successfully converted
+to flags, FALSE if not

 


 
 
fd :
file descriptor to read from, usually stdin (0)
data :
hash table containing VPN key/value pair data items
 

 
out_data :
on successful return, a hash table
-(mapping char*:char*) containing the key/value pairs of VPN data items. [out][transfer full]
-
secret_name :
VPN secret key name for which to retrieve flags for
 

 
out_secrets :
on successful return, a hash table
-(mapping char*:char*) containing the key/value pairsof VPN secrets. [out][transfer full]
+
out_flags :
on success, the flags associated with secret_name. [out]
 
 

 

 
Returns :

 
-TRUE if reading values was successful, FALSE if not
 

 
 

@@ -132,6 +138,6 @@ an applet when the applet calls the authentication dialog of the VPN plugin.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib.devhelp2 b/docs/libnm-glib/html/libnm-glib.devhelp2
index c372ebee..e046cc04 100644
--- a/docs/libnm-glib/html/libnm-glib.devhelp2
+++ b/docs/libnm-glib/html/libnm-glib.devhelp2
@@ -31,7 +31,7 @@
       
       
       
-      
+      
       
     
     
@@ -39,54 +39,66 @@
     
   
   
-    
-    
-    
-    
-    
-    
-    
+    
+    
     
     
-    
-    
-    
-    
     
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
+    
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
     
     
-    
-    
-    
-    
-    
-    
-    
-    
     
-    
     
+    
     
-    
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
+    
     
     
+    
     
     
     
@@ -98,25 +110,25 @@
     
     
     
-    
-    
     
+    
+    
+    
+    
     
     
-    
     
-    
-    
-    
+    
+    
+    
     
+    
+    
+    
+    
     
     
-    
     
-    
-    
-    
-    
     
     
     
@@ -125,57 +137,57 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
     
-    
-    
+    
+    
+    
     
     
-    
     
-    
+    
+    
+    
+    
     
+    
     
-    
-    
-    
+    
     
     
-    
+    
+    
     
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
     
-    
-    
+    
     
     
-    
     
-    
+    
+    
+    
+    
+    
     
+    
     
-    
-    
-    
+    
     
     
-    
+    
+    
+    
     
-    
-    
+    
+    
+    
+    
+    
     
     
     
@@ -198,45 +210,45 @@
     
     
     
-    
-    
     
-    
     
+    
     
     
     
-    
-    
+    
+    
+    
+    
     
     
     
-    
+    
     
     
     
     
-    
-    
     
-    
-    
-    
-    
     
+    
     
-    
     
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
     
-    
     
-    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -246,54 +258,54 @@
     
     
     
-    
-    
     
-    
     
-    
     
-    
+    
+    
+    
+    
     
+    
     
     
-    
-    
     
-    
     
+    
     
     
-    
-    
+    
+    
+    
+    
     
     
-    
+    
     
     
     
-    
-    
     
-    
-    
-    
-    
     
+    
     
+    
+    
     
+    
     
-    
-    
-    
-    
-    
+    
+    
+    
+    
     
+    
     
     
+    
     
+    
     
-    
+    
     
     
     
@@ -303,127 +315,127 @@
     
     
     
-    
-    
     
-    
     
     
-    
+    
+    
+    
     
+    
     
-    
-    
     
-    
     
+    
     
+    
     
-    
-    
+    
+    
+    
     
+    
     
-    
     
     
     
-    
-    
     
-    
     
+    
     
+    
     
-    
-    
+    
+    
+    
     
+    
     
-    
     
     
     
-    
-    
     
-    
     
-    
     
-    
-    
+    
+    
+    
+    
     
+    
+    
     
     
-    
-    
     
-    
     
+    
     
+    
     
-    
-    
+    
+    
+    
     
+    
     
-    
     
     
     
-    
-    
     
-    
-    
     
-    
     
-    
-    
-    
+    
+    
+    
+    
+    
     
+    
+    
+    
     
     
     
-    
-    
-    
     
-    
     
-    
-    
+    
+    
+    
+    
+    
     
-    
     
-    
+    
+    
+    
     
     
     
-    
-    
-    
     
-    
-    
-    
-    
+    
     
     
+    
+    
+    
+    
     
-    
-    
-    
-    
+    
+    
+    
+    
     
-    
-    
-    
-    
+    
     
     
+    
+    
+    
+    
     
-    
-    
+    
+    
+    
     
     
     
@@ -437,16 +449,16 @@
     
     
     
-    
     
+    
     
     
+    
     
-    
     
+    
     
     
-    
     
     
     
@@ -455,14 +467,14 @@
     
     
     
-    
     
+    
     
+    
     
-    
     
+    
     
-    
     
     
     
@@ -470,66 +482,66 @@
     
     
     
-    
-    
     
+    
+    
     
     
     
     
-    
-    
     
+    
+    
     
-    
-    
     
-    
-    
     
     
+    
+    
+    
+    
     
     
     
     
     
+    
+    
     
     
     
     
     
-    
-    
+    
     
     
     
-    
     
     
     
     
     
     
-    
-    
-    
     
-    
-    
-    
-    
     
+    
+    
+    
     
+    
     
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
     
     
     
+    
+    
+    
+    
     
     
     
@@ -537,74 +549,74 @@
     
     
     
-    
-    
-    
+    
+    
     
     
-    
-    
-    
-    
     
+    
     
     
-    
-    
+    
+    
+    
+    
+    
+    
+    
     
     
-    
     
-    
+    
     
     
     
     
+    
+    
     
     
-    
-    
-    
-    
     
+    
+    
     
     
     
-    
-    
-    
     
     
-    
+    
+    
+    
     
-    
     
     
+    
+    
+    
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
+    
     
     
     
@@ -673,6 +685,10 @@
     
     
     
+    
+    
+    
+    
     
     
     
@@ -697,12 +713,12 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
   
 
diff --git a/docs/libnm-glib/html/object-tree.html b/docs/libnm-glib/html/object-tree.html
index 0488f18b..e001e47a 100644
--- a/docs/libnm-glib/html/object-tree.html
+++ b/docs/libnm-glib/html/object-tree.html
@@ -3,12 +3,12 @@
 
 
 Object Hierarchy
-
+
 
 
 
 
-
+
 
 
 
@@ -20,8 +20,8 @@
 Next
 
 

-

-Object Hierarchy

+

+Object Hierarchy

 
     GObject
         NMObject
@@ -54,6 +54,6 @@
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/ref-overview.html b/docs/libnm-glib/html/ref-overview.html
index db83e194..6dd6954c 100644
--- a/docs/libnm-glib/html/ref-overview.html
+++ b/docs/libnm-glib/html/ref-overview.html
@@ -3,12 +3,12 @@
 
 
 Object Overview
-
+
 
 
 
 
-
+
 
 
 
@@ -20,8 +20,8 @@
 Next
 
 

-

-Object Overview

+

+Object Overview

 

       libnm-glib maps closely to the actual D-Bus API that NetworkManager
       provides, simply wrapping the remote D-Bus objects as native GObjects,
@@ -42,6 +42,6 @@
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/libnm-glib-sections.txt b/docs/libnm-glib/libnm-glib-sections.txt
index a8216584..ea71d9d2 100644
--- a/docs/libnm-glib/libnm-glib-sections.txt
+++ b/docs/libnm-glib/libnm-glib-sections.txt
@@ -1,36 +1,31 @@
-

-libnm_glib
-
-

-
 

 nm-access-point
 NMAccessPoint
-NMAccessPoint
-NMAccessPointClass
-NM_ACCESS_POINT_BSSID
 NM_ACCESS_POINT_FLAGS
-NM_ACCESS_POINT_FREQUENCY
-NM_ACCESS_POINT_HW_ADDRESS
-NM_ACCESS_POINT_MAX_BITRATE
-NM_ACCESS_POINT_MODE
+NM_ACCESS_POINT_WPA_FLAGS
 NM_ACCESS_POINT_RSN_FLAGS
 NM_ACCESS_POINT_SSID
+NM_ACCESS_POINT_BSSID
+NM_ACCESS_POINT_FREQUENCY
+NM_ACCESS_POINT_MODE
+NM_ACCESS_POINT_MAX_BITRATE
 NM_ACCESS_POINT_STRENGTH
-NM_ACCESS_POINT_WPA_FLAGS
-nm_access_point_connection_valid
-nm_access_point_filter_connections
-nm_access_point_get_bssid
+NM_ACCESS_POINT_HW_ADDRESS
+NMAccessPoint
+NMAccessPointClass
+nm_access_point_new
 nm_access_point_get_flags
-nm_access_point_get_frequency
-nm_access_point_get_hw_address
-nm_access_point_get_max_bitrate
-nm_access_point_get_mode
+nm_access_point_get_wpa_flags
 nm_access_point_get_rsn_flags
 nm_access_point_get_ssid
+nm_access_point_get_bssid
+nm_access_point_get_frequency
+nm_access_point_get_mode
+nm_access_point_get_max_bitrate
 nm_access_point_get_strength
-nm_access_point_get_wpa_flags
-nm_access_point_new
+nm_access_point_filter_connections
+nm_access_point_connection_valid
+nm_access_point_get_hw_address
 
 NM_ACCESS_POINT
 NM_ACCESS_POINT_CLASS
@@ -44,25 +39,25 @@ nm_access_point_get_type
 

 nm-active-connection
 NMActiveConnection
-NMActiveConnection
-NMActiveConnectionClass
 NM_ACTIVE_CONNECTION_CONNECTION
+NM_ACTIVE_CONNECTION_UUID
+NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT
+NM_ACTIVE_CONNECTION_DEVICES
+NM_ACTIVE_CONNECTION_STATE
 NM_ACTIVE_CONNECTION_DEFAULT
 NM_ACTIVE_CONNECTION_DEFAULT6
-NM_ACTIVE_CONNECTION_DEVICES
 NM_ACTIVE_CONNECTION_MASTER
-NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT
-NM_ACTIVE_CONNECTION_STATE
-NM_ACTIVE_CONNECTION_UUID
+NMActiveConnection
+NMActiveConnectionClass
+nm_active_connection_new
 nm_active_connection_get_connection
+nm_active_connection_get_uuid
+nm_active_connection_get_specific_object
+nm_active_connection_get_devices
+nm_active_connection_get_state
 nm_active_connection_get_default
 nm_active_connection_get_default6
-nm_active_connection_get_devices
 nm_active_connection_get_master
-nm_active_connection_get_specific_object
-nm_active_connection_get_state
-nm_active_connection_get_uuid
-nm_active_connection_new
 
 NM_ACTIVE_CONNECTION
 NM_ACTIVE_CONNECTION_CLASS
@@ -76,51 +71,60 @@ nm_active_connection_get_type
 

 nm-client
 NMClient
-NMClient
-NMClientActivateFn
-NMClientAddActivateFn
-NMClientClass
-NMClientPermission
-NMClientPermissionResult
-NM_CLIENT_ACTIVE_CONNECTIONS
+NM_CLIENT_VERSION
+NM_CLIENT_STATE
 NM_CLIENT_MANAGER_RUNNING
 NM_CLIENT_NETWORKING_ENABLED
-NM_CLIENT_STATE
-NM_CLIENT_VERSION
-NM_CLIENT_WIMAX_ENABLED
-NM_CLIENT_WIMAX_HARDWARE_ENABLED
 NM_CLIENT_WIRELESS_ENABLED
 NM_CLIENT_WIRELESS_HARDWARE_ENABLED
 NM_CLIENT_WWAN_ENABLED
 NM_CLIENT_WWAN_HARDWARE_ENABLED
+NM_CLIENT_WIMAX_ENABLED
+NM_CLIENT_WIMAX_HARDWARE_ENABLED
+NM_CLIENT_ACTIVE_CONNECTIONS
+NM_CLIENT_CONNECTIVITY
+NM_CLIENT_PRIMARY_CONNECTION
+NM_CLIENT_ACTIVATING_CONNECTION
+NMClientPermission
+NMClientPermissionResult
+NMClient
+NMClientClass
+nm_client_new
+nm_client_new_async
+nm_client_new_finish
+nm_client_get_devices
+nm_client_get_device_by_path
+nm_client_get_device_by_iface
+NMClientActivateFn
 nm_client_activate_connection
+NMClientAddActivateFn
 nm_client_add_and_activate_connection
 nm_client_deactivate_connection
-nm_client_get_active_connections
-nm_client_get_device_by_iface
-nm_client_get_device_by_path
-nm_client_get_devices
-nm_client_get_logging
-nm_client_get_manager_running
-nm_client_get_permission_result
-nm_client_get_state
-nm_client_get_version
 nm_client_networking_get_enabled
 nm_client_networking_set_enabled
-nm_client_new
-nm_client_new_async
-nm_client_new_finish
-nm_client_set_logging
-nm_client_sleep
-nm_client_wimax_get_enabled
-nm_client_wimax_hardware_get_enabled
-nm_client_wimax_set_enabled
 nm_client_wireless_get_enabled
-nm_client_wireless_hardware_get_enabled
 nm_client_wireless_set_enabled
+nm_client_wireless_hardware_get_enabled
 nm_client_wwan_get_enabled
-nm_client_wwan_hardware_get_enabled
 nm_client_wwan_set_enabled
+nm_client_wwan_hardware_get_enabled
+nm_client_wimax_get_enabled
+nm_client_wimax_set_enabled
+nm_client_wimax_hardware_get_enabled
+nm_client_get_version
+nm_client_get_state
+nm_client_get_manager_running
+nm_client_get_active_connections
+nm_client_sleep
+nm_client_get_permission_result
+nm_client_get_logging
+nm_client_set_logging
+nm_client_get_connectivity
+nm_client_check_connectivity
+nm_client_check_connectivity_async
+nm_client_check_connectivity_finish
+nm_client_get_primary_connection
+nm_client_get_activating_connection
 
 NM_CLIENT
 NM_CLIENT_CLASS
@@ -134,57 +138,57 @@ nm_client_get_type
 

 nm-device
 NMDevice
-NMDevice
-NMDeviceClass
-NMDeviceDeactivateFn
-NM_DEVICE_ACTIVE_CONNECTION
-NM_DEVICE_AUTOCONNECT
-NM_DEVICE_AVAILABLE_CONNECTIONS
-NM_DEVICE_CAPABILITIES
 NM_DEVICE_DEVICE_TYPE
-NM_DEVICE_DHCP4_CONFIG
-NM_DEVICE_DHCP6_CONFIG
+NM_DEVICE_UDI
+NM_DEVICE_INTERFACE
+NM_DEVICE_IP_INTERFACE
 NM_DEVICE_DRIVER
 NM_DEVICE_DRIVER_VERSION
-NM_DEVICE_FIRMWARE_MISSING
 NM_DEVICE_FIRMWARE_VERSION
-NM_DEVICE_INTERFACE
+NM_DEVICE_CAPABILITIES
+NM_DEVICE_MANAGED
+NM_DEVICE_AUTOCONNECT
+NM_DEVICE_FIRMWARE_MISSING
 NM_DEVICE_IP4_CONFIG
+NM_DEVICE_DHCP4_CONFIG
 NM_DEVICE_IP6_CONFIG
-NM_DEVICE_IP_INTERFACE
-NM_DEVICE_MANAGED
-NM_DEVICE_PRODUCT
+NM_DEVICE_DHCP6_CONFIG
 NM_DEVICE_STATE
 NM_DEVICE_STATE_REASON
-NM_DEVICE_UDI
+NM_DEVICE_ACTIVE_CONNECTION
+NM_DEVICE_AVAILABLE_CONNECTIONS
 NM_DEVICE_VENDOR
-nm_device_connection_compatible
-nm_device_connection_valid
-nm_device_disconnect
-nm_device_filter_connections
-nm_device_get_active_connection
-nm_device_get_autoconnect
-nm_device_get_available_connections
-nm_device_get_capabilities
+NM_DEVICE_PRODUCT
+NMDevice
+NMDeviceClass
+nm_device_new
+nm_device_get_iface
+nm_device_get_ip_iface
 nm_device_get_device_type
-nm_device_get_dhcp4_config
-nm_device_get_dhcp6_config
+nm_device_get_udi
 nm_device_get_driver
 nm_device_get_driver_version
-nm_device_get_firmware_missing
 nm_device_get_firmware_version
-nm_device_get_iface
+nm_device_get_capabilities
+nm_device_get_managed
+nm_device_get_autoconnect
+nm_device_set_autoconnect
+nm_device_get_firmware_missing
 nm_device_get_ip4_config
+nm_device_get_dhcp4_config
 nm_device_get_ip6_config
-nm_device_get_ip_iface
-nm_device_get_managed
-nm_device_get_product
+nm_device_get_dhcp6_config
 nm_device_get_state
 nm_device_get_state_reason
-nm_device_get_udi
+nm_device_get_active_connection
+nm_device_get_available_connections
+nm_device_get_product
 nm_device_get_vendor
-nm_device_new
-nm_device_set_autoconnect
+NMDeviceDeactivateFn
+nm_device_disconnect
+nm_device_filter_connections
+nm_device_connection_valid
+nm_device_connection_compatible
 
 NM_DEVICE
 NM_DEVICE_CLASS
@@ -198,14 +202,14 @@ nm_device_get_type
 

 nm-device-adsl
 NMDeviceAdsl
-NMDeviceAdsl
-NMDeviceAdslClass
 NMDeviceAdslError
-NM_DEVICE_ADSL_CARRIER
 NM_DEVICE_ADSL_ERROR
 nm_device_adsl_error_quark
-nm_device_adsl_get_carrier
+NM_DEVICE_ADSL_CARRIER
+NMDeviceAdsl
+NMDeviceAdslClass
 nm_device_adsl_new
+nm_device_adsl_get_carrier
 
 NM_DEVICE_ADSL
 NM_DEVICE_ADSL_CLASS
@@ -219,18 +223,18 @@ nm_device_adsl_get_type
 

 nm-device-bond
 NMDeviceBond
-NMDeviceBond
-NMDeviceBondClass
 NMDeviceBondError
-NM_DEVICE_BOND_CARRIER
 NM_DEVICE_BOND_ERROR
+nm_device_bond_error_quark
 NM_DEVICE_BOND_HW_ADDRESS
+NM_DEVICE_BOND_CARRIER
 NM_DEVICE_BOND_SLAVES
-nm_device_bond_error_quark
-nm_device_bond_get_carrier
+NMDeviceBond
+NMDeviceBondClass
+nm_device_bond_new
 nm_device_bond_get_hw_address
+nm_device_bond_get_carrier
 nm_device_bond_get_slaves
-nm_device_bond_new
 
 NM_DEVICE_BOND
 NM_DEVICE_BOND_CLASS
@@ -244,18 +248,18 @@ nm_device_bond_get_type
 

 nm-device-bridge
 NMDeviceBridge
-NMDeviceBridge
-NMDeviceBridgeClass
 NMDeviceBridgeError
-NM_DEVICE_BRIDGE_CARRIER
 NM_DEVICE_BRIDGE_ERROR
+nm_device_bridge_error_quark
 NM_DEVICE_BRIDGE_HW_ADDRESS
+NM_DEVICE_BRIDGE_CARRIER
 NM_DEVICE_BRIDGE_SLAVES
-nm_device_bridge_error_quark
-nm_device_bridge_get_carrier
+NMDeviceBridge
+NMDeviceBridgeClass
+nm_device_bridge_new
 nm_device_bridge_get_hw_address
+nm_device_bridge_get_carrier
 nm_device_bridge_get_slaves
-nm_device_bridge_new
 
 NM_DEVICE_BRIDGE
 NM_DEVICE_BRIDGE_CLASS
@@ -269,18 +273,18 @@ nm_device_bridge_get_type
 

 nm-device-bt
 NMDeviceBt
-NMDeviceBt
-NMDeviceBtClass
 NMDeviceBtError
-NM_DEVICE_BT_CAPABILITIES
 NM_DEVICE_BT_ERROR
+nm_device_bt_error_quark
 NM_DEVICE_BT_HW_ADDRESS
 NM_DEVICE_BT_NAME
-nm_device_bt_error_quark
-nm_device_bt_get_capabilities
+NM_DEVICE_BT_CAPABILITIES
+NMDeviceBt
+NMDeviceBtClass
+nm_device_bt_new
 nm_device_bt_get_hw_address
 nm_device_bt_get_name
-nm_device_bt_new
+nm_device_bt_get_capabilities
 
 NM_DEVICE_BT
 NM_DEVICE_BT_CLASS
@@ -294,20 +298,20 @@ nm_device_bt_get_type
 

 nm-device-ethernet
 NMDeviceEthernet
-NMDeviceEthernet
-NMDeviceEthernetClass
 NMDeviceEthernetError
-NM_DEVICE_ETHERNET_CARRIER
 NM_DEVICE_ETHERNET_ERROR
+nm_device_ethernet_error_quark
 NM_DEVICE_ETHERNET_HW_ADDRESS
 NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS
 NM_DEVICE_ETHERNET_SPEED
-nm_device_ethernet_error_quark
-nm_device_ethernet_get_carrier
+NM_DEVICE_ETHERNET_CARRIER
+NMDeviceEthernet
+NMDeviceEthernetClass
+nm_device_ethernet_new
 nm_device_ethernet_get_hw_address
 nm_device_ethernet_get_permanent_hw_address
 nm_device_ethernet_get_speed
-nm_device_ethernet_new
+nm_device_ethernet_get_carrier
 
 NM_DEVICE_ETHERNET
 NM_DEVICE_ETHERNET_CLASS
@@ -321,16 +325,16 @@ nm_device_ethernet_get_type
 

 nm-device-infiniband
 NMDeviceInfiniband
-NMDeviceInfiniband
-NMDeviceInfinibandClass
 NMDeviceInfinibandError
-NM_DEVICE_INFINIBAND_CARRIER
 NM_DEVICE_INFINIBAND_ERROR
-NM_DEVICE_INFINIBAND_HW_ADDRESS
 nm_device_infiniband_error_quark
-nm_device_infiniband_get_carrier
-nm_device_infiniband_get_hw_address
+NM_DEVICE_INFINIBAND_HW_ADDRESS
+NM_DEVICE_INFINIBAND_CARRIER
+NMDeviceInfiniband
+NMDeviceInfinibandClass
 nm_device_infiniband_new
+nm_device_infiniband_get_hw_address
+nm_device_infiniband_get_carrier
 
 NM_DEVICE_INFINIBAND
 NM_DEVICE_INFINIBAND_CLASS
@@ -344,15 +348,15 @@ nm_device_infiniband_get_type
 

 nm-device-modem
 NMDeviceModem
-NMDeviceModem
-NMDeviceModemClass
 NMDeviceModemError
-NM_DEVICE_MODEM_CURRENT_CAPABILITIES
 NM_DEVICE_MODEM_ERROR
-NM_DEVICE_MODEM_MODEM_CAPABILITIES
 nm_device_modem_error_quark
-nm_device_modem_get_current_capabilities
+NM_DEVICE_MODEM_MODEM_CAPABILITIES
+NM_DEVICE_MODEM_CURRENT_CAPABILITIES
+NMDeviceModem
+NMDeviceModemClass
 nm_device_modem_get_modem_capabilities
+nm_device_modem_get_current_capabilities
 
 NM_DEVICE_MODEM
 NM_DEVICE_MODEM_CLASS
@@ -366,18 +370,18 @@ nm_device_modem_get_type
 

 nm-device-olpc-mesh
 NMDeviceOlpcMesh
-NMDeviceOlpcMesh
-NMDeviceOlpcMeshClass
 NMDeviceOlpcMeshError
-NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL
-NM_DEVICE_OLPC_MESH_COMPANION
 NM_DEVICE_OLPC_MESH_ERROR
-NM_DEVICE_OLPC_MESH_HW_ADDRESS
 nm_device_olpc_mesh_error_quark
-nm_device_olpc_mesh_get_active_channel
-nm_device_olpc_mesh_get_companion
-nm_device_olpc_mesh_get_hw_address
+NM_DEVICE_OLPC_MESH_HW_ADDRESS
+NM_DEVICE_OLPC_MESH_COMPANION
+NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL
+NMDeviceOlpcMesh
+NMDeviceOlpcMeshClass
 nm_device_olpc_mesh_new
+nm_device_olpc_mesh_get_hw_address
+nm_device_olpc_mesh_get_companion
+nm_device_olpc_mesh_get_active_channel
 
 NM_DEVICE_OLPC_MESH
 NM_DEVICE_OLPC_MESH_CLASS
@@ -391,18 +395,18 @@ nm_device_olpc_mesh_get_type
 

 nm-device-vlan
 NMDeviceVlan
-NMDeviceVlan
-NMDeviceVlanClass
 NMDeviceVlanError
-NM_DEVICE_VLAN_CARRIER
 NM_DEVICE_VLAN_ERROR
+nm_device_vlan_error_quark
 NM_DEVICE_VLAN_HW_ADDRESS
+NM_DEVICE_VLAN_CARRIER
 NM_DEVICE_VLAN_VLAN_ID
-nm_device_vlan_error_quark
-nm_device_vlan_get_carrier
+NMDeviceVlan
+NMDeviceVlanClass
+nm_device_vlan_new
 nm_device_vlan_get_hw_address
+nm_device_vlan_get_carrier
 nm_device_vlan_get_vlan_id
-nm_device_vlan_new
 
 NM_DEVICE_VLAN
 NM_DEVICE_VLAN_CLASS
@@ -416,27 +420,27 @@ nm_device_vlan_get_type
 

 nm-device-wifi
 NMDeviceWifi
-NMDeviceWifi
-NMDeviceWifiClass
 NMDeviceWifiError
-NMDeviceWifiRequestScanFn
-NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT
-NM_DEVICE_WIFI_BITRATE
-NM_DEVICE_WIFI_CAPABILITIES
 NM_DEVICE_WIFI_ERROR
+nm_device_wifi_error_quark
 NM_DEVICE_WIFI_HW_ADDRESS
-NM_DEVICE_WIFI_MODE
 NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS
-nm_device_wifi_error_quark
-nm_device_wifi_get_access_point_by_path
-nm_device_wifi_get_access_points
-nm_device_wifi_get_active_access_point
-nm_device_wifi_get_bitrate
-nm_device_wifi_get_capabilities
+NM_DEVICE_WIFI_MODE
+NM_DEVICE_WIFI_BITRATE
+NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT
+NM_DEVICE_WIFI_CAPABILITIES
+NMDeviceWifi
+NMDeviceWifiClass
+nm_device_wifi_new
 nm_device_wifi_get_hw_address
-nm_device_wifi_get_mode
 nm_device_wifi_get_permanent_hw_address
-nm_device_wifi_new
+nm_device_wifi_get_mode
+nm_device_wifi_get_bitrate
+nm_device_wifi_get_capabilities
+nm_device_wifi_get_active_access_point
+nm_device_wifi_get_access_point_by_path
+nm_device_wifi_get_access_points
+NMDeviceWifiRequestScanFn
 nm_device_wifi_request_scan_simple
 
 NM_DEVICE_WIFI
@@ -451,28 +455,28 @@ nm_device_wifi_get_type
 

 nm-device-wimax
 NMDeviceWimax
-NMDeviceWimax
-NMDeviceWimaxClass
 NMDeviceWimaxError
-NM_DEVICE_WIMAX_ACTIVE_NSP
-NM_DEVICE_WIMAX_BSID
-NM_DEVICE_WIMAX_CENTER_FREQUENCY
-NM_DEVICE_WIMAX_CINR
 NM_DEVICE_WIMAX_ERROR
+nm_device_wimax_error_quark
 NM_DEVICE_WIMAX_HW_ADDRESS
+NM_DEVICE_WIMAX_ACTIVE_NSP
+NM_DEVICE_WIMAX_CENTER_FREQUENCY
 NM_DEVICE_WIMAX_RSSI
+NM_DEVICE_WIMAX_CINR
 NM_DEVICE_WIMAX_TX_POWER
-nm_device_wimax_error_quark
-nm_device_wimax_get_active_nsp
-nm_device_wimax_get_bsid
-nm_device_wimax_get_center_frequency
-nm_device_wimax_get_cinr
+NM_DEVICE_WIMAX_BSID
+NMDeviceWimax
+NMDeviceWimaxClass
+nm_device_wimax_new
 nm_device_wimax_get_hw_address
+nm_device_wimax_get_active_nsp
 nm_device_wimax_get_nsp_by_path
 nm_device_wimax_get_nsps
+nm_device_wimax_get_center_frequency
 nm_device_wimax_get_rssi
+nm_device_wimax_get_cinr
 nm_device_wimax_get_tx_power
-nm_device_wimax_new
+nm_device_wimax_get_bsid
 
 NM_DEVICE_WIMAX
 NM_DEVICE_WIMAX_CLASS
@@ -489,9 +493,9 @@ nm_device_wimax_get_type
 NMDHCP4Config
 NMDHCP4ConfigClass
 NM_DHCP4_CONFIG_OPTIONS
-nm_dhcp4_config_get_one_option
-nm_dhcp4_config_get_options
 nm_dhcp4_config_new
+nm_dhcp4_config_get_options
+nm_dhcp4_config_get_one_option
 
 NM_DHCP4_CONFIG
 NM_DHCP4_CONFIG_CLASS
@@ -507,9 +511,9 @@ nm_dhcp4_config_get_type
 NMDHCP6Config
 NMDHCP6ConfigClass
 NM_DHCP6_CONFIG_OPTIONS
-nm_dhcp6_config_get_one_option
-nm_dhcp6_config_get_options
 nm_dhcp6_config_new
+nm_dhcp6_config_get_options
+nm_dhcp6_config_get_one_option
 
 NM_DHCP6_CONFIG
 NM_DHCP6_CONFIG_CLASS
@@ -560,27 +564,22 @@ nm_secret_agent_get_secrets_flags_get_type
 nm_wimax_nsp_network_type_get_type
 

 
-

-nm-glib-marshal
-
-

-
 

 nm-ip4-config
 NMIP4Config
 NMIP4Config
 NMIP4ConfigClass
 NM_IP4_CONFIG_ADDRESSES
-NM_IP4_CONFIG_DOMAINS
 NM_IP4_CONFIG_NAMESERVERS
+NM_IP4_CONFIG_DOMAINS
 NM_IP4_CONFIG_ROUTES
 NM_IP4_CONFIG_WINS_SERVERS
+nm_ip4_config_new
 nm_ip4_config_get_addresses
-nm_ip4_config_get_domains
 nm_ip4_config_get_nameservers
+nm_ip4_config_get_domains
 nm_ip4_config_get_routes
 nm_ip4_config_get_wins_servers
-nm_ip4_config_new
 
 NM_IP4_CONFIG
 NM_IP4_CONFIG_CLASS
@@ -597,14 +596,14 @@ nm_ip4_config_get_type
 NMIP6Config
 NMIP6ConfigClass
 NM_IP6_CONFIG_ADDRESSES
-NM_IP6_CONFIG_DOMAINS
 NM_IP6_CONFIG_NAMESERVERS
+NM_IP6_CONFIG_DOMAINS
 NM_IP6_CONFIG_ROUTES
+nm_ip6_config_new
 nm_ip6_config_get_addresses
-nm_ip6_config_get_domains
 nm_ip6_config_get_nameservers
+nm_ip6_config_get_domains
 nm_ip6_config_get_routes
-nm_ip6_config_new
 
 NM_IP6_CONFIG
 NM_IP6_CONFIG_CLASS
@@ -618,13 +617,13 @@ nm_ip6_config_get_type
 

 nm-object
 NMObject
-NMObject
-NMObjectClass
 NMObjectError
-NM_OBJECT_DBUS_CONNECTION
-NM_OBJECT_DBUS_PATH
 NM_OBJECT_ERROR
 nm_object_error_quark
+NM_OBJECT_DBUS_CONNECTION
+NM_OBJECT_DBUS_PATH
+NMObject
+NMObjectClass
 nm_object_get_connection
 nm_object_get_path
 
@@ -640,17 +639,17 @@ nm_object_get_type
 

 nm-remote-connection
 NMRemoteConnection
+NM_REMOTE_CONNECTION_UPDATED
+NM_REMOTE_CONNECTION_REMOVED
 NMRemoteConnection
 NMRemoteConnectionClass
 NMRemoteConnectionCommitFunc
 NMRemoteConnectionDeleteFunc
 NMRemoteConnectionGetSecretsFunc
-NM_REMOTE_CONNECTION_REMOVED
-NM_REMOTE_CONNECTION_UPDATED
+nm_remote_connection_new
 nm_remote_connection_commit_changes
 nm_remote_connection_delete
 nm_remote_connection_get_secrets
-nm_remote_connection_new
 
 NM_IS_REMOTE_CONNECTION
 NM_IS_REMOTE_CONNECTION_CLASS
@@ -664,26 +663,26 @@ nm_remote_connection_get_type
 

 nm-remote-settings
 NMRemoteSettings
-NMRemoteSettings
-NMRemoteSettingsAddConnectionFunc
-NMRemoteSettingsClass
 NMRemoteSettingsError
-NMRemoteSettingsSaveHostnameFunc
-NM_REMOTE_SETTINGS_BUS
-NM_REMOTE_SETTINGS_CAN_MODIFY
-NM_REMOTE_SETTINGS_CONNECTIONS_READ
 NM_REMOTE_SETTINGS_ERROR
+nm_remote_settings_error_quark
+NM_REMOTE_SETTINGS_BUS
+NM_REMOTE_SETTINGS_SERVICE_RUNNING
 NM_REMOTE_SETTINGS_HOSTNAME
+NM_REMOTE_SETTINGS_CAN_MODIFY
 NM_REMOTE_SETTINGS_NEW_CONNECTION
-NM_REMOTE_SETTINGS_SERVICE_RUNNING
-nm_remote_settings_add_connection
-nm_remote_settings_error_quark
-nm_remote_settings_get_connection_by_path
-nm_remote_settings_get_connection_by_uuid
-nm_remote_settings_list_connections
+NM_REMOTE_SETTINGS_CONNECTIONS_READ
+NMRemoteSettingsAddConnectionFunc
+NMRemoteSettingsSaveHostnameFunc
+NMRemoteSettings
+NMRemoteSettingsClass
 nm_remote_settings_new
 nm_remote_settings_new_async
 nm_remote_settings_new_finish
+nm_remote_settings_list_connections
+nm_remote_settings_get_connection_by_path
+nm_remote_settings_get_connection_by_uuid
+nm_remote_settings_add_connection
 nm_remote_settings_save_hostname
 
 NM_IS_REMOTE_SETTINGS
@@ -698,25 +697,25 @@ nm_remote_settings_get_type
 

 nm-secret-agent
 NMSecretAgent
-NMSecretAgent
-NMSecretAgentClass
-NMSecretAgentDeleteSecretsFunc
+NM_SECRET_AGENT_ERROR
+nm_secret_agent_error_quark
 NMSecretAgentError
 NMSecretAgentGetSecretsFlags
-NMSecretAgentGetSecretsFunc
-NMSecretAgentSaveSecretsFunc
-NM_SECRET_AGENT_AUTO_REGISTER
-NM_SECRET_AGENT_ERROR
 NM_SECRET_AGENT_IDENTIFIER
+NM_SECRET_AGENT_AUTO_REGISTER
 NM_SECRET_AGENT_REGISTERED
 NM_SECRET_AGENT_REGISTRATION_RESULT
-nm_secret_agent_delete_secrets
-nm_secret_agent_error_quark
+NMSecretAgent
+NMSecretAgentGetSecretsFunc
+NMSecretAgentSaveSecretsFunc
+NMSecretAgentDeleteSecretsFunc
+NMSecretAgentClass
+nm_secret_agent_register
+nm_secret_agent_unregister
 nm_secret_agent_get_registered
 nm_secret_agent_get_secrets
-nm_secret_agent_register
 nm_secret_agent_save_secrets
-nm_secret_agent_unregister
+nm_secret_agent_delete_secrets
 
 NM_IS_SECRET_AGENT
 NM_IS_SECRET_AGENT_CLASS
@@ -749,13 +748,13 @@ nm_uint_array_get_type
 

 nm-vpn-connection
 NMVPNConnection
+NM_VPN_CONNECTION_VPN_STATE
+NM_VPN_CONNECTION_BANNER
 NMVPNConnection
 NMVPNConnectionClass
-NM_VPN_CONNECTION_BANNER
-NM_VPN_CONNECTION_VPN_STATE
-nm_vpn_connection_get_banner
-nm_vpn_connection_get_vpn_state
 nm_vpn_connection_new
+nm_vpn_connection_get_vpn_state
+nm_vpn_connection_get_banner
 
 NM_IS_VPN_CONNECTION
 NM_IS_VPN_CONNECTION_CLASS
@@ -780,21 +779,21 @@ nm_vpn_plugin_ui_interface_prop_get_type
 

 nm-vpn-plugin
 NMVPNPlugin
-NMVPNPlugin
-NMVPNPluginClass
-NMVPNPluginError
 NM_VPN_PLUGIN_DBUS_SERVICE_NAME
 NM_VPN_PLUGIN_STATE
-nm_vpn_plugin_disconnect
+NMVPNPluginError
+NMVPNPlugin
+NMVPNPluginClass
 nm_vpn_plugin_error_quark
-nm_vpn_plugin_failure
 nm_vpn_plugin_get_connection
 nm_vpn_plugin_get_state
+nm_vpn_plugin_set_state
+nm_vpn_plugin_set_login_banner
+nm_vpn_plugin_failure
 nm_vpn_plugin_set_config
 nm_vpn_plugin_set_ip4_config
 nm_vpn_plugin_set_ip6_config
-nm_vpn_plugin_set_login_banner
-nm_vpn_plugin_set_state
+nm_vpn_plugin_disconnect
 
 NM_IS_VPN_PLUGIN
 NM_IS_VPN_PLUGIN_CLASS
@@ -809,26 +808,26 @@ nm_vpn_plugin_get_type
 
 

 nm-vpn-plugin-ui-interface
-NMVpnPluginUi
 NMVpnPluginUiWidget
-NMVpnPluginUiCapability
+NMVpnPluginUi
 NMVpnPluginUiFactory
-NMVpnPluginUiInterface
-NMVpnPluginUiInterfaceProp
-NMVpnPluginUiWidgetInterface
-NM_VPN_PLUGIN_UI_INTERFACE_DESC
+nm_vpn_plugin_ui_factory
+NMVpnPluginUiCapability
 NM_VPN_PLUGIN_UI_INTERFACE_NAME
+NM_VPN_PLUGIN_UI_INTERFACE_DESC
 NM_VPN_PLUGIN_UI_INTERFACE_SERVICE
-nm_vpn_plugin_ui_factory
-nm_vpn_plugin_ui_interface_delete_connection
-nm_vpn_plugin_ui_interface_export
+NMVpnPluginUiInterfaceProp
+NMVpnPluginUiInterface
+nm_vpn_plugin_ui_interface_ui_factory
 nm_vpn_plugin_ui_interface_get_capabilities
-nm_vpn_plugin_ui_interface_get_suggested_name
 nm_vpn_plugin_ui_interface_import
-nm_vpn_plugin_ui_interface_ui_factory
+nm_vpn_plugin_ui_interface_export
+nm_vpn_plugin_ui_interface_get_suggested_name
+nm_vpn_plugin_ui_interface_delete_connection
+NMVpnPluginUiWidgetInterface
 nm_vpn_plugin_ui_widget_interface_get_widget
-nm_vpn_plugin_ui_widget_interface_save_secrets
 nm_vpn_plugin_ui_widget_interface_update_connection
+nm_vpn_plugin_ui_widget_interface_save_secrets
 
 NM_IS_VPN_PLUGIN_UI_INTERFACE
 NM_IS_VPN_PLUGIN_UI_WIDGET_INTERFACE
@@ -844,25 +843,25 @@ nm_vpn_plugin_ui_widget_interface_get_type
 
 

 nm-vpn-plugin-utils
-nm_vpn_plugin_utils_get_secret_flags
 nm_vpn_plugin_utils_read_vpn_details
+nm_vpn_plugin_utils_get_secret_flags
 

 
 

 nm-wimax-nsp
 NMWimaxNsp
-NMWimaxNsp
-NMWimaxNspClass
-NMWimaxNspNetworkType
 NM_WIMAX_NSP_NAME
-NM_WIMAX_NSP_NETWORK_TYPE
 NM_WIMAX_NSP_SIGNAL_QUALITY
-nm_wimax_nsp_connection_valid
-nm_wimax_nsp_filter_connections
+NM_WIMAX_NSP_NETWORK_TYPE
+NMWimaxNspNetworkType
+NMWimaxNsp
+NMWimaxNspClass
+nm_wimax_nsp_new
 nm_wimax_nsp_get_name
-nm_wimax_nsp_get_network_type
 nm_wimax_nsp_get_signal_quality
-nm_wimax_nsp_new
+nm_wimax_nsp_get_network_type
+nm_wimax_nsp_filter_connections
+nm_wimax_nsp_connection_valid
 
 NM_IS_WIMAX_NSP
 NM_IS_WIMAX_NSP_CLASS
diff --git a/docs/libnm-glib/tmpl/libnm_glib.sgml b/docs/libnm-glib/tmpl/libnm_glib.sgml
deleted file mode 100644
index ed0710b9..00000000
--- a/docs/libnm-glib/tmpl/libnm_glib.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-libnm_glib
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/libnm-glib/tmpl/nm-access-point.sgml b/docs/libnm-glib/tmpl/nm-access-point.sgml
index 41cade52..ad78146c 100644
--- a/docs/libnm-glib/tmpl/nm-access-point.sgml
+++ b/docs/libnm-glib/tmpl/nm-access-point.sgml
@@ -22,166 +22,165 @@ NMAccessPoint
 
 
 
-
+
 
 
 
 
 
-
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
 
-
-
+
 
 
 
 
-@ap: 
 @connection: 
+@path: 
 @Returns: 
 
 
-
+
 
 
 
 
 @ap: 
-@connections: 
 @Returns: 
 
 
-
+
 
 
 
@@ -190,7 +189,7 @@ NMAccessPoint
 @Returns: 
 
 
-
+
 
 
 
@@ -199,7 +198,7 @@ NMAccessPoint
 @Returns: 
 
 
-
+
 
 
 
@@ -208,7 +207,7 @@ NMAccessPoint
 @Returns: 
 
 
-
+
 
 
 
@@ -217,7 +216,7 @@ NMAccessPoint
 @Returns: 
 
 
-
+
 
 
 
@@ -235,7 +234,7 @@ NMAccessPoint
 @Returns: 
 
 
-
+
 
 
 
@@ -244,7 +243,7 @@ NMAccessPoint
 @Returns: 
 
 
-
+
 
 
 
@@ -253,31 +252,32 @@ NMAccessPoint
 @Returns: 
 
 
-
+
 
 
 
 
 @ap: 
+@connections: 
 @Returns: 
 
 
-
+
 
 
 
 
 @ap: 
+@connection: 
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@path: 
+@ap: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-active-connection.sgml b/docs/libnm-glib/tmpl/nm-active-connection.sgml
index 40528ae9..56f51c6e 100644
--- a/docs/libnm-glib/tmpl/nm-active-connection.sgml
+++ b/docs/libnm-glib/tmpl/nm-active-connection.sgml
@@ -22,131 +22,132 @@ NMActiveConnection
 
 
 
-
+
 
 
 
 
 
-
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
 
-
-
+
 
 
 
 
 @connection: 
+@path: 
 @Returns: 
 
 
-
+
 
 
 
@@ -155,7 +156,7 @@ NMActiveConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -164,7 +165,7 @@ NMActiveConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -173,7 +174,7 @@ NMActiveConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -182,7 +183,7 @@ NMActiveConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -191,7 +192,7 @@ NMActiveConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -200,7 +201,7 @@ NMActiveConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -209,13 +210,12 @@ NMActiveConnection
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@path: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-client.sgml b/docs/libnm-glib/tmpl/nm-client.sgml
index c3443c40..2c439d61 100644
--- a/docs/libnm-glib/tmpl/nm-client.sgml
+++ b/docs/libnm-glib/tmpl/nm-client.sgml
@@ -22,130 +22,103 @@ NMClient
 
 
 
-
+
 
 
 
 
 
-
+
+
 
 
 
 
-@nmclient: the object which received the signal.
-@arg1: 
 
-
+
+
 
 
 
 
-@nmclient: the object which received the signal.
-@arg1: 
 
-
+
+
 
 
 
 
-@nmclient: the object which received the signal.
-@arg1: 
-@arg2: 
 
-
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
+
+
+
 
 
 
 
-
+
+
+
 
 
 
 
-
+
+
+
 
 
 
 
-@client: 
-@active_connection: 
-@error: 
-@user_data: 
 
 
-
+
 
 
 
 
-@client: 
-@connection: 
-@new_connection_path: 
-@error: 
-@user_data: 
 
 
-
+
 
 
 
 
-@parent: 
-@device_added: 
-@device_removed: 
-@permission_changed: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
+
 
 
 
@@ -176,81 +149,190 @@ NMClient
 @NM_CLIENT_PERMISSION_RESULT_AUTH: 
 @NM_CLIENT_PERMISSION_RESULT_NO: 
 
-
+
 
 
 
 
 
+
+
 
-
+
+
+@nmclient: the object which received the signal.
+@arg1: 
+
+
 
 
 
 
+@nmclient: the object which received the signal.
+@arg1: 
 
+
+
 
-
+
+
+@nmclient: the object which received the signal.
+@arg1: 
+@arg2: 
+
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
+
+
+
+
+@parent: 
+@device_added: 
+@device_removed: 
+@permission_changed: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
 
 
 
 
+@void: 
+@Returns: 
 
 
-
+
+
+
+
+
+@cancellable: 
+@callback: 
+@user_data: 
+
+
+
+
+
+
+
+@result: 
+@error: 
+@Returns: 
+
+
+
+
+
+
+
+@client: 
+@Returns: 
+
+
+
+
+
+
+
+@client: 
+@object_path: 
+@Returns: 
+
+
+
+
+
+
+
+@client: 
+@iface: 
+@Returns: 
+
+
+
 
 
 
 
+@client: 
+@active_connection: 
+@error: 
+@user_data: 
 
 
 
@@ -266,6 +348,18 @@ NMClient
 @user_data: 
 
 
+
+
+
+
+
+@client: 
+@connection: 
+@new_connection_path: 
+@error: 
+@user_data: 
+
+
 
 
 
@@ -288,7 +382,7 @@ NMClient
 @active: 
 
 
-
+
 
 
 
@@ -297,48 +391,43 @@ NMClient
 @Returns: 
 
 
-
+
 
 
 
 
 @client: 
-@iface: 
-@Returns: 
+@enabled: 
 
 
-
+
 
 
 
 
 @client: 
-@object_path: 
 @Returns: 
 
 
-
+
 
 
 
 
 @client: 
-@Returns: 
+@enabled: 
 
 
-
+
 
 
 
 
 @client: 
-@level: 
-@domains: 
-@error: 
 @Returns: 
 
 
-
+
 
 
 
@@ -347,17 +436,16 @@ NMClient
 @Returns: 
 
 
-
+
 
 
 
 
 @client: 
-@permission: 
-@Returns: 
+@enabled: 
 
 
-
+
 
 
 
@@ -366,7 +454,7 @@ NMClient
 @Returns: 
 
 
-
+
 
 
 
@@ -375,62 +463,57 @@ NMClient
 @Returns: 
 
 
-
+
 
 
 
 
 @client: 
-@Returns: 
+@enabled: 
 
 
-
+
 
 
 
 
 @client: 
-@enabled: 
+@Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@client: 
 @Returns: 
 
 
-
+
 
 
 
 
-@cancellable: 
-@callback: 
-@user_data: 
+@client: 
+@Returns: 
 
 
-
+
 
 
 
 
-@result: 
-@error: 
+@client: 
 @Returns: 
 
 
-
+
 
 
 
 
 @client: 
-@level: 
-@domains: 
-@error: 
 @Returns: 
 
 
@@ -443,34 +526,41 @@ NMClient
 @sleep_: 
 
 
-
+
 
 
 
 
 @client: 
+@permission: 
 @Returns: 
 
 
-
+
 
 
 
 
 @client: 
+@level: 
+@domains: 
+@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @client: 
-@enabled: 
+@level: 
+@domains: 
+@error: 
+@Returns: 
 
 
-
+
 
 
 
@@ -479,34 +569,40 @@ NMClient
 @Returns: 
 
 
-
+
 
 
 
 
 @client: 
+@cancellable: 
+@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @client: 
-@enabled: 
+@cancellable: 
+@callback: 
+@user_data: 
 
 
-
+
 
 
 
 
 @client: 
+@result: 
+@error: 
 @Returns: 
 
 
-
+
 
 
 
@@ -515,12 +611,12 @@ NMClient
 @Returns: 
 
 
-
+
 
 
 
 
 @client: 
-@enabled: 
+@Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-adsl.sgml b/docs/libnm-glib/tmpl/nm-device-adsl.sgml
index 286f2f41..111cf8a6 100644
--- a/docs/libnm-glib/tmpl/nm-device-adsl.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-adsl.sgml
@@ -22,38 +22,30 @@ NMDeviceAdsl
 
 
 
-
+
 
 
 
 
+@NM_DEVICE_ADSL_ERROR_UNKNOWN: 
+@NM_DEVICE_ADSL_ERROR_NOT_ADSL_CONNECTION: 
+@NM_DEVICE_ADSL_ERROR_INVALID_ADSL_CONNECTION: 
 
-
+
 
 
 
 
-
-
 
-
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
-
-
+
 
 
 
 
-@NM_DEVICE_ADSL_ERROR_UNKNOWN: 
-@NM_DEVICE_ADSL_ERROR_NOT_ADSL_CONNECTION: 
-@NM_DEVICE_ADSL_ERROR_INVALID_ADSL_CONNECTION: 
+@void: 
+@Returns: 
+
 
 
 
@@ -62,38 +54,46 @@ NMDeviceAdsl
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
-@void: 
-@Returns: 
+
+
 
+
 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
 
 
 
 
-@device: 
+@connection: 
+@path: 
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@path: 
+@device: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-bond.sgml b/docs/libnm-glib/tmpl/nm-device-bond.sgml
index 29c46c9a..cc85389d 100644
--- a/docs/libnm-glib/tmpl/nm-device-bond.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-bond.sgml
@@ -22,49 +22,38 @@ NMDeviceBond
 
 
 
-
+
 
 
 
 
+@NM_DEVICE_BOND_ERROR_UNKNOWN: 
+@NM_DEVICE_BOND_ERROR_NOT_BOND_CONNECTION: 
+@NM_DEVICE_BOND_ERROR_INVALID_BOND_CONNECTION: 
+@NM_DEVICE_BOND_ERROR_INTERFACE_MISMATCH: 
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
-
-
+@void: 
+@Returns: 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
 
-
+
 
 
 
 
-@NM_DEVICE_BOND_ERROR_UNKNOWN: 
-@NM_DEVICE_BOND_ERROR_NOT_BOND_CONNECTION: 
-@NM_DEVICE_BOND_ERROR_INVALID_BOND_CONNECTION: 
-@NM_DEVICE_BOND_ERROR_INTERFACE_MISMATCH: 
+
 
 
 
@@ -73,42 +62,54 @@ NMDeviceBond
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
+
+
 
+
 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
 
 
 
 
-@device: 
+@connection: 
+@path: 
 @Returns: 
 
 
@@ -121,7 +122,7 @@ NMDeviceBond
 @Returns: 
 
 
-
+
 
 
 
@@ -130,13 +131,12 @@ NMDeviceBond
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@path: 
+@device: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-bridge.sgml b/docs/libnm-glib/tmpl/nm-device-bridge.sgml
index 9d20554e..3570bae3 100644
--- a/docs/libnm-glib/tmpl/nm-device-bridge.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-bridge.sgml
@@ -22,49 +22,38 @@ NMDeviceBridge
 
 
 
-
+
 
 
 
 
+@NM_DEVICE_BRIDGE_ERROR_UNKNOWN: 
+@NM_DEVICE_BRIDGE_ERROR_NOT_BRIDGE_CONNECTION: 
+@NM_DEVICE_BRIDGE_ERROR_INVALID_BRIDGE_CONNECTION: 
+@NM_DEVICE_BRIDGE_ERROR_INTERFACE_MISMATCH: 
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
-
-
+@void: 
+@Returns: 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
 
-
+
 
 
 
 
-@NM_DEVICE_BRIDGE_ERROR_UNKNOWN: 
-@NM_DEVICE_BRIDGE_ERROR_NOT_BRIDGE_CONNECTION: 
-@NM_DEVICE_BRIDGE_ERROR_INVALID_BRIDGE_CONNECTION: 
-@NM_DEVICE_BRIDGE_ERROR_INTERFACE_MISMATCH: 
+
 
 
 
@@ -73,42 +62,54 @@ NMDeviceBridge
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
+
+
 
+
 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
 
 
 
 
-@device: 
+@connection: 
+@path: 
 @Returns: 
 
 
@@ -121,7 +122,7 @@ NMDeviceBridge
 @Returns: 
 
 
-
+
 
 
 
@@ -130,13 +131,12 @@ NMDeviceBridge
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@path: 
+@device: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-bt.sgml b/docs/libnm-glib/tmpl/nm-device-bt.sgml
index e0b17425..404ec888 100644
--- a/docs/libnm-glib/tmpl/nm-device-bt.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-bt.sgml
@@ -22,51 +22,47 @@ NMDeviceBt
 
 
 
-
+
 
 
 
 
+@NM_DEVICE_BT_ERROR_UNKNOWN: 
+@NM_DEVICE_BT_ERROR_NOT_BT_CONNECTION: 
+@NM_DEVICE_BT_ERROR_INVALID_BT_CONNECTION: 
+@NM_DEVICE_BT_ERROR_INVALID_DEVICE_MAC: 
+@NM_DEVICE_BT_ERROR_MAC_MISMATCH: 
+@NM_DEVICE_BT_ERROR_MISSING_DEVICE_CAPS: 
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
+@void: 
+@Returns: 
+
+
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
 
-
+
+
 
 
 
 
-@NM_DEVICE_BT_ERROR_UNKNOWN: 
-@NM_DEVICE_BT_ERROR_NOT_BT_CONNECTION: 
-@NM_DEVICE_BT_ERROR_INVALID_BT_CONNECTION: 
-@NM_DEVICE_BT_ERROR_INVALID_DEVICE_MAC: 
-@NM_DEVICE_BT_ERROR_MAC_MISMATCH: 
-@NM_DEVICE_BT_ERROR_MISSING_DEVICE_CAPS: 
+
 
 
 
@@ -75,42 +71,47 @@ NMDeviceBt
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
-
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
 
-
+
 
 
 
 
-@device: 
+@connection: 
+@path: 
 @Returns: 
 
 
@@ -132,13 +133,12 @@ NMDeviceBt
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@path: 
+@device: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-ethernet.sgml b/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
index 3f5735b5..a3771275 100644
--- a/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
@@ -22,106 +22,107 @@ NMDeviceEthernet
 
 
 
-
+
 
 
 
 
+@NM_DEVICE_ETHERNET_ERROR_UNKNOWN: 
+@NM_DEVICE_ETHERNET_ERROR_NOT_ETHERNET_CONNECTION: 
+@NM_DEVICE_ETHERNET_ERROR_INVALID_ETHERNET_CONNECTION: 
+@NM_DEVICE_ETHERNET_ERROR_INVALID_DEVICE_MAC: 
+@NM_DEVICE_ETHERNET_ERROR_MAC_MISMATCH: 
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
+@void: 
+@Returns: 
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
 
-
+
+
 
 
 
 
-@NM_DEVICE_ETHERNET_ERROR_UNKNOWN: 
-@NM_DEVICE_ETHERNET_ERROR_NOT_ETHERNET_CONNECTION: 
-@NM_DEVICE_ETHERNET_ERROR_INVALID_ETHERNET_CONNECTION: 
-@NM_DEVICE_ETHERNET_ERROR_INVALID_DEVICE_MAC: 
-@NM_DEVICE_ETHERNET_ERROR_MAC_MISMATCH: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
 
-
+
 
 
 
 
-@device: 
+@connection: 
+@path: 
 @Returns: 
 
 
@@ -152,13 +153,12 @@ NMDeviceEthernet
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@path: 
+@device: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-infiniband.sgml b/docs/libnm-glib/tmpl/nm-device-infiniband.sgml
index 94ad7b90..f50d415f 100644
--- a/docs/libnm-glib/tmpl/nm-device-infiniband.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-infiniband.sgml
@@ -22,45 +22,39 @@ NMDeviceInfiniband
 
 
 
-
+
 
 
 
 
+@NM_DEVICE_INFINIBAND_ERROR_UNKNOWN: 
+@NM_DEVICE_INFINIBAND_ERROR_NOT_INFINIBAND_CONNECTION: 
+@NM_DEVICE_INFINIBAND_ERROR_INVALID_INFINIBAND_CONNECTION: 
+@NM_DEVICE_INFINIBAND_ERROR_INVALID_DEVICE_MAC: 
+@NM_DEVICE_INFINIBAND_ERROR_MAC_MISMATCH: 
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
+@void: 
+@Returns: 
 
-
+
+
 
 
 
 
-@NM_DEVICE_INFINIBAND_ERROR_UNKNOWN: 
-@NM_DEVICE_INFINIBAND_ERROR_NOT_INFINIBAND_CONNECTION: 
-@NM_DEVICE_INFINIBAND_ERROR_INVALID_INFINIBAND_CONNECTION: 
-@NM_DEVICE_INFINIBAND_ERROR_INVALID_DEVICE_MAC: 
-@NM_DEVICE_INFINIBAND_ERROR_MAC_MISMATCH: 
+
 
 
 
@@ -69,35 +63,42 @@ NMDeviceInfiniband
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
 
-
+
 
 
 
 
-@device: 
+@connection: 
+@path: 
 @Returns: 
 
 
@@ -110,13 +111,12 @@ NMDeviceInfiniband
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@path: 
+@device: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-modem.sgml b/docs/libnm-glib/tmpl/nm-device-modem.sgml
index e41c07ec..4e1cc83a 100644
--- a/docs/libnm-glib/tmpl/nm-device-modem.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-modem.sgml
@@ -22,44 +22,38 @@ NMDeviceModem
 
 
 
-
+
 
 
 
 
+@NM_DEVICE_MODEM_ERROR_UNKNOWN: 
+@NM_DEVICE_MODEM_ERROR_NOT_MODEM_CONNECTION: 
+@NM_DEVICE_MODEM_ERROR_INVALID_MODEM_CONNECTION: 
+@NM_DEVICE_MODEM_ERROR_MISSING_DEVICE_CAPS: 
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
+@void: 
+@Returns: 
 
-
+
+
 
 
 
 
-@NM_DEVICE_MODEM_ERROR_UNKNOWN: 
-@NM_DEVICE_MODEM_ERROR_NOT_MODEM_CONNECTION: 
-@NM_DEVICE_MODEM_ERROR_INVALID_MODEM_CONNECTION: 
-@NM_DEVICE_MODEM_ERROR_MISSING_DEVICE_CAPS: 
+
 
 
 
@@ -68,30 +62,36 @@ NMDeviceModem
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
 
-
+
 
 
 
@@ -100,7 +100,7 @@ NMDeviceModem
 @Returns: 
 
 
-
+
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml b/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml
index 20c63328..fb78ba35 100644
--- a/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml
@@ -22,48 +22,44 @@ NMDeviceOlpcMesh
 
 
 
-
+
 
 
 
 
+@NM_DEVICE_OLPC_MESH_ERROR_UNKNOWN: 
+@NM_DEVICE_OLPC_MESH_ERROR_NOT_OLPC_MESH_CONNECTION: 
+@NM_DEVICE_OLPC_MESH_ERROR_INVALID_OLPC_MESH_CONNECTION: 
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
+@void: 
+@Returns: 
+
+
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
 
-
+
+
 
 
 
 
-@NM_DEVICE_OLPC_MESH_ERROR_UNKNOWN: 
-@NM_DEVICE_OLPC_MESH_ERROR_NOT_OLPC_MESH_CONNECTION: 
-@NM_DEVICE_OLPC_MESH_ERROR_INVALID_OLPC_MESH_CONNECTION: 
+
 
 
 
@@ -72,46 +68,51 @@ NMDeviceOlpcMesh
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
-
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
 
-
+
 
 
 
 
-@device: 
+@connection: 
+@path: 
 @Returns: 
 
 
-
+
 
 
 
@@ -120,7 +121,7 @@ NMDeviceOlpcMesh
 @Returns: 
 
 
-
+
 
 
 
@@ -129,13 +130,12 @@ NMDeviceOlpcMesh
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@path: 
+@device: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-vlan.sgml b/docs/libnm-glib/tmpl/nm-device-vlan.sgml
index 30d839e0..3ac5830f 100644
--- a/docs/libnm-glib/tmpl/nm-device-vlan.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-vlan.sgml
@@ -22,50 +22,39 @@ NMDeviceVlan
 
 
 
-
+
 
 
 
 
+@NM_DEVICE_VLAN_ERROR_UNKNOWN: 
+@NM_DEVICE_VLAN_ERROR_NOT_VLAN_CONNECTION: 
+@NM_DEVICE_VLAN_ERROR_INVALID_VLAN_CONNECTION: 
+@NM_DEVICE_VLAN_ERROR_ID_MISMATCH: 
+@NM_DEVICE_VLAN_ERROR_INTERFACE_MISMATCH: 
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
-
-
+@void: 
+@Returns: 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
 
-
+
 
 
 
 
-@NM_DEVICE_VLAN_ERROR_UNKNOWN: 
-@NM_DEVICE_VLAN_ERROR_NOT_VLAN_CONNECTION: 
-@NM_DEVICE_VLAN_ERROR_INVALID_VLAN_CONNECTION: 
-@NM_DEVICE_VLAN_ERROR_ID_MISMATCH: 
-@NM_DEVICE_VLAN_ERROR_INTERFACE_MISMATCH: 
+
 
 
 
@@ -74,42 +63,54 @@ NMDeviceVlan
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
+
+
 
+
 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
 
 
 
 
-@device: 
+@connection: 
+@path: 
 @Returns: 
 
 
@@ -122,7 +123,7 @@ NMDeviceVlan
 @Returns: 
 
 
-
+
 
 
 
@@ -131,13 +132,12 @@ NMDeviceVlan
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@path: 
+@device: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-wifi.sgml b/docs/libnm-glib/tmpl/nm-device-wifi.sgml
index 3b5def39..094344b8 100644
--- a/docs/libnm-glib/tmpl/nm-device-wifi.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-wifi.sgml
@@ -22,165 +22,164 @@ NMDeviceWifi
 
 
 
-
+
 
 
 
 
+@NM_DEVICE_WIFI_ERROR_UNKNOWN: 
+@NM_DEVICE_WIFI_ERROR_NOT_WIFI_CONNECTION: 
+@NM_DEVICE_WIFI_ERROR_INVALID_WIFI_CONNECTION: 
+@NM_DEVICE_WIFI_ERROR_INVALID_DEVICE_MAC: 
+@NM_DEVICE_WIFI_ERROR_MAC_MISMATCH: 
+@NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_WPA_CAPS: 
+@NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_RSN_CAPS: 
 
-
+
 
 
 
 
-@nmdevicewifi: the object which received the signal.
-@arg1: 
 
-
+
+
 
 
 
 
-@nmdevicewifi: the object which received the signal.
-@arg1: 
+@void: 
+@Returns: 
 
-
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@access_point_added: 
-@access_point_removed: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
 
-
+
+
 
 
 
 
-@NM_DEVICE_WIFI_ERROR_UNKNOWN: 
-@NM_DEVICE_WIFI_ERROR_NOT_WIFI_CONNECTION: 
-@NM_DEVICE_WIFI_ERROR_INVALID_WIFI_CONNECTION: 
-@NM_DEVICE_WIFI_ERROR_INVALID_DEVICE_MAC: 
-@NM_DEVICE_WIFI_ERROR_MAC_MISMATCH: 
-@NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_WPA_CAPS: 
-@NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_RSN_CAPS: 
 
-
+
+
 
 
 
 
-@device: 
-@error: 
-@user_data: 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+@nmdevicewifi: the object which received the signal.
+@arg1: 
 
-
-
+
 
 
 
 
+@nmdevicewifi: the object which received the signal.
+@arg1: 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+@parent: 
+@access_point_added: 
+@access_point_removed: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
 
-
-
+
 
 
 
 
-@void: 
+@connection: 
+@path: 
 @Returns: 
 
 
-
+
 
 
 
 
 @device: 
-@path: 
 @Returns: 
 
 
-
+
 
 
 
@@ -189,7 +188,7 @@ NMDeviceWifi
 @Returns: 
 
 
-
+
 
 
 
@@ -216,7 +215,7 @@ NMDeviceWifi
 @Returns: 
 
 
-
+
 
 
 
@@ -225,16 +224,17 @@ NMDeviceWifi
 @Returns: 
 
 
-
+
 
 
 
 
 @device: 
+@path: 
 @Returns: 
 
 
-
+
 
 
 
@@ -243,14 +243,14 @@ NMDeviceWifi
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@path: 
-@Returns: 
+@device: 
+@error: 
+@user_data: 
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-wimax.sgml b/docs/libnm-glib/tmpl/nm-device-wimax.sgml
index d23d0231..23d89281 100644
--- a/docs/libnm-glib/tmpl/nm-device-wimax.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-wimax.sgml
@@ -22,84 +22,69 @@ NMDeviceWimax
 
 
 
-
+
 
 
 
 
+@NM_DEVICE_WIMAX_ERROR_UNKNOWN: 
+@NM_DEVICE_WIMAX_ERROR_NOT_WIMAX_CONNECTION: 
+@NM_DEVICE_WIMAX_ERROR_INVALID_WIMAX_CONNECTION: 
+@NM_DEVICE_WIMAX_ERROR_INVALID_DEVICE_MAC: 
+@NM_DEVICE_WIMAX_ERROR_MAC_MISMATCH: 
 
-
+
 
 
 
 
-@nmdevicewimax: the object which received the signal.
-@arg1: 
 
-
+
+
 
 
 
 
-@nmdevicewimax: the object which received the signal.
-@arg1: 
-
-
-
+@void: 
+@Returns: 
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@nsp_added: 
-@nsp_removed: 
 
-
+
+
 
 
 
 
-@NM_DEVICE_WIMAX_ERROR_UNKNOWN: 
-@NM_DEVICE_WIMAX_ERROR_NOT_WIMAX_CONNECTION: 
-@NM_DEVICE_WIMAX_ERROR_INVALID_WIMAX_CONNECTION: 
-@NM_DEVICE_WIMAX_ERROR_INVALID_DEVICE_MAC: 
-@NM_DEVICE_WIMAX_ERROR_MAC_MISMATCH: 
 
-
+
+
 
 
 
@@ -113,94 +98,111 @@ NMDeviceWimax
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+@nmdevicewimax: the object which received the signal.
+@arg1: 
 
-
-
+
 
 
 
 
+@nmdevicewimax: the object which received the signal.
+@arg1: 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
+
+
+
+
 
+@parent: 
+@nsp_added: 
+@nsp_removed: 
 
-
+
 
 
 
 
-@wimax: 
+@connection: 
+@path: 
 @Returns: 
 
 
-
+
 
 
 
 
-@self: 
+@wimax: 
 @Returns: 
 
 
-
+
 
 
 
 
-@self: 
+@wimax: 
 @Returns: 
 
 
-
+
 
 
 
 
-@self: 
+@wimax: 
+@path: 
 @Returns: 
 
 
-
+
 
 
 
@@ -209,26 +211,25 @@ NMDeviceWimax
 @Returns: 
 
 
-
+
 
 
 
 
-@wimax: 
-@path: 
+@self: 
 @Returns: 
 
 
-
+
 
 
 
 
-@wimax: 
+@self: 
 @Returns: 
 
 
-
+
 
 
 
@@ -246,13 +247,12 @@ NMDeviceWimax
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@path: 
+@self: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device.sgml b/docs/libnm-glib/tmpl/nm-device.sgml
index d61ff355..7d783dc0 100644
--- a/docs/libnm-glib/tmpl/nm-device.sgml
+++ b/docs/libnm-glib/tmpl/nm-device.sgml
@@ -22,341 +22,336 @@ NMDevice
 
 
 
-
+
 
 
 
 
 
-
+
+
 
 
 
 
-@nmdevice: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@state_changed: 
-@connection_compatible: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
 
-
+
+
 
 
 
 
-@device: 
-@error: 
-@user_data: 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+@nmdevice: the object which received the signal.
+@arg1: 
+@arg2: 
+@arg3: 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+@parent: 
+@state_changed: 
+@connection_compatible: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
 
 
 
 
+@connection: 
+@path: 
+@Returns: 
 
 
-
+
 
 
 
 
 @device: 
-@connection: 
-@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @device: 
-@connection: 
 @Returns: 
 
 
-
+
 
 
 
 
 @device: 
-@callback: 
-@user_data: 
+@Returns: 
 
 
-
+
 
 
 
 
 @device: 
-@connections: 
 @Returns: 
 
 
-
+
 
 
 
@@ -365,7 +360,7 @@ NMDevice
 @Returns: 
 
 
-
+
 
 
 
@@ -374,7 +369,7 @@ NMDevice
 @Returns: 
 
 
-
+
 
 
 
@@ -392,7 +387,7 @@ NMDevice
 @Returns: 
 
 
-
+
 
 
 
@@ -401,7 +396,7 @@ NMDevice
 @Returns: 
 
 
-
+
 
 
 
@@ -410,16 +405,16 @@ NMDevice
 @Returns: 
 
 
-
+
 
 
 
 
 @device: 
-@Returns: 
+@autoconnect: 
 
 
-
+
 
 
 
@@ -428,7 +423,7 @@ NMDevice
 @Returns: 
 
 
-
+
 
 
 
@@ -437,7 +432,7 @@ NMDevice
 @Returns: 
 
 
-
+
 
 
 
@@ -446,7 +441,7 @@ NMDevice
 @Returns: 
 
 
-
+
 
 
 
@@ -455,7 +450,7 @@ NMDevice
 @Returns: 
 
 
-
+
 
 
 
@@ -464,7 +459,7 @@ NMDevice
 @Returns: 
 
 
-
+
 
 
 
@@ -473,16 +468,17 @@ NMDevice
 @Returns: 
 
 
-
+
 
 
 
 
 @device: 
+@reason: 
 @Returns: 
 
 
-
+
 
 
 
@@ -491,7 +487,7 @@ NMDevice
 @Returns: 
 
 
-
+
 
 
 
@@ -509,7 +505,7 @@ NMDevice
 @Returns: 
 
 
-
+
 
 
 
@@ -518,50 +514,54 @@ NMDevice
 @Returns: 
 
 
-
+
 
 
 
 
 @device: 
-@reason: 
-@Returns: 
+@error: 
+@user_data: 
 
 
-
+
 
 
 
 
 @device: 
-@Returns: 
+@callback: 
+@user_data: 
 
 
-
+
 
 
 
 
 @device: 
+@connections: 
 @Returns: 
 
 
-
+
 
 
 
 
+@device: 
 @connection: 
-@path: 
 @Returns: 
 
 
-
+
 
 
 
 
 @device: 
-@autoconnect: 
+@connection: 
+@error: 
+@Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml b/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
index cef5854d..35a6e306 100644
--- a/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
+++ b/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
@@ -53,13 +53,13 @@ NMDHCP4Config
 
 
 
-
+
 
 
 
 
-@config: 
-@option: 
+@connection: 
+@object_path: 
 @Returns: 
 
 
@@ -72,13 +72,13 @@ NMDHCP4Config
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@object_path: 
+@config: 
+@option: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml b/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
index 2c113261..3e00467c 100644
--- a/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
+++ b/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
@@ -53,13 +53,13 @@ NMDHCP6Config
 
 
 
-
+
 
 
 
 
-@config: 
-@option: 
+@connection: 
+@object_path: 
 @Returns: 
 
 
@@ -72,13 +72,13 @@ NMDHCP6Config
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@object_path: 
+@config: 
+@option: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-glib-marshal.sgml b/docs/libnm-glib/tmpl/nm-glib-marshal.sgml
deleted file mode 100644
index 2f3b0280..00000000
--- a/docs/libnm-glib/tmpl/nm-glib-marshal.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-nm-glib-marshal
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/libnm-glib/tmpl/nm-ip4-config.sgml b/docs/libnm-glib/tmpl/nm-ip4-config.sgml
index e015c2af..08b6bcbd 100644
--- a/docs/libnm-glib/tmpl/nm-ip4-config.sgml
+++ b/docs/libnm-glib/tmpl/nm-ip4-config.sgml
@@ -73,14 +73,14 @@ NMIP4Config
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
@@ -101,16 +101,17 @@ NMIP4Config
 
 
 
-
+
 
 
 
 
-@config: 
+@connection: 
+@object_path: 
 @Returns: 
 
 
-
+
 
 
 
@@ -128,7 +129,7 @@ NMIP4Config
 @Returns: 
 
 
-
+
 
 
 
@@ -137,7 +138,7 @@ NMIP4Config
 @Returns: 
 
 
-
+
 
 
 
@@ -146,13 +147,12 @@ NMIP4Config
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@object_path: 
+@config: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-ip6-config.sgml b/docs/libnm-glib/tmpl/nm-ip6-config.sgml
index f098e022..a9c44abd 100644
--- a/docs/libnm-glib/tmpl/nm-ip6-config.sgml
+++ b/docs/libnm-glib/tmpl/nm-ip6-config.sgml
@@ -68,14 +68,14 @@ NMIP6Config
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
@@ -89,16 +89,17 @@ NMIP6Config
 
 
 
-
+
 
 
 
 
-@config: 
+@connection: 
+@object_path: 
 @Returns: 
 
 
-
+
 
 
 
@@ -116,7 +117,7 @@ NMIP6Config
 @Returns: 
 
 
-
+
 
 
 
@@ -125,13 +126,12 @@ NMIP6Config
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@object_path: 
+@config: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-object.sgml b/docs/libnm-glib/tmpl/nm-object.sgml
index 93b2441e..bb17ec37 100644
--- a/docs/libnm-glib/tmpl/nm-object.sgml
+++ b/docs/libnm-glib/tmpl/nm-object.sgml
@@ -22,82 +22,82 @@ NMObject
 
 
 
-
+
 
 
 
 
+@NM_OBJECT_ERROR_UNKNOWN: 
+@NM_OBJECT_ERROR_OBJECT_CREATION_FAILURE: 
 
-
+
 
 
 
 
-@nmobject: the object which received the signal.
-@arg1: 
-@arg2: 
 
-
+
+
 
 
 
 
-
-
+@void: 
+@Returns: 
 
-
 
-
+
 
 
 
 
-@parent: 
-@object_creation_failed: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
 
-
+
+
 
 
 
 
-@NM_OBJECT_ERROR_UNKNOWN: 
-@NM_OBJECT_ERROR_OBJECT_CREATION_FAILURE: 
 
-
+
+
 
 
 
 
 
-
-
+
 
 
 
 
+@nmobject: the object which received the signal.
+@arg1: 
+@arg2: 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
-
+@parent: 
+@object_creation_failed: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-remote-connection.sgml b/docs/libnm-glib/tmpl/nm-remote-connection.sgml
index 298d7b91..e8314074 100644
--- a/docs/libnm-glib/tmpl/nm-remote-connection.sgml
+++ b/docs/libnm-glib/tmpl/nm-remote-connection.sgml
@@ -22,6 +22,20 @@ NMRemoteConnection
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -111,18 +125,14 @@ NMRemoteConnection
 @user_data: 
 
 
-
-
-
-
-
-
-
-
+
 
 
 
 
+@bus: 
+@path: 
+@Returns: 
 
 
 
@@ -156,13 +166,3 @@ NMRemoteConnection
 @user_data: 
 
 
-
-
-
-
-
-@bus: 
-@path: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-remote-settings.sgml b/docs/libnm-glib/tmpl/nm-remote-settings.sgml
index 44b4d4fb..6471c98c 100644
--- a/docs/libnm-glib/tmpl/nm-remote-settings.sgml
+++ b/docs/libnm-glib/tmpl/nm-remote-settings.sgml
@@ -22,218 +22,218 @@ NMRemoteSettings
 
 
 
-
+
 
 
 
 
+@NM_REMOTE_SETTINGS_ERROR_UNKNOWN: 
+@NM_REMOTE_SETTINGS_ERROR_CONNECTION_REMOVED: 
+@NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE: 
 
-
+
 
 
 
 
-@nmremotesettings: the object which received the signal.
 
-
+
+
 
 
 
 
-@nmremotesettings: the object which received the signal.
-@arg1: 
+@void: 
+@Returns: 
 
-
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
+
+
+
 
 
 
 
-
+
+
+
 
 
 
 
-@settings: 
-@connection: 
-@error: 
-@user_data: 
 
 
-
+
 
 
 
 
-@parent: 
-@new_connection: 
-@connections_read: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
 
-
+
+
 
 
 
 
-@NM_REMOTE_SETTINGS_ERROR_UNKNOWN: 
-@NM_REMOTE_SETTINGS_ERROR_CONNECTION_REMOVED: 
-@NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE: 
 
-
+
+
 
 
 
 
 @settings: 
+@connection: 
 @error: 
 @user_data: 
 
 
-
+
 
 
 
 
+@settings: 
+@error: 
+@user_data: 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+@nmremotesettings: the object which received the signal.
 
-
-
+
 
 
 
 
+@nmremotesettings: the object which received the signal.
+@arg1: 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+@parent: 
+@new_connection: 
+@connections_read: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
 
-
-
+
 
 
 
 
-@settings: 
-@connection: 
-@callback: 
-@user_data: 
+@bus: 
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
-@Returns: 
+@bus: 
+@cancellable: 
+@callback: 
+@user_data: 
 
 
-
+
 
 
 
 
-@settings: 
-@path: 
+@result: 
+@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @settings: 
-@uuid: 
 @Returns: 
 
 
-
+
 
 
 
 
 @settings: 
+@path: 
 @Returns: 
 
 
-
+
 
 
 
 
-@bus: 
+@settings: 
+@uuid: 
 @Returns: 
 
 
-
+
 
 
 
 
-@bus: 
-@cancellable: 
+@settings: 
+@connection: 
 @callback: 
 @user_data: 
-
-
-
-
-
-
-
-@result: 
-@error: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-secret-agent.sgml b/docs/libnm-glib/tmpl/nm-secret-agent.sgml
index 9d23cbc5..68a5f3a1 100644
--- a/docs/libnm-glib/tmpl/nm-secret-agent.sgml
+++ b/docs/libnm-glib/tmpl/nm-secret-agent.sgml
@@ -22,161 +22,168 @@ NMSecretAgent
 
 
 
-
+
 
 
 
 
 
-
+
+
 
 
 
 
-@nmsecretagent: the object which received the signal.
-@arg1: 
+@void: 
+@Returns: 
 
-
+
+
 
 
 
 
-
+@NM_SECRET_AGENT_ERROR_NOT_AUTHORIZED: 
+@NM_SECRET_AGENT_ERROR_INVALID_CONNECTION: 
+@NM_SECRET_AGENT_ERROR_USER_CANCELED: 
+@NM_SECRET_AGENT_ERROR_AGENT_CANCELED: 
+@NM_SECRET_AGENT_ERROR_INTERNAL_ERROR: 
+@NM_SECRET_AGENT_ERROR_NO_SECRETS: 
+
+
 
 
 
 
-
+@NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE: 
+@NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION: 
+@NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW: 
+@NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED: 
+
+
 
 
 
 
-
+
+
+
 
 
 
 
-@parent: 
-@get_secrets: 
-@cancel_get_secrets: 
-@save_secrets: 
-@delete_secrets: 
-@registration_result: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
 
-
+
+
 
 
 
 
-@agent: 
-@connection: 
-@error: 
-@user_data: 
 
 
-
+
 
 
 
 
-@NM_SECRET_AGENT_ERROR_NOT_AUTHORIZED: 
-@NM_SECRET_AGENT_ERROR_INVALID_CONNECTION: 
-@NM_SECRET_AGENT_ERROR_USER_CANCELED: 
-@NM_SECRET_AGENT_ERROR_AGENT_CANCELED: 
-@NM_SECRET_AGENT_ERROR_INTERNAL_ERROR: 
-@NM_SECRET_AGENT_ERROR_NO_SECRETS: 
 
-
+
+
 
 
 
 
-@NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE: 
-@NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION: 
-@NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW: 
-@NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED: 
 
-
+
 
 
 
 
-@agent: 
-@connection: 
-@secrets: 
-@error: 
-@user_data: 
-
+@nmsecretagent: the object which received the signal.
+@arg1: 
 
-
+
 
 
 
 
-@agent: 
-@connection: 
-@error: 
-@user_data: 
-
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+@agent: 
+@connection: 
+@secrets: 
+@error: 
+@user_data: 
 
 
-
+
 
 
 
 
+@agent: 
+@connection: 
+@error: 
+@user_data: 
 
 
-
+
 
 
 
 
+@agent: 
+@connection: 
+@error: 
+@user_data: 
 
 
-
+
 
 
 
 
+@parent: 
+@get_secrets: 
+@cancel_get_secrets: 
+@save_secrets: 
+@delete_secrets: 
+@registration_result: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
 
-
-
+
 
 
 
 
 @self: 
-@connection: 
-@callback: 
-@user_data: 
+@Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@self: 
 @Returns: 
 
 
@@ -203,15 +210,6 @@ NMSecretAgent
 @user_data: 
 
 
-
-
-
-
-
-@self: 
-@Returns: 
-
-
 
 
 
@@ -223,12 +221,14 @@ NMSecretAgent
 @user_data: 
 
 
-
+
 
 
 
 
 @self: 
-@Returns: 
+@connection: 
+@callback: 
+@user_data: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-vpn-connection.sgml b/docs/libnm-glib/tmpl/nm-vpn-connection.sgml
index 3086909a..c20f145d 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-connection.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-connection.sgml
@@ -22,6 +22,20 @@ NMVPNConnection
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -61,26 +75,13 @@ NMVPNConnection
 @_reserved5: 
 @_reserved6: 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
 
 
 
 
-@vpn: 
+@connection: 
+@path: 
 @Returns: 
 
 
@@ -93,13 +94,12 @@ NMVPNConnection
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@path: 
+@vpn: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
index f4c724a8..f38e277d 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
@@ -1,5 +1,5 @@
 
-NMVpnPluginUiWidget
+NMVpnPluginUi
 
 
 
@@ -22,17 +22,16 @@ NMVpnPluginUiWidget
 
 
 
-
+
 
 
 
 
-@NM_VPN_PLUGIN_UI_CAPABILITY_NONE: 
-@NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT: 
-@NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT: 
-@NM_VPN_PLUGIN_UI_CAPABILITY_IPV6: 
+@error: 
+@Returns: 
 
-
+
+
 
 
 
@@ -41,104 +40,105 @@ NMVpnPluginUiWidget
 @Returns: 
 
 
-
+
 
 
 
 
-@g_iface: 
-@ui_factory: 
-@get_capabilities: 
-@import_from_file: 
-@export_to_file: 
-@get_suggested_name: 
-@delete_connection: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
+@NM_VPN_PLUGIN_UI_CAPABILITY_NONE: 
+@NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT: 
+@NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT: 
+@NM_VPN_PLUGIN_UI_CAPABILITY_IPV6: 
 
-
+
 
 
 
 
-@NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME: 
-@NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC: 
-@NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE: 
 
-
+
+
 
 
 
 
-@g_iface: 
-@get_widget: 
-@update_connection: 
-@save_secrets: 
-@changed: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
 
+@NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME: 
+@NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC: 
+@NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE: 
 
-
-
+
 
 
 
 
+@g_iface: 
+@ui_factory: 
+@get_capabilities: 
+@import_from_file: 
+@export_to_file: 
+@get_suggested_name: 
+@delete_connection: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
 
-
-
+
 
 
 
 
+@iface: 
+@connection: 
 @error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @iface: 
-@connection: 
-@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @iface: 
 @path: 
-@connection: 
 @error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @iface: 
+@path: 
+@connection: 
+@error: 
 @Returns: 
 
 
@@ -152,27 +152,27 @@ NMVpnPluginUiWidget
 @Returns: 
 
 
-
+
 
 
 
 
 @iface: 
-@path: 
+@connection: 
 @error: 
 @Returns: 
 
 
-
+
 
 
 
 
-@iface: 
-@connection: 
-@error: 
-@Returns: 
-
+@g_iface: 
+@get_widget: 
+@update_connection: 
+@save_secrets: 
+@changed: 
 
 
 
@@ -183,7 +183,7 @@ NMVpnPluginUiWidget
 @Returns: 
 
 
-
+
 
 
 
@@ -194,7 +194,7 @@ NMVpnPluginUiWidget
 @Returns: 
 
 
-
+
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml
index ed0ab40b..3a6536da 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml
@@ -22,25 +22,25 @@ nm-vpn-plugin-utils
 
 
 
-
+
 
 
 
 
-@data: 
-@secret_name: 
-@out_flags: 
+@fd: 
+@out_data: 
+@out_secrets: 
 @Returns: 
 
 
-
+
 
 
 
 
-@fd: 
-@out_data: 
-@out_secrets: 
+@data: 
+@secret_name: 
+@out_flags: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
index 7ece0f79..8c738c54 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
@@ -22,33 +22,19 @@ NMVPNPlugin
 
 
 
-
+
 
 
 
 
-@parent: 
 
-
+
+
 
 
 
 
-@parent: 
-@connect: 
-@need_secrets: 
-@disconnect: 
-@state_changed: 
-@ip4_config: 
-@login_banner: 
-@failure: 
-@quit: 
-@config: 
-@ip6_config: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
+
 
 
 
@@ -65,64 +51,86 @@ NMVPNPlugin
 @NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED: 
 @NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID: 
 
-
+
 
 
 
 
+@parent: 
+
+
+
 
+
 
-
+@parent: 
+@connect: 
+@need_secrets: 
+@disconnect: 
+@state_changed: 
+@ip4_config: 
+@login_banner: 
+@failure: 
+@quit: 
+@config: 
+@ip6_config: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
 
 
 
 
+@void: 
+@Returns: 
 
 
-
+
 
 
 
 
 @plugin: 
-@err: 
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@plugin: 
 @Returns: 
 
 
-
+
 
 
 
 
 @plugin: 
-@reason: 
+@state: 
 
 
-
+
 
 
 
 
 @plugin: 
-@Returns: 
+@banner: 
 
 
-
+
 
 
 
 
 @plugin: 
-@Returns: 
+@reason: 
 
 
 
@@ -152,21 +160,13 @@ NMVPNPlugin
 @ip6_config: 
 
 
-
-
-
-
-
-@plugin: 
-@banner: 
-
-
-
+
 
 
 
 
 @plugin: 
-@state: 
+@err: 
+@Returns: 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml b/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml
index f5dca7a3..f270a1d2 100644
--- a/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml
+++ b/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml
@@ -22,39 +22,26 @@ NMWimaxNsp
 
 
 
-
+
 
 
 
 
 
-
-
-
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-@_reserved5: 
-@_reserved6: 
+
 
 
 
@@ -66,48 +53,60 @@ NMWimaxNsp
 @NM_WIMAX_NSP_NETWORK_TYPE_PARTNER: 
 @NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER: 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+@_reserved5: 
+@_reserved6: 
+
+
 
 
 
 
-@nsp: 
 @connection: 
+@path: 
 @Returns: 
 
 
-
+
 
 
 
 
 @nsp: 
-@connections: 
 @Returns: 
 
 
-
+
 
 
 
@@ -125,22 +124,23 @@ NMWimaxNsp
 @Returns: 
 
 
-
+
 
 
 
 
 @nsp: 
+@connections: 
 @Returns: 
 
 
-
+
 
 
 
 
+@nsp: 
 @connection: 
-@path: 
 @Returns: 
 
 
diff --git a/docs/libnm-glib/version.xml b/docs/libnm-glib/version.xml
index 68f4aad3..fe98bd59 100644
--- a/docs/libnm-glib/version.xml
+++ b/docs/libnm-glib/version.xml
@@ -1 +1 @@
-0.9.8.0
+0.9.8.8
diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in
index adddb718..68627afb 100644
--- a/docs/libnm-util/Makefile.in
+++ b/docs/libnm-util/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -21,23 +20,51 @@
 # Everything below here is generic #
 ####################################
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -56,8 +83,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.make
+DIST_COMMON = $(top_srcdir)/gtk-doc.make $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(srcdir)/version.xml.in
 subdir = docs/libnm-util
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
@@ -78,12 +105,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = version.xml
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -91,6 +124,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -233,7 +267,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGCONFIG_PATH = @PKGCONFIG_PATH@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@@ -248,6 +281,8 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@
+SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@
 SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
 SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
 SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
@@ -433,6 +468,42 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) \
 @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp
 @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = 
 @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp
+
+#### setup ####
+GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V))
+GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SETUP_0 = @echo "  DOC   Preparing build";
+
+#### scan ####
+GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V))
+GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SCAN_0 = @echo "  DOC   Scanning header files";
+GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V))
+GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_INTROSPECT_0 = @echo "  DOC   Introspecting gobjects";
+
+#### templates ####
+GTK_DOC_V_TMPL = $(GTK_DOC_V_TMPL_$(V))
+GTK_DOC_V_TMPL_ = $(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_TMPL_0 = @echo "  DOC   Rebuilding template files";
+
+#### xml ####
+GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V))
+GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XML_0 = @echo "  DOC   Building XML";
+
+#### html ####
+GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V))
+GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_HTML_0 = @echo "  DOC   Building HTML";
+GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V))
+GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XREF_0 = @echo "  DOC   Fixing cross-references";
+
+#### pdf ####
+GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V))
+GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_PDF_0 = @echo "  DOC   Building PDF";
 all: all-am
 
 .SUFFIXES:
@@ -475,11 +546,11 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -620,18 +691,18 @@ uninstall-am: uninstall-local
 .MAKE: install-am install-strip
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
-	clean-libtool clean-local dist-hook distclean \
-	distclean-generic distclean-libtool distclean-local distdir \
-	dvi dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-data-local install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic \
+	clean-libtool clean-local cscopelist-am ctags-am dist-hook \
+	distclean distclean-generic distclean-libtool distclean-local \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-data-local \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
 	maintainer-clean-local mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-local
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-local
 
 
 @ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
@@ -641,35 +712,28 @@ docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
 
 $(REPORT_FILES): sgml-build.stamp
 
-#### setup ####
-
 setup-build.stamp:
-	-@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    echo '  DOC   Preparing build'; \
+	-$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
 	    files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
 	    if test "x$$files" != "x" ; then \
 	        for file in $$files ; do \
 	            test -f $(abs_srcdir)/$$file && \
-	                cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \
+	                cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
 	        done; \
 	    fi; \
 	    test -d $(abs_srcdir)/tmpl && \
 	        { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
 	        chmod -R u+w $(abs_builddir)/tmpl; } \
 	fi
-	@touch setup-build.stamp
-
-#### scan ####
+	$(AM_V_at)touch setup-build.stamp
 
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-	@echo '  DOC   Scanning header files'
-	@_source_dir='' ; \
+	$(GTK_DOC_V_SCAN)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
 	gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
-	@if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
-	    echo "  DOC   Introspecting gobjects"; \
+	$(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    scanobj_options=""; \
 	    gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
 	    if test "$(?)" = "0"; then \
@@ -684,22 +748,19 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
 	        test -f $$i || touch $$i ; \
 	    done \
 	fi
-	@touch scan-build.stamp
+	$(AM_V_at)touch scan-build.stamp
 
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
 	@true
 
-#### templates ####
-
 tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	@echo '  DOC   Rebuilding template files'
-	@gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	$(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+	$(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
 	  if test -w $(abs_srcdir) ; then \
 	    cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
 	  fi \
 	fi
-	@touch tmpl-build.stamp
+	$(AM_V_at)touch tmpl-build.stamp
 
 tmpl.stamp: tmpl-build.stamp
 	@true
@@ -707,28 +768,20 @@ tmpl.stamp: tmpl-build.stamp
 $(srcdir)/tmpl/*.sgml:
 	@true
 
-#### xml ####
-
 sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-	@echo '  DOC   Building XML'
-	@-chmod -R u+w $(srcdir)
-	@_source_dir='' ; \
+	$(GTK_DOC_V_XML)-chmod -R u+w $(srcdir) && _source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
 	gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
-	@touch sgml-build.stamp
+	$(AM_V_at)touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
 	@true
 
-#### html ####
-
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo '  DOC   Building HTML'
-	@rm -rf html
-	@mkdir html
-	@mkhtml_options=""; \
+	$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
+	mkhtml_options=""; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
 	if test "$(?)" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
@@ -749,16 +802,12 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
 	  fi; \
 	done;
-	@echo '  DOC   Fixing cross-references'
-	@gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-	@touch html-build.stamp
-
-#### pdf ####
+	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+	$(AM_V_at)touch html-build.stamp
 
 pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo '  DOC   Building PDF'
-	@rm -f $(DOC_MODULE).pdf
-	@mkpdf_options=""; \
+	$(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
+	mkpdf_options=""; \
 	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
 	if test "$(?)" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
@@ -775,7 +824,7 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	  done; \
 	fi; \
 	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
-	@touch pdf-build.stamp
+	$(AM_V_at)touch pdf-build.stamp
 
 ##############
 
@@ -791,7 +840,7 @@ distclean-local:
 	    rm -rf tmpl; \
 	fi
 
-maintainer-clean-local: clean
+maintainer-clean-local:
 	@rm -rf xml html
 
 install-data-local:
@@ -827,7 +876,7 @@ uninstall-local:
 #
 # Require gtk-doc when making dist
 #
-@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc:
+@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: docs
 @ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc:
 @ENABLE_GTK_DOC_FALSE@	@echo "*** gtk-doc must be installed and enabled in order to make dist"
 @ENABLE_GTK_DOC_FALSE@	@false
diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html
index 3f55caf8..7c3d81b0 100644
--- a/docs/libnm-util/html/NMConnection.html
+++ b/docs/libnm-util/html/NMConnection.html
@@ -3,12 +3,12 @@
 
 
 NMConnection
-
+
 
 
 
 
-
+
 
 
 
@@ -46,47 +46,74 @@
 
 #include <nm-connection.h>
 
-                    NMConnection;
-                    NMConnectionClass;
 enum                NMConnectionError;
 #define             NM_CONNECTION_ERROR
+GQuark              nm_connection_error_quark           (void);
 #define             NM_CONNECTION_PATH
+                    NMConnection;
+                    NMConnectionClass;
+NMConnection *      nm_connection_new                   (void);
+NMConnection *      nm_connection_new_from_hash         (GHashTable *hash,
+                                                         GError **error);
+NMConnection *      nm_connection_duplicate             (NMConnection *connection);
+NMSetting *         nm_connection_create_setting        (const char *name);
 void                nm_connection_add_setting           (NMConnection *connection,
                                                          NMSetting *setting);
-void                nm_connection_clear_secrets         (NMConnection *connection);
-void                nm_connection_clear_secrets_with_flags
-                                                        (NMConnection *connection,
-                                                         NMSettingClearSecretsWithFlagsFn func,
-                                                         gpointer user_data);
+void                nm_connection_remove_setting        (NMConnection *connection,
+                                                         GType setting_type);
+NMSetting *         nm_connection_get_setting           (NMConnection *connection,
+                                                         GType setting_type);
+NMSetting *         nm_connection_get_setting_by_name   (NMConnection *connection,
+                                                         const char *name);
+gboolean            nm_connection_replace_settings      (NMConnection *connection,
+                                                         GHashTable *new_settings,
+                                                         GError **error);
 gboolean            nm_connection_compare               (NMConnection *a,
                                                          NMConnection *b,
                                                          NMSettingCompareFlags flags);
-NMSetting *         nm_connection_create_setting        (const char *name);
 gboolean            nm_connection_diff                  (NMConnection *a,
                                                          NMConnection *b,
                                                          NMSettingCompareFlags flags,
                                                          GHashTable **out_settings);
-void                nm_connection_dump                  (NMConnection *connection);
-NMConnection *      nm_connection_duplicate             (NMConnection *connection);
-GQuark              nm_connection_error_quark           (void);
+gboolean            nm_connection_verify                (NMConnection *connection,
+                                                         GError **error);
+const char *        nm_connection_need_secrets          (NMConnection *connection,
+                                                         GPtrArray **hints);
+void                nm_connection_clear_secrets         (NMConnection *connection);
+void                nm_connection_clear_secrets_with_flags
+                                                        (NMConnection *connection,
+                                                         NMSettingClearSecretsWithFlagsFn func,
+                                                         gpointer user_data);
+gboolean            nm_connection_update_secrets        (NMConnection *connection,
+                                                         const char *setting_name,
+                                                         GHashTable *secrets,
+                                                         GError **error);
+void                nm_connection_set_path              (NMConnection *connection,
+                                                         const char *path);
+const char *        nm_connection_get_path              (NMConnection *connection);
+const char *        nm_connection_get_virtual_iface_name
+                                                        (NMConnection *connection);
+gboolean            nm_connection_is_type               (NMConnection *connection,
+                                                         const char *type);
 void                nm_connection_for_each_setting_value
                                                         (NMConnection *connection,
                                                          NMSettingValueIterFn func,
                                                          gpointer user_data);
+GHashTable *        nm_connection_to_hash               (NMConnection *connection,
+                                                         NMSettingHashFlags flags);
+void                nm_connection_dump                  (NMConnection *connection);
+GType               nm_connection_lookup_setting_type   (const char *name);
+GType               nm_connection_lookup_setting_type_by_quark
+                                                        (GQuark error_quark);
+const char *        nm_connection_get_uuid              (NMConnection *connection);
 const char *        nm_connection_get_id                (NMConnection *connection);
-const char *        nm_connection_get_path              (NMConnection *connection);
-NMSetting *         nm_connection_get_setting           (NMConnection *connection,
-                                                         GType setting_type);
 NMSetting8021x *    nm_connection_get_setting_802_1x    (NMConnection *connection);
-NMSettingAdsl *     nm_connection_get_setting_adsl      (NMConnection *connection);
 NMSettingBluetooth * nm_connection_get_setting_bluetooth
                                                         (NMConnection *connection);
 NMSettingBond *     nm_connection_get_setting_bond      (NMConnection *connection);
 NMSettingBridge *   nm_connection_get_setting_bridge    (NMConnection *connection);
 NMSettingBridgePort * nm_connection_get_setting_bridge_port
                                                         (NMConnection *connection);
-NMSetting *         nm_connection_get_setting_by_name   (NMConnection *connection,
-                                                         const char *name);
 NMSettingCdma *     nm_connection_get_setting_cdma      (NMConnection *connection);
 NMSettingConnection * nm_connection_get_setting_connection
                                                         (NMConnection *connection);
@@ -101,53 +128,26 @@ const char *        NMSettingPPP *      nm_connection_get_setting_ppp       (NMConnection *connection);
 NMSettingPPPOE *    nm_connection_get_setting_pppoe     (NMConnection *connection);
 NMSettingSerial *   nm_connection_get_setting_serial    (NMConnection *connection);
-NMSettingVlan *     nm_connection_get_setting_vlan      (NMConnection *connection);
 NMSettingVPN *      nm_connection_get_setting_vpn       (NMConnection *connection);
 NMSettingWimax *    nm_connection_get_setting_wimax     (NMConnection *connection);
+NMSettingAdsl *     nm_connection_get_setting_adsl      (NMConnection *connection);
 NMSettingWired *    nm_connection_get_setting_wired     (NMConnection *connection);
 NMSettingWireless * nm_connection_get_setting_wireless  (NMConnection *connection);
 NMSettingWirelessSecurity * nm_connection_get_setting_wireless_security
                                                         (NMConnection *connection);
-const char *        nm_connection_get_uuid              (NMConnection *connection);
-const char *        nm_connection_get_virtual_iface_name
-                                                        (NMConnection *connection);
-gboolean            nm_connection_is_type               (NMConnection *connection,
-                                                         const char *type);
-GType               nm_connection_lookup_setting_type   (const char *name);
-GType               nm_connection_lookup_setting_type_by_quark
-                                                        (GQuark error_quark);
-const char *        nm_connection_need_secrets          (NMConnection *connection,
-                                                         GPtrArray **hints);
-NMConnection *      nm_connection_new                   (void);
-NMConnection *      nm_connection_new_from_hash         (GHashTable *hash,
-                                                         GError **error);
-void                nm_connection_remove_setting        (NMConnection *connection,
-                                                         GType setting_type);
-gboolean            nm_connection_replace_settings      (NMConnection *connection,
-                                                         GHashTable *new_settings,
-                                                         GError **error);
-void                nm_connection_set_path              (NMConnection *connection,
-                                                         const char *path);
-GHashTable *        nm_connection_to_hash               (NMConnection *connection,
-                                                         NMSettingHashFlags flags);
-gboolean            nm_connection_update_secrets        (NMConnection *connection,
-                                                         const char *setting_name,
-                                                         GHashTable *secrets,
-                                                         GError **error);
-gboolean            nm_connection_verify                (NMConnection *connection,
-                                                         GError **error);
+NMSettingVlan *     nm_connection_get_setting_vlan      (NMConnection *connection);
 

 

 

 
Object Hierarchy

-
-  GObject
-   +----NMConnection
-

 
   GEnum
    +----NMConnectionError
 

+
+  GObject
+   +----NMConnection
+

 

 

 
Properties

@@ -183,28 +183,6 @@ parameters (MTU, SSID, APN, channel, rate, etc) and IP-level parameters
 

 
Details

 

-
NMConnection

-
typedef struct _NMConnection NMConnection;

-

-The NMConnection struct contains only private data.
-It should only be accessed through the functions described below.
-

-

-

-

-
NMConnectionClass

-
typedef struct {
-	GObjectClass parent;
-
-	/* Signals */
-	void (*secrets_updated) (NMConnection *connection, const char * setting);
-} NMConnectionClass;
-

-

-

-

-

-

 
enum NMConnectionError

 
typedef enum {
 	NM_CONNECTION_ERROR_UNKNOWN = 0,                  /*< nick=UnknownError >*/
@@ -216,8 +194,11 @@ It should only be accessed through the functions described below.
 

 Describes errors that may result from operations involving a NMConnection.
 

-

+

+++
@@ -258,6 +239,24 @@ Describes errors that may result from operations involving a 
 

 

+
nm_connection_error_quark ()

+
GQuark              nm_connection_error_quark           (void);

+

+Registers an error quark for NMConnection if necessary.
+

+

 


 
 

 
NM_CONNECTION_ERROR_UNKNOWN

++++
+
+
+
+
+




Returns :
the error quark used for NMConnection errors.

+

+

+

 
NM_CONNECTION_PATH

 
#define NM_CONNECTION_PATH "path"
 

@@ -266,112 +265,100 @@ Describes errors that may result from operations involving a 
 

 

-
nm_connection_add_setting ()

-
void                nm_connection_add_setting           (NMConnection *connection,
-                                                         NMSetting *setting);

+
NMConnection

+
typedef struct _NMConnection NMConnection;

 

-Adds a NMSetting to the connection, replacing any previous NMSetting of the
-same name which has previously been added to the NMConnection.  The
-connection takes ownership of the NMSetting object and does not increase
-the setting object's reference count.
+The NMConnection struct contains only private data.
+It should only be accessed through the functions described below.
 

-

--
-
-
-
-
-
-
-
-
-
-


connection :
a NMConnection
-
setting :
the NMSetting to add to the connection object. [transfer full]
-

 

 

 

-
nm_connection_clear_secrets ()

-
void                nm_connection_clear_secrets         (NMConnection *connection);

+
NMConnectionClass

+
typedef struct {
+	GObjectClass parent;
+
+	/* Signals */
+	void (*secrets_updated) (NMConnection *connection, const char * setting);
+} NMConnectionClass;
+

 

-Clears and frees any secrets that may be stored in the connection, to avoid
-keeping secret data in memory when not needed.
 

-

+
+

+

+
nm_connection_new ()

+
NMConnection *      nm_connection_new                   (void);

+

+Creates a new NMConnection object with no NMSetting objects.
+

+

+++
-
-
+
+

 


 
connection :
the NMConnection
-
Returns :
the new empty NMConnection object
 

 

 

 

 

-
nm_connection_clear_secrets_with_flags ()

-
void                nm_connection_clear_secrets_with_flags
-                                                        (NMConnection *connection,
-                                                         NMSettingClearSecretsWithFlagsFn func,
-                                                         gpointer user_data);

+
nm_connection_new_from_hash ()

+
NMConnection *      nm_connection_new_from_hash         (GHashTable *hash,
+                                                         GError **error);

 

-Clears and frees secrets determined by func.
+Creates a new NMConnection from a hash table describing the connection.  See
+nm_connection_to_hash() for a description of the expected hash table.
 

-

+

+++
-
-
+
-
-
+
+
-
-
+
+

 


 
 
connection :
the NMConnection
+
hash :
the GHashTable describing
+the connection. [element-type utf8 GLib.HashTable]
 
 

 
func :
function to be called to determine whether a
-specific secret should be cleared or not. [scope call]
-
error :
on unsuccessful return, an error
 

 
user_data :
caller-supplied data passed to func
-
Returns :
the new NMConnection object, populated with settings created
+from the values in the hash table, or NULL if the connection failed to
+validate
 

 
 

 

 

 

-
nm_connection_compare ()

-
gboolean            nm_connection_compare               (NMConnection *a,
-                                                         NMConnection *b,
-                                                         NMSettingCompareFlags flags);

+
nm_connection_duplicate ()

+
NMConnection *      nm_connection_duplicate             (NMConnection *connection);

 

-Compares two NMConnection objects for similarity, with comparison behavior
-modified by a set of flags.  See nm_setting_compare() for a description of
-each flag's behavior.
+Duplicates a NMConnection.
 

-

+

+++
-
-
-
-
-
-
-
-
-
-
+
+
-
+

 


 
 
a :
a NMConnection
-
b :
a second NMConnection to compare with the first
flags :
compare flags, e.g. NM_SETTING_COMPARE_FLAG_EXACT
-
connection :
the NMConnection to duplicate
 

 

 
Returns :

-TRUE if the comparison succeeds, FALSE if it does nota new NMConnection containing the same settings and properties
+as the source NMConnection. [transfer full]
+
 

 
 

@@ -383,8 +370,11 @@ each flag's behavior.
 

 Create a new NMSetting object of the desired type, given a setting name.
 

-

+

+++
@@ -392,7 +382,7 @@ Create a new 
 
-
@@ -400,88 +390,89 @@ Create a new 
 

 

-
nm_connection_diff ()

-
gboolean            nm_connection_diff                  (NMConnection *a,
-                                                         NMConnection *b,
-                                                         NMSettingCompareFlags flags,
-                                                         GHashTable **out_settings);

+
nm_connection_add_setting ()

+
void                nm_connection_add_setting           (NMConnection *connection,
+                                                         NMSetting *setting);

 

-Compares two NMConnection objects for similarity, with comparison behavior
-modified by a set of flags.  See nm_setting_compare() for a description of
-each flag's behavior.  If the connections differ, settings and keys within
-each setting that differ are added to the returned out_settings hash table.
-No values are returned, only key names.
+Adds a NMSetting to the connection, replacing any previous NMSetting of the
+same name which has previously been added to the NMConnection.  The
+connection takes ownership of the NMSetting object and does not increase
+the setting object's reference count.
 

-

 


 
 

 
name :

 
Returns :
the new setting object, or NULL if the setting name was unknown. [transfer full]
+the new setting object, or NULL if the setting name was unknown. [transfer full]
 
 

 

+

+++
-
+
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-

 


 
 
a :
connection :

 a NMConnection
 
 

 
b :
a second NMConnection to compare with the first
flags :
compare flags, e.g. NM_SETTING_COMPARE_FLAG_EXACT
-
out_settings :
if the
-connections differ, on return a hash table mapping setting names to
-second-level GHashTable (utf8 to guint32), which contains the key names that
-differ mapped to one or more of NMSettingDiffResult as a bitfield. [element-type utf8 GLib.HashTable]
+
setting :
the NMSetting to add to the connection object. [transfer full]
 
 
Returns :

-TRUE if the connections contain the same values, FALSE if they do
-not

 
 

 

 

 

-
nm_connection_dump ()

-
void                nm_connection_dump                  (NMConnection *connection);

+
nm_connection_remove_setting ()

+
void                nm_connection_remove_setting        (NMConnection *connection,
+                                                         GType setting_type);

 

-Print the connection to stdout.  For debugging purposes ONLY, should NOT
-be used for serialization of the connection or machine-parsed in any way. The
-output format is not guaranteed to be stable and may change at any time.
+Removes the NMSetting with the given GType from the NMConnection.  This
+operation dereferences the NMSetting object.
 

-

+

+-
++
+
+
-
-
+
+
+
+
+
+

 




 
connection :
the NMConnection
+a NMConnection
 
setting_type :
the GType of the setting object to remove

 

 

 

 

-
nm_connection_duplicate ()

-
NMConnection *      nm_connection_duplicate             (NMConnection *connection);

+
nm_connection_get_setting ()

+
NMSetting *         nm_connection_get_setting           (NMConnection *connection,
+                                                         GType setting_type);

 

-Duplicates a NMConnection.
+Gets the NMSetting with the given GType, if one has been previously added
+to the NMConnection.
 

-

+

+++
-
+
+
+
+
+
-
@@ -489,134 +480,219 @@ as the source 
 

 

-
nm_connection_error_quark ()

-
GQuark              nm_connection_error_quark           (void);

+
nm_connection_get_setting_by_name ()

+
NMSetting *         nm_connection_get_setting_by_name   (NMConnection *connection,
+                                                         const char *name);

 

-Registers an error quark for NMConnection if necessary.
+Gets the NMSetting with the given name, if one has been previously added
+the the NMConnection.
 

-

 


 
 

 
connection :
the NMConnection to duplicatea NMConnection
+
setting_type :
the GType of the setting object to return
 

 

 
Returns :
a new NMConnection containing the same settings and properties
-as the source NMConnection. [transfer full]
+the NMSetting, or NULL if no setting of that type was previously
+added to the NMConnection. [transfer none]
 
 

 

+

+-
++
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+

 



connection :
a NMConnection
+
name :
a setting name

 
Returns :
the error quark used for NMConnection errors.
the NMSetting, or NULL if no setting with that name was previously
+added to the NMConnection. [transfer none]
+

 

 

 

 

-
nm_connection_for_each_setting_value ()

-
void                nm_connection_for_each_setting_value
-                                                        (NMConnection *connection,
-                                                         NMSettingValueIterFn func,
-                                                         gpointer user_data);

-

-Iterates over the properties of each NMSetting object in the NMConnection,
-calling the supplied user function for each property.
-

-

+
nm_connection_replace_settings ()

+
gboolean            nm_connection_replace_settings      (NMConnection *connection,
+                                                         GHashTable *new_settings,
+                                                         GError **error);

+

+++
-
-
-
+
-
-
+
+
+
+
+
+

 


 
 

 
connection :
the NMConnection
+a NMConnection
 
 

 
func :
user-supplied function called for each setting's property. [scope call]
+
new_settings :
a GHashTable of settings. [element-type utf8 GLib.HashTable]
 
 

 
user_data :
user data passed to func at each invocation
error :
location to store error, or NULL
+
Returns :

+TRUE if the settings were valid and added to the connection, FALSE
+if they were not
 

 
 

 

 

 

-
nm_connection_get_id ()

-
const char *        nm_connection_get_id                (NMConnection *connection);

+
nm_connection_compare ()

+
gboolean            nm_connection_compare               (NMConnection *a,
+                                                         NMConnection *b,
+                                                         NMSettingCompareFlags flags);

 

-A shortcut to return the ID from the connection's NMSettingConnection.
+Compares two NMConnection objects for similarity, with comparison behavior
+modified by a set of flags.  See nm_setting_compare() for a description of
+each flag's behavior.
 

-

+

+++
-
-
+
+
+
+
+
+
+
+
+
-
+

 


 
 
connection :
the NMConnection
+
a :
a NMConnection
+
b :
a second NMConnection to compare with the first
flags :
compare flags, e.g. NM_SETTING_COMPARE_FLAG_EXACT
 
 

 

 
Returns :
the ID from the connection's 'connection' setting
+TRUE if the comparison succeeds, FALSE if it does not
 

 
 

 

 

 

-
nm_connection_get_path ()

-
const char *        nm_connection_get_path              (NMConnection *connection);

+
nm_connection_diff ()

+
gboolean            nm_connection_diff                  (NMConnection *a,
+                                                         NMConnection *b,
+                                                         NMSettingCompareFlags flags,
+                                                         GHashTable **out_settings);

 

-Returns the connection's D-Bus path.
+Compares two NMConnection objects for similarity, with comparison behavior
+modified by a set of flags.  See nm_setting_compare() for a description of
+each flag's behavior.  If the connections differ, settings and keys within
+each setting that differ are added to the returned out_settings hash table.
+No values are returned, only key names.
 

-

+

+++
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+

 


 
 
connection :
the NMConnection
+
a :
a NMConnection
+
b :
a second NMConnection to compare with the first
flags :
compare flags, e.g. NM_SETTING_COMPARE_FLAG_EXACT
+
out_settings :
if the
+connections differ, on return a hash table mapping setting names to
+second-level GHashTable (utf8 to guint32), which contains the key names that
+differ mapped to one or more of NMSettingDiffResult as a bitfield. [element-type utf8 GLib.HashTable]
 
 

 

 
Returns :
the D-Bus path of the connection, previously set by a call to
-nm_connection_set_path().
+TRUE if the connections contain the same values, FALSE if they do
+not
 

 
 

 

 

 

-
nm_connection_get_setting ()

-
NMSetting *         nm_connection_get_setting           (NMConnection *connection,
-                                                         GType setting_type);

+
nm_connection_verify ()

+
gboolean            nm_connection_verify                (NMConnection *connection,
+                                                         GError **error);

 

-Gets the NMSetting with the given GType, if one has been previously added
-to the NMConnection.
+Validates the connection and all its settings.  Each setting's properties
+have allowed values, and some values are dependent on other values.  For
+example, if a WiFi connection is security enabled, the NMSettingWireless
+setting object's 'security' property must contain the setting name of the
+NMSettingWirelessSecurity object, which must also be present in the 
+connection for the connection to be valid.  As another example, the
+NMSettingWired object's 'mac-address' property must be a validly formatted
+MAC address.  The returned GError contains information about which
+setting and which property failed validation, and how it failed validation.
 

-

+

+++
-
+
-
-
+
+
-
+

 


 
 

 
connection :
a NMConnection
-the NMConnection to verify
 

 
setting_type :
the GType of the setting object to return
error :
location to store error, or NULL
+
 

 

 
Returns :
the NMSetting, or NULL if no setting of that type was previously
-added to the NMConnection. [transfer none]
-
+TRUE if the connection is valid, FALSE if it is not
 

 
 

 

 

 

-
nm_connection_get_setting_802_1x ()

-
NMSetting8021x *    nm_connection_get_setting_802_1x    (NMConnection *connection);

+
nm_connection_need_secrets ()

+
const char *        nm_connection_need_secrets          (NMConnection *connection,
+                                                         GPtrArray **hints);

 

-A shortcut to return any NMSetting8021x the connection might contain.
+Returns the name of the first setting object in the connection which would
+need secrets to make a successful connection.  The returned hints are only
+intended as a guide to what secrets may be required, because in some
+circumstances, there is no way to conclusively determine exactly which
+secrets are needed.
 

-

+

+++
@@ -624,22 +700,57 @@ A shortcut to return any Returns :

-
+
+
+
+
+

 


 
 

 
connection :
an NMSetting8021x if the connection contains one, otherwise NULL. [transfer none]
+
hints :
the address of a pointer to a GPtrArray, initialized to NULL, which on
+return points to an allocated GPtrArray containing the property names of
+secrets of the NMSetting which may be required; the caller owns the array
+and must free the array itself with g_ptr_array_free(), but not free its
+elements. [out][element-type utf8][allow-none][transfer container]
 
 
Returns :
the setting name of the NMSetting object which has invalid or
+missing secrets

 
 

 

 

 

-
nm_connection_get_setting_adsl ()

-
NMSettingAdsl *     nm_connection_get_setting_adsl      (NMConnection *connection);

+
nm_connection_clear_secrets ()

+
void                nm_connection_clear_secrets         (NMConnection *connection);

+

+Clears and frees any secrets that may be stored in the connection, to avoid
+keeping secret data in memory when not needed.
+

+

++++
+
+
+
+
+




connection :
the NMConnection
+

+

+

+

+
nm_connection_clear_secrets_with_flags ()

+
void                nm_connection_clear_secrets_with_flags
+                                                        (NMConnection *connection,
+                                                         NMSettingClearSecretsWithFlagsFn func,
+                                                         gpointer user_data);

 

-A shortcut to return any NMSettingAdsl the connection might contain.
+Clears and frees secrets determined by func.
 

-

+

+++
@@ -647,8 +758,14 @@ A shortcut to return any Returns :

-
+
+
+
+
+
@@ -656,14 +773,24 @@ A shortcut to return any 
-
nm_connection_get_setting_bluetooth ()

-
NMSettingBluetooth * nm_connection_get_setting_bluetooth
-                                                        (NMConnection *connection);

+
nm_connection_update_secrets ()

+
gboolean            nm_connection_update_secrets        (NMConnection *connection,
+                                                         const char *setting_name,
+                                                         GHashTable *secrets,
+                                                         GError **error);

-A shortcut to return any NMSettingBluetooth the connection might contain.
+Update the specified setting's secrets, given a hash table of secrets
+intended for that setting (deserialized from D-Bus for example).  Will also
+extract the given setting's secrets hash if given a hash of hashes, as would
+be returned from nm_connection_to_hash().  If setting_name is NULL, expects
+a fully serialized NMConnection as returned by nm_connection_to_hash() and
+will update all secrets from all settings contained in secrets.
 

-

 


 
 

 
connection :
an NMSettingAdsl if the connection contains one, otherwise NULL. [transfer none]
+
func :
function to be called to determine whether a
+specific secret should be cleared or not. [scope call]
+
user_data :
caller-supplied data passed to func
 
 

 
 

+

+++
@@ -671,22 +798,44 @@ A shortcut to return any Returns :

-
+
+
+
+
+
+
+
+
+
+
+
+
+

 


 
 

 
connection :
an NMSettingBluetooth if the connection contains one, otherwise NULL. [transfer none]
+
setting_name :
the setting object name to which the secrets apply
secrets :
a GHashTable mapping
+string:GValue of setting property names and secrets of the given setting_name. [element-type utf8 GObject.Value]
+
error :
location to store error, or NULL
 
 
Returns :

+TRUE if the secrets were successfully updated, FALSE if the update
+failed (tried to update secrets for a setting that doesn't exist, etc)

 
 

 

 

 

-
nm_connection_get_setting_bond ()

-
NMSettingBond *     nm_connection_get_setting_bond      (NMConnection *connection);

+
nm_connection_set_path ()

+
void                nm_connection_set_path              (NMConnection *connection,
+                                                         const char *path);

 

-A shortcut to return any NMSettingBond the connection might contain.
+Sets the D-Bus path of the connection.  This property is not serialized, and
+is only for the reference of the caller.  Sets the "path"
+property.
 

-

+

+++
@@ -694,22 +843,25 @@ A shortcut to return any Returns :

-
+
+

 


 
 

 
connection :
an NMSettingBond if the connection contains one, otherwise NULL. [transfer none]
-
path :
the D-Bus path of the connection as given by the settings service
+which provides the connection
 

 
 

 

 

 

-
nm_connection_get_setting_bridge ()

-
NMSettingBridge *   nm_connection_get_setting_bridge    (NMConnection *connection);

+
nm_connection_get_path ()

+
const char *        nm_connection_get_path              (NMConnection *connection);

 

-A shortcut to return any NMSettingBridge the connection might contain.
+Returns the connection's D-Bus path.
 

-

+

+++
@@ -718,31 +870,37 @@ A shortcut to return any Returns :

-
+

 


 
 

 
connection :
an NMSettingBridge if the connection contains one, otherwise NULL. [transfer none]
-the D-Bus path of the connection, previously set by a call to
+nm_connection_set_path().
 

 
 

 

 

 

-
nm_connection_get_setting_bridge_port ()

-
NMSettingBridgePort * nm_connection_get_setting_bridge_port
+
nm_connection_get_virtual_iface_name ()

+
const char *        nm_connection_get_virtual_iface_name
                                                         (NMConnection *connection);

 

-A shortcut to return any NMSettingBridgePort the connection might contain.
+Returns the name of the virtual kernel interface which the connection
+needs to use if specified in the settings. This function abstracts all
+connection types which require this functionality. For all other
+connection types, this function will return NULL.
 

-

+

+++
-
-
@@ -750,43 +908,54 @@ A shortcut to return any 
-
nm_connection_get_setting_by_name ()

-
NMSetting *         nm_connection_get_setting_by_name   (NMConnection *connection,
-                                                         const char *name);

+
nm_connection_is_type ()

+
gboolean            nm_connection_is_type               (NMConnection *connection,
+                                                         const char *type);

-Gets the NMSetting with the given name, if one has been previously added
-the the NMConnection.
+A convenience function to check if the given connection is a particular
+type (ie wired, wifi, ppp, etc). Checks the "type"
+property of the connection and matches that against type.
 

-

 


 
 

 
connection :
the NMConnection
+The NMConnection
 
 

 

 
Returns :
an NMSettingBridgePort if the connection contains one, otherwise NULL. [transfer none]
+Name of the kernel interface or NULL
 
 

 
 

+

+++
-
-
-
+
+
-
+

 


 
 

 
connection :
a NMConnection
+the NMConnection
 
 

 
name :
a setting name
type :
a setting name to check the connection's type against (like
+NM_SETTING_WIRELESS_SETTING_NAME or NM_SETTING_WIRED_SETTING_NAME)
 

 

 
Returns :
the NMSetting, or NULL if no setting with that name was previously
-added to the NMConnection. [transfer none]
-
+TRUE if the connection is of the given type, FALSE if not
 

 
 

 

 

 

-
nm_connection_get_setting_cdma ()

-
NMSettingCdma *     nm_connection_get_setting_cdma      (NMConnection *connection);

+
nm_connection_for_each_setting_value ()

+
void                nm_connection_for_each_setting_value
+                                                        (NMConnection *connection,
+                                                         NMSettingValueIterFn func,
+                                                         gpointer user_data);

 

-A shortcut to return any NMSettingCdma the connection might contain.
+Iterates over the properties of each NMSetting object in the NMConnection,
+calling the supplied user function for each property.
 

-

+

+++
@@ -794,23 +963,35 @@ A shortcut to return any Returns :

-
+
+
+
+
+

 


 
 

 
connection :
an NMSettingCdma if the connection contains one, otherwise NULL. [transfer none]
+
func :
user-supplied function called for each setting's property. [scope call]
 
 
user_data :
user data passed to func at each invocation

 
 

 

 

 

-
nm_connection_get_setting_connection ()

-
NMSettingConnection * nm_connection_get_setting_connection
-                                                        (NMConnection *connection);

+
nm_connection_to_hash ()

+
GHashTable *        nm_connection_to_hash               (NMConnection *connection,
+                                                         NMSettingHashFlags flags);

 

-A shortcut to return any NMSettingConnection the connection might contain.
+Converts the NMConnection into a GHashTable describing the connection,
+suitable for marshalling over D-Bus or serializing.  The hash table mapping
+is string:GHashTable with each element in the returned hash representing
+a NMSetting object.  The keys are setting object names, and the values
+are GHashTables mapping string:GValue, each of which represents the
+properties of the NMSetting object.
 

-

+

+++
@@ -818,8 +999,16 @@ A shortcut to return any flags :

+
+
+
-
@@ -827,85 +1016,87 @@ A shortcut to return any 
-
nm_connection_get_setting_gsm ()

-
NMSettingGsm *      nm_connection_get_setting_gsm       (NMConnection *connection);

+
nm_connection_dump ()

+
void                nm_connection_dump                  (NMConnection *connection);

-A shortcut to return any NMSettingGsm the connection might contain.
+Print the connection to stdout.  For debugging purposes ONLY, should NOT
+be used for serialization of the connection or machine-parsed in any way. The
+output format is not guaranteed to be stable and may change at any time.
 

-

 


 
 

 
connection :
hash flags, e.g. NM_SETTING_HASH_FLAG_ALL
+

 
Returns :
an NMSettingConnection if the connection contains one, otherwise NULL. [transfer none]
+a new
+GHashTable describing the connection, its settings, and each setting's
+properties.  The caller owns the hash table and must unref the hash table
+with g_hash_table_unref() when it is no longer needed. [transfer full][element-type utf8 GLib.HashTable]
 
 

 
 

+

+-
-
++
+
-
-
-
-
-
-
+

 




 
connection :

 the NMConnection
 
Returns :
an NMSettingGsm if the connection contains one, otherwise NULL. [transfer none]
-

 

 

 

 

-
nm_connection_get_setting_infiniband ()

-
NMSettingInfiniband * nm_connection_get_setting_infiniband
-                                                        (NMConnection *connection);

+
nm_connection_lookup_setting_type ()

+
GType               nm_connection_lookup_setting_type   (const char *name);

 

-A shortcut to return any NMSettingInfiniband the connection might contain.
+Returns the GType of the setting's class for a given setting name.
 

-

+

+++
-
-
+
+
-
+

 


 
 
connection :
the NMConnection
-
name :
a setting name
 

 

 
Returns :
an NMSettingInfiniband if the connection contains one, otherwise NULL. [transfer none]
-the GType of the setting's class
 

 
 

 

 

 

-
nm_connection_get_setting_ip4_config ()

-
NMSettingIP4Config * nm_connection_get_setting_ip4_config
-                                                        (NMConnection *connection);

+
nm_connection_lookup_setting_type_by_quark ()

+
GType               nm_connection_lookup_setting_type_by_quark
+                                                        (GQuark error_quark);

 

-A shortcut to return any NMSettingIP4Config the connection might contain.
+Returns the GType of the setting's class for a given setting error quark.
+Useful for figuring out which setting a returned error is for.
 

-

+

+++
-
-
+
+
-
+

 


 
 
connection :
the NMConnection
-
error_quark :
a setting error quark
 

 

 
Returns :
an NMSettingIP4Config if the connection contains one, otherwise NULL. [transfer none]
-the GType of the setting's class
 

 
 

 

 

 

-
nm_connection_get_setting_ip6_config ()

-
NMSettingIP6Config * nm_connection_get_setting_ip6_config
-                                                        (NMConnection *connection);

+
nm_connection_get_uuid ()

+
const char *        nm_connection_get_uuid              (NMConnection *connection);

 

-A shortcut to return any NMSettingIP6Config the connection might contain.
+A shortcut to return the UUID from the connection's NMSettingConnection.
 

-

+

+++
@@ -914,21 +1105,23 @@ A shortcut to return any Returns :

-
+

 


 
 

 
connection :
an NMSettingIP6Config if the connection contains one, otherwise NULL. [transfer none]
-the UUID from the connection's 'connection' setting
 

 
 

 

 

 

-
nm_connection_get_setting_olpc_mesh ()

-
NMSettingOlpcMesh * nm_connection_get_setting_olpc_mesh (NMConnection *connection);

+
nm_connection_get_id ()

+
const char *        nm_connection_get_id                (NMConnection *connection);

 

-A shortcut to return any NMSettingOlpcMesh the connection might contain.
+A shortcut to return the ID from the connection's NMSettingConnection.
 

-

+

+++
@@ -937,21 +1130,23 @@ A shortcut to return any Returns :

-
+

 


 
 

 
connection :
an NMSettingOlpcMesh if the connection contains one, otherwise NULL. [transfer none]
-the ID from the connection's 'connection' setting
 

 
 

 

 

 

-
nm_connection_get_setting_ppp ()

-
NMSettingPPP *      nm_connection_get_setting_ppp       (NMConnection *connection);

+
nm_connection_get_setting_802_1x ()

+
NMSetting8021x *    nm_connection_get_setting_802_1x    (NMConnection *connection);

 

-A shortcut to return any NMSettingPPP the connection might contain.
+A shortcut to return any NMSetting8021x the connection might contain.
 

-

+

+++
@@ -960,7 +1155,7 @@ A shortcut to return any Returns :

-
@@ -968,13 +1163,17 @@ A shortcut to return any 
-
nm_connection_get_setting_pppoe ()

-
NMSettingPPPOE *    nm_connection_get_setting_pppoe     (NMConnection *connection);

+
nm_connection_get_setting_bluetooth ()

+
NMSettingBluetooth * nm_connection_get_setting_bluetooth
+                                                        (NMConnection *connection);

-A shortcut to return any NMSettingPPPOE the connection might contain.
+A shortcut to return any NMSettingBluetooth the connection might contain.
 

-

 


 
 

 
connection :
an NMSettingPPP if the connection contains one, otherwise NULL. [transfer none]
+an NMSetting8021x if the connection contains one, otherwise NULL. [transfer none]
 
 

 
 

+

+++
@@ -983,7 +1182,7 @@ A shortcut to return any Returns :

-
@@ -991,13 +1190,16 @@ A shortcut to return any 
-
nm_connection_get_setting_serial ()

-
NMSettingSerial *   nm_connection_get_setting_serial    (NMConnection *connection);

+
nm_connection_get_setting_bond ()

+
NMSettingBond *     nm_connection_get_setting_bond      (NMConnection *connection);

-A shortcut to return any NMSettingSerial the connection might contain.
+A shortcut to return any NMSettingBond the connection might contain.
 

-

 


 
 

 
connection :
an NMSettingPPPOE if the connection contains one, otherwise NULL. [transfer none]
+an NMSettingBluetooth if the connection contains one, otherwise NULL. [transfer none]
 
 

 
 

+

+++
@@ -1006,7 +1208,7 @@ A shortcut to return any Returns :

-
@@ -1014,13 +1216,16 @@ A shortcut to return any 
-
nm_connection_get_setting_vlan ()

-
NMSettingVlan *     nm_connection_get_setting_vlan      (NMConnection *connection);

+
nm_connection_get_setting_bridge ()

+
NMSettingBridge *   nm_connection_get_setting_bridge    (NMConnection *connection);

-A shortcut to return any NMSettingVlan the connection might contain.
+A shortcut to return any NMSettingBridge the connection might contain.
 

-

 


 
 

 
connection :
an NMSettingSerial if the connection contains one, otherwise NULL. [transfer none]
+an NMSettingBond if the connection contains one, otherwise NULL. [transfer none]
 
 

 
 

+

+++
@@ -1029,7 +1234,7 @@ A shortcut to return any Returns :

-
@@ -1037,13 +1242,17 @@ A shortcut to return any 
-
nm_connection_get_setting_vpn ()

-
NMSettingVPN *      nm_connection_get_setting_vpn       (NMConnection *connection);

+
nm_connection_get_setting_bridge_port ()

+
NMSettingBridgePort * nm_connection_get_setting_bridge_port
+                                                        (NMConnection *connection);

-A shortcut to return any NMSettingVPN the connection might contain.
+A shortcut to return any NMSettingBridgePort the connection might contain.
 

-

 


 
 

 
connection :
an NMSettingVlan if the connection contains one, otherwise NULL. [transfer none]
+an NMSettingBridge if the connection contains one, otherwise NULL. [transfer none]
 
 

 
 

+

+++
@@ -1052,7 +1261,7 @@ A shortcut to return any Returns :

-
@@ -1060,13 +1269,16 @@ A shortcut to return any 
-
nm_connection_get_setting_wimax ()

-
NMSettingWimax *    nm_connection_get_setting_wimax     (NMConnection *connection);

+
nm_connection_get_setting_cdma ()

+
NMSettingCdma *     nm_connection_get_setting_cdma      (NMConnection *connection);

-A shortcut to return any NMSettingWimax the connection might contain.
+A shortcut to return any NMSettingCdma the connection might contain.
 

-

 


 
 

 
connection :
an NMSettingVPN if the connection contains one, otherwise NULL. [transfer none]
+an NMSettingBridgePort if the connection contains one, otherwise NULL. [transfer none]
 
 

 
 

+

+++
@@ -1075,7 +1287,7 @@ A shortcut to return any Returns :

-
@@ -1083,13 +1295,17 @@ A shortcut to return any 
-
nm_connection_get_setting_wired ()

-
NMSettingWired *    nm_connection_get_setting_wired     (NMConnection *connection);

+
nm_connection_get_setting_connection ()

+
NMSettingConnection * nm_connection_get_setting_connection
+                                                        (NMConnection *connection);

-A shortcut to return any NMSettingWired the connection might contain.
+A shortcut to return any NMSettingConnection the connection might contain.
 

-

 


 
 

 
connection :
an NMSettingWimax if the connection contains one, otherwise NULL. [transfer none]
+an NMSettingCdma if the connection contains one, otherwise NULL. [transfer none]
 
 

 
 

+

+++
@@ -1098,7 +1314,7 @@ A shortcut to return any Returns :

-
@@ -1106,13 +1322,16 @@ A shortcut to return any 
-
nm_connection_get_setting_wireless ()

-
NMSettingWireless * nm_connection_get_setting_wireless  (NMConnection *connection);

+
nm_connection_get_setting_gsm ()

+
NMSettingGsm *      nm_connection_get_setting_gsm       (NMConnection *connection);

-A shortcut to return any NMSettingWireless the connection might contain.
+A shortcut to return any NMSettingGsm the connection might contain.
 

-

 


 
 

 
connection :
an NMSettingWired if the connection contains one, otherwise NULL. [transfer none]
+an NMSettingConnection if the connection contains one, otherwise NULL. [transfer none]
 
 

 
 

+

+++
@@ -1121,7 +1340,7 @@ A shortcut to return any Returns :

-
@@ -1129,14 +1348,17 @@ A shortcut to return any 
-
nm_connection_get_setting_wireless_security ()

-
NMSettingWirelessSecurity * nm_connection_get_setting_wireless_security
+
nm_connection_get_setting_infiniband ()

+
NMSettingInfiniband * nm_connection_get_setting_infiniband
                                                         (NMConnection *connection);

 

-A shortcut to return any NMSettingWirelessSecurity the connection might contain.
+A shortcut to return any NMSettingInfiniband the connection might contain.
 

-

 


 
 

 
connection :
an NMSettingWireless if the connection contains one, otherwise NULL. [transfer none]
+an NMSettingGsm if the connection contains one, otherwise NULL. [transfer none]
 
 

 

+

+++
@@ -1145,7 +1367,7 @@ A shortcut to return any 
 
-
@@ -1153,13 +1375,17 @@ A shortcut to return any 
 

 

-
nm_connection_get_uuid ()

-
const char *        nm_connection_get_uuid              (NMConnection *connection);

+
nm_connection_get_setting_ip4_config ()

+
NMSettingIP4Config * nm_connection_get_setting_ip4_config
+                                                        (NMConnection *connection);

 

-A shortcut to return the UUID from the connection's NMSettingConnection.
+A shortcut to return any NMSettingIP4Config the connection might contain.
 

-

 


 
 

 
connection :

 
Returns :
an NMSettingWirelessSecurity if the connection contains one, otherwise NULL. [transfer none]
+an NMSettingInfiniband if the connection contains one, otherwise NULL. [transfer none]
 
 

 

+

+++
@@ -1168,49 +1394,51 @@ A shortcut to return the UUID from the connection's Returns :

-
+

 


 
 

 
connection :
the UUID from the connection's 'connection' settingan NMSettingIP4Config if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

 

 

 

-
nm_connection_get_virtual_iface_name ()

-
const char *        nm_connection_get_virtual_iface_name
+
nm_connection_get_setting_ip6_config ()

+
NMSettingIP6Config * nm_connection_get_setting_ip6_config
                                                         (NMConnection *connection);

 

-Returns the name of the virtual kernel interface which the connection
-needs to use if specified in the settings. This function abstracts all
-connection types which require this functionality. For all other
-connection types, this function will return NULL.
+A shortcut to return any NMSettingIP6Config the connection might contain.
 

-

+

+++
-
-
+

 


 
 

 
connection :
The NMConnection
+the NMConnection
 
 

 

 
Returns :
Name of the kernel interface or NULLan NMSettingIP6Config if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

 

 

 

-
nm_connection_is_type ()

-
gboolean            nm_connection_is_type               (NMConnection *connection,
-                                                         const char *type);

+
nm_connection_get_setting_olpc_mesh ()

+
NMSettingOlpcMesh * nm_connection_get_setting_olpc_mesh (NMConnection *connection);

 

-A convenience function to check if the given connection is a particular
-type (ie wired, wifi, ppp, etc). Checks the "type"
-property of the connection and matches that against type.
+A shortcut to return any NMSettingOlpcMesh the connection might contain.
 

-

+

+++
@@ -1218,76 +1446,77 @@ property of the connection and matches that against 
 
 
-
-
-
-
-
+

 


 
 

 
connection :

 
type :
a setting name to check the connection's type against (like
-NM_SETTING_WIRELESS_SETTING_NAME or NM_SETTING_WIRED_SETTING_NAME)

 
Returns :

-TRUE if the connection is of the given type, FALSE if notan NMSettingOlpcMesh if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

 

 

 

-
nm_connection_lookup_setting_type ()

-
GType               nm_connection_lookup_setting_type   (const char *name);

+
nm_connection_get_setting_ppp ()

+
NMSettingPPP *      nm_connection_get_setting_ppp       (NMConnection *connection);

 

-Returns the GType of the setting's class for a given setting name.
+A shortcut to return any NMSettingPPP the connection might contain.
 

-

+

+++
-
-
+
+
-
+

 


 
 
name :
a setting name
connection :
the NMConnection
+
 

 

 
Returns :
the GType of the setting's classan NMSettingPPP if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

 

 

 

-
nm_connection_lookup_setting_type_by_quark ()

-
GType               nm_connection_lookup_setting_type_by_quark
-                                                        (GQuark error_quark);

+
nm_connection_get_setting_pppoe ()

+
NMSettingPPPOE *    nm_connection_get_setting_pppoe     (NMConnection *connection);

 

-Returns the GType of the setting's class for a given setting error quark.
-Useful for figuring out which setting a returned error is for.
+A shortcut to return any NMSettingPPPOE the connection might contain.
 

-

+

+++
-
-
+
+
-
+

 


 
 
error_quark :
a setting error quark
connection :
the NMConnection
+
 

 

 
Returns :
the GType of the setting's classan NMSettingPPPOE if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

 

 

 

-
nm_connection_need_secrets ()

-
const char *        nm_connection_need_secrets          (NMConnection *connection,
-                                                         GPtrArray **hints);

+
nm_connection_get_setting_serial ()

+
NMSettingSerial *   nm_connection_get_setting_serial    (NMConnection *connection);

 

-Returns the name of the first setting object in the connection which would
-need secrets to make a successful connection.  The returned hints are only
-intended as a guide to what secrets may be required, because in some
-circumstances, there is no way to conclusively determine exactly which
-secrets are needed.
+A shortcut to return any NMSettingSerial the connection might contain.
 

-

+

+++
@@ -1295,137 +1524,103 @@ secrets are needed.
 
-
-
-
-
-
+

 


 
 

 
connection :

 

 
hints :
the address of a pointer to a GPtrArray, initialized to NULL, which on
-return points to an allocated GPtrArray containing the property names of
-secrets of the NMSetting which may be required; the caller owns the array
-and must free the each array element with g_free(), as well as the array
-itself with g_ptr_array_free(). [out callee-allocates][element-type utf8][allow-none][transfer full]
-

 
Returns :
the setting name of the NMSetting object which has invalid or
-missing secretsan NMSettingSerial if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

 

 

 

-
nm_connection_new ()

-
NMConnection *      nm_connection_new                   (void);

-

-Creates a new NMConnection object with no NMSetting objects.
-

-

--
-
-
-
-


Returns :
the new empty NMConnection object

-

-

-

-
nm_connection_new_from_hash ()

-
NMConnection *      nm_connection_new_from_hash         (GHashTable *hash,
-                                                         GError **error);

+
nm_connection_get_setting_vpn ()

+
NMSettingVPN *      nm_connection_get_setting_vpn       (NMConnection *connection);

 

-Creates a new NMConnection from a hash table describing the connection.  See
-nm_connection_to_hash() for a description of the expected hash table.
+A shortcut to return any NMSettingVPN the connection might contain.
 

-

+

+++
-
-
+
-
-
-
-
-
+

 


 
 
hash :
the GHashTable describing
-the connection. [element-type utf8 GLib.HashTable]
+
connection :
the NMConnection
 
 

 
error :
on unsuccessful return, an error

 
Returns :
the new NMConnection object, populated with settings created
-from the values in the hash table, or NULL if the connection failed to
-validatean NMSettingVPN if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

 

 

 

-
nm_connection_remove_setting ()

-
void                nm_connection_remove_setting        (NMConnection *connection,
-                                                         GType setting_type);

+
nm_connection_get_setting_wimax ()

+
NMSettingWimax *    nm_connection_get_setting_wimax     (NMConnection *connection);

 

-Removes the NMSetting with the given GType from the NMConnection.  This
-operation dereferences the NMSetting object.
+A shortcut to return any NMSettingWimax the connection might contain.
 

-

+

+++
-
-
-
+
+

 


 
 

 
connection :
a NMConnection
+the NMConnection
 
 

 
setting_type :
the GType of the setting object to remove
Returns :
an NMSettingWimax if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

 

 

 

-
nm_connection_replace_settings ()

-
gboolean            nm_connection_replace_settings      (NMConnection *connection,
-                                                         GHashTable *new_settings,
-                                                         GError **error);

-

+
nm_connection_get_setting_adsl ()

+
NMSettingAdsl *     nm_connection_get_setting_adsl      (NMConnection *connection);

+

+A shortcut to return any NMSettingAdsl the connection might contain.
+

+

+++
-
-
-
-
-
-
-
-
-
-
+

 


 
 

 
connection :
a NMConnection
-
new_settings :
a GHashTable of settings. [element-type utf8 GLib.HashTable]
-
error :
location to store error, or NULL
+the NMConnection
 
 

 

 
Returns :

-TRUE if the settings were valid and added to the connection, FALSE
-if they were notan NMSettingAdsl if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

 

 

 

-
nm_connection_set_path ()

-
void                nm_connection_set_path              (NMConnection *connection,
-                                                         const char *path);

+
nm_connection_get_setting_wired ()

+
NMSettingWired *    nm_connection_get_setting_wired     (NMConnection *connection);

 

-Sets the D-Bus path of the connection.  This property is not serialized, and
-is only for the reference of the caller.  Sets the "path"
-property.
+A shortcut to return any NMSettingWired the connection might contain.
 

-

+

+++
@@ -1433,28 +1628,25 @@ property.
 
-
-
+
+

 


 
 

 
connection :

 

 
path :
the D-Bus path of the connection as given by the settings service
-which provides the connection
Returns :
an NMSettingWired if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

 

 

 

-
nm_connection_to_hash ()

-
GHashTable *        nm_connection_to_hash               (NMConnection *connection,
-                                                         NMSettingHashFlags flags);

+
nm_connection_get_setting_wireless ()

+
NMSettingWireless * nm_connection_get_setting_wireless  (NMConnection *connection);

 

-Converts the NMConnection into a GHashTable describing the connection,
-suitable for marshalling over D-Bus or serializing.  The hash table mapping
-is string:GHashTable with each element in the returned hash representing
-a NMSetting object.  The keys are setting object names, and the values
-are GHashTables mapping string:GValue, each of which represents the
-properties of the NMSetting object.
+A shortcut to return any NMSettingWireless the connection might contain.
 

-

+

+++
@@ -1462,16 +1654,8 @@ properties of the 
 
-
-
-
-
-
@@ -1479,21 +1663,17 @@ with 
-
nm_connection_update_secrets ()

-
gboolean            nm_connection_update_secrets        (NMConnection *connection,
-                                                         const char *setting_name,
-                                                         GHashTable *secrets,
-                                                         GError **error);

+
nm_connection_get_setting_wireless_security ()

+
NMSettingWirelessSecurity * nm_connection_get_setting_wireless_security
+                                                        (NMConnection *connection);

-Update the specified setting's secrets, given a hash table of secrets
-intended for that setting (deserialized from D-Bus for example).  Will also
-extract the given setting's secrets hash if given a hash of hashes, as would
-be returned from nm_connection_to_hash().  If setting_name is NULL, expects
-a fully serialized NMConnection as returned by nm_connection_to_hash() and
-will update all secrets from all settings contained in secrets.
+A shortcut to return any NMSettingWirelessSecurity the connection might contain.
 

-

 


 
 

 
connection :

 
flags :
hash flags, e.g. NM_SETTING_HASH_FLAG_ALL
-

 
Returns :
a new
-GHashTable describing the connection, its settings, and each setting's
-properties.  The caller owns the hash table and must unref the hash table
-with g_hash_table_unref() when it is no longer needed. [transfer full][element-type utf8 GLib.HashTable]
+an NMSettingWireless if the connection contains one, otherwise NULL. [transfer none]
 
 

 
 

+

+++
@@ -1501,61 +1681,35 @@ will update all secrets from all settings contained in 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
+

 


 
 

 
connection :

 
setting_name :
the setting object name to which the secrets apply
secrets :
a GHashTable mapping
-string:GValue of setting property names and secrets of the given setting_name. [element-type utf8 GObject.Value]
-
error :
location to store error, or NULL
-

 
Returns :

-TRUE if the secrets were successfully updated, FALSE if the update
-failed (tried to update secrets for a setting that doesn't exist, etc)an NMSettingWirelessSecurity if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

 

 

 

-
nm_connection_verify ()

-
gboolean            nm_connection_verify                (NMConnection *connection,
-                                                         GError **error);

+
nm_connection_get_setting_vlan ()

+
NMSettingVlan *     nm_connection_get_setting_vlan      (NMConnection *connection);

 

-Validates the connection and all its settings.  Each setting's properties
-have allowed values, and some values are dependent on other values.  For
-example, if a WiFi connection is security enabled, the NMSettingWireless
-setting object's 'security' property must contain the setting name of the
-NMSettingWirelessSecurity object, which must also be present in the 
-connection for the connection to be valid.  As another example, the
-NMSettingWired object's 'mac-address' property must be a validly formatted
-MAC address.  The returned GError contains information about which
-setting and which property failed validation, and how it failed validation.
+A shortcut to return any NMSettingVlan the connection might contain.
 

-

+

+++
-
-
-
-
-
-
+

 


 
 

 
connection :
the NMConnection to verify
error :
location to store error, or NULL
+the NMConnection
 
 

 

 
Returns :

-TRUE if the connection is valid, FALSE if it is notan NMSettingVlan if the connection contains one, otherwise NULL. [transfer none]
+
 

 
 

@@ -1583,8 +1737,11 @@ of the D-Bus path of the connection as provided by a settings service.
 The ::secrets-cleared signal is emitted when the secrets of a connection
 are cleared.
 

-

+

+++
@@ -1607,8 +1764,11 @@ are cleared.
 The ::secrets-updated signal is emitted when the secrets of a setting
 have been changed.
 

-

 


 
 

 
connection :

+

+++
@@ -1630,6 +1790,6 @@ updated

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html
index 12b826b1..a44ef38f 100644
--- a/docs/libnm-util/html/NMSetting.html
+++ b/docs/libnm-util/html/NMSetting.html
@@ -3,12 +3,12 @@
 NMSetting
-
+
-
+
@@ -41,74 +41,86 @@
 

 


 
 

 
connection :

 
 
 
 
 
 
 
 
 
 
 
 
 

 

 
Synopsis

-
+
 #include <nm-setting.h>
 
+enum                NMSettingError;
+#define             NM_SETTING_ERROR
+GQuark              nm_setting_error_quark              (void);
+#define             NM_SETTING_PARAM_SERIALIZE
+#define             NM_SETTING_PARAM_REQUIRED
+#define             NM_SETTING_PARAM_SECRET
+#define             NM_SETTING_PARAM_FUZZY_IGNORE
+#define             NM_SETTING_NAME
+enum                NMSettingSecretFlags;
+enum                NMSettingCompareFlags;
                     NMSetting;
-                    NMSettingClass;
 gboolean            (*NMSettingClearSecretsWithFlagsFn) (NMSetting *setting,
                                                          const char *secret,
                                                          NMSettingSecretFlags flags,
                                                          gpointer user_data);
-enum                NMSettingCompareFlags;
-enum                NMSettingDiffResult;
-enum                NMSettingError;
-enum                NMSettingHashFlags;
-enum                NMSettingSecretFlags;
+                    NMSettingClass;
 void                (*NMSettingValueIterFn)             (NMSetting *setting,
                                                          const char *key,
                                                          const GValue *value,
                                                          GParamFlags flags,
                                                          gpointer user_data);
-#define             NM_SETTING_ERROR
-#define             NM_SETTING_NAME
-#define             NM_SETTING_PARAM_FUZZY_IGNORE
-#define             NM_SETTING_PARAM_REQUIRED
-#define             NM_SETTING_PARAM_SECRET
-#define             NM_SETTING_PARAM_SERIALIZE
-void                nm_setting_clear_secrets            (NMSetting *setting);
-void                nm_setting_clear_secrets_with_flags (NMSetting *setting,
-                                                         NMSettingClearSecretsWithFlagsFn func,
-                                                         gpointer user_data);
+enum                NMSettingHashFlags;
+GHashTable *        nm_setting_to_hash                  (NMSetting *setting,
+                                                         NMSettingHashFlags flags);
+NMSetting *         nm_setting_new_from_hash            (GType setting_type,
+                                                         GHashTable *hash);
+NMSetting *         nm_setting_duplicate                (NMSetting *setting);
+const char *        nm_setting_get_name                 (NMSetting *setting);
+gboolean            nm_setting_verify                   (NMSetting *setting,
+                                                         GSList *all_settings,
+                                                         GError **error);
 gboolean            nm_setting_compare                  (NMSetting *a,
                                                          NMSetting *b,
                                                          NMSettingCompareFlags flags);
+enum                NMSettingDiffResult;
 gboolean            nm_setting_diff                     (NMSetting *a,
                                                          NMSetting *b,
                                                          NMSettingCompareFlags flags,
                                                          gboolean invert_results,
                                                          GHashTable **results);
-NMSetting *         nm_setting_duplicate                (NMSetting *setting);
 void                nm_setting_enumerate_values         (NMSetting *setting,
                                                          NMSettingValueIterFn func,
                                                          gpointer user_data);
-GQuark              nm_setting_error_quark              (void);
-const char *        nm_setting_get_name                 (NMSetting *setting);
+char *              nm_setting_to_string                (NMSetting *setting);
+void                nm_setting_clear_secrets            (NMSetting *setting);
+void                nm_setting_clear_secrets_with_flags (NMSetting *setting,
+                                                         NMSettingClearSecretsWithFlagsFn func,
+                                                         gpointer user_data);
+GPtrArray *         nm_setting_need_secrets             (NMSetting *setting);
+gboolean            nm_setting_update_secrets           (NMSetting *setting,
+                                                         GHashTable *secrets,
+                                                         GError **error);
 gboolean            nm_setting_get_secret_flags         (NMSetting *setting,
                                                          const char *secret_name,
                                                          NMSettingSecretFlags *out_flags,
                                                          GError **error);
-const char *        nm_setting_get_virtual_iface_name   (NMSetting *setting);
-GPtrArray *         nm_setting_need_secrets             (NMSetting *setting);
-NMSetting *         nm_setting_new_from_hash            (GType setting_type,
-                                                         GHashTable *hash);
 gboolean            nm_setting_set_secret_flags         (NMSetting *setting,
                                                          const char *secret_name,
                                                          NMSettingSecretFlags flags,
                                                          GError **error);
-GHashTable *        nm_setting_to_hash                  (NMSetting *setting,
-                                                         NMSettingHashFlags flags);
-char *              nm_setting_to_string                (NMSetting *setting);
-gboolean            nm_setting_update_secrets           (NMSetting *setting,
-                                                         GHashTable *secrets,
-                                                         GError **error);
-gboolean            nm_setting_verify                   (NMSetting *setting,
-                                                         GSList *all_settings,
-                                                         GError **error);
+const char *        nm_setting_get_virtual_iface_name   (NMSetting *setting);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingError
+

+
+  GEnum
+   +----NMSettingSecretFlags
+

+
+  GEnum
+   +----NMSettingCompareFlags
+

 
   GObject
    +----NMSetting
@@ -135,25 +147,13 @@ const char *        NMSettingWirelessSecurity
          +----NMSettingVPN
 

-
-  GEnum
-   +----NMSettingCompareFlags
-

-
-  GEnum
-   +----NMSettingDiffResult
-

-
-  GEnum
-   +----NMSettingError
-

 
   GEnum
    +----NMSettingHashFlags
 

 
   GEnum
-   +----NMSettingSecretFlags
+   +----NMSettingDiffResult
 

 

 

@@ -176,95 +176,165 @@ of properties and allowed values.
 

 
Details

 

-
NMSetting

-
typedef struct _NMSetting NMSetting;

+
enum NMSettingError

+
typedef enum {
+	NM_SETTING_ERROR_UNKNOWN = 0,           /*< nick=UnknownError >*/
+	NM_SETTING_ERROR_PROPERTY_NOT_FOUND,    /*< nick=PropertyNotFound >*/
+	NM_SETTING_ERROR_PROPERTY_NOT_SECRET,   /*< nick=PropertyNotSecret >*/
+	NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH /*< nick=PropertyTypeMismatch >*/
+} NMSettingError;
+

 

-The NMSetting struct contains only private data.
-It should only be accessed through the functions described below.
+Describes errors that may result from operations involving a NMSetting.
 

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




NM_SETTING_ERROR_UNKNOWN
unknown or unclassified error
+
NM_SETTING_ERROR_PROPERTY_NOT_FOUND
a property required by the operation
+  was not found; for example, an attempt to update an invalid secret
+
NM_SETTING_ERROR_PROPERTY_NOT_SECRET
an operation which requires a secret
+  was attempted on a non-secret property
+
NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH
the operation requires a property
+  of a specific type, or the value couldn't be transformed to the same type
+  as the property being acted upon
+

 

 

 

-
NMSettingClass

-
typedef struct {
-	GObjectClass parent;
-
-	/* Virtual functions */
-	gboolean    (*verify)            (NMSetting  *setting,
-	                                  GSList     *all_settings,
-	                                  GError     **error);
-
-	GPtrArray  *(*need_secrets)      (NMSetting  *setting);
-
-	gboolean    (*update_one_secret) (NMSetting  *setting,
-	                                  const char *key,
-	                                  GValue     *value,
-	                                  GError    **error);
-
-	gboolean    (*get_secret_flags)  (NMSetting  *setting,
-	                                  const char *secret_name,
-	                                  gboolean verify_secret,
-	                                  NMSettingSecretFlags *out_flags,
-	                                  GError **error);
-
-	gboolean    (*set_secret_flags)  (NMSetting  *setting,
-	                                  const char *secret_name,
-	                                  gboolean verify_secret,
-	                                  NMSettingSecretFlags flags,
-	                                  GError **error);
-
-	/* Returns TRUE if the given property contains the same value in both settings */
-	gboolean    (*compare_property)  (NMSetting *setting,
-	                                  NMSetting *other,
-	                                  const GParamSpec *prop_spec,
-	                                  NMSettingCompareFlags flags);
-
-	void        (*clear_secrets_with_flags) (NMSetting *setting,
-	                                         GParamSpec *pspec,
-	                                         NMSettingClearSecretsWithFlagsFn func,
-	                                         gpointer user_data);
-
-	const char *(*get_virtual_iface_name) (NMSetting *setting);
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-} NMSettingClass;
+
NM_SETTING_ERROR

+
#define NM_SETTING_ERROR nm_setting_error_quark ()
 

 

 

 

 

 

-
NMSettingClearSecretsWithFlagsFn ()

-
gboolean            (*NMSettingClearSecretsWithFlagsFn) (NMSetting *setting,
-                                                         const char *secret,
-                                                         NMSettingSecretFlags flags,
-                                                         gpointer user_data);

-

+
nm_setting_error_quark ()

+
GQuark              nm_setting_error_quark              (void);

+

+Registers an error quark for NMSetting if necessary.
+

+

++++
+
+
+
+
+




Returns :
the error quark used for NMSetting errors.

+

+

+

+
NM_SETTING_PARAM_SERIALIZE

+
#define NM_SETTING_PARAM_SERIALIZE    (1 << (0 + G_PARAM_USER_SHIFT))
+

+

+

+

+

+

+
NM_SETTING_PARAM_REQUIRED

+
#define NM_SETTING_PARAM_REQUIRED     (1 << (1 + G_PARAM_USER_SHIFT))
+

+

+

+

+

+

+
NM_SETTING_PARAM_SECRET

+
#define NM_SETTING_PARAM_SECRET       (1 << (2 + G_PARAM_USER_SHIFT))
+

+

+

+

+

+

+
NM_SETTING_PARAM_FUZZY_IGNORE

+
#define NM_SETTING_PARAM_FUZZY_IGNORE (1 << (3 + G_PARAM_USER_SHIFT))
+

+

+

+

+

+

+
NM_SETTING_NAME

+
#define NM_SETTING_NAME "name"
+

+

+

+

+

+

+
enum NMSettingSecretFlags

+
typedef enum {
+	NM_SETTING_SECRET_FLAG_NONE         = 0x00000000,
+	NM_SETTING_SECRET_FLAG_AGENT_OWNED  = 0x00000001,
+	NM_SETTING_SECRET_FLAG_NOT_SAVED    = 0x00000002,
+	NM_SETTING_SECRET_FLAG_NOT_REQUIRED = 0x00000004
+
+	/* NOTE: if adding flags, update nm-setting-private.h as well */
+} NMSettingSecretFlags;
+

+

+These flags indicate specific behavior related to handling of a secret.  Each
+secret has a corresponding set of these flags which indicate how the secret
+is to be stored and/or requested when it is needed.
+

+

+++
-
-
-
-
-
-
+
+
-
-
+
-
-
+
-
-
+
+

 


 
 
setting :
The setting for which secrets are being iterated
secret :
The secret's name
NM_SETTING_SECRET_FLAG_NONE
the system is responsible for providing and
+storing this secret (default)
+
 

 
flags :
The secret's flags, eg NM_SETTING_SECRET_FLAG_AGENT_OWNED
+
NM_SETTING_SECRET_FLAG_AGENT_OWNED
a user secret agent is responsible
+for providing and storing this secret; when it is required agents will be
+asked to retrieve it
 
 

 
user_data :
User data passed to nm_connection_clear_secrets_with_flags()
+
NM_SETTING_SECRET_FLAG_NOT_SAVED
this secret should not be saved, but
+should be requested from the user each time it is needed
 
 

 
Returns :

-TRUE to clear the secret, FALSE to not clear the secret
NM_SETTING_SECRET_FLAG_NOT_REQUIRED
in situations where it cannot be
+automatically determined that the secret is required (some VPNs and PPP
+providers dont require all secrets) this flag indicates that the specific
+secret is not required
+
 

 
 

@@ -285,8 +355,11 @@ It should only be accessed through the functions described below.
 These flags modify the comparison behavior when comparing two settings or
 two connections.
 

-

+

+++
@@ -329,75 +402,138 @@ storage (ie, the secret's flag includes NM_SETTING_S
 
 

 

-
enum NMSettingDiffResult

-
typedef enum {
-	NM_SETTING_DIFF_RESULT_UNKNOWN = 0x00000000,
-	NM_SETTING_DIFF_RESULT_IN_A =    0x00000001,
-	NM_SETTING_DIFF_RESULT_IN_B =    0x00000002,
-} NMSettingDiffResult;
-

+
NMSetting

+
typedef struct _NMSetting NMSetting;

 

-These values indicate the result of a setting difference operation.
+The NMSetting struct contains only private data.
+It should only be accessed through the functions described below.
 

-

 


 
 

 
NM_SETTING_COMPARE_FLAG_EXACT

+
+

+

+
NMSettingClearSecretsWithFlagsFn ()

+
gboolean            (*NMSettingClearSecretsWithFlagsFn) (NMSetting *setting,
+                                                         const char *secret,
+                                                         NMSettingSecretFlags flags,
+                                                         gpointer user_data);

+

+++
 
-
-
+
+
-
-
+
+
+
+
+
-
-
+
+
+
+
+

 


 
NM_SETTING_DIFF_RESULT_UNKNOWN
unknown result
-
setting :
The setting for which secrets are being iterated
 

 
NM_SETTING_DIFF_RESULT_IN_A
the property is present in setting A
+
secret :
The secret's name
flags :
The secret's flags, eg NM_SETTING_SECRET_FLAG_AGENT_OWNED
 
 

 
NM_SETTING_DIFF_RESULT_IN_B
the property is present in setting B
+
user_data :
User data passed to nm_connection_clear_secrets_with_flags()
 
 
Returns :

+TRUE to clear the secret, FALSE to not clear the secret

 
 

 

 

 

-
enum NMSettingError

-
typedef enum {
-	NM_SETTING_ERROR_UNKNOWN = 0,           /*< nick=UnknownError >*/
-	NM_SETTING_ERROR_PROPERTY_NOT_FOUND,    /*< nick=PropertyNotFound >*/
-	NM_SETTING_ERROR_PROPERTY_NOT_SECRET,   /*< nick=PropertyNotSecret >*/
-	NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH /*< nick=PropertyTypeMismatch >*/
-} NMSettingError;
+
NMSettingClass

+
typedef struct {
+	GObjectClass parent;
+
+	/* Virtual functions */
+	gboolean    (*verify)            (NMSetting  *setting,
+	                                  GSList     *all_settings,
+	                                  GError     **error);
+
+	GPtrArray  *(*need_secrets)      (NMSetting  *setting);
+
+	gboolean    (*update_one_secret) (NMSetting  *setting,
+	                                  const char *key,
+	                                  GValue     *value,
+	                                  GError    **error);
+
+	gboolean    (*get_secret_flags)  (NMSetting  *setting,
+	                                  const char *secret_name,
+	                                  gboolean verify_secret,
+	                                  NMSettingSecretFlags *out_flags,
+	                                  GError **error);
+
+	gboolean    (*set_secret_flags)  (NMSetting  *setting,
+	                                  const char *secret_name,
+	                                  gboolean verify_secret,
+	                                  NMSettingSecretFlags flags,
+	                                  GError **error);
+
+	/* Returns TRUE if the given property contains the same value in both settings */
+	gboolean    (*compare_property)  (NMSetting *setting,
+	                                  NMSetting *other,
+	                                  const GParamSpec *prop_spec,
+	                                  NMSettingCompareFlags flags);
+
+	void        (*clear_secrets_with_flags) (NMSetting *setting,
+	                                         GParamSpec *pspec,
+	                                         NMSettingClearSecretsWithFlagsFn func,
+	                                         gpointer user_data);
+
+	const char *(*get_virtual_iface_name) (NMSetting *setting);
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+} NMSettingClass;
 

 

-Describes errors that may result from operations involving a NMSetting.
 

-

+
+

+

+
NMSettingValueIterFn ()

+
void                (*NMSettingValueIterFn)             (NMSetting *setting,
+                                                         const char *key,
+                                                         const GValue *value,
+                                                         GParamFlags flags,
+                                                         gpointer user_data);

+

+++
-
-
+
-
-
+
+
-
-
+
+
+
+
+
-
-
+
@@ -416,8 +552,11 @@ Describes errors that may result from operations involving a nm_setting_to_hash().
 

-

 


 
 
NM_SETTING_ERROR_UNKNOWN
unknown or unclassified error
+
setting :
The setting for which properties are being iterated, given to
+nm_setting_enumerate_values()
 
 

 
NM_SETTING_ERROR_PROPERTY_NOT_FOUND
a property required by the operation
-  was not found; for example, an attempt to update an invalid secret
-
key :
The value/property name
 

 
NM_SETTING_ERROR_PROPERTY_NOT_SECRET
an operation which requires a secret
-  was attempted on a non-secret property
+
value :
The property's value
flags :
The property's flags, like NM_SETTING_PARAM_SECRET
 
 

 
NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH
the operation requires a property
-  of a specific type, or the value couldn't be transformed to the same type
-  as the property being acted upon
+
user_data :
User data passed to nm_setting_enumerate_values()
 
 

 

+

+++
@@ -439,49 +578,34 @@ when calling 
-
enum NMSettingSecretFlags

-
typedef enum {
-	NM_SETTING_SECRET_FLAG_NONE         = 0x00000000,
-	NM_SETTING_SECRET_FLAG_AGENT_OWNED  = 0x00000001,
-	NM_SETTING_SECRET_FLAG_NOT_SAVED    = 0x00000002,
-	NM_SETTING_SECRET_FLAG_NOT_REQUIRED = 0x00000004
-
-	/* NOTE: if adding flags, update nm-setting-private.h as well */
-} NMSettingSecretFlags;
-

+
nm_setting_to_hash ()

+
GHashTable *        nm_setting_to_hash                  (NMSetting *setting,
+                                                         NMSettingHashFlags flags);

-These flags indicate specific behavior related to handling of a secret.  Each
-secret has a corresponding set of these flags which indicate how the secret
-is to be stored and/or requested when it is needed.
+Converts the NMSetting into a GHashTable mapping each setting property
+name to a GValue describing that property, suitable for marshalling over
+D-Bus or serializing.  The mapping is string to GValue.
 

-

 


 
 

 
NM_SETTING_HASH_FLAG_ALL

 

+

+++
-
-
-
-
-
-
+
-
-
+
-
-
+
@@ -489,136 +613,131 @@ secret is not required
 

-
NMSettingValueIterFn ()

-
void                (*NMSettingValueIterFn)             (NMSetting *setting,
-                                                         const char *key,
-                                                         const GValue *value,
-                                                         GParamFlags flags,
-                                                         gpointer user_data);

-

 


 
 
NM_SETTING_SECRET_FLAG_NONE
the system is responsible for providing and
-storing this secret (default)
-
NM_SETTING_SECRET_FLAG_AGENT_OWNED
a user secret agent is responsible
-for providing and storing this secret; when it is required agents will be
-asked to retrieve it
+
setting :
the NMSetting
 
 

 
NM_SETTING_SECRET_FLAG_NOT_SAVED
this secret should not be saved, but
-should be requested from the user each time it is needed
+
flags :
hash flags, e.g. NM_SETTING_HASH_FLAG_ALL
 
 

 
NM_SETTING_SECRET_FLAG_NOT_REQUIRED
in situations where it cannot be
-automatically determined that the secret is required (some VPNs and PPP
-providers dont require all secrets) this flag indicates that the specific
-secret is not required
+
Returns :
a new GHashTable
+describing the setting's properties. [transfer full][element-type utf8 GObject.Value]
 
 

 
 
 

+
nm_setting_new_from_hash ()

+
NMSetting *         nm_setting_new_from_hash            (GType setting_type,
+                                                         GHashTable *hash);

+

+Creates a new NMSetting object and populates that object with the properties
+contained in the hash table, using each hash key as the property to set,
+and each hash value as the value to set that property to.  Setting properties
+are strongly typed, thus the GValue type of the hash value must be correct.
+See the documentation on each NMSetting object subclass for the correct
+property names and value types.
+

+

+++
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
-
-
+
+

 


 
 
setting :
The setting for which properties are being iterated, given to
-nm_setting_enumerate_values()
-
key :
The value/property name
value :
The property's value
setting_type :
the NMSetting type which the hash contains properties for
 

 
flags :
The property's flags, like NM_SETTING_PARAM_SECRET
+
hash :
the GHashTable containing a
+string to GValue mapping of properties that apply to the setting. [element-type utf8 GObject.Value]
 
 

 
user_data :
User data passed to nm_setting_enumerate_values()
-
Returns :
a new NMSetting object populated with the properties from the
+hash table, or NULL on failure
 

 
 

 

 

 

-
NM_SETTING_ERROR

-
#define NM_SETTING_ERROR nm_setting_error_quark ()
-

-

-

-

-

-

-
NM_SETTING_NAME

-
#define NM_SETTING_NAME "name"
-

-

-

-

-

-

-
NM_SETTING_PARAM_FUZZY_IGNORE

-
#define NM_SETTING_PARAM_FUZZY_IGNORE (1 << (3 + G_PARAM_USER_SHIFT))
-

-

-

-

-

-

-
NM_SETTING_PARAM_REQUIRED

-
#define NM_SETTING_PARAM_REQUIRED     (1 << (1 + G_PARAM_USER_SHIFT))
-

-

-

-

-

-

-
NM_SETTING_PARAM_SECRET

-
#define NM_SETTING_PARAM_SECRET       (1 << (2 + G_PARAM_USER_SHIFT))
-

-

-

-

-

-

-
NM_SETTING_PARAM_SERIALIZE

-
#define NM_SETTING_PARAM_SERIALIZE    (1 << (0 + G_PARAM_USER_SHIFT))
-

+
nm_setting_duplicate ()

+
NMSetting *         nm_setting_duplicate                (NMSetting *setting);

 

+Duplicates a NMSetting.
 

+

++++
+
+
+
+
+
+
+
+
+
+
+




setting :
the NMSetting to duplicate
Returns :
a new NMSetting containing the same properties and values as the
+source NMSetting. [transfer full]
+

 

 

 

-
nm_setting_clear_secrets ()

-
void                nm_setting_clear_secrets            (NMSetting *setting);

+
nm_setting_get_name ()

+
const char *        nm_setting_get_name                 (NMSetting *setting);

 

-Resets and clears any secrets in the setting.  Secrets should be added to the
-setting only when needed, and cleared immediately after use to prevent
-leakage of information.
+Returns the type name of the NMSetting object
 

-

+

+-
++
+
+
-
+
+
+
+
+
+

 




 
setting :

 the NMSetting
 
Returns :
a string containing the type name of the NMSetting object,
+like 'ppp' or 'wireless' or 'wired'.

 

 

 

 

-
nm_setting_clear_secrets_with_flags ()

-
void                nm_setting_clear_secrets_with_flags (NMSetting *setting,
-                                                         NMSettingClearSecretsWithFlagsFn func,
-                                                         gpointer user_data);

+
nm_setting_verify ()

+
gboolean            nm_setting_verify                   (NMSetting *setting,
+                                                         GSList *all_settings,
+                                                         GError **error);

 

-Clears and frees secrets determined by func.
+Validates the setting.  Each setting's properties have allowed values, and
+some are dependent on other values (hence the need for all_settings).  The
+returned GError contains information about which property of the setting
+failed validation, and in what way that property failed validation.
 

-

+

+++
-
+
-
-
+
-
-
+
+
+
+
+

 


 
 

 
setting :
the NMSetting
-the NMSetting to verify
 

 
func :
function to be called to determine whether a
-specific secret should be cleared or not. [scope call]
+
all_settings :
a GSList of all settings
+in the connection from which setting came. [element-type NMSetting]
 
 

 
user_data :
caller-supplied data passed to func
+
error :
location to store error, or NULL
 
 
Returns :

+TRUE if the setting is valid, FALSE if it is not

 
 

 

@@ -633,8 +752,11 @@ Compares two NMSettingCompareFlags
 for a description of each flag's behavior.
 

-

+

+++
@@ -660,6 +782,42 @@ for a description of each flag's behavior.
 

+
enum NMSettingDiffResult

+
typedef enum {
+	NM_SETTING_DIFF_RESULT_UNKNOWN = 0x00000000,
+	NM_SETTING_DIFF_RESULT_IN_A =    0x00000001,
+	NM_SETTING_DIFF_RESULT_IN_B =    0x00000002,
+} NMSettingDiffResult;
+

+

+These values indicate the result of a setting difference operation.
+

+

 


 
 

 
a :

 
 

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




NM_SETTING_DIFF_RESULT_UNKNOWN
unknown result
+
NM_SETTING_DIFF_RESULT_IN_A
the property is present in setting A
+
NM_SETTING_DIFF_RESULT_IN_B
the property is present in setting B
+

+

+

+

 
nm_setting_diff ()

 
gboolean            nm_setting_diff                     (NMSetting *a,
                                                          NMSetting *b,
@@ -673,8 +831,11 @@ for a description of each flag's behavior.  If the settings differ, the keys
 of each setting that differ from the other are added to results, mapped to
 one or more NMSettingDiffResult values.
 

-

+

+++
@@ -714,29 +875,6 @@ in and the settings differ, a new one is created and returned. 
-
nm_setting_duplicate ()

-
NMSetting *         nm_setting_duplicate                (NMSetting *setting);

-

-Duplicates a NMSetting.
-

-

 


 
 

 
a :

--
-
-
-
-
-
-
-
-
-
-


setting :
the NMSetting to duplicate
Returns :
a new NMSetting containing the same properties and values as the
-source NMSetting. [transfer full]
-

-

-

-

 
nm_setting_enumerate_values ()

 
void                nm_setting_enumerate_values         (NMSetting *setting,
                                                          NMSettingValueIterFn func,
@@ -745,8 +883,11 @@ source NMSetting object, calling the supplied
 user function for each property.
 

-

+

+++
@@ -767,28 +908,18 @@ user function for each property.
 

-
nm_setting_error_quark ()

-
GQuark              nm_setting_error_quark              (void);

-

-Registers an error quark for NMSetting if necessary.
-

-

 


 
 

 
setting :

 
 

--
-
-
-
-


Returns :
the error quark used for NMSetting errors.

-

-

-

-
nm_setting_get_name ()

-
const char *        nm_setting_get_name                 (NMSetting *setting);

+
nm_setting_to_string ()

+
char *              nm_setting_to_string                (NMSetting *setting);

 

-Returns the type name of the NMSetting object
+Convert the setting into a string.  For debugging purposes ONLY, should NOT
+be used for serialization of the setting, or machine-parsed in any way. The
+output format is not guaranteed to be stable and may change at any time.
 

-

+

+++
@@ -797,62 +928,49 @@ Returns the type name of the Returns :

-
+

 


 
 

 
setting :
a string containing the type name of the NMSetting object,
-like 'ppp' or 'wireless' or 'wired'.an allocated string containing a textual representation of the
+setting's properties and values (including secrets!), which the caller should
+free with g_free()
+
 

 
 

 

 

 

-
nm_setting_get_secret_flags ()

-
gboolean            nm_setting_get_secret_flags         (NMSetting *setting,
-                                                         const char *secret_name,
-                                                         NMSettingSecretFlags *out_flags,
-                                                         GError **error);

+
nm_setting_clear_secrets ()

+
void                nm_setting_clear_secrets            (NMSetting *setting);

 

-For a given secret, retrieves the NMSettingSecretFlags describing how to
-handle that secret.
+Resets and clears any secrets in the setting.  Secrets should be added to the
+setting only when needed, and cleared immediately after use to prevent
+leakage of information.
 

-

+

+-
-
++
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+

 




 
setting :

 the NMSetting
 
secret_name :
the secret key name to get flags for
out_flags :
on success, the NMSettingSecretFlags for the secret
error :
location to store error, or NULL
-
Returns :
TRUE on success (if the given secret name was a valid property of
-this setting, and if that property is secret), FALSE if not

 

 

 

 

-
nm_setting_get_virtual_iface_name ()

-
const char *        nm_setting_get_virtual_iface_name   (NMSetting *setting);

+
nm_setting_clear_secrets_with_flags ()

+
void                nm_setting_clear_secrets_with_flags (NMSetting *setting,
+                                                         NMSettingClearSecretsWithFlagsFn func,
+                                                         gpointer user_data);

 

-Returns the name of the virtual kernel interface which the connection
-needs to use if specified in the settings.
+Clears and frees secrets determined by func.
 

-

+

+++
@@ -860,9 +978,15 @@ needs to use if specified in the settings.
 
-
-
+
+
+
+
+
+

 


 
 

 
setting :

 

 
Returns :
Name of the virtual interface or NULL if the setting does not
-support this feature
func :
function to be called to determine whether a
+specific secret should be cleared or not. [scope call]
+
user_data :
caller-supplied data passed to func
+
 

 
 

@@ -877,8 +1001,11 @@ to make a successful connection.  The returned hints are only intended as a
 guide to what secrets may be required, because in some circumstances, there
 is no way to conclusively determine exactly which secrets are needed.
 

-

+

+++
@@ -887,10 +1014,10 @@ is no way to conclusively determine exactly which secrets are needed.
 
-
@@ -898,51 +1025,61 @@ itself with 
-
nm_setting_new_from_hash ()

-
NMSetting *         nm_setting_new_from_hash            (GType setting_type,
-                                                         GHashTable *hash);

+
nm_setting_update_secrets ()

+
gboolean            nm_setting_update_secrets           (NMSetting *setting,
+                                                         GHashTable *secrets,
+                                                         GError **error);

-Creates a new NMSetting object and populates that object with the properties
-contained in the hash table, using each hash key as the property to set,
-and each hash value as the value to set that property to.  Setting properties
-are strongly typed, thus the GValue type of the hash value must be correct.
-See the documentation on each NMSetting object subclass for the correct
-property names and value types.
+Update the setting's secrets, given a hash table of secrets intended for that
+setting (deserialized from D-Bus for example).
 

-

 


 
 

 
setting :

 

 
Returns :
a GPtrArray containing the property names of secrets of the
-NMSetting which may be required; the caller owns the array
-and must free the each array element with g_free(), as well as the array
-itself with g_ptr_array_free(). [transfer full][element-type utf8]
+a GPtrArray containing
+the property names of secrets of the NMSetting which may be required; the
+caller owns the array and must free it with g_ptr_array_free(), but must not
+free the elements. [transfer container][element-type utf8]
 
 

 
 

+

+++
-
-
+
+
-
-
+
+
+
+
+
-
+

 


 
 
setting_type :
the NMSetting type which the hash contains properties for
setting :
the NMSetting
+
 

 
hash :
the GHashTable containing a
-string to GValue mapping of properties that apply to the setting. [element-type utf8 GObject.Value]
+
secrets :
a GHashTable mapping
+string to GValue of setting property names and secrets. [element-type utf8 GObject.Value]
+
error :
location to store error, or NULL
 
 

 

 
Returns :
a new NMSetting object populated with the properties from the
-hash table, or NULL on failure
+TRUE if the secrets were successfully updated, FALSE on failure to
+update one or more of the secrets.
 

 
 

 

 

 

-
nm_setting_set_secret_flags ()

-
gboolean            nm_setting_set_secret_flags         (NMSetting *setting,
+
nm_setting_get_secret_flags ()

+
gboolean            nm_setting_get_secret_flags         (NMSetting *setting,
                                                          const char *secret_name,
-                                                         NMSettingSecretFlags flags,
+                                                         NMSettingSecretFlags *out_flags,
                                                          GError **error);

 

 For a given secret, retrieves the NMSettingSecretFlags describing how to
 handle that secret.
 

-

+

+++
@@ -951,15 +1088,15 @@ handle that secret.
 
-
+
-
-
+
+
-
@@ -972,47 +1109,20 @@ this setting, and if that property is secret), FALSE if not

-
nm_setting_to_hash ()

-
GHashTable *        nm_setting_to_hash                  (NMSetting *setting,
-                                                         NMSettingHashFlags flags);

-

-Converts the NMSetting into a GHashTable mapping each setting property
-name to a GValue describing that property, suitable for marshalling over
-D-Bus or serializing.  The mapping is string to GValue.
-

-

 


 
 

 
setting :

 

 
secret_name :
the secret key name to set flags forthe secret key name to get flags for
 

 
flags :
the NMSettingSecretFlags for the secret
out_flags :
on success, the NMSettingSecretFlags for the secret
 

 

 
error :
location to store error, or NULL
+location to store error, or NULL
 
 

 

 
 
 

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :
the NMSetting
-
flags :
hash flags, e.g. NM_SETTING_HASH_FLAG_ALL
-
Returns :
a new GHashTable
-describing the setting's properties. [transfer full][element-type utf8 GObject.Value]
-

-

-

-

-
nm_setting_to_string ()

-
char *              nm_setting_to_string                (NMSetting *setting);

+
nm_setting_set_secret_flags ()

+
gboolean            nm_setting_set_secret_flags         (NMSetting *setting,
+                                                         const char *secret_name,
+                                                         NMSettingSecretFlags flags,
+                                                         GError **error);

 

-Convert the setting into a string.  For debugging purposes ONLY, should NOT
-be used for serialization of the setting, or machine-parsed in any way. The
-output format is not guaranteed to be stable and may change at any time.
+For a given secret, retrieves the NMSettingSecretFlags describing how to
+handle that secret.
 

-

+

+++
@@ -1020,87 +1130,49 @@ output format is not guaranteed to be stable and may change at any time.
 
-
-
-
-
-

 


 
 

 
setting :

 

 
Returns :
an allocated string containing a textual representation of the
-setting's properties and values (including secrets!), which the caller should
-free with g_free()
-

-

-

-

-
nm_setting_update_secrets ()

-
gboolean            nm_setting_update_secrets           (NMSetting *setting,
-                                                         GHashTable *secrets,
-                                                         GError **error);

-

-Update the setting's secrets, given a hash table of secrets intended for that
-setting (deserialized from D-Bus for example).
-

-

--
-
-
-
+
+
-
-
+
+
-
-
+


setting :
the NMSetting
-
secret_name :
the secret key name to set flags for
 

 
secrets :
a GHashTable mapping
-string to GValue of setting property names and secrets. [element-type utf8 GObject.Value]
-
flags :
the NMSettingSecretFlags for the secret
 

 

 
error :
location to store error, or NULL
+location to store error, or NULL
 
 

 

 
Returns :

-TRUE if the secrets were successfully updated and the connection
-is valid, FALSE on failure or if the setting was never added to the connectionTRUE on success (if the given secret name was a valid property of
+this setting, and if that property is secret), FALSE if not
 

 
 

 

 

 

-
nm_setting_verify ()

-
gboolean            nm_setting_verify                   (NMSetting *setting,
-                                                         GSList *all_settings,
-                                                         GError **error);

+
nm_setting_get_virtual_iface_name ()

+
const char *        nm_setting_get_virtual_iface_name   (NMSetting *setting);

 

-Validates the setting.  Each setting's properties have allowed values, and
-some are dependent on other values (hence the need for all_settings).  The
-returned GError contains information about which property of the setting
-failed validation, and in what way that property failed validation.
+Returns the name of the virtual kernel interface which the connection
+needs to use if specified in the settings.
 

-

+

+++
-
-
-
-
-
-
-
-
-
-
+

 


 
 

 
setting :
the NMSetting to verify
all_settings :
a GSList of all settings
-in the connection from which setting came. [element-type NMSetting]
-
error :
location to store error, or NULL
+the NMSetting
 
 

 

 
Returns :

-TRUE if the setting is valid, FALSE if it is notName of the virtual interface or NULL if the setting does not
+support this feature
 

 
 

@@ -1122,6 +1194,6 @@ example 'ppp' or 'wireless' or 'wired'.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSetting8021x.html b/docs/libnm-util/html/NMSetting8021x.html
index a81f903d..0078c61b 100644
--- a/docs/libnm-util/html/NMSetting8021x.html
+++ b/docs/libnm-util/html/NMSetting8021x.html
@@ -3,12 +3,12 @@
 
 
 NMSetting8021x
-
+
 
 
 
 
-
+
 
 
 
@@ -44,179 +44,179 @@
 
 #include <nm-setting-8021x.h>
 
-                    NMSetting8021x;
 enum                NMSetting8021xCKFormat;
 enum                NMSetting8021xCKScheme;
-                    NMSetting8021xClass;
+#define             NM_SETTING_802_1X_SETTING_NAME
 enum                NMSetting8021xError;
-#define             NM_SETTING_802_1X_ALTSUBJECT_MATCHES
+#define             NM_SETTING_802_1X_ERROR
+GQuark              nm_setting_802_1x_error_quark       (void);
+#define             NM_SETTING_802_1X_EAP
+#define             NM_SETTING_802_1X_IDENTITY
 #define             NM_SETTING_802_1X_ANONYMOUS_IDENTITY
+#define             NM_SETTING_802_1X_PAC_FILE
 #define             NM_SETTING_802_1X_CA_CERT
 #define             NM_SETTING_802_1X_CA_PATH
+#define             NM_SETTING_802_1X_SUBJECT_MATCH
+#define             NM_SETTING_802_1X_ALTSUBJECT_MATCHES
 #define             NM_SETTING_802_1X_CLIENT_CERT
-#define             NM_SETTING_802_1X_EAP
-#define             NM_SETTING_802_1X_ERROR
-#define             NM_SETTING_802_1X_IDENTITY
-#define             NM_SETTING_802_1X_PAC_FILE
-#define             NM_SETTING_802_1X_PASSWORD
-#define             NM_SETTING_802_1X_PASSWORD_FLAGS
-#define             NM_SETTING_802_1X_PASSWORD_RAW
-#define             NM_SETTING_802_1X_PASSWORD_RAW_FLAGS
-#define             NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING
-#define             NM_SETTING_802_1X_PHASE1_PEAPLABEL
 #define             NM_SETTING_802_1X_PHASE1_PEAPVER
-#define             NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES
+#define             NM_SETTING_802_1X_PHASE1_PEAPLABEL
+#define             NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING
 #define             NM_SETTING_802_1X_PHASE2_AUTH
 #define             NM_SETTING_802_1X_PHASE2_AUTHEAP
 #define             NM_SETTING_802_1X_PHASE2_CA_CERT
 #define             NM_SETTING_802_1X_PHASE2_CA_PATH
+#define             NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH
+#define             NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES
 #define             NM_SETTING_802_1X_PHASE2_CLIENT_CERT
+#define             NM_SETTING_802_1X_PASSWORD
+#define             NM_SETTING_802_1X_PASSWORD_FLAGS
+#define             NM_SETTING_802_1X_PASSWORD_RAW
+#define             NM_SETTING_802_1X_PASSWORD_RAW_FLAGS
+#define             NM_SETTING_802_1X_PRIVATE_KEY
+#define             NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD
+#define             NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS
 #define             NM_SETTING_802_1X_PHASE2_PRIVATE_KEY
 #define             NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD
 #define             NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS
-#define             NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH
 #define             NM_SETTING_802_1X_PIN
 #define             NM_SETTING_802_1X_PIN_FLAGS
-#define             NM_SETTING_802_1X_PRIVATE_KEY
-#define             NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD
-#define             NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS
-#define             NM_SETTING_802_1X_SETTING_NAME
-#define             NM_SETTING_802_1X_SUBJECT_MATCH
 #define             NM_SETTING_802_1X_SYSTEM_CA_CERTS
-gboolean            nm_setting_802_1x_add_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         const char *altsubject_match);
+                    NMSetting8021x;
+                    NMSetting8021xClass;
+NMSetting *         nm_setting_802_1x_new               (void);
+guint32             nm_setting_802_1x_get_num_eap_methods
+                                                        (NMSetting8021x *setting);
+const char *        nm_setting_802_1x_get_eap_method    (NMSetting8021x *setting,
+                                                         guint32 i);
 gboolean            nm_setting_802_1x_add_eap_method    (NMSetting8021x *setting,
                                                          const char *eap);
-gboolean            nm_setting_802_1x_add_phase2_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         const char *phase2_altsubject_match);
-void                nm_setting_802_1x_clear_altsubject_matches
-                                                        (NMSetting8021x *setting);
-void                nm_setting_802_1x_clear_eap_methods (NMSetting8021x *setting);
-void                nm_setting_802_1x_clear_phase2_altsubject_matches
-                                                        (NMSetting8021x *setting);
-GQuark              nm_setting_802_1x_error_quark       (void);
-const char *        nm_setting_802_1x_get_altsubject_match
-                                                        (NMSetting8021x *setting,
+void                nm_setting_802_1x_remove_eap_method (NMSetting8021x *setting,
                                                          guint32 i);
+void                nm_setting_802_1x_clear_eap_methods (NMSetting8021x *setting);
+const char *        nm_setting_802_1x_get_identity      (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_anonymous_identity
                                                         (NMSetting8021x *setting);
-const GByteArray *  nm_setting_802_1x_get_ca_cert_blob  (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_ca_cert_path  (NMSetting8021x *setting);
-NMSetting8021xCKScheme nm_setting_802_1x_get_ca_cert_scheme
+const char *        nm_setting_802_1x_get_pac_file      (NMSetting8021x *setting);
+gboolean            nm_setting_802_1x_get_system_ca_certs
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_ca_path       (NMSetting8021x *setting);
-const GByteArray *  nm_setting_802_1x_get_client_cert_blob
-                                                        (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_client_cert_path
+const char *        nm_setting_802_1x_get_phase2_ca_path
                                                         (NMSetting8021x *setting);
-NMSetting8021xCKScheme nm_setting_802_1x_get_client_cert_scheme
+NMSetting8021xCKScheme nm_setting_802_1x_get_ca_cert_scheme
                                                         (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_eap_method    (NMSetting8021x *setting,
-                                                         guint32 i);
-const char *        nm_setting_802_1x_get_identity      (NMSetting8021x *setting);
+const GByteArray *  nm_setting_802_1x_get_ca_cert_blob  (NMSetting8021x *setting);
+const char *        nm_setting_802_1x_get_ca_cert_path  (NMSetting8021x *setting);
+gboolean            nm_setting_802_1x_set_ca_cert       (NMSetting8021x *setting,
+                                                         const char *cert_path,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
+                                                         GError **error);
+const char *        nm_setting_802_1x_get_subject_match (NMSetting8021x *setting);
 guint32             nm_setting_802_1x_get_num_altsubject_matches
                                                         (NMSetting8021x *setting);
-guint32             nm_setting_802_1x_get_num_eap_methods
+const char *        nm_setting_802_1x_get_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         guint32 i);
+gboolean            nm_setting_802_1x_add_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         const char *altsubject_match);
+void                nm_setting_802_1x_remove_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         guint32 i);
+void                nm_setting_802_1x_clear_altsubject_matches
                                                         (NMSetting8021x *setting);
-guint32             nm_setting_802_1x_get_num_phase2_altsubject_matches
+NMSetting8021xCKScheme nm_setting_802_1x_get_client_cert_scheme
                                                         (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_pac_file      (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_password      (NMSetting8021x *setting);
-NMSettingSecretFlags nm_setting_802_1x_get_password_flags
+const GByteArray *  nm_setting_802_1x_get_client_cert_blob
                                                         (NMSetting8021x *setting);
-const GByteArray *  nm_setting_802_1x_get_password_raw  (NMSetting8021x *setting);
-NMSettingSecretFlags nm_setting_802_1x_get_password_raw_flags
+const char *        nm_setting_802_1x_get_client_cert_path
                                                         (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_phase1_fast_provisioning
+gboolean            nm_setting_802_1x_set_client_cert   (NMSetting8021x *setting,
+                                                         const char *cert_path,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
+                                                         GError **error);
+const char *        nm_setting_802_1x_get_phase1_peapver
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_phase1_peaplabel
                                                         (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_phase1_peapver
+const char *        nm_setting_802_1x_get_phase1_fast_provisioning
                                                         (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_phase2_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         guint32 i);
 const char *        nm_setting_802_1x_get_phase2_auth   (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_phase2_autheap
                                                         (NMSetting8021x *setting);
+NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_ca_cert_scheme
+                                                        (NMSetting8021x *setting);
 const GByteArray *  nm_setting_802_1x_get_phase2_ca_cert_blob
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_phase2_ca_cert_path
                                                         (NMSetting8021x *setting);
-NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_ca_cert_scheme
-                                                        (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_phase2_ca_path
+gboolean            nm_setting_802_1x_set_phase2_ca_cert
+                                                        (NMSetting8021x *setting,
+                                                         const char *cert_path,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
+                                                         GError **error);
+const char *        nm_setting_802_1x_get_phase2_subject_match
                                                         (NMSetting8021x *setting);
-const GByteArray *  nm_setting_802_1x_get_phase2_client_cert_blob
+guint32             nm_setting_802_1x_get_num_phase2_altsubject_matches
                                                         (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_phase2_client_cert_path
+const char *        nm_setting_802_1x_get_phase2_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         guint32 i);
+gboolean            nm_setting_802_1x_add_phase2_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         const char *phase2_altsubject_match);
+void                nm_setting_802_1x_remove_phase2_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         guint32 i);
+void                nm_setting_802_1x_clear_phase2_altsubject_matches
                                                         (NMSetting8021x *setting);
 NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_client_cert_scheme
                                                         (NMSetting8021x *setting);
-const GByteArray *  nm_setting_802_1x_get_phase2_private_key_blob
-                                                        (NMSetting8021x *setting);
-NMSetting8021xCKFormat nm_setting_802_1x_get_phase2_private_key_format
-                                                        (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_phase2_private_key_password
-                                                        (NMSetting8021x *setting);
-NMSettingSecretFlags nm_setting_802_1x_get_phase2_private_key_password_flags
+const GByteArray *  nm_setting_802_1x_get_phase2_client_cert_blob
                                                         (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_phase2_private_key_path
+const char *        nm_setting_802_1x_get_phase2_client_cert_path
                                                         (NMSetting8021x *setting);
-NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_private_key_scheme
+gboolean            nm_setting_802_1x_set_phase2_client_cert
+                                                        (NMSetting8021x *setting,
+                                                         const char *cert_path,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
+                                                         GError **error);
+const char *        nm_setting_802_1x_get_password      (NMSetting8021x *setting);
+NMSettingSecretFlags nm_setting_802_1x_get_password_flags
                                                         (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_phase2_subject_match
+const GByteArray *  nm_setting_802_1x_get_password_raw  (NMSetting8021x *setting);
+NMSettingSecretFlags nm_setting_802_1x_get_password_raw_flags
                                                         (NMSetting8021x *setting);
 const char *        nm_setting_802_1x_get_pin           (NMSetting8021x *setting);
 NMSettingSecretFlags nm_setting_802_1x_get_pin_flags    (NMSetting8021x *setting);
+NMSetting8021xCKScheme nm_setting_802_1x_get_private_key_scheme
+                                                        (NMSetting8021x *setting);
 const GByteArray *  nm_setting_802_1x_get_private_key_blob
                                                         (NMSetting8021x *setting);
-NMSetting8021xCKFormat nm_setting_802_1x_get_private_key_format
+const char *        nm_setting_802_1x_get_private_key_path
                                                         (NMSetting8021x *setting);
+gboolean            nm_setting_802_1x_set_private_key   (NMSetting8021x *setting,
+                                                         const char *key_path,
+                                                         const char *password,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
+                                                         GError **error);
 const char *        nm_setting_802_1x_get_private_key_password
                                                         (NMSetting8021x *setting);
 NMSettingSecretFlags nm_setting_802_1x_get_private_key_password_flags
                                                         (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_private_key_path
+NMSetting8021xCKFormat nm_setting_802_1x_get_private_key_format
                                                         (NMSetting8021x *setting);
-NMSetting8021xCKScheme nm_setting_802_1x_get_private_key_scheme
+NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_private_key_scheme
                                                         (NMSetting8021x *setting);
-const char *        nm_setting_802_1x_get_subject_match (NMSetting8021x *setting);
-gboolean            nm_setting_802_1x_get_system_ca_certs
+const GByteArray *  nm_setting_802_1x_get_phase2_private_key_blob
+                                                        (NMSetting8021x *setting);
+const char *        nm_setting_802_1x_get_phase2_private_key_path
                                                         (NMSetting8021x *setting);
-NMSetting *         nm_setting_802_1x_new               (void);
-void                nm_setting_802_1x_remove_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         guint32 i);
-void                nm_setting_802_1x_remove_eap_method (NMSetting8021x *setting,
-                                                         guint32 i);
-void                nm_setting_802_1x_remove_phase2_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         guint32 i);
-gboolean            nm_setting_802_1x_set_ca_cert       (NMSetting8021x *setting,
-                                                         const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);
-gboolean            nm_setting_802_1x_set_client_cert   (NMSetting8021x *setting,
-                                                         const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);
-gboolean            nm_setting_802_1x_set_phase2_ca_cert
-                                                        (NMSetting8021x *setting,
-                                                         const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);
-gboolean            nm_setting_802_1x_set_phase2_client_cert
-                                                        (NMSetting8021x *setting,
-                                                         const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);
 gboolean            nm_setting_802_1x_set_phase2_private_key
                                                         (NMSetting8021x *setting,
                                                          const char *key_path,
@@ -224,21 +224,16 @@ const char *        NMSetting8021xCKScheme scheme,
                                                          NMSetting8021xCKFormat *out_format,
                                                          GError **error);
-gboolean            nm_setting_802_1x_set_private_key   (NMSetting8021x *setting,
-                                                         const char *key_path,
-                                                         const char *password,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);
+const char *        nm_setting_802_1x_get_phase2_private_key_password
+                                                        (NMSetting8021x *setting);
+NMSettingSecretFlags nm_setting_802_1x_get_phase2_private_key_password_flags
+                                                        (NMSetting8021x *setting);
+NMSetting8021xCKFormat nm_setting_802_1x_get_phase2_private_key_format
+                                                        (NMSetting8021x *setting);
 

 

 

 
Object Hierarchy

-
-  GObject
-   +----NMSetting
-         +----NMSetting8021x
-

 
   GEnum
    +----NMSetting8021xCKFormat
@@ -251,6 +246,11 @@ const char *        
+  GObject
+   +----NMSetting
+         +----NMSetting8021x
+

 

 

 
Properties

@@ -280,6 +280,8 @@ const char *        phase2-private-key-password" gchar*                : Read / Write
   "phase2-private-key-password-flags" guint                 : Read / Write
   "phase2-subject-match"     gchar*                : Read / Write
+  "pin"                      gchar*                : Read / Write
+  "pin-flags"                guint                 : Read / Write
   "private-key"              GArray_guchar_*       : Read / Write
   "private-key-password"     gchar*                : Read / Write
   "private-key-password-flags" guint                 : Read / Write
@@ -321,13 +323,6 @@ following books.
 

 
Details

 

-
NMSetting8021x

-
typedef struct _NMSetting8021x NMSetting8021x;

-

-

-

-

-

 
enum NMSetting8021xCKFormat

 
typedef enum {
  /*< underscore_name=nm_setting_802_1x_ck_format >*/
@@ -341,8 +336,11 @@ following books.
 NMSetting8021xCKFormat values indicate the general type of a certificate
 or private key
 

-

+

+++
@@ -384,8 +382,11 @@ and private key
 stored in the setting properties, either as a blob of the item's data, or as
 a path to a certificate or private key file on the filesystem
 

-

 


 
 

 
NM_SETTING_802_1X_CK_FORMAT_UNKNOWN

+

+++
@@ -410,16 +411,8 @@ to a file containing the certificate or key data
 

-
NMSetting8021xClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSetting8021xClass;
+
NM_SETTING_802_1X_SETTING_NAME

+
#define NM_SETTING_802_1X_SETTING_NAME "802-1x"
 

 

 

@@ -434,8 +427,11 @@ to a file containing the certificate or key data
 	NM_SETTING_802_1X_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
 } NMSetting8021xError;
 

-

 


 
 

 
NM_SETTING_802_1X_CK_SCHEME_UNKNOWN

 
 

+

+++
@@ -458,104 +454,114 @@ required
 

-
NM_SETTING_802_1X_ALTSUBJECT_MATCHES

-
#define NM_SETTING_802_1X_ALTSUBJECT_MATCHES "altsubject-matches"
+
NM_SETTING_802_1X_ERROR

+
#define NM_SETTING_802_1X_ERROR nm_setting_802_1x_error_quark ()
 

 

 

 

-
NM_SETTING_802_1X_ANONYMOUS_IDENTITY

-
#define NM_SETTING_802_1X_ANONYMOUS_IDENTITY "anonymous-identity"
-

+
nm_setting_802_1x_error_quark ()

+
GQuark              nm_setting_802_1x_error_quark       (void);

 

+Registers an error quark for NMSetting8021x if necessary.
 

+

 


 
 

 
NM_SETTING_802_1X_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMSetting8021x errors.

 

 

 

-
NM_SETTING_802_1X_CA_CERT

-
#define NM_SETTING_802_1X_CA_CERT "ca-cert"
+
NM_SETTING_802_1X_EAP

+
#define NM_SETTING_802_1X_EAP "eap"
 

 

 

 

 

 

-
NM_SETTING_802_1X_CA_PATH

-
#define NM_SETTING_802_1X_CA_PATH "ca-path"
+
NM_SETTING_802_1X_IDENTITY

+
#define NM_SETTING_802_1X_IDENTITY "identity"
 

 

 

 

 

 

-
NM_SETTING_802_1X_CLIENT_CERT

-
#define NM_SETTING_802_1X_CLIENT_CERT "client-cert"
+
NM_SETTING_802_1X_ANONYMOUS_IDENTITY

+
#define NM_SETTING_802_1X_ANONYMOUS_IDENTITY "anonymous-identity"
 

 

 

 

 

 

-
NM_SETTING_802_1X_EAP

-
#define NM_SETTING_802_1X_EAP "eap"
+
NM_SETTING_802_1X_PAC_FILE

+
#define NM_SETTING_802_1X_PAC_FILE "pac-file"
 

 

 

 

 

 

-
NM_SETTING_802_1X_ERROR

-
#define NM_SETTING_802_1X_ERROR nm_setting_802_1x_error_quark ()
+
NM_SETTING_802_1X_CA_CERT

+
#define NM_SETTING_802_1X_CA_CERT "ca-cert"
 

 

 

 

 

 

-
NM_SETTING_802_1X_IDENTITY

-
#define NM_SETTING_802_1X_IDENTITY "identity"
+
NM_SETTING_802_1X_CA_PATH

+
#define NM_SETTING_802_1X_CA_PATH "ca-path"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PAC_FILE

-
#define NM_SETTING_802_1X_PAC_FILE "pac-file"
+
NM_SETTING_802_1X_SUBJECT_MATCH

+
#define NM_SETTING_802_1X_SUBJECT_MATCH "subject-match"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PASSWORD

-
#define NM_SETTING_802_1X_PASSWORD "password"
+
NM_SETTING_802_1X_ALTSUBJECT_MATCHES

+
#define NM_SETTING_802_1X_ALTSUBJECT_MATCHES "altsubject-matches"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PASSWORD_FLAGS

-
#define NM_SETTING_802_1X_PASSWORD_FLAGS "password-flags"
+
NM_SETTING_802_1X_CLIENT_CERT

+
#define NM_SETTING_802_1X_CLIENT_CERT "client-cert"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PASSWORD_RAW

-
#define NM_SETTING_802_1X_PASSWORD_RAW "password-raw"
+
NM_SETTING_802_1X_PHASE1_PEAPVER

+
#define NM_SETTING_802_1X_PHASE1_PEAPVER "phase1-peapver"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PASSWORD_RAW_FLAGS

-
#define NM_SETTING_802_1X_PASSWORD_RAW_FLAGS "password-raw-flags"
+
NM_SETTING_802_1X_PHASE1_PEAPLABEL

+
#define NM_SETTING_802_1X_PHASE1_PEAPLABEL "phase1-peaplabel"
 

 

 

@@ -570,152 +576,152 @@ required
 

 

 

-
NM_SETTING_802_1X_PHASE1_PEAPLABEL

-
#define NM_SETTING_802_1X_PHASE1_PEAPLABEL "phase1-peaplabel"
+
NM_SETTING_802_1X_PHASE2_AUTH

+
#define NM_SETTING_802_1X_PHASE2_AUTH "phase2-auth"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PHASE1_PEAPVER

-
#define NM_SETTING_802_1X_PHASE1_PEAPVER "phase1-peapver"
+
NM_SETTING_802_1X_PHASE2_AUTHEAP

+
#define NM_SETTING_802_1X_PHASE2_AUTHEAP "phase2-autheap"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES

-
#define NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES "phase2-altsubject-matches"
+
NM_SETTING_802_1X_PHASE2_CA_CERT

+
#define NM_SETTING_802_1X_PHASE2_CA_CERT "phase2-ca-cert"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PHASE2_AUTH

-
#define NM_SETTING_802_1X_PHASE2_AUTH "phase2-auth"
+
NM_SETTING_802_1X_PHASE2_CA_PATH

+
#define NM_SETTING_802_1X_PHASE2_CA_PATH "phase2-ca-path"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PHASE2_AUTHEAP

-
#define NM_SETTING_802_1X_PHASE2_AUTHEAP "phase2-autheap"
+
NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH

+
#define NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH "phase2-subject-match"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PHASE2_CA_CERT

-
#define NM_SETTING_802_1X_PHASE2_CA_CERT "phase2-ca-cert"
+
NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES

+
#define NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES "phase2-altsubject-matches"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PHASE2_CA_PATH

-
#define NM_SETTING_802_1X_PHASE2_CA_PATH "phase2-ca-path"
+
NM_SETTING_802_1X_PHASE2_CLIENT_CERT

+
#define NM_SETTING_802_1X_PHASE2_CLIENT_CERT "phase2-client-cert"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PHASE2_CLIENT_CERT

-
#define NM_SETTING_802_1X_PHASE2_CLIENT_CERT "phase2-client-cert"
+
NM_SETTING_802_1X_PASSWORD

+
#define NM_SETTING_802_1X_PASSWORD "password"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY

-
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY "phase2-private-key"
+
NM_SETTING_802_1X_PASSWORD_FLAGS

+
#define NM_SETTING_802_1X_PASSWORD_FLAGS "password-flags"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD

-
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD "phase2-private-key-password"
+
NM_SETTING_802_1X_PASSWORD_RAW

+
#define NM_SETTING_802_1X_PASSWORD_RAW "password-raw"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS

-
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS "phase2-private-key-password-flags"
+
NM_SETTING_802_1X_PASSWORD_RAW_FLAGS

+
#define NM_SETTING_802_1X_PASSWORD_RAW_FLAGS "password-raw-flags"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH

-
#define NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH "phase2-subject-match"
+
NM_SETTING_802_1X_PRIVATE_KEY

+
#define NM_SETTING_802_1X_PRIVATE_KEY "private-key"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PIN

-
#define NM_SETTING_802_1X_PIN "pin"
+
NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD

+
#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD "private-key-password"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PIN_FLAGS

-
#define NM_SETTING_802_1X_PIN_FLAGS "pin-flags"
+
NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS

+
#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS "private-key-password-flags"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PRIVATE_KEY

-
#define NM_SETTING_802_1X_PRIVATE_KEY "private-key"
+
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY

+
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY "phase2-private-key"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD

-
#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD "private-key-password"
+
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD

+
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD "phase2-private-key-password"
 

 

 

 

 

 

-
NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS

-
#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS "private-key-password-flags"
+
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS

+
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS "phase2-private-key-password-flags"
 

 

 

 

 

 

-
NM_SETTING_802_1X_SETTING_NAME

-
#define NM_SETTING_802_1X_SETTING_NAME "802-1x"
+
NM_SETTING_802_1X_PIN

+
#define NM_SETTING_802_1X_PIN "pin"
 

 

 

 

 

 

-
NM_SETTING_802_1X_SUBJECT_MATCH

-
#define NM_SETTING_802_1X_SUBJECT_MATCH "subject-match"
+
NM_SETTING_802_1X_PIN_FLAGS

+
#define NM_SETTING_802_1X_PIN_FLAGS "pin-flags"
 

 

 

@@ -730,17 +736,62 @@ required
 

 

 

-
nm_setting_802_1x_add_altsubject_match ()

-
gboolean            nm_setting_802_1x_add_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         const char *altsubject_match);

+
NMSetting8021x

+
typedef struct _NMSetting8021x NMSetting8021x;

+

+

+

+

+

+
NMSetting8021xClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSetting8021xClass;
+

 

-Adds an allowed alternate subject name match.  Until at least one
-match is added, the altSubjectName of the remote authentication
-server is not verified.
 

-

+
+

+

+
nm_setting_802_1x_new ()

+
NMSetting *         nm_setting_802_1x_new               (void);

+

+Creates a new NMSetting8021x object with default values.
+

+

++++
+
+
+
+
+




Returns :
the new empty NMSetting8021x object

+

+

+

+
nm_setting_802_1x_get_num_eap_methods ()

+
guint32             nm_setting_802_1x_get_num_eap_methods
+                                                        (NMSetting8021x *setting);

+

+Returns the number of eap methods allowed for use when connecting to the
+network.  Generally only one EAP method is used.  Use the functions
+nm_setting_802_1x_get_eap_method(), nm_setting_802_1x_add_eap_method(),
+and nm_setting_802_1x_remove_eap_method() for adding, removing, and retrieving
+allowed EAP methods.
+

+

+++
@@ -748,13 +799,39 @@ server is not verified.
 
-
-
+
+
+
+
+

 


 
 

 
setting :

 

 
altsubject_match :
the altSubjectName to allow for this connection
Returns :
the number of allowed EAP methods

+

+

+

+
nm_setting_802_1x_get_eap_method ()

+
const char *        nm_setting_802_1x_get_eap_method    (NMSetting8021x *setting,
+                                                         guint32 i);

+

+Returns the name of the allowed EAP method at index i.
+

+

++++
+
+
+
+
+
+
+
+
-
+




setting :
the NMSetting8021x
+
i :
the index of the EAP method name to return
 

 

 
Returns :
TRUE if the alternative subject name match was
-successfully added, FALSE if it was already allowed.the name of the allowed EAP method at index i
+
 

 
 

@@ -769,8 +846,11 @@ Adds an allowed EAP method.  The setting is not valid until at least one
 EAP method has been added.  See "eap" property for a list of
 allowed EAP methods.
 

-

+

+++
@@ -791,17 +871,17 @@ not a valid method or if it was already allowed.

-
nm_setting_802_1x_add_phase2_altsubject_match ()

-
gboolean            nm_setting_802_1x_add_phase2_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         const char *phase2_altsubject_match);

+
nm_setting_802_1x_remove_eap_method ()

+
void                nm_setting_802_1x_remove_eap_method (NMSetting8021x *setting,
+                                                         guint32 i);

 

-Adds an allowed alternate subject name match for "phase 2".  Until
-at least one match is added, the altSubjectName of the "phase 2"
-remote authentication server is not verified.
+Removes the allowed EAP method at the specified index.
 

-

 


 
 

 
setting :

 
 
 

+

+++
@@ -809,28 +889,24 @@ remote authentication server is not verified.
 
-
-
-
-
-
-
+
+

 


 
 

 
setting :

 

 
phase2_altsubject_match :
the "phase 2" altSubjectName to allow for this
-connection
Returns :
TRUE if the "phase 2" alternative subject name match was
-successfully added, FALSE if it was already allowed.
i :
the index of the EAP method to remove
 

 
 

 

 

 

-
nm_setting_802_1x_clear_altsubject_matches ()

-
void                nm_setting_802_1x_clear_altsubject_matches
-                                                        (NMSetting8021x *setting);

+
nm_setting_802_1x_clear_eap_methods ()

+
void                nm_setting_802_1x_clear_eap_methods (NMSetting8021x *setting);

 

-Clears all altSubjectName matches.
+Clears all allowed EAP methods.
 

-

+

+++
nm_setting_802_1x_get_phase1_peaplabel ()
const char *        nm_setting_802_1x_get_phase1_peaplabel
                                                         (NMSetting8021x *setting);

-

 


 

 
setting :

 the NMSetting8021x
@@ -840,77 +916,26 @@ Clears all altSubjectName matches.
 
 

 

-
nm_setting_802_1x_clear_eap_methods ()

-
void                nm_setting_802_1x_clear_eap_methods (NMSetting8021x *setting);

+
nm_setting_802_1x_get_identity ()

+
const char *        nm_setting_802_1x_get_identity      (NMSetting8021x *setting);

 

-Clears all allowed EAP methods.
+Returns the identifier used by some EAP methods (like TLS) to
+authenticate the user.  Often this is a username or login name.
 

-

+

+-
++
+
+
-
-

 




 
setting :

 the NMSetting8021x
 

-

-

-

-
nm_setting_802_1x_clear_phase2_altsubject_matches ()

-
void                nm_setting_802_1x_clear_phase2_altsubject_matches
-                                                        (NMSetting8021x *setting);

-

-Clears all "phase 2" altSubjectName matches.
-

-

--
-
-
-
-


setting :
the NMSetting8021x
-

-

-

-

-
nm_setting_802_1x_error_quark ()

-
GQuark              nm_setting_802_1x_error_quark       (void);

-

-Registers an error quark for NMSetting8021x if necessary.
-

-

--
-
-
-
-


Returns :
the error quark used for NMSetting8021x errors.

-

-

-

-
nm_setting_802_1x_get_altsubject_match ()

-
const char *        nm_setting_802_1x_get_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         guint32 i);

-

-Returns the altSubjectName match at index i.
-

-

--
-
-
-
-
-
-
-
-
+


setting :
the NMSettingConnection
-
i :
the zero-based index of the array of altSubjectName matches
 

 

 
Returns :
the altSubjectName match at index i
-the user identifier
 

 
 

@@ -926,8 +951,11 @@ authenticate the user in the outer unencrypted "phase 1" authentication.  The
 inner "phase 2" authentication will use the "identity" in
 a secure form, if applicable for that EAP method.
 

-

+

+++
@@ -943,18 +971,16 @@ a secure form, if applicable for that EAP method.
 

-
nm_setting_802_1x_get_ca_cert_blob ()

-
const GByteArray *  nm_setting_802_1x_get_ca_cert_blob  (NMSetting8021x *setting);

+
nm_setting_802_1x_get_pac_file ()

+
const char *        nm_setting_802_1x_get_pac_file      (NMSetting8021x *setting);

 

-Returns the CA certificate blob if the CA certificate is stored using the
-NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.  Not all EAP methods use a
-CA certificate (LEAP for example), and those that can take advantage of the
-CA certificate allow it to be unset.  Note that lack of a CA certificate
-reduces security by allowing man-in-the-middle attacks, because the identity
-of the network cannot be confirmed by the client.
+Returns the file containing PAC credentials used by EAP-FAST method.
 

-

 


 
 

 
setting :

 
 

+

+++
@@ -963,25 +989,29 @@ of the network cannot be confirmed by the client.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the CA certificate datathe PAC file
 

 
 

 

 

 

-
nm_setting_802_1x_get_ca_cert_path ()

-
const char *        nm_setting_802_1x_get_ca_cert_path  (NMSetting8021x *setting);

+
nm_setting_802_1x_get_system_ca_certs ()

+
gboolean            nm_setting_802_1x_get_system_ca_certs
+                                                        (NMSetting8021x *setting);

 

-Returns the CA certificate path if the CA certificate is stored using the
-NM_SETTING_802_1X_CK_SCHEME_PATH scheme.  Not all EAP methods use a
-CA certificate (LEAP for example), and those that can take advantage of the
-CA certificate allow it to be unset.  Note that lack of a CA certificate
-reduces security by allowing man-in-the-middle attacks, because the identity
-of the network cannot be confirmed by the client.
+Sets the "system-ca-certs" property. The
+"ca-path" and "phase2-ca-path"
+properties are ignored if the "system-ca-certs" property is
+TRUE, in which case a system-wide CA certificate directory specified at
+compile time (using the --system-ca-path configure option) is used in place
+of these properties.
 

-

+

+++
@@ -990,23 +1020,27 @@ of the network cannot be confirmed by the client.
 
-
+

 


 
 

 
setting :

 

 
Returns :
path to the CA certificate fileTRUE if a system CA certificate path should be used, FALSE if not
 

 
 

 

 

 

-
nm_setting_802_1x_get_ca_cert_scheme ()

-
NMSetting8021xCKScheme nm_setting_802_1x_get_ca_cert_scheme
-                                                        (NMSetting8021x *setting);

+
nm_setting_802_1x_get_ca_path ()

+
const char *        nm_setting_802_1x_get_ca_path       (NMSetting8021x *setting);

 

-Returns the scheme used to store the CA certificate.  If the returned scheme
-is NM_SETTING_802_1X_CK_SCHEME_BLOB, use nm_setting_802_1x_get_ca_cert_blob();
-if NM_SETTING_802_1X_CK_SCHEME_PATH, use nm_setting_802_1x_get_ca_cert_path().
+Returns the path of the CA certificate directory if previously set.  Systems
+will often have a directory that contains multiple individual CA certificates
+which the supplicant can then add to the verification chain.  This may be
+used in addition to the "ca-cert" property to add more CA
+certificates for verifying the network to client.
 

-

+

+++
@@ -1015,24 +1049,28 @@ if Returns :

-
+

 


 
 

 
setting :
scheme used to store the CA certificate (blob or path)the CA certificate directory path
 

 
 

 

 

 

-
nm_setting_802_1x_get_ca_path ()

-
const char *        nm_setting_802_1x_get_ca_path       (NMSetting8021x *setting);

+
nm_setting_802_1x_get_phase2_ca_path ()

+
const char *        nm_setting_802_1x_get_phase2_ca_path
+                                                        (NMSetting8021x *setting);

 

-Returns the path of the CA certificate directory if previously set.  Systems
-will often have a directory that contains multiple individual CA certificates
-which the supplicant can then add to the verification chain.  This may be
-used in addition to the "ca-cert" property to add more CA
-certificates for verifying the network to client.
+Returns the path of the "phase 2" CA certificate directory if previously set.
+Systems will often have a directory that contains multiple individual CA
+certificates which the supplicant can then add to the verification chain.
+This may be used in addition to the "phase2-ca-cert" property
+to add more CA certificates for verifying the network to client.
 

-

+

+++
@@ -1041,23 +1079,26 @@ certificates for verifying the network to client.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the CA certificate directory paththe "phase 2" CA certificate directory path
 

 
 

 

 

 

-
nm_setting_802_1x_get_client_cert_blob ()

-
const GByteArray *  nm_setting_802_1x_get_client_cert_blob
+
nm_setting_802_1x_get_ca_cert_scheme ()

+
NMSetting8021xCKScheme nm_setting_802_1x_get_ca_cert_scheme
                                                         (NMSetting8021x *setting);

 

-Client certificates are used to identify the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
+Returns the scheme used to store the CA certificate.  If the returned scheme
+is NM_SETTING_802_1X_CK_SCHEME_BLOB, use nm_setting_802_1x_get_ca_cert_blob();
+if NM_SETTING_802_1X_CK_SCHEME_PATH, use nm_setting_802_1x_get_ca_cert_path().
 

-

+

+++
@@ -1066,23 +1107,28 @@ authentication method.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the client certificate datascheme used to store the CA certificate (blob or path)
 

 
 

 

 

 

-
nm_setting_802_1x_get_client_cert_path ()

-
const char *        nm_setting_802_1x_get_client_cert_path
-                                                        (NMSetting8021x *setting);

+
nm_setting_802_1x_get_ca_cert_blob ()

+
const GByteArray *  nm_setting_802_1x_get_ca_cert_blob  (NMSetting8021x *setting);

 

-Client certificates are used to identify the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
+Returns the CA certificate blob if the CA certificate is stored using the
+NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.  Not all EAP methods use a
+CA certificate (LEAP for example), and those that can take advantage of the
+CA certificate allow it to be unset.  Note that lack of a CA certificate
+reduces security by allowing man-in-the-middle attacks, because the identity
+of the network cannot be confirmed by the client.
 

-

+

+++
@@ -1091,23 +1137,28 @@ authentication method.
 
-
+

 


 
 

 
setting :

 

 
Returns :
path to the client certificate filethe CA certificate data
 

 
 

 

 

 

-
nm_setting_802_1x_get_client_cert_scheme ()

-
NMSetting8021xCKScheme nm_setting_802_1x_get_client_cert_scheme
-                                                        (NMSetting8021x *setting);

+
nm_setting_802_1x_get_ca_cert_path ()

+
const char *        nm_setting_802_1x_get_ca_cert_path  (NMSetting8021x *setting);

 

-Returns the scheme used to store the client certificate.  If the returned scheme
-is NM_SETTING_802_1X_CK_SCHEME_BLOB, use nm_setting_802_1x_get_client_cert_blob();
-if NM_SETTING_802_1X_CK_SCHEME_PATH, use nm_setting_802_1x_get_client_cert_path().
+Returns the CA certificate path if the CA certificate is stored using the
+NM_SETTING_802_1X_CK_SCHEME_PATH scheme.  Not all EAP methods use a
+CA certificate (LEAP for example), and those that can take advantage of the
+CA certificate allow it to be unset.  Note that lack of a CA certificate
+reduces security by allowing man-in-the-middle attacks, because the identity
+of the network cannot be confirmed by the client.
 

-

+

+++
@@ -1116,21 +1167,30 @@ if Returns :

-
+

 


 
 

 
setting :
scheme used to store the client certificate (blob or path)path to the CA certificate file
 

 
 

 

 

 

-
nm_setting_802_1x_get_eap_method ()

-
const char *        nm_setting_802_1x_get_eap_method    (NMSetting8021x *setting,
-                                                         guint32 i);

+
nm_setting_802_1x_set_ca_cert ()

+
gboolean            nm_setting_802_1x_set_ca_cert       (NMSetting8021x *setting,
+                                                         const char *cert_path,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
+                                                         GError **error);

 

-Returns the name of the allowed EAP method at index i.
+Reads a certificate from disk and sets the "ca-cert" property
+with the raw certificate data if using the NM_SETTING_802_1X_CK_SCHEME_BLOB
+scheme, or with the path to the certificate file if using the
+NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
 

-

+

+++
@@ -1138,27 +1198,41 @@ Returns the name of the allowed EAP method at index 
 
 
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+

 


 
 

 
setting :

 
i :
the index of the EAP method name to return
cert_path :
when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH
+or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the CA certificate
+file (PEM or DER format).  The path must be UTF-8 encoded; use
+g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
+clears the CA certificate.
scheme :
desired storage scheme for the certificate
out_format :
on successful return, the type of the certificate added
error :
on unsuccessful return, an error
 

 

 
Returns :
the name of the allowed EAP method at index i
-TRUE if the operation succeeded, FALSE if it was unsuccessful
 

 
 

 

 

 

-
nm_setting_802_1x_get_identity ()

-
const char *        nm_setting_802_1x_get_identity      (NMSetting8021x *setting);

-

-Returns the identifier used by some EAP methods (like TLS) to
-authenticate the user.  Often this is a username or login name.
-

-

+
nm_setting_802_1x_get_subject_match ()

+
const char *        nm_setting_802_1x_get_subject_match (NMSetting8021x *setting);

+

+++
@@ -1167,7 +1241,10 @@ authenticate the user.  Often this is a username or login name.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the user identifierthe "subject-match" property. This is the
+substring to be matched against the subject of the authentication
+server certificate, or NULL no subject verification is to be
+performed.
 

 
 

@@ -1181,8 +1258,11 @@ authenticate the user.  Often this is a username or login name.
 Returns the number of entries in the
 "altsubject-matches" property of this setting.
 

-

+

+++
@@ -1198,42 +1278,52 @@ Returns the number of entries in the
 

-
nm_setting_802_1x_get_num_eap_methods ()

-
guint32             nm_setting_802_1x_get_num_eap_methods
-                                                        (NMSetting8021x *setting);

+
nm_setting_802_1x_get_altsubject_match ()

+
const char *        nm_setting_802_1x_get_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         guint32 i);

 

-Returns the number of eap methods allowed for use when connecting to the
-network.  Generally only one EAP method is used.  Use the functions
-nm_setting_802_1x_get_eap_method(), nm_setting_802_1x_add_eap_method(),
-and nm_setting_802_1x_remove_eap_method() for adding, removing, and retrieving
-allowed EAP methods.
+Returns the altSubjectName match at index i.
 

-

 


 
 

 
setting :

 
 

+

+++
-
+
+
+
+
-
+

 


 
 

 
setting :
the NMSetting8021x
+the NMSettingConnection
 
 

 
i :
the zero-based index of the array of altSubjectName matches

 
Returns :
the number of allowed EAP methodsthe altSubjectName match at index i
+
 

 
 

 

 

 

-
nm_setting_802_1x_get_num_phase2_altsubject_matches ()

-
guint32             nm_setting_802_1x_get_num_phase2_altsubject_matches
-                                                        (NMSetting8021x *setting);

+
nm_setting_802_1x_add_altsubject_match ()

+
gboolean            nm_setting_802_1x_add_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         const char *altsubject_match);

 

-Returns the number of entries in the
-"phase2-altsubject-matches" property of this setting.
+Adds an allowed alternate subject name match.  Until at least one
+match is added, the altSubjectName of the remote authentication
+server is not verified.
 

-

+

+++
@@ -1241,21 +1331,31 @@ Returns the number of entries in the
 
+
+
+
+
-
+

 


 
 

 
setting :

 

 
altsubject_match :
the altSubjectName to allow for this connection

 
Returns :
the number of phase2-altsubject-matches entries.TRUE if the alternative subject name match was
+successfully added, FALSE if it was already allowed.
 

 
 

 

 

 

-
nm_setting_802_1x_get_pac_file ()

-
const char *        nm_setting_802_1x_get_pac_file      (NMSetting8021x *setting);

-

-Returns the file containing PAC credentials used by EAP-FAST method.
-

-

+
nm_setting_802_1x_remove_altsubject_match ()

+
void                nm_setting_802_1x_remove_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         guint32 i);

+

+Removes the allowed altSubjectName at the specified index.
+

+

+++
@@ -1263,18 +1363,47 @@ Returns the file containing PAC credentials used by EAP-FAST method.
 
-
-
+
+

 


 
 

 
setting :

 

 
Returns :
the PAC file
i :
the index of the altSubjectName match to remove
 

 
 

 

 

 

-
nm_setting_802_1x_get_password ()

-
const char *        nm_setting_802_1x_get_password      (NMSetting8021x *setting);

-

+
nm_setting_802_1x_clear_altsubject_matches ()

+
void                nm_setting_802_1x_clear_altsubject_matches
+                                                        (NMSetting8021x *setting);

+

+Clears all altSubjectName matches.
+

+

++++
+
+
+
+
+




setting :
the NMSetting8021x
+

+

+

+

+
nm_setting_802_1x_get_client_cert_scheme ()

+
NMSetting8021xCKScheme nm_setting_802_1x_get_client_cert_scheme
+                                                        (NMSetting8021x *setting);

+

+Returns the scheme used to store the client certificate.  If the returned scheme
+is NM_SETTING_802_1X_CK_SCHEME_BLOB, use nm_setting_802_1x_get_client_cert_blob();
+if NM_SETTING_802_1X_CK_SCHEME_PATH, use nm_setting_802_1x_get_client_cert_path().
+

+

+++
@@ -1283,19 +1412,26 @@ Returns the file containing PAC credentials used by EAP-FAST method.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the password used by the authentication method, if any, as specified
-by the "password" propertyscheme used to store the client certificate (blob or path)
 

 
 

 

 

 

-
nm_setting_802_1x_get_password_flags ()

-
NMSettingSecretFlags nm_setting_802_1x_get_password_flags
+
nm_setting_802_1x_get_client_cert_blob ()

+
const GByteArray *  nm_setting_802_1x_get_client_cert_blob
                                                         (NMSetting8021x *setting);

-

+

+Client certificates are used to identify the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
+

+

+++
@@ -1304,18 +1440,26 @@ by the 
 
-
+

 


 
 

 
setting :

 
Returns :
the NMSettingSecretFlags pertaining to the "password"
-the client certificate data
 

 
 

 

 

 

-
nm_setting_802_1x_get_password_raw ()

-
const GByteArray *  nm_setting_802_1x_get_password_raw  (NMSetting8021x *setting);

-

+
nm_setting_802_1x_get_client_cert_path ()

+
const char *        nm_setting_802_1x_get_client_cert_path
+                                                        (NMSetting8021x *setting);

+

+Client certificates are used to identify the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
+

+

+++
@@ -1324,20 +1468,35 @@ by the 
 
-
+

 


 
 

 
setting :

 
Returns :
the password used by the authentication method as a
-UTF-8-encoded array of bytes, as specified by the
-"password-raw" propertypath to the client certificate file
 

 
 

 

 

 

-
nm_setting_802_1x_get_password_raw_flags ()

-
NMSettingSecretFlags nm_setting_802_1x_get_password_raw_flags
-                                                        (NMSetting8021x *setting);

-

+
nm_setting_802_1x_set_client_cert ()

+
gboolean            nm_setting_802_1x_set_client_cert   (NMSetting8021x *setting,
+                                                         const char *cert_path,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
+                                                         GError **error);

+

+Reads a certificate from disk and sets the "client-cert"
+property with the raw certificate data if using the
+NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
+file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
+

+

+Client certificates are used to identify the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
+

+

+++
@@ -1345,21 +1504,42 @@ UTF-8-encoded array of bytes, as specified by the
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+

 


 
 

 
setting :

 

 
cert_path :
when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH
+or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the client
+certificate file (PEM, DER, or PKCS12 format).  The path must be UTF-8
+encoded; use g_filename_to_utf8() to convert if needed.  Passing NULL with
+any scheme clears the client certificate.
scheme :
desired storage scheme for the certificate
out_format :
on successful return, the type of the certificate added
error :
on unsuccessful return, an error

 
Returns :
the NMSettingSecretFlags pertaining to the
-"password-raw"
-TRUE if the operation succeeded, FALSE if it was unsuccessful
 

 
 

 

 

 

-
nm_setting_802_1x_get_phase1_fast_provisioning ()

-
const char *        nm_setting_802_1x_get_phase1_fast_provisioning
+
nm_setting_802_1x_get_phase1_peapver ()

+
const char *        nm_setting_802_1x_get_phase1_peapver
                                                         (NMSetting8021x *setting);

-

+

+++
@@ -1368,9 +1548,9 @@ UTF-8-encoded array of bytes, as specified by the
 
-
+

 


 
 

 
setting :

 

 
Returns :
whether "phase 1" PEAP fast provisioning should be used, as specified
-by the "phase1-fast-provisioning" property.  See the
-wpa_supplicant documentation for more details.the "phase 1" PEAP version to be used when authenticating with
+EAP-PEAP as contained in the "phase1-peapver" property.  Valid
+values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).
 

 
 

@@ -1380,8 +1560,11 @@ wpa_supplicant documentation for more details.

 
 

+

+++
@@ -1392,7 +1575,7 @@ wpa_supplicant documentation for more details.
@@ -1401,11 +1584,14 @@ wpa_supplicant documentation for more details.

-
nm_setting_802_1x_get_phase1_peapver ()

-
const char *        nm_setting_802_1x_get_phase1_peapver
+
nm_setting_802_1x_get_phase1_fast_provisioning ()

+
const char *        nm_setting_802_1x_get_phase1_fast_provisioning
                                                         (NMSetting8021x *setting);

-

 


 
 

 
setting :

 
Returns :

 whether the "phase 1" PEAP label is new-style or old-style, to be
 used when authenticating with EAP-PEAP, as contained in the
-"phase1-peaplabel" property.  Valid values are NULL (unset),
+"phase1-peaplabel" property.  Valid values are NULL (unset),
 "0" (use old-style label), and "1" (use new-style label).  See the
 wpa_supplicant documentation for more details.
 

 
 
 

+

+++
@@ -1414,48 +1600,46 @@ wpa_supplicant documentation for more details.
-
+

 


 
 

 
setting :

 

 

 
Returns :
the "phase 1" PEAP version to be used when authenticating with
-EAP-PEAP as contained in the "phase1-peapver" property.  Valid
-values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).whether "phase 1" PEAP fast provisioning should be used, as specified
+by the "phase1-fast-provisioning" property.  See the
+wpa_supplicant documentation for more details.
 

 
 

 

 

 

-
nm_setting_802_1x_get_phase2_altsubject_match ()

-
const char *        nm_setting_802_1x_get_phase2_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         guint32 i);

-

-Returns the "phase 2" altSubjectName match at index i.
-

-

+
nm_setting_802_1x_get_phase2_auth ()

+
const char *        nm_setting_802_1x_get_phase2_auth   (NMSetting8021x *setting);

+

+++
-
-
-
-
-
-
+

 


 
 

 
setting :
the NMSettingConnection
+the NMSetting8021x
 
 

 
i :
the zero-based index of the array of "phase 2" altSubjectName matches

 
Returns :
the "phase 2" altSubjectName match at index i
-the "phase 2" non-EAP (ex MD5) allowed authentication method as
+specified by the "phase2-auth" property.
 

 
 

 

 

 

-
nm_setting_802_1x_get_phase2_auth ()

-
const char *        nm_setting_802_1x_get_phase2_auth   (NMSetting8021x *setting);

-

+
nm_setting_802_1x_get_phase2_autheap ()

+
const char *        nm_setting_802_1x_get_phase2_autheap
+                                                        (NMSetting8021x *setting);

+

+++
@@ -1464,19 +1648,28 @@ Returns the "phase 2" altSubjectName match at index 
 
-
+

 


 
 

 
setting :

 

 
Returns :
the "phase 2" non-EAP (ex MD5) allowed authentication method as
-specified by the "phase2-auth" property.the "phase 2" EAP-based (ex TLS) allowed authentication method as
+specified by the "phase2-autheap" property.
 

 
 

 

 

 

-
nm_setting_802_1x_get_phase2_autheap ()

-
const char *        nm_setting_802_1x_get_phase2_autheap
+
nm_setting_802_1x_get_phase2_ca_cert_scheme ()

+
NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_ca_cert_scheme
                                                         (NMSetting8021x *setting);

-

+

+Returns the scheme used to store the "phase 2" CA certificate.  If the
+returned scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
+nm_setting_802_1x_get_ca_cert_blob(); if NM_SETTING_802_1X_CK_SCHEME_PATH,
+use nm_setting_802_1x_get_ca_cert_path().
+

+

+++
@@ -1485,8 +1678,7 @@ specified by the Returns :

-
+

 


 
 

 
setting :
the "phase 2" EAP-based (ex TLS) allowed authentication method as
-specified by the "phase2-autheap" property.scheme used to store the "phase 2" CA certificate (blob or path)
 

 
 

@@ -1504,8 +1696,11 @@ CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
 of the network cannot be confirmed by the client.
 

-

+

+++
@@ -1532,8 +1727,11 @@ CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
 of the network cannot be confirmed by the client.
 

-

 


 
 

 
setting :

+

+++
@@ -1549,17 +1747,24 @@ of the network cannot be confirmed by the client.
 

-
nm_setting_802_1x_get_phase2_ca_cert_scheme ()

-
NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_ca_cert_scheme
-                                                        (NMSetting8021x *setting);

+
nm_setting_802_1x_set_phase2_ca_cert ()

+
gboolean            nm_setting_802_1x_set_phase2_ca_cert
+                                                        (NMSetting8021x *setting,
+                                                         const char *cert_path,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
+                                                         GError **error);

 

-Returns the scheme used to store the "phase 2" CA certificate.  If the
-returned scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
-nm_setting_802_1x_get_ca_cert_blob(); if NM_SETTING_802_1X_CK_SCHEME_PATH,
-use nm_setting_802_1x_get_ca_cert_path().
+Reads a certificate from disk and sets the "phase2-ca-cert"
+property with the raw certificate data if using the
+NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
+file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
 

-

 


 
 

 
setting :

 
 

+

+++
@@ -1567,26 +1772,42 @@ use cert_path :

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+

 


 
 

 
setting :
when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH
+or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" CA
+certificate file (PEM or DER format).  The path must be UTF-8 encoded; use
+g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
+clears the "phase2" CA certificate.
scheme :
desired storage scheme for the certificate
out_format :
on successful return, the type of the certificate added
error :
on unsuccessful return, an error

 
Returns :
scheme used to store the "phase 2" CA certificate (blob or path)TRUE if the operation succeeded, FALSE if it was unsuccessful
 

 
 

 

 

 

-
nm_setting_802_1x_get_phase2_ca_path ()

-
const char *        nm_setting_802_1x_get_phase2_ca_path
+
nm_setting_802_1x_get_phase2_subject_match ()

+
const char *        nm_setting_802_1x_get_phase2_subject_match
                                                         (NMSetting8021x *setting);

-

-Returns the path of the "phase 2" CA certificate directory if previously set.
-Systems will often have a directory that contains multiple individual CA
-certificates which the supplicant can then add to the verification chain.
-This may be used in addition to the "phase2-ca-cert" property
-to add more CA certificates for verifying the network to client.
-

-

+

+++
@@ -1595,23 +1816,28 @@ to add more CA certificates for verifying the network to client.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the "phase 2" CA certificate directory paththe "phase2-subject-match" property. This is
+the substring to be matched against the subject of the "phase 2"
+authentication server certificate, or NULL no subject verification
+is to be performed.
 

 
 

 

 

 

-
nm_setting_802_1x_get_phase2_client_cert_blob ()

-
const GByteArray *  nm_setting_802_1x_get_phase2_client_cert_blob
+
nm_setting_802_1x_get_num_phase2_altsubject_matches ()

+
guint32             nm_setting_802_1x_get_num_phase2_altsubject_matches
                                                         (NMSetting8021x *setting);

 

-Client certificates are used to identify the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
+Returns the number of entries in the
+"phase2-altsubject-matches" property of this setting.
 

-

+

+++
@@ -1620,50 +1846,59 @@ authentication method.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the "phase 2" client certificate datathe number of phase2-altsubject-matches entries.
 

 
 

 

 

 

-
nm_setting_802_1x_get_phase2_client_cert_path ()

-
const char *        nm_setting_802_1x_get_phase2_client_cert_path
-                                                        (NMSetting8021x *setting);

+
nm_setting_802_1x_get_phase2_altsubject_match ()

+
const char *        nm_setting_802_1x_get_phase2_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         guint32 i);

 

-Client certificates are used to identify the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
+Returns the "phase 2" altSubjectName match at index i.
 

-

+

+++
-
+
+
+
+
-
+

 


 
 

 
setting :
the NMSetting8021x
+the NMSettingConnection
 
 

 
i :
the zero-based index of the array of "phase 2" altSubjectName matches

 
Returns :
path to the "phase 2" client certificate filethe "phase 2" altSubjectName match at index i
+
 

 
 

 

 

 

-
nm_setting_802_1x_get_phase2_client_cert_scheme ()

-
NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_client_cert_scheme
-                                                        (NMSetting8021x *setting);

+
nm_setting_802_1x_add_phase2_altsubject_match ()

+
gboolean            nm_setting_802_1x_add_phase2_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         const char *phase2_altsubject_match);

 

-Returns the scheme used to store the "phase 2" client certificate.  If the
-returned scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
-nm_setting_802_1x_get_client_cert_blob(); if
-NM_SETTING_802_1X_CK_SCHEME_PATH, use
-nm_setting_802_1x_get_client_cert_path().
+Adds an allowed alternate subject name match for "phase 2".  Until
+at least one match is added, the altSubjectName of the "phase 2"
+remote authentication server is not verified.
 

-

+

+++
@@ -1671,29 +1906,32 @@ returned scheme is phase2_altsubject_match :

+
+
+
-
+

 


 
 

 
setting :
the "phase 2" altSubjectName to allow for this
+connection

 
Returns :
scheme used to store the "phase 2" client certificate (blob or path)TRUE if the "phase 2" alternative subject name match was
+successfully added, FALSE if it was already allowed.
 

 
 

 

 

 

-
nm_setting_802_1x_get_phase2_private_key_blob ()

-
const GByteArray *  nm_setting_802_1x_get_phase2_private_key_blob
-                                                        (NMSetting8021x *setting);

-

-Private keys are used to authenticate the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
-

+
nm_setting_802_1x_remove_phase2_altsubject_match ()

+
void                nm_setting_802_1x_remove_phase2_altsubject_match
+                                                        (NMSetting8021x *setting,
+                                                         guint32 i);

 

-WARNING: the phase2 private key property is not a "secret" property, and thus
-unencrypted private key data may be readable by unprivileged users.  Private
-keys should always be encrypted with a private key password.
+Removes the allowed "phase 2" altSubjectName at the specified index.
 

-

+

+++
@@ -1701,40 +1939,49 @@ keys should always be encrypted with a private key password.
 
-
-
+
+

 


 
 

 
setting :

 

 
Returns :
the "phase 2" private key data
i :
the index of the "phase 2" altSubjectName match to remove
 

 
 

 

 

 

-
nm_setting_802_1x_get_phase2_private_key_format ()

-
NMSetting8021xCKFormat nm_setting_802_1x_get_phase2_private_key_format
+
nm_setting_802_1x_clear_phase2_altsubject_matches ()

+
void                nm_setting_802_1x_clear_phase2_altsubject_matches
                                                         (NMSetting8021x *setting);

-

+

+Clears all "phase 2" altSubjectName matches.
+

+

+-
-
++
+
-
-
-
-
-
-
+

 




 
setting :

 the NMSetting8021x
 
Returns :
the data format of the "phase 2" private key data stored in the
-"phase2-private-key" property

 

 

 

 

-
nm_setting_802_1x_get_phase2_private_key_password ()

-
const char *        nm_setting_802_1x_get_phase2_private_key_password
+
nm_setting_802_1x_get_phase2_client_cert_scheme ()

+
NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_client_cert_scheme
                                                         (NMSetting8021x *setting);

-

+

+Returns the scheme used to store the "phase 2" client certificate.  If the
+returned scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
+nm_setting_802_1x_get_client_cert_blob(); if
+NM_SETTING_802_1X_CK_SCHEME_PATH, use
+nm_setting_802_1x_get_client_cert_path().
+

+

+++
@@ -1743,20 +1990,26 @@ keys should always be encrypted with a private key password.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the private key password used to decrypt the private key if
-previously set with nm_setting_802_1x_set_phase2_private_key() or the
-"phase2-private-key-password" property.scheme used to store the "phase 2" client certificate (blob or path)
 

 
 

 

 

 

-
nm_setting_802_1x_get_phase2_private_key_password_flags ()

-
NMSettingSecretFlags nm_setting_802_1x_get_phase2_private_key_password_flags
+
nm_setting_802_1x_get_phase2_client_cert_blob ()

+
const GByteArray *  nm_setting_802_1x_get_phase2_client_cert_blob
                                                         (NMSetting8021x *setting);

-

+

+Client certificates are used to identify the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
+

+

+++
@@ -1765,25 +2018,26 @@ previously set with Returns :

-
+

 


 
 

 
setting :
the NMSettingSecretFlags pertaining to the
-"phase2-private-key-password"
-the "phase 2" client certificate data
 

 
 

 

 

 

-
nm_setting_802_1x_get_phase2_private_key_path ()

-
const char *        nm_setting_802_1x_get_phase2_private_key_path
+
nm_setting_802_1x_get_phase2_client_cert_path ()

+
const char *        nm_setting_802_1x_get_phase2_client_cert_path
                                                         (NMSetting8021x *setting);

 

-Private keys are used to authenticate the connecting client to the network
+Client certificates are used to identify the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.
 

-

+

+++
@@ -1792,25 +2046,36 @@ authentication method.
 
-
+

 


 
 

 
setting :

 

 
Returns :
path to the "phase 2" private key filepath to the "phase 2" client certificate file
 

 
 

 

 

 

-
nm_setting_802_1x_get_phase2_private_key_scheme ()

-
NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_private_key_scheme
-                                                        (NMSetting8021x *setting);

+
nm_setting_802_1x_set_phase2_client_cert ()

+
gboolean            nm_setting_802_1x_set_phase2_client_cert
+                                                        (NMSetting8021x *setting,
+                                                         const char *cert_path,
+                                                         NMSetting8021xCKScheme scheme,
+                                                         NMSetting8021xCKFormat *out_format,
+                                                         GError **error);

 

-Returns the scheme used to store the "phase 2" private key.  If the returned
-scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
-nm_setting_802_1x_get_client_cert_blob(); if
-NM_SETTING_802_1X_CK_SCHEME_PATH, use
-nm_setting_802_1x_get_client_cert_path().
+Reads a certificate from disk and sets the "phase2-client-cert"
+property with the raw certificate data if using the
+NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
+file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
+

+

+Client certificates are used to identify the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
 

-

+

+++
@@ -1818,61 +2083,41 @@ scheme is Returns :

-
+
+
-
-

 


 
 

 
setting :
scheme used to store the "phase 2" private key (blob or path)
cert_path :
when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH
+or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" client
+certificate file (PEM, DER, or PKCS12 format).  The path must be UTF-8
+encoded; use g_filename_to_utf8() to convert if needed.  Passing NULL with
+any scheme clears the "phase2" client certificate.
 

-

-

-

-
nm_setting_802_1x_get_phase2_subject_match ()

-
const char *        nm_setting_802_1x_get_phase2_subject_match
-                                                        (NMSetting8021x *setting);

-

--
-
-
+
+
-
-
+
+
-
-


 
setting :
the NMSetting8021x
-
scheme :
desired storage scheme for the certificate
 

 
Returns :
the "phase2-subject-match" property. This is
-the substring to be matched against the subject of the "phase 2"
-authentication server certificate, or NULL no subject verification
-is to be performed.
out_format :
on successful return, the type of the certificate added
 

-

-

-

-
nm_setting_802_1x_get_pin ()

-
const char *        nm_setting_802_1x_get_pin           (NMSetting8021x *setting);

-

--
-
-
+
+
-
+


 
setting :
the NMSetting8021x
-
error :
on unsuccessful return, an error
 

 

 
Returns :
the PIN used by the authentication method, if any, as specified
-by the "pin" propertyTRUE if the operation succeeded, FALSE if it was unsuccessful
 

 
 

 

 

 

-
nm_setting_802_1x_get_pin_flags ()

-
NMSettingSecretFlags nm_setting_802_1x_get_pin_flags    (NMSetting8021x *setting);

-

+
nm_setting_802_1x_get_password ()

+
const char *        nm_setting_802_1x_get_password      (NMSetting8021x *setting);

+

+++
@@ -1881,30 +2126,22 @@ by the "pin" property
-
+

 


 
 

 
setting :

 

 

 
Returns :
the NMSettingSecretFlags pertaining to the
-"pin"
-the password used by the authentication method, if any, as specified
+by the "password" property
 

 
 

 

 

 

-
nm_setting_802_1x_get_private_key_blob ()

-
const GByteArray *  nm_setting_802_1x_get_private_key_blob
+
nm_setting_802_1x_get_password_flags ()

+
NMSettingSecretFlags nm_setting_802_1x_get_password_flags
                                                         (NMSetting8021x *setting);

-

-Private keys are used to authenticate the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
-

-

-WARNING: the private key property is not a "secret" property, and thus
-unencrypted private key data may be readable by unprivileged users.  Private
-keys should always be encrypted with a private key password.
-

-

+

+++
@@ -1913,18 +2150,21 @@ keys should always be encrypted with a private key password.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the private key datathe NMSettingSecretFlags pertaining to the "password"
+
 

 
 

 

 

 

-
nm_setting_802_1x_get_private_key_format ()

-
NMSetting8021xCKFormat nm_setting_802_1x_get_private_key_format
-                                                        (NMSetting8021x *setting);

-

+
nm_setting_802_1x_get_password_raw ()

+
const GByteArray *  nm_setting_802_1x_get_password_raw  (NMSetting8021x *setting);

+

+++
@@ -1933,19 +2173,23 @@ keys should always be encrypted with a private key password.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the data format of the private key data stored in the
-"private-key" propertythe password used by the authentication method as a
+UTF-8-encoded array of bytes, as specified by the
+"password-raw" property
 

 
 

 

 

 

-
nm_setting_802_1x_get_private_key_password ()

-
const char *        nm_setting_802_1x_get_private_key_password
+
nm_setting_802_1x_get_password_raw_flags ()

+
NMSettingSecretFlags nm_setting_802_1x_get_password_raw_flags
                                                         (NMSetting8021x *setting);

-

+

+++
@@ -1954,20 +2198,22 @@ keys should always be encrypted with a private key password.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the private key password used to decrypt the private key if
-previously set with nm_setting_802_1x_set_private_key(), or the
-"private-key-password" property.the NMSettingSecretFlags pertaining to the
+"password-raw"
+
 

 
 

 

 

 

-
nm_setting_802_1x_get_private_key_password_flags ()

-
NMSettingSecretFlags nm_setting_802_1x_get_private_key_password_flags
-                                                        (NMSetting8021x *setting);

-

+
nm_setting_802_1x_get_pin ()

+
const char *        nm_setting_802_1x_get_pin           (NMSetting8021x *setting);

+

+++
@@ -1976,25 +2222,21 @@ previously set with Returns :

-
+

 


 
 

 
setting :
the NMSettingSecretFlags pertaining to the
-"private-key-password"
-the PIN used by the authentication method, if any, as specified
+by the "pin" property
 

 
 

 

 

 

-
nm_setting_802_1x_get_private_key_path ()

-
const char *        nm_setting_802_1x_get_private_key_path
-                                                        (NMSetting8021x *setting);

-

-Private keys are used to authenticate the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
-

-

+
nm_setting_802_1x_get_pin_flags ()

+
NMSettingSecretFlags nm_setting_802_1x_get_pin_flags    (NMSetting8021x *setting);

+

+++
@@ -2003,7 +2245,9 @@ authentication method.
 
-
+

 


 
 

 
setting :

 

 
Returns :
path to the private key filethe NMSettingSecretFlags pertaining to the
+"pin"
+
 

 
 

@@ -2020,8 +2264,11 @@ Returns the scheme used to store the private key.  If the returned scheme is
 NM_SETTING_802_1X_CK_SCHEME_PATH, use
 nm_setting_802_1x_get_client_cert_path().
 

-

+

+++
@@ -2037,103 +2284,24 @@ Returns the scheme used to store the private key.  If the returned scheme is
 

-
nm_setting_802_1x_get_subject_match ()

-
const char *        nm_setting_802_1x_get_subject_match (NMSetting8021x *setting);

-

 


 
 

 
setting :

 
 

--
-
-
-
-
-
-
-
-
-
-


setting :
the NMSetting8021x
-
Returns :
the "subject-match" property. This is the
-substring to be matched against the subject of the authentication
-server certificate, or NULL no subject verification is to be
-performed.

-

-

-

-
nm_setting_802_1x_get_system_ca_certs ()

-
gboolean            nm_setting_802_1x_get_system_ca_certs
+
nm_setting_802_1x_get_private_key_blob ()

+
const GByteArray *  nm_setting_802_1x_get_private_key_blob
                                                         (NMSetting8021x *setting);

 

-Sets the "system-ca-certs" property. The
-"ca-path" and "phase2-ca-path"
-properties are ignored if the "system-ca-certs" property is
-TRUE, in which case a system-wide CA certificate directory specified at
-compile time (using the --system-ca-path configure option) is used in place
-of these properties.
-

-

--
-
-
-
-
-
-
-
-
-
-


setting :
the NMSetting8021x
-
Returns :
TRUE if a system CA certificate path should be used, FALSE if not

-

-

-

-
nm_setting_802_1x_new ()

-
NMSetting *         nm_setting_802_1x_new               (void);

-

-Creates a new NMSetting8021x object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSetting8021x object

-

-

-

-
nm_setting_802_1x_remove_altsubject_match ()

-
void                nm_setting_802_1x_remove_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         guint32 i);

-

-Removes the allowed altSubjectName at the specified index.
+Private keys are used to authenticate the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
 

-

--
-
-
-
-
-
-
-
-
-
-


setting :
the NMSetting8021x
-
i :
the index of the altSubjectName match to remove

-

-

-

-
nm_setting_802_1x_remove_eap_method ()

-
void                nm_setting_802_1x_remove_eap_method (NMSetting8021x *setting,
-                                                         guint32 i);

 

-Removes the allowed EAP method at the specified index.
+WARNING: the private key property is not a "secret" property, and thus
+unencrypted private key data may be readable by unprivileged users.  Private
+keys should always be encrypted with a private key password.
 

-

+

+++
@@ -2141,23 +2309,27 @@ Removes the allowed EAP method at the specified index.
 
-
-
+
+

 


 
 

 
setting :

 

 
i :
the index of the EAP method to remove
Returns :
the private key data
 

 
 

 

 

 

-
nm_setting_802_1x_remove_phase2_altsubject_match ()

-
void                nm_setting_802_1x_remove_phase2_altsubject_match
-                                                        (NMSetting8021x *setting,
-                                                         guint32 i);

+
nm_setting_802_1x_get_private_key_path ()

+
const char *        nm_setting_802_1x_get_private_key_path
+                                                        (NMSetting8021x *setting);

 

-Removes the allowed "phase 2" altSubjectName at the specified index.
+Private keys are used to authenticate the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
 

-

+

+++
@@ -2165,82 +2337,52 @@ Removes the allowed "phase 2" altSubjectName at the specified index.
 
-
-
+
+

 


 
 

 
setting :

 

 
i :
the index of the "phase 2" altSubjectName match to remove
Returns :
path to the private key file
 

 
 

 

 

 

-
nm_setting_802_1x_set_ca_cert ()

-
gboolean            nm_setting_802_1x_set_ca_cert       (NMSetting8021x *setting,
-                                                         const char *cert_path,
+
nm_setting_802_1x_set_private_key ()

+
gboolean            nm_setting_802_1x_set_private_key   (NMSetting8021x *setting,
+                                                         const char *key_path,
+                                                         const char *password,
                                                          NMSetting8021xCKScheme scheme,
                                                          NMSetting8021xCKFormat *out_format,
                                                          GError **error);

 

-Reads a certificate from disk and sets the "ca-cert" property
-with the raw certificate data if using the NM_SETTING_802_1X_CK_SCHEME_BLOB
-scheme, or with the path to the certificate file if using the
-NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
+Private keys are used to authenticate the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :
the NMSetting8021x
-
cert_path :
when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH
-or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the CA certificate
-file (PEM or DER format).  The path must be UTF-8 encoded; use
-g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
-clears the CA certificate.
scheme :
desired storage scheme for the certificate
out_format :
on successful return, the type of the certificate added
error :
on unsuccessful return, an error
Returns :
TRUE if the operation succeeded, FALSE if it was unsuccessful

-

-

-

-
nm_setting_802_1x_set_client_cert ()

-
gboolean            nm_setting_802_1x_set_client_cert   (NMSetting8021x *setting,
-                                                         const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);

 

-Reads a certificate from disk and sets the "client-cert"
-property with the raw certificate data if using the
-NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
-file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
+This function reads a private key from disk and sets the
+"private-key" property with the private key file data if using
+the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the private
+key file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
 

 

-Client certificates are used to identify the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
+If password is given, this function attempts to decrypt the private key to
+verify that password is correct, and if it is, updates the
+"private-key-password" property with the given password.  If
+the decryption is unsuccessful, FALSE is returned, error is set, and no
+internal data is changed.  If no password is given, the private key is
+assumed to be valid, no decryption is performed, and the password may be set
+at a later time.
+

+

+WARNING: the private key property is not a "secret" property, and thus
+unencrypted private key data using the BLOB scheme may be readable by
+unprivileged users.  Private keys should always be encrypted with a private
+key password to prevent unauthorized access to unencrypted private key data.
 

-

+

+++
@@ -2248,20 +2390,26 @@ authentication method.
 
-
-
+
+
+
+
+
+
-
+
-
+
@@ -2276,21 +2424,14 @@ any scheme clears the client certificate
 

-
nm_setting_802_1x_set_phase2_ca_cert ()

-
gboolean            nm_setting_802_1x_set_phase2_ca_cert
-                                                        (NMSetting8021x *setting,
-                                                         const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);

-

-Reads a certificate from disk and sets the "phase2-ca-cert"
-property with the raw certificate data if using the
-NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
-file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
-

-

 


 
 

 
setting :

 

 
cert_path :
when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH
-or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the client
-certificate file (PEM, DER, or PKCS12 format).  The path must be UTF-8
-encoded; use g_filename_to_utf8() to convert if needed.  Passing NULL with
-any scheme clears the client certificate.
key_path :
when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
+NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the private key file
+(PEM, DER, or PKCS12 format).  The path must be UTF-8 encoded; use
+g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
+clears the private key.
password :
password used to decrypt the private key, or NULL if the password
+is unknown.  If the password is given but fails to decrypt the private key,
+an error is returned.
 

 

 
scheme :
desired storage scheme for the certificatedesired storage scheme for the private key
 

 

 
out_format :
on successful return, the type of the certificate addedon successful return, the type of the private key added
 

 

 
error :

 
 

+
nm_setting_802_1x_get_private_key_password ()

+
const char *        nm_setting_802_1x_get_private_key_password
+                                                        (NMSetting8021x *setting);

+

+++
@@ -2298,54 +2439,80 @@ file if using the cert_path :

-
+
+
+
+

 


 
 

 
setting :
when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH
-or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" CA
-certificate file (PEM or DER format).  The path must be UTF-8 encoded; use
-g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
-clears the "phase2" CA certificate.
Returns :
the private key password used to decrypt the private key if
+previously set with nm_setting_802_1x_set_private_key(), or the
+"private-key-password" property.
 

+

+

+

+
nm_setting_802_1x_get_private_key_password_flags ()

+
NMSettingSecretFlags nm_setting_802_1x_get_private_key_password_flags
+                                                        (NMSetting8021x *setting);

+

++++
+
-
-
+
+
-
-
+
+
+
+




 
scheme :
desired storage scheme for the certificate
setting :
the NMSetting8021x
+
 

 
out_format :
on successful return, the type of the certificate added
Returns :
the NMSettingSecretFlags pertaining to the
+"private-key-password"
+
 

+

+

+

+
nm_setting_802_1x_get_private_key_format ()

+
NMSetting8021xCKFormat nm_setting_802_1x_get_private_key_format
+                                                        (NMSetting8021x *setting);

+

++++
+
-
-
+
+
-
+




 
error :
on unsuccessful return, an error
setting :
the NMSetting8021x
+
 

 

 
Returns :
TRUE if the operation succeeded, FALSE if it was unsuccessfulthe data format of the private key data stored in the
+"private-key" property
 

 
 

 

 

 

-
nm_setting_802_1x_set_phase2_client_cert ()

-
gboolean            nm_setting_802_1x_set_phase2_client_cert
-                                                        (NMSetting8021x *setting,
-                                                         const char *cert_path,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);

-

-Reads a certificate from disk and sets the "phase2-client-cert"
-property with the raw certificate data if using the
-NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
-file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
-

+
nm_setting_802_1x_get_phase2_private_key_scheme ()

+
NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_private_key_scheme
+                                                        (NMSetting8021x *setting);

 

-Client certificates are used to identify the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
+Returns the scheme used to store the "phase 2" private key.  If the returned
+scheme is NM_SETTING_802_1X_CK_SCHEME_BLOB, use
+nm_setting_802_1x_get_client_cert_blob(); if
+NM_SETTING_802_1X_CK_SCHEME_PATH, use
+nm_setting_802_1x_get_client_cert_path().
 

-

+

+++
@@ -2353,28 +2520,69 @@ authentication method.
 
-
-
+
+
+
+

 


 
 

 
setting :

 

 
cert_path :
when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH
-or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" client
-certificate file (PEM, DER, or PKCS12 format).  The path must be UTF-8
-encoded; use g_filename_to_utf8() to convert if needed.  Passing NULL with
-any scheme clears the "phase2" client certificate.
Returns :
scheme used to store the "phase 2" private key (blob or path)
 

+

+

+

+
nm_setting_802_1x_get_phase2_private_key_blob ()

+
const GByteArray *  nm_setting_802_1x_get_phase2_private_key_blob
+                                                        (NMSetting8021x *setting);

+

+Private keys are used to authenticate the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
+

+

+WARNING: the phase2 private key property is not a "secret" property, and thus
+unencrypted private key data may be readable by unprivileged users.  Private
+keys should always be encrypted with a private key password.
+

+

++++
+
-
-
+
+
-
-
+
+
+
+




 
scheme :
desired storage scheme for the certificate
setting :
the NMSetting8021x
+
 

 
out_format :
on successful return, the type of the certificate added
Returns :
the "phase 2" private key data
 

+

+

+

+
nm_setting_802_1x_get_phase2_private_key_path ()

+
const char *        nm_setting_802_1x_get_phase2_private_key_path
+                                                        (NMSetting8021x *setting);

+

+Private keys are used to authenticate the connecting client to the network
+when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
+authentication method.
+

+

++++
+
-
-
+
+
-
+




 
error :
on unsuccessful return, an error
setting :
the NMSetting8021x
+
 

 

 
Returns :
TRUE if the operation succeeded, FALSE if it was unsuccessfulpath to the "phase 2" private key file
 

 
 

@@ -2415,8 +2623,11 @@ thus unencrypted private key data using the BLOB scheme may be readable by
 unprivileged users.  Private keys should always be encrypted with a private
 key password to prevent unauthorized access to unencrypted private key data.
 

-

+

+++
@@ -2428,12 +2639,12 @@ key password to prevent unauthorized access to unencrypted private key data.
 
-
@@ -2458,41 +2669,14 @@ an error is returned.

-
nm_setting_802_1x_set_private_key ()

-
gboolean            nm_setting_802_1x_set_private_key   (NMSetting8021x *setting,
-                                                         const char *key_path,
-                                                         const char *password,
-                                                         NMSetting8021xCKScheme scheme,
-                                                         NMSetting8021xCKFormat *out_format,
-                                                         GError **error);

-

-Private keys are used to authenticate the connecting client to the network
-when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
-authentication method.
-

-

-This function reads a private key from disk and sets the
-"private-key" property with the private key file data if using
-the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the private
-key file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.
-

-

-If password is given, this function attempts to decrypt the private key to
-verify that password is correct, and if it is, updates the
-"private-key-password" property with the given password.  If
-the decryption is unsuccessful, FALSE is returned, error is set, and no
-internal data is changed.  If no password is given, the private key is
-assumed to be valid, no decryption is performed, and the password may be set
-at a later time.
-

-

-WARNING: the private key property is not a "secret" property, and thus
-unencrypted private key data using the BLOB scheme may be readable by
-unprivileged users.  Private keys should always be encrypted with a private
-key password to prevent unauthorized access to unencrypted private key data.
-

-

 


 
 

 
setting :
when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
 NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" private
 key file (PEM, DER, or PKCS12 format).  The path must be UTF-8 encoded;
-use g_filename_to_utf8() to convert if needed.  Passing NULL with any
+use g_filename_to_utf8() to convert if needed.  Passing NULL with any
 scheme clears the private key.
 

 

 
password :
password used to decrypt the private key, or NULL if the password
+password used to decrypt the private key, or NULL if the password
 is unknown.  If the password is given but fails to decrypt the private key,
 an error is returned.
 

 
 
 

+
nm_setting_802_1x_get_phase2_private_key_password ()

+
const char *        nm_setting_802_1x_get_phase2_private_key_password
+                                                        (NMSetting8021x *setting);

+

+++
@@ -2500,34 +2684,59 @@ key password to prevent unauthorized access to unencrypted private key data.
 
-
-
-
-
-
-
+
+
+
+

 


 
 

 
setting :

 

 
key_path :
when scheme is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
-NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the private key file
-(PEM, DER, or PKCS12 format).  The path must be UTF-8 encoded; use
-g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
-clears the private key.
password :
password used to decrypt the private key, or NULL if the password
-is unknown.  If the password is given but fails to decrypt the private key,
-an error is returned.
Returns :
the private key password used to decrypt the private key if
+previously set with nm_setting_802_1x_set_phase2_private_key() or the
+"phase2-private-key-password" property.
 

+

+

+

+
nm_setting_802_1x_get_phase2_private_key_password_flags ()

+
NMSettingSecretFlags nm_setting_802_1x_get_phase2_private_key_password_flags
+                                                        (NMSetting8021x *setting);

+

++++
+
-
-
+
+
-
-
+
+
+
+




 
scheme :
desired storage scheme for the private key
setting :
the NMSetting8021x
+
 

 
out_format :
on successful return, the type of the private key added
Returns :
the NMSettingSecretFlags pertaining to the
+"phase2-private-key-password"
+
 

+

+

+

+
nm_setting_802_1x_get_phase2_private_key_format ()

+
NMSetting8021xCKFormat nm_setting_802_1x_get_phase2_private_key_format
+                                                        (NMSetting8021x *setting);

+

++++
+
-
-
+
+
-
+




 
error :
on unsuccessful return, an error
setting :
the NMSetting8021x
+
 

 

 
Returns :
TRUE if the operation succeeded, FALSE if it was unsuccessfulthe data format of the "phase 2" private key data stored in the
+"phase2-private-key" property
 

 
 

@@ -2825,6 +3034,25 @@ authentication server certificate's subject is performed.
 

 

 

+
The "pin" property

+
  "pin"                      gchar*                : Read / Write

+

+PIN used for EAP authentication methods.
+

+
Default value: NULL

+

+

+

+
The "pin-flags" property

+
  "pin-flags"                guint                 : Read / Write

+

+Flags indicating how to handle "pin":.
+

+
Allowed values: <= 7

+
Default value: 0

+

+

+

 
The "private-key" property

 
  "private-key"              GArray_guchar_*       : Read / Write

 

@@ -2894,6 +3122,6 @@ and 
 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingAdsl.html b/docs/libnm-util/html/NMSettingAdsl.html
index c7289a0a..761094b9 100644
--- a/docs/libnm-util/html/NMSettingAdsl.html
+++ b/docs/libnm-util/html/NMSettingAdsl.html
@@ -3,12 +3,12 @@
 
 
 NMSettingAdsl
-
+
 
 
 
 
-
+
 
 
 
@@ -44,45 +44,45 @@
 
 #include <nm-setting-adsl.h>
 
-                    NMSettingAdsl;
-                    NMSettingAdslClass;
+#define             NM_SETTING_ADSL_SETTING_NAME
 enum                NMSettingAdslError;
-#define             NM_SETTING_ADSL_ENCAPSULATION
-#define             NM_SETTING_ADSL_ENCAPSULATION_LLC
-#define             NM_SETTING_ADSL_ENCAPSULATION_VCMUX
 #define             NM_SETTING_ADSL_ERROR
+GQuark              nm_setting_adsl_error_quark         (void);
+#define             NM_SETTING_ADSL_USERNAME
 #define             NM_SETTING_ADSL_PASSWORD
 #define             NM_SETTING_ADSL_PASSWORD_FLAGS
 #define             NM_SETTING_ADSL_PROTOCOL
-#define             NM_SETTING_ADSL_PROTOCOL_IPOATM
+#define             NM_SETTING_ADSL_ENCAPSULATION
+#define             NM_SETTING_ADSL_VPI
+#define             NM_SETTING_ADSL_VCI
 #define             NM_SETTING_ADSL_PROTOCOL_PPPOA
 #define             NM_SETTING_ADSL_PROTOCOL_PPPOE
-#define             NM_SETTING_ADSL_SETTING_NAME
-#define             NM_SETTING_ADSL_USERNAME
-#define             NM_SETTING_ADSL_VCI
-#define             NM_SETTING_ADSL_VPI
-GQuark              nm_setting_adsl_error_quark         (void);
-const char *        nm_setting_adsl_get_encapsulation   (NMSettingAdsl *setting);
+#define             NM_SETTING_ADSL_PROTOCOL_IPOATM
+#define             NM_SETTING_ADSL_ENCAPSULATION_VCMUX
+#define             NM_SETTING_ADSL_ENCAPSULATION_LLC
+                    NMSettingAdsl;
+                    NMSettingAdslClass;
+NMSetting *         nm_setting_adsl_new                 (void);
+const char *        nm_setting_adsl_get_username        (NMSettingAdsl *setting);
 const char *        nm_setting_adsl_get_password        (NMSettingAdsl *setting);
-NMSettingSecretFlags nm_setting_adsl_get_password_flags (NMSettingAdsl *setting);
 const char *        nm_setting_adsl_get_protocol        (NMSettingAdsl *setting);
-const char *        nm_setting_adsl_get_username        (NMSettingAdsl *setting);
-guint32             nm_setting_adsl_get_vci             (NMSettingAdsl *setting);
+const char *        nm_setting_adsl_get_encapsulation   (NMSettingAdsl *setting);
 guint32             nm_setting_adsl_get_vpi             (NMSettingAdsl *setting);
-NMSetting *         nm_setting_adsl_new                 (void);
+guint32             nm_setting_adsl_get_vci             (NMSettingAdsl *setting);
+NMSettingSecretFlags nm_setting_adsl_get_password_flags (NMSettingAdsl *setting);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingAdslError
+

 
   GObject
    +----NMSetting
          +----NMSettingAdsl
 

-
-  GEnum
-   +----NMSettingAdslError
-

 

 

 
Properties

@@ -106,23 +106,8 @@ properties of ADSL connections.
 

 
Details

 

-
NMSettingAdsl

-
typedef struct _NMSettingAdsl NMSettingAdsl;

-

-

-

-

-

-
NMSettingAdslClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingAdslClass;
+
NM_SETTING_ADSL_SETTING_NAME

+
#define NM_SETTING_ADSL_SETTING_NAME "adsl"
 

 

 

@@ -136,8 +121,11 @@ properties of ADSL connections.
 	NM_SETTING_ADSL_ERROR_MISSING_PROPERTY          /*< nick=MissingProperty >*/
 } NMSettingAdslError;
 

-

+

+++
@@ -160,64 +148,82 @@ required
 

-
NM_SETTING_ADSL_ENCAPSULATION

-
#define NM_SETTING_ADSL_ENCAPSULATION       "encapsulation"
+
NM_SETTING_ADSL_ERROR

+
#define NM_SETTING_ADSL_ERROR nm_setting_adsl_error_quark ()
 

 

 

 

-
NM_SETTING_ADSL_ENCAPSULATION_LLC

-
#define NM_SETTING_ADSL_ENCAPSULATION_LLC   "llc"
+
nm_setting_adsl_error_quark ()

+
GQuark              nm_setting_adsl_error_quark         (void);

+

+Registers an error quark for NMSettingAdsl if necessary.
+

+

 


 
 

 
NM_SETTING_ADSL_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingAdsl errors.

+

+

+

+
NM_SETTING_ADSL_USERNAME

+
#define NM_SETTING_ADSL_USERNAME            "username"
 

 

 

 

 

 

-
NM_SETTING_ADSL_ENCAPSULATION_VCMUX

-
#define NM_SETTING_ADSL_ENCAPSULATION_VCMUX "vcmux"
+
NM_SETTING_ADSL_PASSWORD

+
#define NM_SETTING_ADSL_PASSWORD            "password"
 

 

 

 

 

 

-
NM_SETTING_ADSL_ERROR

-
#define NM_SETTING_ADSL_ERROR nm_setting_adsl_error_quark ()
+
NM_SETTING_ADSL_PASSWORD_FLAGS

+
#define NM_SETTING_ADSL_PASSWORD_FLAGS      "password-flags"
 

 

 

 

 

 

-
NM_SETTING_ADSL_PASSWORD

-
#define NM_SETTING_ADSL_PASSWORD            "password"
+
NM_SETTING_ADSL_PROTOCOL

+
#define NM_SETTING_ADSL_PROTOCOL            "protocol"
 

 

 

 

 

 

-
NM_SETTING_ADSL_PASSWORD_FLAGS

-
#define NM_SETTING_ADSL_PASSWORD_FLAGS      "password-flags"
+
NM_SETTING_ADSL_ENCAPSULATION

+
#define NM_SETTING_ADSL_ENCAPSULATION       "encapsulation"
 

 

 

 

 

 

-
NM_SETTING_ADSL_PROTOCOL

-
#define NM_SETTING_ADSL_PROTOCOL            "protocol"
+
NM_SETTING_ADSL_VPI

+
#define NM_SETTING_ADSL_VPI                 "vpi"
 

 

 

 

 

 

-
NM_SETTING_ADSL_PROTOCOL_IPOATM

-
#define NM_SETTING_ADSL_PROTOCOL_IPOATM     "ipoatm"
+
NM_SETTING_ADSL_VCI

+
#define NM_SETTING_ADSL_VCI                 "vci"
 

 

 

@@ -240,57 +246,78 @@ required
 

 

 

-
NM_SETTING_ADSL_SETTING_NAME

-
#define NM_SETTING_ADSL_SETTING_NAME "adsl"
+
NM_SETTING_ADSL_PROTOCOL_IPOATM

+
#define NM_SETTING_ADSL_PROTOCOL_IPOATM     "ipoatm"
 

 

 

 

 

 

-
NM_SETTING_ADSL_USERNAME

-
#define NM_SETTING_ADSL_USERNAME            "username"
+
NM_SETTING_ADSL_ENCAPSULATION_VCMUX

+
#define NM_SETTING_ADSL_ENCAPSULATION_VCMUX "vcmux"
 

 

 

 

 

 

-
NM_SETTING_ADSL_VCI

-
#define NM_SETTING_ADSL_VCI                 "vci"
+
NM_SETTING_ADSL_ENCAPSULATION_LLC

+
#define NM_SETTING_ADSL_ENCAPSULATION_LLC   "llc"
 

 

 

 

 

 

-
NM_SETTING_ADSL_VPI

-
#define NM_SETTING_ADSL_VPI                 "vpi"
+
NMSettingAdsl

+
typedef struct _NMSettingAdsl NMSettingAdsl;

+

+

+

+

+

+
NMSettingAdslClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingAdslClass;
 

 

 

 

 

 

-
nm_setting_adsl_error_quark ()

-
GQuark              nm_setting_adsl_error_quark         (void);

+
nm_setting_adsl_new ()

+
NMSetting *         nm_setting_adsl_new                 (void);

 

-Registers an error quark for NMSettingAdsl if necessary.
+Creates a new NMSettingAdsl object with default values.
 

-

+

+++
-
+

 


 

 
Returns :
the error quark used for NMSettingAdsl errors.the new empty NMSettingAdsl object
 

 

 

 

 

-
nm_setting_adsl_get_encapsulation ()

-
const char *        nm_setting_adsl_get_encapsulation   (NMSettingAdsl *setting);

-

+
nm_setting_adsl_get_username ()

+
const char *        nm_setting_adsl_get_username        (NMSettingAdsl *setting);

+

+++
@@ -299,7 +326,7 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "encapsulation" property of the settingthe "username" property of the setting
 

 
 

@@ -308,8 +335,11 @@ Registers an error quark for 
 
nm_setting_adsl_get_password ()

 
const char *        nm_setting_adsl_get_password        (NMSettingAdsl *setting);

-

+

+++
@@ -325,10 +355,13 @@ Registers an error quark for 
-
nm_setting_adsl_get_password_flags ()

-
NMSettingSecretFlags nm_setting_adsl_get_password_flags (NMSettingAdsl *setting);

-

 


 
 

 
setting :

+
nm_setting_adsl_get_protocol ()

+
const char *        nm_setting_adsl_get_protocol        (NMSettingAdsl *setting);

+

+++
@@ -337,18 +370,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the NMSettingSecretFlags pertaining to the "password"
-the "protocol" property of the setting
 

 
 

 

 

 

-
nm_setting_adsl_get_protocol ()

-
const char *        nm_setting_adsl_get_protocol        (NMSettingAdsl *setting);

-

+
nm_setting_adsl_get_encapsulation ()

+
const char *        nm_setting_adsl_get_encapsulation   (NMSettingAdsl *setting);

+

+++
@@ -357,17 +392,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "protocol" property of the settingthe "encapsulation" property of the setting
 

 
 

 

 

 

-
nm_setting_adsl_get_username ()

-
const char *        nm_setting_adsl_get_username        (NMSettingAdsl *setting);

-

+
nm_setting_adsl_get_vpi ()

+
guint32             nm_setting_adsl_get_vpi             (NMSettingAdsl *setting);

+

+++
@@ -376,7 +414,7 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "username" property of the settingthe "vpi" property of the setting
 

 
 

@@ -385,8 +423,11 @@ Registers an error quark for 
 
nm_setting_adsl_get_vci ()

 
guint32             nm_setting_adsl_get_vci             (NMSettingAdsl *setting);

-

+

+++
@@ -402,10 +443,13 @@ Registers an error quark for 
-
nm_setting_adsl_get_vpi ()

-
guint32             nm_setting_adsl_get_vpi             (NMSettingAdsl *setting);

-

 


 
 

 
setting :

+
nm_setting_adsl_get_password_flags ()

+
NMSettingSecretFlags nm_setting_adsl_get_password_flags (NMSettingAdsl *setting);

+

+++
@@ -414,26 +458,12 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "vpi" property of the settingthe NMSettingSecretFlags pertaining to the "password"
+
 

 
 

 

-

-

-
nm_setting_adsl_new ()

-
NMSetting *         nm_setting_adsl_new                 (void);

-

-Creates a new NMSettingAdsl object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSettingAdsl object

-

 

 

 
Property Details

@@ -506,6 +536,6 @@ ADSL connection vpi.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBluetooth.html b/docs/libnm-util/html/NMSettingBluetooth.html
index e2f39011..388ae5e7 100644
--- a/docs/libnm-util/html/NMSettingBluetooth.html
+++ b/docs/libnm-util/html/NMSettingBluetooth.html
@@ -3,12 +3,12 @@
 
 
 NMSettingBluetooth
-
+
 
 
 
 
-
+
 
 
 
@@ -44,33 +44,33 @@
 
 #include <nm-setting-bluetooth.h>
 
-                    NMSettingBluetooth;
-                    NMSettingBluetoothClass;
+#define             NM_SETTING_BLUETOOTH_SETTING_NAME
 enum                NMSettingBluetoothError;
-#define             NM_SETTING_BLUETOOTH_BDADDR
 #define             NM_SETTING_BLUETOOTH_ERROR
-#define             NM_SETTING_BLUETOOTH_SETTING_NAME
+GQuark              nm_setting_bluetooth_error_quark    (void);
+#define             NM_SETTING_BLUETOOTH_BDADDR
 #define             NM_SETTING_BLUETOOTH_TYPE
 #define             NM_SETTING_BLUETOOTH_TYPE_DUN
 #define             NM_SETTING_BLUETOOTH_TYPE_PANU
-GQuark              nm_setting_bluetooth_error_quark    (void);
+                    NMSettingBluetooth;
+                    NMSettingBluetoothClass;
+NMSetting *         nm_setting_bluetooth_new            (void);
 const GByteArray *  nm_setting_bluetooth_get_bdaddr     (NMSettingBluetooth *setting);
 const char *        nm_setting_bluetooth_get_connection_type
                                                         (NMSettingBluetooth *setting);
-NMSetting *         nm_setting_bluetooth_new            (void);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingBluetoothError
+

 
   GObject
    +----NMSetting
          +----NMSettingBluetooth
 

-
-  GEnum
-   +----NMSettingBluetoothError
-

 

 

 
Properties

@@ -91,23 +91,8 @@ Point (NAP) profiles.
 

 
Details

 

-
NMSettingBluetooth

-
typedef struct _NMSettingBluetooth NMSettingBluetooth;

-

-

-

-

-

-
NMSettingBluetoothClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingBluetoothClass;
+
NM_SETTING_BLUETOOTH_SETTING_NAME

+
#define NM_SETTING_BLUETOOTH_SETTING_NAME "bluetooth"
 

 

 

@@ -122,8 +107,11 @@ Point (NAP) profiles.
 	NM_SETTING_BLUETOOTH_ERROR_TYPE_SETTING_NOT_FOUND, /*< nick=TypeSettingNotFound >*/
 } NMSettingBluetoothError;
 

-

+

+++
@@ -153,24 +141,34 @@ must also contain an 
-
NM_SETTING_BLUETOOTH_BDADDR

-
#define NM_SETTING_BLUETOOTH_BDADDR    "bdaddr"
+
NM_SETTING_BLUETOOTH_ERROR

+
#define NM_SETTING_BLUETOOTH_ERROR nm_setting_bluetooth_error_quark ()
 

 

 

 
 

 

-
NM_SETTING_BLUETOOTH_ERROR

-
#define NM_SETTING_BLUETOOTH_ERROR nm_setting_bluetooth_error_quark ()
-

+
nm_setting_bluetooth_error_quark ()

+
GQuark              nm_setting_bluetooth_error_quark    (void);

 

+Registers an error quark for NMSettingBluetooth if necessary.
 

+

 


 
 

 
NM_SETTING_BLUETOOTH_ERROR_UNKNOWN

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingBluetooth errors.

 

 

 

-
NM_SETTING_BLUETOOTH_SETTING_NAME

-
#define NM_SETTING_BLUETOOTH_SETTING_NAME "bluetooth"
+
NM_SETTING_BLUETOOTH_BDADDR

+
#define NM_SETTING_BLUETOOTH_BDADDR    "bdaddr"
 

 

 

@@ -205,16 +203,43 @@ NAP (Network Access Point) protocol, which accepts connections via PANU.
 

 

 

-
nm_setting_bluetooth_error_quark ()

-
GQuark              nm_setting_bluetooth_error_quark    (void);

+
NMSettingBluetooth

+
typedef struct _NMSettingBluetooth NMSettingBluetooth;

+

+

+

+

+

+
NMSettingBluetoothClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingBluetoothClass;
+

 

-Registers an error quark for NMSettingBluetooth if necessary.
 

-

+
+

+

+
nm_setting_bluetooth_new ()

+
NMSetting *         nm_setting_bluetooth_new            (void);

+

+Creates a new NMSettingBluetooth object with default values.
+

+

+++
-
+

 


 

 
Returns :
the error quark used for NMSettingBluetooth errors.the new empty NMSettingBluetooth object. [transfer full]
+
 

 

 

@@ -226,8 +251,11 @@ Registers an error quark for 
-

+

+++
@@ -250,8 +278,11 @@ describes a connection to.
 Returns the connection method for communicating with the remote device (i.e.
 either DUN to a DUN-capable device or PANU to a NAP-capable device).
 

-

 


 
 

 
setting :

+

+++
@@ -266,22 +297,6 @@ either DUN to a DUN-capable device or PANU to a NAP-capable device).
 

 


 
 

 
setting :

 

 

-

-

-
nm_setting_bluetooth_new ()

-
NMSetting *         nm_setting_bluetooth_new            (void);

-

-Creates a new NMSettingBluetooth object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSettingBluetooth object. [transfer full]
-

-

 

 

 
Property Details

@@ -306,6 +321,6 @@ Area Networking connections to devices supporting the NAP profile.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBond.html b/docs/libnm-util/html/NMSettingBond.html
index ff77e102..89c6fe25 100644
--- a/docs/libnm-util/html/NMSettingBond.html
+++ b/docs/libnm-util/html/NMSettingBond.html
@@ -3,12 +3,12 @@
 
 
 NMSettingBond
-
+
 
 
 
 
-
+
 
 
 
@@ -44,23 +44,21 @@
 
 #include <nm-setting-bond.h>
 
-                    NMSettingBond;
-                    NMSettingBondClass;
+#define             NM_SETTING_BOND_SETTING_NAME
 enum                NMSettingBondError;
 #define             NM_SETTING_BOND_ERROR
+GQuark              nm_setting_bond_error_quark         (void);
 #define             NM_SETTING_BOND_INTERFACE_NAME
 #define             NM_SETTING_BOND_OPTIONS
-#define             NM_SETTING_BOND_OPTION_ARP_INTERVAL
-#define             NM_SETTING_BOND_OPTION_ARP_IP_TARGET
-#define             NM_SETTING_BOND_OPTION_DOWNDELAY
-#define             NM_SETTING_BOND_OPTION_MIIMON
 #define             NM_SETTING_BOND_OPTION_MODE
+#define             NM_SETTING_BOND_OPTION_MIIMON
+#define             NM_SETTING_BOND_OPTION_DOWNDELAY
 #define             NM_SETTING_BOND_OPTION_UPDELAY
-#define             NM_SETTING_BOND_SETTING_NAME
-gboolean            nm_setting_bond_add_option          (NMSettingBond *setting,
-                                                         const char *name,
-                                                         const char *value);
-GQuark              nm_setting_bond_error_quark         (void);
+#define             NM_SETTING_BOND_OPTION_ARP_INTERVAL
+#define             NM_SETTING_BOND_OPTION_ARP_IP_TARGET
+                    NMSettingBond;
+                    NMSettingBondClass;
+NMSetting *         nm_setting_bond_new                 (void);
 const char *        nm_setting_bond_get_interface_name  (NMSettingBond *setting);
 guint32             nm_setting_bond_get_num_options     (NMSettingBond *setting);
 gboolean            nm_setting_bond_get_option          (NMSettingBond *setting,
@@ -69,25 +67,27 @@ const char *        const char **out_value);
 const char *        nm_setting_bond_get_option_by_name  (NMSettingBond *setting,
                                                          const char *name);
-const char *        nm_setting_bond_get_option_default  (NMSettingBond *setting,
+gboolean            nm_setting_bond_add_option          (NMSettingBond *setting,
+                                                         const char *name,
+                                                         const char *value);
+gboolean            nm_setting_bond_remove_option       (NMSettingBond *setting,
                                                          const char *name);
 const char **       nm_setting_bond_get_valid_options   (NMSettingBond *setting);
-NMSetting *         nm_setting_bond_new                 (void);
-gboolean            nm_setting_bond_remove_option       (NMSettingBond *setting,
+const char *        nm_setting_bond_get_option_default  (NMSettingBond *setting,
                                                          const char *name);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingBondError
+

 
   GObject
    +----NMSetting
          +----NMSettingBond
 

-
-  GEnum
-   +----NMSettingBondError
-

 

 

 
Properties

@@ -106,23 +106,8 @@ necessary for bond connections.
 

 
Details

 

-
NMSettingBond

-
typedef struct _NMSettingBond NMSettingBond;

-

-

-

-

-

-
NMSettingBondClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingBondClass;
+
NM_SETTING_BOND_SETTING_NAME

+
#define NM_SETTING_BOND_SETTING_NAME "bond"
 

 

 

@@ -138,8 +123,11 @@ necessary for bond connections.
 	NM_SETTING_BOND_ERROR_MISSING_OPTION,   /*< nick=MissingOption >*/
 } NMSettingBondError;
 

-

+

+++
@@ -180,6 +168,24 @@ required
 

+
nm_setting_bond_error_quark ()

+
GQuark              nm_setting_bond_error_quark         (void);

+

+Registers an error quark for NMSettingBond if necessary.
+

+

 


 
 

 
NM_SETTING_BOND_ERROR_UNKNOWN

 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingBond errors.

+

+

+

 
NM_SETTING_BOND_INTERFACE_NAME

 
#define NM_SETTING_BOND_INTERFACE_NAME "interface-name"
 

@@ -196,16 +202,16 @@ required
 

 

 

-
NM_SETTING_BOND_OPTION_ARP_INTERVAL

-
#define NM_SETTING_BOND_OPTION_ARP_INTERVAL  "arp_interval"
+
NM_SETTING_BOND_OPTION_MODE

+
#define NM_SETTING_BOND_OPTION_MODE          "mode"
 

 

 

 

 

 

-
NM_SETTING_BOND_OPTION_ARP_IP_TARGET

-
#define NM_SETTING_BOND_OPTION_ARP_IP_TARGET "arp_ip_target"
+
NM_SETTING_BOND_OPTION_MIIMON

+
#define NM_SETTING_BOND_OPTION_MIIMON        "miimon"
 

 

 

@@ -220,85 +226,67 @@ required
 

 

 

-
NM_SETTING_BOND_OPTION_MIIMON

-
#define NM_SETTING_BOND_OPTION_MIIMON        "miimon"
+
NM_SETTING_BOND_OPTION_UPDELAY

+
#define NM_SETTING_BOND_OPTION_UPDELAY       "updelay"
 

 

 

 

 

 

-
NM_SETTING_BOND_OPTION_MODE

-
#define NM_SETTING_BOND_OPTION_MODE          "mode"
+
NM_SETTING_BOND_OPTION_ARP_INTERVAL

+
#define NM_SETTING_BOND_OPTION_ARP_INTERVAL  "arp_interval"
 

 

 

 

 

 

-
NM_SETTING_BOND_OPTION_UPDELAY

-
#define NM_SETTING_BOND_OPTION_UPDELAY       "updelay"
+
NM_SETTING_BOND_OPTION_ARP_IP_TARGET

+
#define NM_SETTING_BOND_OPTION_ARP_IP_TARGET "arp_ip_target"
 

 

 

 

 

 

-
NM_SETTING_BOND_SETTING_NAME

-
#define NM_SETTING_BOND_SETTING_NAME "bond"
-

+
NMSettingBond

+
typedef struct _NMSettingBond NMSettingBond;

 

 

 

 

 

-
nm_setting_bond_add_option ()

-
gboolean            nm_setting_bond_add_option          (NMSettingBond *setting,
-                                                         const char *name,
-                                                         const char *value);

+
NMSettingBondClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingBondClass;
+

 

-Add an option to the table.  The option is compared to an internal list
-of allowed options.  Option names may contain only alphanumeric characters
-(ie [a-zA-Z0-9]).  Adding a new name replaces any existing name/value pair
-that may already exist.
 

-

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


setting :
the NMSettingBond
-
name :
name for the option
value :
value for the option
Returns :

-TRUE if the option was valid and was added to the internal option
-list, FALSE if it was not.

 

 

 

-
nm_setting_bond_error_quark ()

-
GQuark              nm_setting_bond_error_quark         (void);

+
nm_setting_bond_new ()

+
NMSetting *         nm_setting_bond_new                 (void);

 

-Registers an error quark for NMSettingBond if necessary.
+Creates a new NMSettingBond object with default values.
 

-

+

+++
-
+

 


 

 
Returns :
the error quark used for NMSettingBond errors.the new empty NMSettingBond object. [transfer full]
+
 

 

 

@@ -306,8 +294,11 @@ Registers an error quark for 
 
nm_setting_bond_get_interface_name ()

 
const char *        nm_setting_bond_get_interface_name  (NMSettingBond *setting);

-

+

+++
@@ -330,8 +321,11 @@ Returns the number of options that should be set for this bond when it
 is activated. This can be used to retrieve each option individually
 using nm_setting_bond_get_option().
 

-

 


 
 

 
setting :

+

+++
@@ -359,8 +353,11 @@ are *not* guaranteed to be static across modifications to options done by
 and should not be used to refer to options except for short periods of time
 such as during option iteration.
 

-

 


 
 

 
setting :

+

+++
@@ -403,8 +400,11 @@ currently held by the setting)
 Returns the value associated with the bonding option specified by
 name, if it exists.
 

-

 


 
 

 
setting :

+

+++
@@ -417,7 +417,7 @@ Returns the value associated with the bonding option specified by
 
-
@@ -425,11 +425,21 @@ setting; the value is owned by the setting and must not be modified

-
nm_setting_bond_get_option_default ()

-
const char *        nm_setting_bond_get_option_default  (NMSettingBond *setting,
-                                                         const char *name);

-

 


 
 

 
setting :

 

 
Returns :
the value, or NULL if the key/value pair was never added to the
+the value, or NULL if the key/value pair was never added to the
 setting; the value is owned by the setting and must not be modified
 

 
 
 
 

+
nm_setting_bond_add_option ()

+
gboolean            nm_setting_bond_add_option          (NMSettingBond *setting,
+                                                         const char *name,
+                                                         const char *value);

+

+Add an option to the table.  The option is compared to an internal list
+of allowed options.  Option names may contain only alphanumeric characters
+(ie [a-zA-Z0-9]).  Adding a new name replaces any existing name/value pair
+that may already exist.
+

+

+++
@@ -438,25 +448,35 @@ setting; the value is owned by the setting and must not be modified
-
+
+
+
+
+
-
+

 


 
 

 
setting :

 

 

 
name :
the name of the optionname for the option
value :
value for the option
 

 

 
Returns :
the value of the bond option if not overridden by an entry in
-the "options" property.
+TRUE if the option was valid and was added to the internal option
+list, FALSE if it was not.
 

 
 

 

 

 

-
nm_setting_bond_get_valid_options ()

-
const char **       nm_setting_bond_get_valid_options   (NMSettingBond *setting);

+
nm_setting_bond_remove_option ()

+
gboolean            nm_setting_bond_remove_option       (NMSettingBond *setting,
+                                                         const char *name);

 

-Returns a list of valid bond options.
+Remove the bonding option referenced by name from the internal option
+list.
 

-

+

+++
@@ -464,40 +484,54 @@ Returns a list of valid bond options.
 
+
+
+
+
-
+

 


 
 

 
setting :

 

 
name :
name of the option to remove

 
Returns :
a NULL-terminated array of strings of valid bond options. [transfer none]
-
+TRUE if the option was found and removed from the internal option
+list, FALSE if it was not.
 

 
 

 

 

 

-
nm_setting_bond_new ()

-
NMSetting *         nm_setting_bond_new                 (void);

+
nm_setting_bond_get_valid_options ()

+
const char **       nm_setting_bond_get_valid_options   (NMSettingBond *setting);

 

-Creates a new NMSettingBond object with default values.
+Returns a list of valid bond options.
 

-

+

+-
++
+
+
+
+
+
+
-
-
+
+

 



setting :
the NMSettingBond
+

 
Returns :
the new empty NMSettingBond object. [transfer full]
+a NULL-terminated array of strings of valid bond options. [transfer none]
 

 

 

 

 

-
nm_setting_bond_remove_option ()

-
gboolean            nm_setting_bond_remove_option       (NMSettingBond *setting,
+
nm_setting_bond_get_option_default ()

+
const char *        nm_setting_bond_get_option_default  (NMSettingBond *setting,
                                                          const char *name);

-

-Remove the bonding option referenced by name from the internal option
-list.
-

-

+

+++
@@ -506,13 +540,12 @@ list.
 
-
+
-
+

 


 
 

 
setting :

 

 
name :
name of the option to removethe name of the option
 

 

 
Returns :

-TRUE if the option was found and removed from the internal option
-list, FALSE if it was not.the value of the bond option if not overridden by an entry in
+the "options" property.
 

 
 

@@ -542,6 +575,6 @@ alphanumeric characters (ie, [a-zA-Z0-9]).
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBridge.html b/docs/libnm-util/html/NMSettingBridge.html
index e7d071be..b5a9742c 100644
--- a/docs/libnm-util/html/NMSettingBridge.html
+++ b/docs/libnm-util/html/NMSettingBridge.html
@@ -3,12 +3,12 @@
 
 
 NMSettingBridge
-
+
 
 
 
 
-
+
 
 
 
@@ -44,41 +44,41 @@
 
 #include <nm-setting-bridge.h>
 
-                    NMSettingBridge;
-                    NMSettingBridgeClass;
+#define             NM_SETTING_BRIDGE_SETTING_NAME
 enum                NMSettingBridgeError;
-#define             NM_SETTING_BRIDGE_AGEING_TIME
 #define             NM_SETTING_BRIDGE_ERROR
+GQuark              nm_setting_bridge_error_quark       (void);
+#define             NM_SETTING_BRIDGE_INTERFACE_NAME
+#define             NM_SETTING_BRIDGE_STP
+#define             NM_SETTING_BRIDGE_PRIORITY
 #define             NM_SETTING_BRIDGE_FORWARD_DELAY
 #define             NM_SETTING_BRIDGE_HELLO_TIME
-#define             NM_SETTING_BRIDGE_INTERFACE_NAME
 #define             NM_SETTING_BRIDGE_MAX_AGE
-#define             NM_SETTING_BRIDGE_PRIORITY
-#define             NM_SETTING_BRIDGE_SETTING_NAME
-#define             NM_SETTING_BRIDGE_STP
-GQuark              nm_setting_bridge_error_quark       (void);
-guint32             nm_setting_bridge_get_ageing_time   (NMSettingBridge *setting);
-guint16             nm_setting_bridge_get_forward_delay (NMSettingBridge *setting);
-guint16             nm_setting_bridge_get_hello_time    (NMSettingBridge *setting);
+#define             NM_SETTING_BRIDGE_AGEING_TIME
+                    NMSettingBridge;
+                    NMSettingBridgeClass;
+NMSetting *         nm_setting_bridge_new               (void);
 const char *        nm_setting_bridge_get_interface_name
                                                         (NMSettingBridge *setting);
-guint16             nm_setting_bridge_get_max_age       (NMSettingBridge *setting);
-guint16             nm_setting_bridge_get_priority      (NMSettingBridge *setting);
 gboolean            nm_setting_bridge_get_stp           (NMSettingBridge *setting);
-NMSetting *         nm_setting_bridge_new               (void);
+guint16             nm_setting_bridge_get_priority      (NMSettingBridge *setting);
+guint16             nm_setting_bridge_get_forward_delay (NMSettingBridge *setting);
+guint16             nm_setting_bridge_get_hello_time    (NMSettingBridge *setting);
+guint16             nm_setting_bridge_get_max_age       (NMSettingBridge *setting);
+guint32             nm_setting_bridge_get_ageing_time   (NMSettingBridge *setting);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingBridgeError
+

 
   GObject
    +----NMSetting
          +----NMSettingBridge
 

-
-  GEnum
-   +----NMSettingBridgeError
-

 

 

 
Properties

@@ -102,23 +102,8 @@ necessary for bridging connections.
 

 
Details

 

-
NMSettingBridge

-
typedef struct _NMSettingBridge NMSettingBridge;

-

-

-

-

-

-
NMSettingBridgeClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingBridgeClass;
+
NM_SETTING_BRIDGE_SETTING_NAME

+
#define NM_SETTING_BRIDGE_SETTING_NAME "bridge"
 

 

 

@@ -132,8 +117,11 @@ necessary for bridging connections.
 	NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY, /*< nick=MissingProperty >*/
 } NMSettingBridgeError;
 

-

+

+++
@@ -157,40 +145,67 @@ required
 

-
NM_SETTING_BRIDGE_AGEING_TIME

-
#define NM_SETTING_BRIDGE_AGEING_TIME    "ageing-time"
+
NM_SETTING_BRIDGE_ERROR

+
#define NM_SETTING_BRIDGE_ERROR nm_setting_bridge_error_quark ()
 

 

 

 

-
NM_SETTING_BRIDGE_ERROR

-
#define NM_SETTING_BRIDGE_ERROR nm_setting_bridge_error_quark ()
+
nm_setting_bridge_error_quark ()

+
GQuark              nm_setting_bridge_error_quark       (void);

+

+Registers an error quark for NMSettingBridge if necessary.
+

+

 


 
 

 
NM_SETTING_BRIDGE_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingBridge errors.

+
Since 0.9.8

+

+

+

+
NM_SETTING_BRIDGE_INTERFACE_NAME

+
#define NM_SETTING_BRIDGE_INTERFACE_NAME "interface-name"
 

 

 

 

 

 

-
NM_SETTING_BRIDGE_FORWARD_DELAY

-
#define NM_SETTING_BRIDGE_FORWARD_DELAY  "forward-delay"
+
NM_SETTING_BRIDGE_STP

+
#define NM_SETTING_BRIDGE_STP            "stp"
 

 

 

 

 

 

-
NM_SETTING_BRIDGE_HELLO_TIME

-
#define NM_SETTING_BRIDGE_HELLO_TIME     "hello-time"
+
NM_SETTING_BRIDGE_PRIORITY

+
#define NM_SETTING_BRIDGE_PRIORITY       "priority"
 

 

 

 

 

 

-
NM_SETTING_BRIDGE_INTERFACE_NAME

-
#define NM_SETTING_BRIDGE_INTERFACE_NAME "interface-name"
+
NM_SETTING_BRIDGE_FORWARD_DELAY

+
#define NM_SETTING_BRIDGE_FORWARD_DELAY  "forward-delay"
+

+

+

+

+

+

+
NM_SETTING_BRIDGE_HELLO_TIME

+
#define NM_SETTING_BRIDGE_HELLO_TIME     "hello-time"
 

 

 

@@ -205,50 +220,65 @@ required
 

 

 

-
NM_SETTING_BRIDGE_PRIORITY

-
#define NM_SETTING_BRIDGE_PRIORITY       "priority"
+
NM_SETTING_BRIDGE_AGEING_TIME

+
#define NM_SETTING_BRIDGE_AGEING_TIME    "ageing-time"
 

 

 

 

 

 

-
NM_SETTING_BRIDGE_SETTING_NAME

-
#define NM_SETTING_BRIDGE_SETTING_NAME "bridge"
-

+
NMSettingBridge

+
typedef struct _NMSettingBridge NMSettingBridge;

 

 

 

 

 

-
NM_SETTING_BRIDGE_STP

-
#define NM_SETTING_BRIDGE_STP            "stp"
+
NMSettingBridgeClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingBridgeClass;
 

 

 

 

 

 

-
nm_setting_bridge_error_quark ()

-
GQuark              nm_setting_bridge_error_quark       (void);

+
nm_setting_bridge_new ()

+
NMSetting *         nm_setting_bridge_new               (void);

 

-Registers an error quark for NMSettingBridge if necessary.
+Creates a new NMSettingBridge object with default values.
 

-

+

+++
-
+

 


 

 
Returns :
the error quark used for NMSettingBridge errors.the new empty NMSettingBridge object. [transfer full]
+
 

 

 
Since 0.9.8

 

 

 

-
nm_setting_bridge_get_ageing_time ()

-
guint32             nm_setting_bridge_get_ageing_time   (NMSettingBridge *setting);

-

+
nm_setting_bridge_get_interface_name ()

+
const char *        nm_setting_bridge_get_interface_name
+                                                        (NMSettingBridge *setting);

+

+++
@@ -257,7 +287,7 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "ageing-time" property of the settingthe "interface-name" property of the setting
 

 
 

@@ -265,10 +295,13 @@ Registers an error quark for 
-
nm_setting_bridge_get_forward_delay ()

-
guint16             nm_setting_bridge_get_forward_delay (NMSettingBridge *setting);

-

+
nm_setting_bridge_get_stp ()

+
gboolean            nm_setting_bridge_get_stp           (NMSettingBridge *setting);

+

+++
@@ -277,7 +310,7 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "forward-delay" property of the settingthe "stp" property of the setting
 

 
 

@@ -285,10 +318,13 @@ Registers an error quark for 
-
nm_setting_bridge_get_hello_time ()

-
guint16             nm_setting_bridge_get_hello_time    (NMSettingBridge *setting);

-

+
nm_setting_bridge_get_priority ()

+
guint16             nm_setting_bridge_get_priority      (NMSettingBridge *setting);

+

+++
@@ -297,7 +333,7 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "hello-time" property of the settingthe "priority" property of the setting
 

 
 

@@ -305,11 +341,13 @@ Registers an error quark for 
-
nm_setting_bridge_get_interface_name ()

-
const char *        nm_setting_bridge_get_interface_name
-                                                        (NMSettingBridge *setting);

-

+
nm_setting_bridge_get_forward_delay ()

+
guint16             nm_setting_bridge_get_forward_delay (NMSettingBridge *setting);

+

+++
@@ -318,7 +356,7 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "interface-name" property of the settingthe "forward-delay" property of the setting
 

 
 

@@ -326,10 +364,13 @@ Registers an error quark for 
-
nm_setting_bridge_get_max_age ()

-
guint16             nm_setting_bridge_get_max_age       (NMSettingBridge *setting);

-

+
nm_setting_bridge_get_hello_time ()

+
guint16             nm_setting_bridge_get_hello_time    (NMSettingBridge *setting);

+

+++
@@ -338,7 +379,7 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "max-age" property of the settingthe "hello-time" property of the setting
 

 
 

@@ -346,10 +387,13 @@ Registers an error quark for 
-
nm_setting_bridge_get_priority ()

-
guint16             nm_setting_bridge_get_priority      (NMSettingBridge *setting);

-

+
nm_setting_bridge_get_max_age ()

+
guint16             nm_setting_bridge_get_max_age       (NMSettingBridge *setting);

+

+++
@@ -358,7 +402,7 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "priority" property of the settingthe "max-age" property of the setting
 

 
 

@@ -366,10 +410,13 @@ Registers an error quark for 
-
nm_setting_bridge_get_stp ()

-
gboolean            nm_setting_bridge_get_stp           (NMSettingBridge *setting);

-

+
nm_setting_bridge_get_ageing_time ()

+
guint32             nm_setting_bridge_get_ageing_time   (NMSettingBridge *setting);

+

+++
@@ -378,29 +425,12 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "stp" property of the settingthe "ageing-time" property of the setting
 

 
 

 
Since 0.9.8

 

-

-

-
nm_setting_bridge_new ()

-
NMSetting *         nm_setting_bridge_new               (void);

-

-Creates a new NMSettingBridge object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSettingBridge object. [transfer full]
-

-
Since 0.9.8

-

 

 

 
Property Details

@@ -484,6 +514,6 @@ Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBridgePort.html b/docs/libnm-util/html/NMSettingBridgePort.html
index c4dca496..bb2e37d0 100644
--- a/docs/libnm-util/html/NMSettingBridgePort.html
+++ b/docs/libnm-util/html/NMSettingBridgePort.html
@@ -3,12 +3,12 @@
 
 
 NMSettingBridgePort
-
+
 
 
 
 
-
+
 
 
 
@@ -44,34 +44,34 @@
 
 #include <nm-setting-bridge-port.h>
 
-                    NMSettingBridgePort;
-                    NMSettingBridgePortClass;
+#define             NM_SETTING_BRIDGE_PORT_SETTING_NAME
 enum                NMSettingBridgePortError;
 #define             NM_SETTING_BRIDGE_PORT_ERROR
-#define             NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE
-#define             NM_SETTING_BRIDGE_PORT_PATH_COST
-#define             NM_SETTING_BRIDGE_PORT_PRIORITY
-#define             NM_SETTING_BRIDGE_PORT_SETTING_NAME
 GQuark              nm_setting_bridge_port_error_quark  (void);
-gboolean            nm_setting_bridge_port_get_hairpin_mode
-                                                        (NMSettingBridgePort *setting);
+#define             NM_SETTING_BRIDGE_PORT_PRIORITY
+#define             NM_SETTING_BRIDGE_PORT_PATH_COST
+#define             NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE
+                    NMSettingBridgePort;
+                    NMSettingBridgePortClass;
+NMSetting *         nm_setting_bridge_port_new          (void);
+guint16             nm_setting_bridge_port_get_priority (NMSettingBridgePort *setting);
 guint16             nm_setting_bridge_port_get_path_cost
                                                         (NMSettingBridgePort *setting);
-guint16             nm_setting_bridge_port_get_priority (NMSettingBridgePort *setting);
-NMSetting *         nm_setting_bridge_port_new          (void);
+gboolean            nm_setting_bridge_port_get_hairpin_mode
+                                                        (NMSettingBridgePort *setting);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingBridgePortError
+

 
   GObject
    +----NMSetting
          +----NMSettingBridgePort
 

-
-  GEnum
-   +----NMSettingBridgePortError
-

 

 

 
Properties

@@ -91,23 +91,8 @@ optional properties that apply to bridge ports.
 

 
Details

 

-
NMSettingBridgePort

-
typedef struct _NMSettingBridgePort NMSettingBridgePort;

-

-

-

-

-

-
NMSettingBridgePortClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingBridgePortClass;
+
NM_SETTING_BRIDGE_PORT_SETTING_NAME

+
#define NM_SETTING_BRIDGE_PORT_SETTING_NAME "bridge-port"
 

 

 

@@ -121,8 +106,11 @@ optional properties that apply to bridge ports.
 	NM_SETTING_BRIDGE_PORT_ERROR_MISSING_PROPERTY, /*< nick=MissingProperty >*/
 } NMSettingBridgePortError;
 

-

+

+++
@@ -154,8 +142,27 @@ is required
 

-
NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE

-
#define NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE "hairpin-mode"
+
nm_setting_bridge_port_error_quark ()

+
GQuark              nm_setting_bridge_port_error_quark  (void);

+

+Registers an error quark for NMSettingBridgePort if necessary.
+

+

 


 
 

 
NM_SETTING_BRIDGE_PORT_ERROR_UNKNOWN

 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingBridgePort errors.

+
Since 0.9.8

+

+

+

+
NM_SETTING_BRIDGE_PORT_PRIORITY

+
#define NM_SETTING_BRIDGE_PORT_PRIORITY     "priority"
 

 

 

@@ -170,43 +177,64 @@ is required
 

 

 

-
NM_SETTING_BRIDGE_PORT_PRIORITY

-
#define NM_SETTING_BRIDGE_PORT_PRIORITY     "priority"
+
NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE

+
#define NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE "hairpin-mode"
 

 

 

 

 

 

-
NM_SETTING_BRIDGE_PORT_SETTING_NAME

-
#define NM_SETTING_BRIDGE_PORT_SETTING_NAME "bridge-port"
+
NMSettingBridgePort

+
typedef struct _NMSettingBridgePort NMSettingBridgePort;

+

+

+

+

+

+
NMSettingBridgePortClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingBridgePortClass;
 

 

 

 

 

 

-
nm_setting_bridge_port_error_quark ()

-
GQuark              nm_setting_bridge_port_error_quark  (void);

+
nm_setting_bridge_port_new ()

+
NMSetting *         nm_setting_bridge_port_new          (void);

 

-Registers an error quark for NMSettingBridgePort if necessary.
+Creates a new NMSettingBridgePort object with default values.
 

-

+

+++
-
+

 


 

 
Returns :
the error quark used for NMSettingBridgePort errors.the new empty NMSettingBridgePort object. [transfer full]
+
 

 

 
Since 0.9.8

 

 

 

-
nm_setting_bridge_port_get_hairpin_mode ()

-
gboolean            nm_setting_bridge_port_get_hairpin_mode
-                                                        (NMSettingBridgePort *setting);

-

+
nm_setting_bridge_port_get_priority ()

+
guint16             nm_setting_bridge_port_get_priority (NMSettingBridgePort *setting);

+

+++
@@ -215,7 +243,7 @@ Registers an error quark for 
 
-
+

 


 
 

 
setting :

 
Returns :
the "hairpin-mode" property of the settingthe "priority" property of the setting
 

 
 

@@ -226,8 +254,11 @@ Registers an error quark for 
nm_setting_bridge_port_get_path_cost ()

 
guint16             nm_setting_bridge_port_get_path_cost
                                                         (NMSettingBridgePort *setting);

-

+

+++
@@ -244,10 +275,14 @@ Registers an error quark for 
 

 

-
nm_setting_bridge_port_get_priority ()

-
guint16             nm_setting_bridge_port_get_priority (NMSettingBridgePort *setting);

-

 


 
 

 
setting :

+
nm_setting_bridge_port_get_hairpin_mode ()

+
gboolean            nm_setting_bridge_port_get_hairpin_mode
+                                                        (NMSettingBridgePort *setting);

+

+++
@@ -256,29 +291,12 @@ Registers an error quark for 
 
-
+

 


 
 

 
setting :

 
Returns :
the "priority" property of the settingthe "hairpin-mode" property of the setting
 

 
 

 
Since 0.9.8

 

-

-

-
nm_setting_bridge_port_new ()

-
NMSetting *         nm_setting_bridge_port_new          (void);

-

-Creates a new NMSettingBridgePort object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSettingBridgePort object. [transfer full]
-

-
Since 0.9.8

-

 

 

 
Property Details

@@ -318,6 +336,6 @@ The Spanning Tree Protocol (STP) priority of this bridge port.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingCdma.html b/docs/libnm-util/html/NMSettingCdma.html
index ffb2f45b..0ce20d15 100644
--- a/docs/libnm-util/html/NMSettingCdma.html
+++ b/docs/libnm-util/html/NMSettingCdma.html
@@ -3,12 +3,12 @@
 
 
 NMSettingCdma
-
+
 
 
 
 
-
+
 
 
 
@@ -44,34 +44,34 @@
 
 #include <nm-setting-cdma.h>
 
-                    NMSettingCdma;
-                    NMSettingCdmaClass;
+#define             NM_SETTING_CDMA_SETTING_NAME
 enum                NMSettingCdmaError;
 #define             NM_SETTING_CDMA_ERROR
+GQuark              nm_setting_cdma_error_quark         (void);
 #define             NM_SETTING_CDMA_NUMBER
+#define             NM_SETTING_CDMA_USERNAME
 #define             NM_SETTING_CDMA_PASSWORD
 #define             NM_SETTING_CDMA_PASSWORD_FLAGS
-#define             NM_SETTING_CDMA_SETTING_NAME
-#define             NM_SETTING_CDMA_USERNAME
-GQuark              nm_setting_cdma_error_quark         (void);
+                    NMSettingCdma;
+                    NMSettingCdmaClass;
+NMSetting *         nm_setting_cdma_new                 (void);
 const char *        nm_setting_cdma_get_number          (NMSettingCdma *setting);
+const char *        nm_setting_cdma_get_username        (NMSettingCdma *setting);
 const char *        nm_setting_cdma_get_password        (NMSettingCdma *setting);
 NMSettingSecretFlags nm_setting_cdma_get_password_flags (NMSettingCdma *setting);
-const char *        nm_setting_cdma_get_username        (NMSettingCdma *setting);
-NMSetting *         nm_setting_cdma_new                 (void);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingCdmaError
+

 
   GObject
    +----NMSetting
          +----NMSettingCdma
 

-
-  GEnum
-   +----NMSettingCdmaError
-

 

 

 
Properties

@@ -93,23 +93,8 @@ networks, including those using CDMA2000/EVDO technology.
 

 
Details

 

-
NMSettingCdma

-
typedef struct _NMSettingCdma NMSettingCdma;

-

-

-

-

-

-
NMSettingCdmaClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingCdmaClass;
+
NM_SETTING_CDMA_SETTING_NAME

+
#define NM_SETTING_CDMA_SETTING_NAME "cdma"
 

 

 

@@ -124,8 +109,11 @@ networks, including those using CDMA2000/EVDO technology.
 	NM_SETTING_CDMA_ERROR_MISSING_SERIAL_SETTING /*< nick=MissingSerialSetting >*/
 } NMSettingCdmaError;
 

-

+

+++
@@ -162,6 +150,24 @@ is missing in the connection
 

+
nm_setting_cdma_error_quark ()

+
GQuark              nm_setting_cdma_error_quark         (void);

+

+Registers an error quark for NMSettingCdma if necessary.
+

+

 


 
 

 
NM_SETTING_CDMA_ERROR_UNKNOWN

 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingCdma errors.

+

+

+

 
NM_SETTING_CDMA_NUMBER

 
#define NM_SETTING_CDMA_NUMBER         "number"
 

@@ -170,6 +176,14 @@ is missing in the connection
 

 

 

+
NM_SETTING_CDMA_USERNAME

+
#define NM_SETTING_CDMA_USERNAME       "username"
+

+

+

+

+

+

 
NM_SETTING_CDMA_PASSWORD

 
#define NM_SETTING_CDMA_PASSWORD       "password"
 

@@ -186,32 +200,42 @@ is missing in the connection
 

 

 

-
NM_SETTING_CDMA_SETTING_NAME

-
#define NM_SETTING_CDMA_SETTING_NAME "cdma"
-

+
NMSettingCdma

+
typedef struct _NMSettingCdma NMSettingCdma;

 

 

 

 

 

-
NM_SETTING_CDMA_USERNAME

-
#define NM_SETTING_CDMA_USERNAME       "username"
+
NMSettingCdmaClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingCdmaClass;
 

 

 

 

 

 

-
nm_setting_cdma_error_quark ()

-
GQuark              nm_setting_cdma_error_quark         (void);

+
nm_setting_cdma_new ()

+
NMSetting *         nm_setting_cdma_new                 (void);

 

-Registers an error quark for NMSettingCdma if necessary.
+Creates a new NMSettingCdma object with default values.
 

-

+

+++
-
+

 


 

 
Returns :
the error quark used for NMSettingCdma errors.the new empty NMSettingCdma object
 

 

 

@@ -219,8 +243,11 @@ Registers an error quark for 
 
nm_setting_cdma_get_number ()

 
const char *        nm_setting_cdma_get_number          (NMSettingCdma *setting);

-

+

+++
@@ -236,10 +263,13 @@ Registers an error quark for 
-
nm_setting_cdma_get_password ()

-
const char *        nm_setting_cdma_get_password        (NMSettingCdma *setting);

-

 


 
 

 
setting :

+
nm_setting_cdma_get_username ()

+
const char *        nm_setting_cdma_get_username        (NMSettingCdma *setting);

+

+++
@@ -248,17 +278,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "password" property of the settingthe "username" property of the setting
 

 
 

 

 

 

-
nm_setting_cdma_get_password_flags ()

-
NMSettingSecretFlags nm_setting_cdma_get_password_flags (NMSettingCdma *setting);

-

+
nm_setting_cdma_get_password ()

+
const char *        nm_setting_cdma_get_password        (NMSettingCdma *setting);

+

+++
@@ -267,18 +300,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the NMSettingSecretFlags pertaining to the "password"
-the "password" property of the setting
 

 
 

 

 

 

-
nm_setting_cdma_get_username ()

-
const char *        nm_setting_cdma_get_username        (NMSettingCdma *setting);

-

+
nm_setting_cdma_get_password_flags ()

+
NMSettingSecretFlags nm_setting_cdma_get_password_flags (NMSettingCdma *setting);

+

+++
@@ -287,26 +322,12 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "username" property of the settingthe NMSettingSecretFlags pertaining to the "password"
+
 

 
 

 

-

-

-
nm_setting_cdma_new ()

-
NMSetting *         nm_setting_cdma_new                 (void);

-

-Creates a new NMSettingCdma object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSettingCdma object

-

 

 

 
Property Details

@@ -356,6 +377,6 @@ username is required, it is specified here.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html
index 2fd64bf5..95b82888 100644
--- a/docs/libnm-util/html/NMSettingConnection.html
+++ b/docs/libnm-util/html/NMSettingConnection.html
@@ -3,12 +3,12 @@
 
 
 NMSettingConnection
-
+
 
 
 
 
-
+
 
 
 
@@ -44,39 +44,33 @@
 
 #include <nm-setting-connection.h>
 
-                    NMSettingConnection;
-                    NMSettingConnectionClass;
+#define             NM_SETTING_CONNECTION_SETTING_NAME
 enum                NMSettingConnectionError;
-#define             NM_SETTING_CONNECTION_AUTOCONNECT
 #define             NM_SETTING_CONNECTION_ERROR
+GQuark              nm_setting_connection_error_quark   (void);
 #define             NM_SETTING_CONNECTION_ID
-#define             NM_SETTING_CONNECTION_MASTER
-#define             NM_SETTING_CONNECTION_PERMISSIONS
-#define             NM_SETTING_CONNECTION_READ_ONLY
-#define             NM_SETTING_CONNECTION_SECONDARIES
-#define             NM_SETTING_CONNECTION_SETTING_NAME
-#define             NM_SETTING_CONNECTION_SLAVE_TYPE
-#define             NM_SETTING_CONNECTION_TIMESTAMP
-#define             NM_SETTING_CONNECTION_TYPE
 #define             NM_SETTING_CONNECTION_UUID
+#define             NM_SETTING_CONNECTION_TYPE
+#define             NM_SETTING_CONNECTION_AUTOCONNECT
+#define             NM_SETTING_CONNECTION_TIMESTAMP
+#define             NM_SETTING_CONNECTION_READ_ONLY
+#define             NM_SETTING_CONNECTION_PERMISSIONS
 #define             NM_SETTING_CONNECTION_ZONE
-gboolean            nm_setting_connection_add_permission
-                                                        (NMSettingConnection *setting,
-                                                         const char *ptype,
-                                                         const char *pitem,
-                                                         const char *detail);
-gboolean            nm_setting_connection_add_secondary (NMSettingConnection *setting,
-                                                         const char *sec_uuid);
-GQuark              nm_setting_connection_error_quark   (void);
-gboolean            nm_setting_connection_get_autoconnect
-                                                        (NMSettingConnection *setting);
+#define             NM_SETTING_CONNECTION_MASTER
+#define             NM_SETTING_CONNECTION_SLAVE_TYPE
+#define             NM_SETTING_CONNECTION_SECONDARIES
+                    NMSettingConnection;
+                    NMSettingConnectionClass;
+NMSetting *         nm_setting_connection_new           (void);
+const char *        nm_setting_connection_get_id        (NMSettingConnection *setting);
+const char *        nm_setting_connection_get_uuid      (NMSettingConnection *setting);
 const char *        nm_setting_connection_get_connection_type
                                                         (NMSettingConnection *setting);
-const char *        nm_setting_connection_get_id        (NMSettingConnection *setting);
-const char *        nm_setting_connection_get_master    (NMSettingConnection *setting);
-guint32             nm_setting_connection_get_num_permissions
+gboolean            nm_setting_connection_get_autoconnect
                                                         (NMSettingConnection *setting);
-guint32             nm_setting_connection_get_num_secondaries
+guint64             nm_setting_connection_get_timestamp (NMSettingConnection *setting);
+gboolean            nm_setting_connection_get_read_only (NMSettingConnection *setting);
+guint32             nm_setting_connection_get_num_permissions
                                                         (NMSettingConnection *setting);
 gboolean            nm_setting_connection_get_permission
                                                         (NMSettingConnection *setting,
@@ -84,23 +78,29 @@ const char *        const char **out_ptype,
                                                          const char **out_pitem,
                                                          const char **out_detail);
-gboolean            nm_setting_connection_get_read_only (NMSettingConnection *setting);
-const char *        nm_setting_connection_get_secondary (NMSettingConnection *setting,
-                                                         guint32 idx);
-const char *        nm_setting_connection_get_slave_type
-                                                        (NMSettingConnection *setting);
-guint64             nm_setting_connection_get_timestamp (NMSettingConnection *setting);
-const char *        nm_setting_connection_get_uuid      (NMSettingConnection *setting);
 const char *        nm_setting_connection_get_zone      (NMSettingConnection *setting);
-gboolean            nm_setting_connection_is_slave_type (NMSettingConnection *setting,
-                                                         const char *type);
-NMSetting *         nm_setting_connection_new           (void);
 gboolean            nm_setting_connection_permissions_user_allowed
                                                         (NMSettingConnection *setting,
                                                          const char *uname);
+gboolean            nm_setting_connection_add_permission
+                                                        (NMSettingConnection *setting,
+                                                         const char *ptype,
+                                                         const char *pitem,
+                                                         const char *detail);
 void                nm_setting_connection_remove_permission
                                                         (NMSettingConnection *setting,
                                                          guint32 idx);
+const char *        nm_setting_connection_get_master    (NMSettingConnection *setting);
+gboolean            nm_setting_connection_is_slave_type (NMSettingConnection *setting,
+                                                         const char *type);
+const char *        nm_setting_connection_get_slave_type
+                                                        (NMSettingConnection *setting);
+guint32             nm_setting_connection_get_num_secondaries
+                                                        (NMSettingConnection *setting);
+const char *        nm_setting_connection_get_secondary (NMSettingConnection *setting,
+                                                         guint32 idx);
+gboolean            nm_setting_connection_add_secondary (NMSettingConnection *setting,
+                                                         const char *sec_uuid);
 void                nm_setting_connection_remove_secondary
                                                         (NMSettingConnection *setting,
                                                          guint32 idx);
@@ -108,15 +108,15 @@ const char *        
 
Object Hierarchy

+
+  GEnum
+   +----NMSettingConnectionError
+

 
   GObject
    +----NMSetting
          +----NMSettingConnection
 

-
-  GEnum
-   +----NMSettingConnectionError
-

 

 

 
Properties

@@ -146,25 +146,8 @@ a 
 
Details

 

-
NMSettingConnection

-
typedef struct _NMSettingConnection NMSettingConnection;

-

-The NMSettingConnection struct contains only private data.
-It should only be accessed through the functions described below.
-

-

-

-

-
NMSettingConnectionClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingConnectionClass;
+
NM_SETTING_CONNECTION_SETTING_NAME

+
#define NM_SETTING_CONNECTION_SETTING_NAME "connection"
 

 

 

@@ -184,8 +167,11 @@ It should only be accessed through the functions described below.
 Describes errors that may result from operations involving a
 NMSettingConnection.
 

-

+

+++
@@ -222,19 +208,29 @@ Describes errors that may result from operations involving a
 

-
NM_SETTING_CONNECTION_AUTOCONNECT

-
#define NM_SETTING_CONNECTION_AUTOCONNECT "autoconnect"
+
NM_SETTING_CONNECTION_ERROR

+
#define NM_SETTING_CONNECTION_ERROR nm_setting_connection_error_quark ()
 

 

 

 

-
NM_SETTING_CONNECTION_ERROR

-
#define NM_SETTING_CONNECTION_ERROR nm_setting_connection_error_quark ()
-

+
nm_setting_connection_error_quark ()

+
GQuark              nm_setting_connection_error_quark   (void);

 

+Registers an error quark for NMSettingConnection if necessary.
 

+

 


 
 

 
NM_SETTING_CONNECTION_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingConnection errors.

 

 

 

@@ -246,16 +242,32 @@ Describes errors that may result from operations involving a
 

 

 

-
NM_SETTING_CONNECTION_MASTER

-
#define NM_SETTING_CONNECTION_MASTER      "master"
+
NM_SETTING_CONNECTION_UUID

+
#define NM_SETTING_CONNECTION_UUID        "uuid"
 

 

 

 

 

 

-
NM_SETTING_CONNECTION_PERMISSIONS

-
#define NM_SETTING_CONNECTION_PERMISSIONS "permissions"
+
NM_SETTING_CONNECTION_TYPE

+
#define NM_SETTING_CONNECTION_TYPE        "type"
+

+

+

+

+

+

+
NM_SETTING_CONNECTION_AUTOCONNECT

+
#define NM_SETTING_CONNECTION_AUTOCONNECT "autoconnect"
+

+

+

+

+

+

+
NM_SETTING_CONNECTION_TIMESTAMP

+
#define NM_SETTING_CONNECTION_TIMESTAMP   "timestamp"
 

 

 

@@ -270,114 +282,99 @@ Describes errors that may result from operations involving a
 

 

 

-
NM_SETTING_CONNECTION_SECONDARIES

-
#define NM_SETTING_CONNECTION_SECONDARIES "secondaries"
+
NM_SETTING_CONNECTION_PERMISSIONS

+
#define NM_SETTING_CONNECTION_PERMISSIONS "permissions"
 

 

 

 

 

 

-
NM_SETTING_CONNECTION_SETTING_NAME

-
#define NM_SETTING_CONNECTION_SETTING_NAME "connection"
+
NM_SETTING_CONNECTION_ZONE

+
#define NM_SETTING_CONNECTION_ZONE        "zone"
 

 

 

 

 

 

-
NM_SETTING_CONNECTION_SLAVE_TYPE

-
#define NM_SETTING_CONNECTION_SLAVE_TYPE  "slave-type"
+
NM_SETTING_CONNECTION_MASTER

+
#define NM_SETTING_CONNECTION_MASTER      "master"
 

 

 

 

 

 

-
NM_SETTING_CONNECTION_TIMESTAMP

-
#define NM_SETTING_CONNECTION_TIMESTAMP   "timestamp"
+
NM_SETTING_CONNECTION_SLAVE_TYPE

+
#define NM_SETTING_CONNECTION_SLAVE_TYPE  "slave-type"
 

 

 

 

 

 

-
NM_SETTING_CONNECTION_TYPE

-
#define NM_SETTING_CONNECTION_TYPE        "type"
+
NM_SETTING_CONNECTION_SECONDARIES

+
#define NM_SETTING_CONNECTION_SECONDARIES "secondaries"
 

 

 

 

 

 

-
NM_SETTING_CONNECTION_UUID

-
#define NM_SETTING_CONNECTION_UUID        "uuid"
-

+
NMSettingConnection

+
typedef struct _NMSettingConnection NMSettingConnection;

 

+The NMSettingConnection struct contains only private data.
+It should only be accessed through the functions described below.
 

 

 

 

-
NM_SETTING_CONNECTION_ZONE

-
#define NM_SETTING_CONNECTION_ZONE        "zone"
+
NMSettingConnectionClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingConnectionClass;
 

 

 

 

 

 

-
nm_setting_connection_add_permission ()

-
gboolean            nm_setting_connection_add_permission
-                                                        (NMSettingConnection *setting,
-                                                         const char *ptype,
-                                                         const char *pitem,
-                                                         const char *detail);

+
nm_setting_connection_new ()

+
NMSetting *         nm_setting_connection_new           (void);

 

-Adds a permission to the connection's permission list.  At this time, only
-the "user" permission type is supported, and pitem must be a username. See
-"permissions": for more details.
+Creates a new NMSettingConnection object with default values.
 

-

+

+-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
++
+
-
-
-
+
+

 

setting :
the NMSettingConnection
-
ptype :
the permission type; at this time only "user" is supported
pitem :
the permission item formatted as required for ptype
-
detail :
unused at this time; must be NULL. [allow-none]
-



 
Returns :
TRUE if the permission was unique and was successfully added to the
-list, FALSE if ptype or pitem was invalid or it the permission was already
-present in the list
the new empty NMSettingConnection object

 

 

 

 

-
nm_setting_connection_add_secondary ()

-
gboolean            nm_setting_connection_add_secondary (NMSettingConnection *setting,
-                                                         const char *sec_uuid);

+
nm_setting_connection_get_id ()

+
const char *        nm_setting_connection_get_id        (NMSettingConnection *setting);

 

-Adds a new secondary connetion UUID to the setting.
+Returns the "id" property of the connection.
 

-

+

+++
@@ -385,44 +382,24 @@ Adds a new secondary connetion UUID to the setting.
 
-
-
-
-
-
+

 


 
 

 
setting :

 

 
sec_uuid :
the secondary connection UUID to add

 
Returns :

-TRUE if the secondary connection UUID was added; FALSE if the UUID
-was already presentthe connection ID
 

 
 

-
Since 0.9.8

-

-

-

-
nm_setting_connection_error_quark ()

-
GQuark              nm_setting_connection_error_quark   (void);

-

-Registers an error quark for NMSettingConnection if necessary.
-

-

--
-
-
-
-


Returns :
the error quark used for NMSettingConnection errors.

 

 

 

-
nm_setting_connection_get_autoconnect ()

-
gboolean            nm_setting_connection_get_autoconnect
-                                                        (NMSettingConnection *setting);

+
nm_setting_connection_get_uuid ()

+
const char *        nm_setting_connection_get_uuid      (NMSettingConnection *setting);

 

-Returns the "autoconnect" property of the connection.
+Returns the "uuid" property of the connection.
 

-

+

+++
@@ -431,7 +408,7 @@ Returns the Returns :

-
+

 


 
 

 
setting :
the connection's autoconnect behaviorthe connection UUID
 

 
 

@@ -444,8 +421,11 @@ Returns the "type" property of the connection.
 

-

+

+++
@@ -461,13 +441,17 @@ Returns the 
-
nm_setting_connection_get_id ()

-
const char *        nm_setting_connection_get_id        (NMSettingConnection *setting);

+
nm_setting_connection_get_autoconnect ()

+
gboolean            nm_setting_connection_get_autoconnect
+                                                        (NMSettingConnection *setting);

-Returns the "id" property of the connection.
+Returns the "autoconnect" property of the connection.
 

-

 


 
 

 
setting :

 

+

+++
@@ -476,20 +460,23 @@ Returns the Returns :

-
+

 


 
 

 
setting :
the connection IDthe connection's autoconnect behavior
 

 
 

 

 

 

-
nm_setting_connection_get_master ()

-
const char *        nm_setting_connection_get_master    (NMSettingConnection *setting);

+
nm_setting_connection_get_timestamp ()

+
guint64             nm_setting_connection_get_timestamp (NMSettingConnection *setting);

 

-Returns the "master" property of the connection.
+Returns the "timestamp" property of the connection.
 

-

+

+++
@@ -498,23 +485,23 @@ Returns the Returns :

-
+

 


 
 

 
setting :
interface name of the master device or UUID of the master
-connection.the connection's timestamp
 

 
 

 

 

 

-
nm_setting_connection_get_num_permissions ()

-
guint32             nm_setting_connection_get_num_permissions
-                                                        (NMSettingConnection *setting);

+
nm_setting_connection_get_read_only ()

+
gboolean            nm_setting_connection_get_read_only (NMSettingConnection *setting);

 

-Returns the number of entires in the "permissions"
-property of this setting.
+Returns the "read-only" property of the connection.
 

-

+

+++
@@ -523,18 +510,26 @@ property of this setting.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the number of permissions entires
+TRUE if the connection is read-only, FALSE if it is not
 

 
 

 

 

 

-
nm_setting_connection_get_num_secondaries ()

-
guint32             nm_setting_connection_get_num_secondaries
+
nm_setting_connection_get_num_permissions ()

+
guint32             nm_setting_connection_get_num_permissions
                                                         (NMSettingConnection *setting);

-

+

+Returns the number of entires in the "permissions"
+property of this setting.
+

+

+++
@@ -543,11 +538,10 @@ property of this setting.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the number of configured secondary connection UUIDsthe number of permissions entires
 

 
 

-
Since 0.9.8

 

 

 

@@ -562,8 +556,11 @@ property of this setting.
 Retrieve one of the entries of the "permissions" property
 of this setting.
 

-

+

+++
@@ -585,7 +582,7 @@ of this setting.
 
-
+
@@ -597,13 +594,16 @@ of this setting.
 

-
nm_setting_connection_get_read_only ()

-
gboolean            nm_setting_connection_get_read_only (NMSettingConnection *setting);

+
nm_setting_connection_get_zone ()

+
const char *        nm_setting_connection_get_zone      (NMSettingConnection *setting);

 

-Returns the "read-only" property of the connection.
+Returns the "zone" property of the connection.
 

-

 


 
 

 
setting :

 

 
out_detail :
on return, the permission detail (at this time, always NULL)on return, the permission detail (at this time, always NULL)
 

 

 
Returns :

 
 

+

+++
@@ -612,19 +612,25 @@ Returns the Returns :

-
+

 


 
 

 
setting :

-TRUE if the connection is read-only, FALSE if it is notthe trust level of a connection
 

 
 

 

 

 

-
nm_setting_connection_get_secondary ()

-
const char *        nm_setting_connection_get_secondary (NMSettingConnection *setting,
-                                                         guint32 idx);

-

+
nm_setting_connection_permissions_user_allowed ()

+
gboolean            nm_setting_connection_permissions_user_allowed
+                                                        (NMSettingConnection *setting,
+                                                         const char *uname);

+

+Checks whether the given username is allowed to view/access this connection.
+

+

+++
@@ -632,28 +638,36 @@ Returns the idx :

-
+
+
-
+

 


 
 

 
setting :
the zero-based index of the secondary connection UUID entry
uname :
the user name to check permissions for
 

 

 
Returns :
the secondary connection UUID at index idx
-
+TRUE if the requested user is allowed to view this connection,
+FALSE if the given user is not allowed to view this connection
 

 
 

-
Since 0.9.8

 

 

 

-
nm_setting_connection_get_slave_type ()

-
const char *        nm_setting_connection_get_slave_type
-                                                        (NMSettingConnection *setting);

+
nm_setting_connection_add_permission ()

+
gboolean            nm_setting_connection_add_permission
+                                                        (NMSettingConnection *setting,
+                                                         const char *ptype,
+                                                         const char *pitem,
+                                                         const char *detail);

 

-Returns the "slave-type" property of the connection.
+Adds a permission to the connection's permission list.  At this time, only
+the "user" permission type is supported, and pitem must be a username. See
+"permissions": for more details.
 

-

+

+++
@@ -661,43 +675,42 @@ Returns the Returns :

-
+
+
-
-

 


 
 

 
setting :
the type of slave this connection is, if any
ptype :
the permission type; at this time only "user" is supported
 

-

-

-

-
nm_setting_connection_get_timestamp ()

-
guint64             nm_setting_connection_get_timestamp (NMSettingConnection *setting);

-

-Returns the "timestamp" property of the connection.
-

-

--
-
-
+
+
+
+
+
-
+


 
setting :
the NMSettingConnection
+
pitem :
the permission item formatted as required for ptype
+
detail :
unused at this time; must be NULL. [allow-none]
 
 

 

 
Returns :
the connection's timestampTRUE if the permission was unique and was successfully added to the
+list, FALSE if ptype or pitem was invalid or it the permission was already
+present in the list
 

 
 

 

 

 

-
nm_setting_connection_get_uuid ()

-
const char *        nm_setting_connection_get_uuid      (NMSettingConnection *setting);

+
nm_setting_connection_remove_permission ()

+
void                nm_setting_connection_remove_permission
+                                                        (NMSettingConnection *setting,
+                                                         guint32 idx);

 

-Returns the "uuid" property of the connection.
+Removes the permission at index idx from the connection.
 

-

+

+++
@@ -705,21 +718,24 @@ Returns the Returns :

-
+
+

 


 
 

 
setting :
the connection UUID
idx :
the zero-based index of the permission to remove
 

 
 

 

 

 

-
nm_setting_connection_get_zone ()

-
const char *        nm_setting_connection_get_zone      (NMSettingConnection *setting);

+
nm_setting_connection_get_master ()

+
const char *        nm_setting_connection_get_master    (NMSettingConnection *setting);

 

-Returns the "zone" property of the connection.
+Returns the "master" property of the connection.
 

-

+

+++
@@ -728,7 +744,8 @@ Returns the Returns :

-
+

 


 
 

 
setting :
the trust level of a connectioninterface name of the master device or UUID of the master
+connection.
 

 
 

@@ -738,8 +755,11 @@ Returns the 
nm_setting_connection_is_slave_type ()

 
gboolean            nm_setting_connection_is_slave_type (NMSettingConnection *setting,
                                                          const char *type);

-

+

+++
@@ -761,30 +781,40 @@ against setting's slave type

-
nm_setting_connection_new ()

-
NMSetting *         nm_setting_connection_new           (void);

+
nm_setting_connection_get_slave_type ()

+
const char *        nm_setting_connection_get_slave_type
+                                                        (NMSettingConnection *setting);

 

-Creates a new NMSettingConnection object with default values.
+Returns the "slave-type" property of the connection.
 

-

 


 
 

 
setting :

 
 
 

+

+-
++
+
+
+
+
+
+
-
-
+
+
+

 



setting :
the NMSettingConnection
+

 
Returns :
the new empty NMSettingConnection object
the type of slave this connection is, if any

 

 

 

 

-
nm_setting_connection_permissions_user_allowed ()

-
gboolean            nm_setting_connection_permissions_user_allowed
-                                                        (NMSettingConnection *setting,
-                                                         const char *uname);

-

-Checks whether the given username is allowed to view/access this connection.
-

-

+
nm_setting_connection_get_num_secondaries ()

+
guint32             nm_setting_connection_get_num_secondaries
+                                                        (NMSettingConnection *setting);

+

+++
@@ -792,29 +822,55 @@ Checks whether the given username is allowed to view/access this connection.
 
-
-
+
+
+
+
+

 


 
 

 
setting :

 

 
uname :
the user name to check permissions for
Returns :
the number of configured secondary connection UUIDs

+
Since 0.9.8

+

+

+

+
nm_setting_connection_get_secondary ()

+
const char *        nm_setting_connection_get_secondary (NMSettingConnection *setting,
+                                                         guint32 idx);

+

++++
+
+
+
+
+
+
+
+
-
+




setting :
the NMSettingConnection
+
idx :
the zero-based index of the secondary connection UUID entry
 

 

 
Returns :

-TRUE if the requested user is allowed to view this connection,
-FALSE if the given user is not allowed to view this connectionthe secondary connection UUID at index idx
+
 

 
 

+
Since 0.9.8

 

 

 

-
nm_setting_connection_remove_permission ()

-
void                nm_setting_connection_remove_permission
-                                                        (NMSettingConnection *setting,
-                                                         guint32 idx);

+
nm_setting_connection_add_secondary ()

+
gboolean            nm_setting_connection_add_secondary (NMSettingConnection *setting,
+                                                         const char *sec_uuid);

 

-Removes the permission at index idx from the connection.
+Adds a new secondary connetion UUID to the setting.
 

-

+

+++
@@ -822,11 +878,18 @@ Removes the permission at index idx from
 
-
-
+
+
+
+
+
+

 


 
 

 
setting :

 

 
idx :
the zero-based index of the permission to remove
sec_uuid :
the secondary connection UUID to add
Returns :

+TRUE if the secondary connection UUID was added; FALSE if the UUID
+was already present
 

 
 

+
Since 0.9.8

 

 

 

@@ -837,8 +900,11 @@ Removes the permission at index idx from
 

 Removes the secondary coonnection UUID at index idx.
 

-

+

+++
@@ -998,6 +1064,6 @@ default zone as defined by the firewall.
 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingGsm.html b/docs/libnm-util/html/NMSettingGsm.html
index d10521ac..653911bb 100644
--- a/docs/libnm-util/html/NMSettingGsm.html
+++ b/docs/libnm-util/html/NMSettingGsm.html
@@ -3,12 +3,12 @@
 NMSettingGsm
-
+
-
+
@@ -41,60 +41,60 @@
 

 


 
 

 
setting :

 
 
 
 
 
 
 
 
 
 
 
 

 

 
Synopsis

-
+
 #include <nm-setting-gsm.h>
 
-                    NMSettingGsm;
-                    NMSettingGsmClass;
+#define             NM_SETTING_GSM_SETTING_NAME
 enum                NMSettingGsmError;
-enum                NMSettingGsmNetworkBand;
-enum                NMSettingGsmNetworkType;
-#define             NM_SETTING_GSM_ALLOWED_BANDS
-#define             NM_SETTING_GSM_APN
 #define             NM_SETTING_GSM_ERROR
-#define             NM_SETTING_GSM_HOME_ONLY
-#define             NM_SETTING_GSM_NETWORK_ID
-#define             NM_SETTING_GSM_NETWORK_TYPE
+GQuark              nm_setting_gsm_error_quark          (void);
 #define             NM_SETTING_GSM_NUMBER
+#define             NM_SETTING_GSM_USERNAME
 #define             NM_SETTING_GSM_PASSWORD
 #define             NM_SETTING_GSM_PASSWORD_FLAGS
+#define             NM_SETTING_GSM_APN
+#define             NM_SETTING_GSM_NETWORK_ID
+#define             NM_SETTING_GSM_NETWORK_TYPE
+#define             NM_SETTING_GSM_ALLOWED_BANDS
 #define             NM_SETTING_GSM_PIN
 #define             NM_SETTING_GSM_PIN_FLAGS
-#define             NM_SETTING_GSM_SETTING_NAME
-#define             NM_SETTING_GSM_USERNAME
-GQuark              nm_setting_gsm_error_quark          (void);
-guint32             nm_setting_gsm_get_allowed_bands    (NMSettingGsm *setting);
+#define             NM_SETTING_GSM_HOME_ONLY
+enum                NMSettingGsmNetworkType;
+enum                NMSettingGsmNetworkBand;
+                    NMSettingGsm;
+                    NMSettingGsmClass;
+NMSetting *         nm_setting_gsm_new                  (void);
+const char *        nm_setting_gsm_get_number           (NMSettingGsm *setting);
+const char *        nm_setting_gsm_get_username         (NMSettingGsm *setting);
+const char *        nm_setting_gsm_get_password         (NMSettingGsm *setting);
 const char *        nm_setting_gsm_get_apn              (NMSettingGsm *setting);
-gboolean            nm_setting_gsm_get_home_only        (NMSettingGsm *setting);
 const char *        nm_setting_gsm_get_network_id       (NMSettingGsm *setting);
 int                 nm_setting_gsm_get_network_type     (NMSettingGsm *setting);
-const char *        nm_setting_gsm_get_number           (NMSettingGsm *setting);
-const char *        nm_setting_gsm_get_password         (NMSettingGsm *setting);
-NMSettingSecretFlags nm_setting_gsm_get_password_flags  (NMSettingGsm *setting);
+guint32             nm_setting_gsm_get_allowed_bands    (NMSettingGsm *setting);
 const char *        nm_setting_gsm_get_pin              (NMSettingGsm *setting);
+gboolean            nm_setting_gsm_get_home_only        (NMSettingGsm *setting);
 NMSettingSecretFlags nm_setting_gsm_get_pin_flags       (NMSettingGsm *setting);
-const char *        nm_setting_gsm_get_username         (NMSettingGsm *setting);
-NMSetting *         nm_setting_gsm_new                  (void);
+NMSettingSecretFlags nm_setting_gsm_get_password_flags  (NMSettingGsm *setting);
 

 

 

 
Object Hierarchy

 
-  GObject
-   +----NMSetting
-         +----NMSettingGsm
+  GEnum
+   +----NMSettingGsmError
 

 
   GEnum
-   +----NMSettingGsmError
+   +----NMSettingGsmNetworkType
 

 
   GEnum
    +----NMSettingGsmNetworkBand
 

 
-  GEnum
-   +----NMSettingGsmNetworkType
+  GObject
+   +----NMSetting
+         +----NMSettingGsm
 

 

 

@@ -124,23 +124,8 @@ networks, including those using GPRS/EDGE and UMTS/HSPA technology.
 

 
Details

 

-
NMSettingGsm

-
typedef struct _NMSettingGsm NMSettingGsm;

-

-

-

-

-

-
NMSettingGsmClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingGsmClass;
+
NM_SETTING_GSM_SETTING_NAME

+
#define NM_SETTING_GSM_SETTING_NAME "gsm"
 

 

 

@@ -155,8 +140,11 @@ networks, including those using GPRS/EDGE and UMTS/HSPA technology.
 	NM_SETTING_GSM_ERROR_MISSING_SERIAL_SETTING /*< nick=MissingSerialSetting >*/
 } NMSettingGsmError;
 

-

+

+++
@@ -185,6 +173,187 @@ is missing in the connection
 

+
NM_SETTING_GSM_ERROR

+
#define NM_SETTING_GSM_ERROR nm_setting_gsm_error_quark ()
+

+

+

+

+

+

+
nm_setting_gsm_error_quark ()

+
GQuark              nm_setting_gsm_error_quark          (void);

+

+Registers an error quark for NMSettingGsm if necessary.
+

+

 


 
 

 
NM_SETTING_GSM_ERROR_UNKNOWN

 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingGsm errors.

+

+

+

+
NM_SETTING_GSM_NUMBER

+
#define NM_SETTING_GSM_NUMBER         "number"
+

+

+

+

+

+

+
NM_SETTING_GSM_USERNAME

+
#define NM_SETTING_GSM_USERNAME       "username"
+

+

+

+

+

+

+
NM_SETTING_GSM_PASSWORD

+
#define NM_SETTING_GSM_PASSWORD       "password"
+

+

+

+

+

+

+
NM_SETTING_GSM_PASSWORD_FLAGS

+
#define NM_SETTING_GSM_PASSWORD_FLAGS "password-flags"
+

+

+

+

+

+

+
NM_SETTING_GSM_APN

+
#define NM_SETTING_GSM_APN            "apn"
+

+

+

+

+

+

+
NM_SETTING_GSM_NETWORK_ID

+
#define NM_SETTING_GSM_NETWORK_ID     "network-id"
+

+

+

+

+

+

+
NM_SETTING_GSM_NETWORK_TYPE

+
#define NM_SETTING_GSM_NETWORK_TYPE   "network-type"
+

+

+

+

+

+

+
NM_SETTING_GSM_ALLOWED_BANDS

+
#define NM_SETTING_GSM_ALLOWED_BANDS  "allowed-bands"
+

+

+

+

+

+

+
NM_SETTING_GSM_PIN

+
#define NM_SETTING_GSM_PIN            "pin"
+

+

+

+

+

+

+
NM_SETTING_GSM_PIN_FLAGS

+
#define NM_SETTING_GSM_PIN_FLAGS      "pin-flags"
+

+

+

+

+

+

+
NM_SETTING_GSM_HOME_ONLY

+
#define NM_SETTING_GSM_HOME_ONLY      "home-only"
+

+

+

+

+

+

+
enum NMSettingGsmNetworkType

+
typedef enum {
+	NM_SETTING_GSM_NETWORK_TYPE_ANY = -1,
+	NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA = 0,
+	NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE = 1,
+	NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA = 2,
+	NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE = 3,
+	NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G = 4,
+	NM_SETTING_GSM_NETWORK_TYPE_4G = 5
+} NMSettingGsmNetworkType;
+

+

+NMSettingGsmNetworkType values indicate the allowed access technologies
+the device may use when connecting to this network.
+

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




NM_SETTING_GSM_NETWORK_TYPE_ANY
any access technology may be used
+
NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA
only 3G-type (UMTS and HSPA)
+technologies may be used
+
NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE
only 2G-type (GPRS and EDGE)
+technologies may be used
+
NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA
3G-type technologies are
+preferred but 2G-type technologies may be used as a fallback
+
NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE
2G-type technologies are
+preferred but 3G-type technologies may be used as a fallback
+
NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G
4G/LTE-type technologies are
+preferred but 3G/2/-type technologies may be used as a fallback
+
NM_SETTING_GSM_NETWORK_TYPE_4G
only 4G/LTE type
+technologies may be used
+

+

+

+

 
enum NMSettingGsmNetworkBand

 
typedef enum {
 	NM_SETTING_GSM_BAND_UNKNOWN      = 0x00000000,
@@ -208,8 +377,11 @@ is missing in the connection
 NMSettingGsmNetworkBand values indicate the allowed frequency bands
 the device may use when connecting to this network.
 

-

+

+++
@@ -291,193 +463,54 @@ the device may use when connecting to this network.
 

-
enum NMSettingGsmNetworkType

-
typedef enum {
-	NM_SETTING_GSM_NETWORK_TYPE_ANY = -1,
-	NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA = 0,
-	NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE = 1,
-	NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA = 2,
-	NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE = 3,
-	NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G = 4,
-	NM_SETTING_GSM_NETWORK_TYPE_4G = 5
-} NMSettingGsmNetworkType;
-

-

-NMSettingGsmNetworkType values indicate the allowed access technologies
-the device may use when connecting to this network.
-

-

 


 
 

 
NM_SETTING_GSM_BAND_UNKNOWN

 
 

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


NM_SETTING_GSM_NETWORK_TYPE_ANY
any access technology may be used
-
NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA
only 3G-type (UMTS and HSPA)
-technologies may be used
-
NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE
only 2G-type (GPRS and EDGE)
-technologies may be used
-
NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA
3G-type technologies are
-preferred but 2G-type technologies may be used as a fallback
-
NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE
2G-type technologies are
-preferred but 3G-type technologies may be used as a fallback
-
NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G
4G/LTE-type technologies are
-preferred but 3G/2/-type technologies may be used as a fallback
-
NM_SETTING_GSM_NETWORK_TYPE_4G
only 4G/LTE type
-technologies may be used
-

-

-

-

-
NM_SETTING_GSM_ALLOWED_BANDS

-
#define NM_SETTING_GSM_ALLOWED_BANDS  "allowed-bands"
-

-

-

-

-

-

-
NM_SETTING_GSM_APN

-
#define NM_SETTING_GSM_APN            "apn"
-

-

-

-

-

-

-
NM_SETTING_GSM_ERROR

-
#define NM_SETTING_GSM_ERROR nm_setting_gsm_error_quark ()
-

-

-

-

-

-

-
NM_SETTING_GSM_HOME_ONLY

-
#define NM_SETTING_GSM_HOME_ONLY      "home-only"
-

-

-

-

-

-

-
NM_SETTING_GSM_NETWORK_ID

-
#define NM_SETTING_GSM_NETWORK_ID     "network-id"
-

-

-

-

-

-

-
NM_SETTING_GSM_NETWORK_TYPE

-
#define NM_SETTING_GSM_NETWORK_TYPE   "network-type"
-

-

-

-

-

-

-
NM_SETTING_GSM_NUMBER

-
#define NM_SETTING_GSM_NUMBER         "number"
-

-

-

-

-

-

-
NM_SETTING_GSM_PASSWORD

-
#define NM_SETTING_GSM_PASSWORD       "password"
-

-

-

-

-

-

-
NM_SETTING_GSM_PASSWORD_FLAGS

-
#define NM_SETTING_GSM_PASSWORD_FLAGS "password-flags"
-

-

-

-

-

-

-
NM_SETTING_GSM_PIN

-
#define NM_SETTING_GSM_PIN            "pin"
-

-

-

-

-

-

-
NM_SETTING_GSM_PIN_FLAGS

-
#define NM_SETTING_GSM_PIN_FLAGS      "pin-flags"
-

-

-

-

-

-

-
NM_SETTING_GSM_SETTING_NAME

-
#define NM_SETTING_GSM_SETTING_NAME "gsm"
-

+
NMSettingGsm

+
typedef struct _NMSettingGsm NMSettingGsm;

 

 

 

 

 

-
NM_SETTING_GSM_USERNAME

-
#define NM_SETTING_GSM_USERNAME       "username"
+
NMSettingGsmClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingGsmClass;
 

 

 

 

 

 

-
nm_setting_gsm_error_quark ()

-
GQuark              nm_setting_gsm_error_quark          (void);

+
nm_setting_gsm_new ()

+
NMSetting *         nm_setting_gsm_new                  (void);

 

-Registers an error quark for NMSettingGsm if necessary.
+Creates a new NMSettingGsm object with default values.
 

-

+

+++
-
+

 


 

 
Returns :
the error quark used for NMSettingGsm errors.the new empty NMSettingGsm object
 

 

 

 

 

-
nm_setting_gsm_get_allowed_bands ()

-
guint32             nm_setting_gsm_get_allowed_bands    (NMSettingGsm *setting);

-

+
nm_setting_gsm_get_number ()

+
const char *        nm_setting_gsm_get_number           (NMSettingGsm *setting);

+

+++
@@ -486,17 +519,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "allowed-bands" property of the settingthe "number" property of the setting
 

 
 

 

 

 

-
nm_setting_gsm_get_apn ()

-
const char *        nm_setting_gsm_get_apn              (NMSettingGsm *setting);

-

+
nm_setting_gsm_get_username ()

+
const char *        nm_setting_gsm_get_username         (NMSettingGsm *setting);

+

+++
@@ -505,17 +541,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "apn" property of the settingthe "username" property of the setting
 

 
 

 

 

 

-
nm_setting_gsm_get_home_only ()

-
gboolean            nm_setting_gsm_get_home_only        (NMSettingGsm *setting);

-

+
nm_setting_gsm_get_password ()

+
const char *        nm_setting_gsm_get_password         (NMSettingGsm *setting);

+

+++
@@ -524,17 +563,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "home-only" property of the settingthe "password" property of the setting
 

 
 

 

 

 

-
nm_setting_gsm_get_network_id ()

-
const char *        nm_setting_gsm_get_network_id       (NMSettingGsm *setting);

-

+
nm_setting_gsm_get_apn ()

+
const char *        nm_setting_gsm_get_apn              (NMSettingGsm *setting);

+

+++
@@ -543,17 +585,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "network-id" property of the settingthe "apn" property of the setting
 

 
 

 

 

 

-
nm_setting_gsm_get_network_type ()

-
int                 nm_setting_gsm_get_network_type     (NMSettingGsm *setting);

-

+
nm_setting_gsm_get_network_id ()

+
const char *        nm_setting_gsm_get_network_id       (NMSettingGsm *setting);

+

+++
@@ -562,17 +607,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "network-type" property of the settingthe "network-id" property of the setting
 

 
 

 

 

 

-
nm_setting_gsm_get_number ()

-
const char *        nm_setting_gsm_get_number           (NMSettingGsm *setting);

-

+
nm_setting_gsm_get_network_type ()

+
int                 nm_setting_gsm_get_network_type     (NMSettingGsm *setting);

+

+++
@@ -581,17 +629,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "number" property of the settingthe "network-type" property of the setting
 

 
 

 

 

 

-
nm_setting_gsm_get_password ()

-
const char *        nm_setting_gsm_get_password         (NMSettingGsm *setting);

-

+
nm_setting_gsm_get_allowed_bands ()

+
guint32             nm_setting_gsm_get_allowed_bands    (NMSettingGsm *setting);

+

+++
@@ -600,17 +651,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "password" property of the settingthe "allowed-bands" property of the setting
 

 
 

 

 

 

-
nm_setting_gsm_get_password_flags ()

-
NMSettingSecretFlags nm_setting_gsm_get_password_flags  (NMSettingGsm *setting);

-

+
nm_setting_gsm_get_pin ()

+
const char *        nm_setting_gsm_get_pin              (NMSettingGsm *setting);

+

+++
@@ -619,18 +673,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the NMSettingSecretFlags pertaining to the "password"
-the "pin" property of the setting
 

 
 

 

 

 

-
nm_setting_gsm_get_pin ()

-
const char *        nm_setting_gsm_get_pin              (NMSettingGsm *setting);

-

+
nm_setting_gsm_get_home_only ()

+
gboolean            nm_setting_gsm_get_home_only        (NMSettingGsm *setting);

+

+++
@@ -639,7 +695,7 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "pin" property of the settingthe "home-only" property of the setting
 

 
 

@@ -648,8 +704,11 @@ Registers an error quark for 
 
nm_setting_gsm_get_pin_flags ()

 
NMSettingSecretFlags nm_setting_gsm_get_pin_flags       (NMSettingGsm *setting);

-

+

+++
@@ -666,10 +725,13 @@ Registers an error quark for 
-
nm_setting_gsm_get_username ()

-
const char *        nm_setting_gsm_get_username         (NMSettingGsm *setting);

-

 


 
 

 
setting :

+
nm_setting_gsm_get_password_flags ()

+
NMSettingSecretFlags nm_setting_gsm_get_password_flags  (NMSettingGsm *setting);

+

+++
@@ -678,26 +740,12 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "username" property of the settingthe NMSettingSecretFlags pertaining to the "password"
+
 

 
 

 

-

-

-
nm_setting_gsm_new ()

-
NMSetting *         nm_setting_gsm_new                  (void);

-

-Creates a new NMSettingGsm object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSettingGsm object

-

 

 

 
Property Details

@@ -709,7 +757,7 @@ Bitfield of allowed frequency bands.  Note that not all devices allow
 frequency band control.  Permitted values are those specified by
 NMSettingGsmNetworkBand.
 

-
Allowed values: <= 1

+
Allowed values: <= 16383

 
Default value: 1

 

 

@@ -760,7 +808,7 @@ technologies.  Permitted values are those specified by
 NMSettingGsmNetworkType.  Note that not all devices allow network
 preference control.
 

-
Allowed values: [G_MAXULONG,5]

+
Allowed values: [-1,5]

 
Default value: -1

 

 

@@ -832,6 +880,6 @@ username is required, it is specified here.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingIP4Config.html b/docs/libnm-util/html/NMSettingIP4Config.html
index df6762af..7e40149b 100644
--- a/docs/libnm-util/html/NMSettingIP4Config.html
+++ b/docs/libnm-util/html/NMSettingIP4Config.html
@@ -3,12 +3,12 @@
 
 
 NMSettingIP4Config
-
+
 
 
 
 
-
+
 
 
 
@@ -41,127 +41,131 @@
 

 

 
Synopsis

-
+
 #include <nm-setting-ip4-config.h>
 
-typedef             NMIP4Address;
-typedef             NMIP4Route;
-                    NMSettingIP4Config;
-                    NMSettingIP4ConfigClass;
+#define             NM_SETTING_IP4_CONFIG_SETTING_NAME
 enum                NMSettingIP4ConfigError;
-#define             NM_SETTING_IP4_CONFIG_ADDRESSES
-#define             NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID
-#define             NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME
-#define             NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME
+#define             NM_SETTING_IP4_CONFIG_ERROR
+GQuark              nm_setting_ip4_config_error_quark   (void);
+#define             NM_SETTING_IP4_CONFIG_METHOD
 #define             NM_SETTING_IP4_CONFIG_DNS
 #define             NM_SETTING_IP4_CONFIG_DNS_SEARCH
-#define             NM_SETTING_IP4_CONFIG_ERROR
-#define             NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS
+#define             NM_SETTING_IP4_CONFIG_ADDRESSES
+#define             NM_SETTING_IP4_CONFIG_ROUTES
 #define             NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES
+#define             NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS
+#define             NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID
+#define             NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME
+#define             NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME
+#define             NM_SETTING_IP4_CONFIG_NEVER_DEFAULT
 #define             NM_SETTING_IP4_CONFIG_MAY_FAIL
-#define             NM_SETTING_IP4_CONFIG_METHOD
 #define             NM_SETTING_IP4_CONFIG_METHOD_AUTO
-#define             NM_SETTING_IP4_CONFIG_METHOD_DISABLED
 #define             NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL
 #define             NM_SETTING_IP4_CONFIG_METHOD_MANUAL
 #define             NM_SETTING_IP4_CONFIG_METHOD_SHARED
-#define             NM_SETTING_IP4_CONFIG_NEVER_DEFAULT
-#define             NM_SETTING_IP4_CONFIG_ROUTES
-#define             NM_SETTING_IP4_CONFIG_SETTING_NAME
+#define             NM_SETTING_IP4_CONFIG_METHOD_DISABLED
+typedef             NMIP4Address;
+NMIP4Address *      nm_ip4_address_new                  (void);
+NMIP4Address *      nm_ip4_address_dup                  (NMIP4Address *source);
+void                nm_ip4_address_ref                  (NMIP4Address *address);
+void                nm_ip4_address_unref                (NMIP4Address *address);
 gboolean            nm_ip4_address_compare              (NMIP4Address *address,
                                                          NMIP4Address *other);
-NMIP4Address *      nm_ip4_address_dup                  (NMIP4Address *source);
 guint32             nm_ip4_address_get_address          (NMIP4Address *address);
-guint32             nm_ip4_address_get_gateway          (NMIP4Address *address);
-guint32             nm_ip4_address_get_prefix           (NMIP4Address *address);
-NMIP4Address *      nm_ip4_address_new                  (void);
-void                nm_ip4_address_ref                  (NMIP4Address *address);
 void                nm_ip4_address_set_address          (NMIP4Address *address,
                                                          guint32 addr);
-void                nm_ip4_address_set_gateway          (NMIP4Address *address,
-                                                         guint32 gateway);
+guint32             nm_ip4_address_get_prefix           (NMIP4Address *address);
 void                nm_ip4_address_set_prefix           (NMIP4Address *address,
                                                          guint32 prefix);
-void                nm_ip4_address_unref                (NMIP4Address *address);
+guint32             nm_ip4_address_get_gateway          (NMIP4Address *address);
+void                nm_ip4_address_set_gateway          (NMIP4Address *address,
+                                                         guint32 gateway);
+typedef             NMIP4Route;
+NMIP4Route *        nm_ip4_route_new                    (void);
+NMIP4Route *        nm_ip4_route_dup                    (NMIP4Route *source);
+void                nm_ip4_route_ref                    (NMIP4Route *route);
+void                nm_ip4_route_unref                  (NMIP4Route *route);
 gboolean            nm_ip4_route_compare                (NMIP4Route *route,
                                                          NMIP4Route *other);
-NMIP4Route *        nm_ip4_route_dup                    (NMIP4Route *source);
 guint32             nm_ip4_route_get_dest               (NMIP4Route *route);
-guint32             nm_ip4_route_get_metric             (NMIP4Route *route);
-guint32             nm_ip4_route_get_next_hop           (NMIP4Route *route);
-guint32             nm_ip4_route_get_prefix             (NMIP4Route *route);
-NMIP4Route *        nm_ip4_route_new                    (void);
-void                nm_ip4_route_ref                    (NMIP4Route *route);
 void                nm_ip4_route_set_dest               (NMIP4Route *route,
                                                          guint32 dest);
-void                nm_ip4_route_set_metric             (NMIP4Route *route,
-                                                         guint32 metric);
-void                nm_ip4_route_set_next_hop           (NMIP4Route *route,
-                                                         guint32 next_hop);
+guint32             nm_ip4_route_get_prefix             (NMIP4Route *route);
 void                nm_ip4_route_set_prefix             (NMIP4Route *route,
                                                          guint32 prefix);
-void                nm_ip4_route_unref                  (NMIP4Route *route);
-gboolean            nm_setting_ip4_config_add_address   (NMSettingIP4Config *setting,
-                                                         NMIP4Address *address);
+guint32             nm_ip4_route_get_next_hop           (NMIP4Route *route);
+void                nm_ip4_route_set_next_hop           (NMIP4Route *route,
+                                                         guint32 next_hop);
+guint32             nm_ip4_route_get_metric             (NMIP4Route *route);
+void                nm_ip4_route_set_metric             (NMIP4Route *route,
+                                                         guint32 metric);
+                    NMSettingIP4Config;
+                    NMSettingIP4ConfigClass;
+NMSetting *         nm_setting_ip4_config_new           (void);
+const char *        nm_setting_ip4_config_get_method    (NMSettingIP4Config *setting);
+guint32             nm_setting_ip4_config_get_num_dns   (NMSettingIP4Config *setting);
+guint32             nm_setting_ip4_config_get_dns       (NMSettingIP4Config *setting,
+                                                         guint32 i);
 gboolean            nm_setting_ip4_config_add_dns       (NMSettingIP4Config *setting,
                                                          guint32 dns);
+void                nm_setting_ip4_config_remove_dns    (NMSettingIP4Config *setting,
+                                                         guint32 i);
+void                nm_setting_ip4_config_clear_dns     (NMSettingIP4Config *setting);
+guint32             nm_setting_ip4_config_get_num_dns_searches
+                                                        (NMSettingIP4Config *setting);
+const char *        nm_setting_ip4_config_get_dns_search
+                                                        (NMSettingIP4Config *setting,
+                                                         guint32 i);
 gboolean            nm_setting_ip4_config_add_dns_search
                                                         (NMSettingIP4Config *setting,
                                                          const char *dns_search);
-gboolean            nm_setting_ip4_config_add_route     (NMSettingIP4Config *setting,
-                                                         NMIP4Route *route);
-void                nm_setting_ip4_config_clear_addresses
-                                                        (NMSettingIP4Config *setting);
-void                nm_setting_ip4_config_clear_dns     (NMSettingIP4Config *setting);
+void                nm_setting_ip4_config_remove_dns_search
+                                                        (NMSettingIP4Config *setting,
+                                                         guint32 i);
 void                nm_setting_ip4_config_clear_dns_searches
                                                         (NMSettingIP4Config *setting);
-void                nm_setting_ip4_config_clear_routes  (NMSettingIP4Config *setting);
-GQuark              nm_setting_ip4_config_error_quark   (void);
+guint32             nm_setting_ip4_config_get_num_addresses
+                                                        (NMSettingIP4Config *setting);
 NMIP4Address *      nm_setting_ip4_config_get_address   (NMSettingIP4Config *setting,
                                                          guint32 i);
-const char *        nm_setting_ip4_config_get_dhcp_client_id
-                                                        (NMSettingIP4Config *setting);
-const char *        nm_setting_ip4_config_get_dhcp_hostname
+gboolean            nm_setting_ip4_config_add_address   (NMSettingIP4Config *setting,
+                                                         NMIP4Address *address);
+void                nm_setting_ip4_config_remove_address
+                                                        (NMSettingIP4Config *setting,
+                                                         guint32 i);
+void                nm_setting_ip4_config_clear_addresses
                                                         (NMSettingIP4Config *setting);
-gboolean            nm_setting_ip4_config_get_dhcp_send_hostname
+guint32             nm_setting_ip4_config_get_num_routes
                                                         (NMSettingIP4Config *setting);
-guint32             nm_setting_ip4_config_get_dns       (NMSettingIP4Config *setting,
+NMIP4Route *        nm_setting_ip4_config_get_route     (NMSettingIP4Config *setting,
                                                          guint32 i);
-const char *        nm_setting_ip4_config_get_dns_search
-                                                        (NMSettingIP4Config *setting,
+gboolean            nm_setting_ip4_config_add_route     (NMSettingIP4Config *setting,
+                                                         NMIP4Route *route);
+void                nm_setting_ip4_config_remove_route  (NMSettingIP4Config *setting,
                                                          guint32 i);
-gboolean            nm_setting_ip4_config_get_ignore_auto_dns
-                                                        (NMSettingIP4Config *setting);
+void                nm_setting_ip4_config_clear_routes  (NMSettingIP4Config *setting);
 gboolean            nm_setting_ip4_config_get_ignore_auto_routes
                                                         (NMSettingIP4Config *setting);
-gboolean            nm_setting_ip4_config_get_may_fail  (NMSettingIP4Config *setting);
-const char *        nm_setting_ip4_config_get_method    (NMSettingIP4Config *setting);
-gboolean            nm_setting_ip4_config_get_never_default
+gboolean            nm_setting_ip4_config_get_ignore_auto_dns
                                                         (NMSettingIP4Config *setting);
-guint32             nm_setting_ip4_config_get_num_addresses
+const char *        nm_setting_ip4_config_get_dhcp_client_id
                                                         (NMSettingIP4Config *setting);
-guint32             nm_setting_ip4_config_get_num_dns   (NMSettingIP4Config *setting);
-guint32             nm_setting_ip4_config_get_num_dns_searches
+gboolean            nm_setting_ip4_config_get_dhcp_send_hostname
                                                         (NMSettingIP4Config *setting);
-guint32             nm_setting_ip4_config_get_num_routes
+const char *        nm_setting_ip4_config_get_dhcp_hostname
                                                         (NMSettingIP4Config *setting);
-NMIP4Route *        nm_setting_ip4_config_get_route     (NMSettingIP4Config *setting,
-                                                         guint32 i);
-NMSetting *         nm_setting_ip4_config_new           (void);
-void                nm_setting_ip4_config_remove_address
-                                                        (NMSettingIP4Config *setting,
-                                                         guint32 i);
-void                nm_setting_ip4_config_remove_dns    (NMSettingIP4Config *setting,
-                                                         guint32 i);
-void                nm_setting_ip4_config_remove_dns_search
-                                                        (NMSettingIP4Config *setting,
-                                                         guint32 i);
-void                nm_setting_ip4_config_remove_route  (NMSettingIP4Config *setting,
-                                                         guint32 i);
+gboolean            nm_setting_ip4_config_get_never_default
+                                                        (NMSettingIP4Config *setting);
+gboolean            nm_setting_ip4_config_get_may_fail  (NMSettingIP4Config *setting);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingIP4ConfigError
+

 
   GBoxed
    +----NMIP4Address
@@ -175,10 +179,6 @@ const char *        NMSetting
          +----NMSettingIP4Config
 

-
-  GEnum
-   +----NMSettingIP4ConfigError
-

 

 

 
Properties

@@ -207,39 +207,8 @@ properties related to IPv4 addressing, routing, and Domain Name Service
 

 
Details

 

-
NMIP4Address

-
typedef struct NMIP4Address NMIP4Address;
-

-

-

-

-

-

-
NMIP4Route

-
typedef struct NMIP4Route NMIP4Route;
-

-

-

-

-

-

-
NMSettingIP4Config

-
typedef struct _NMSettingIP4Config NMSettingIP4Config;

-

-

-

-

-

-
NMSettingIP4ConfigClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingIP4ConfigClass;
+
NM_SETTING_IP4_CONFIG_SETTING_NAME

+
#define NM_SETTING_IP4_CONFIG_SETTING_NAME "ipv4"
 

 

 

@@ -254,8 +223,11 @@ properties related to IPv4 addressing, routing, and Domain Name Service
 	NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD /*< nick=NotAllowedForMethod >*/
 } NMSettingIP4ConfigError;
 

-

+

+++
@@ -284,32 +256,34 @@ not valid with the given IP4 method
 

-
NM_SETTING_IP4_CONFIG_ADDRESSES

-
#define NM_SETTING_IP4_CONFIG_ADDRESSES          "addresses"
-

-

-

-

-

-

-
NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID

-
#define NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID     "dhcp-client-id"
+
NM_SETTING_IP4_CONFIG_ERROR

+
#define NM_SETTING_IP4_CONFIG_ERROR nm_setting_ip4_config_error_quark ()
 

 

 

 

-
NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME

-
#define NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME      "dhcp-hostname"
-

+
nm_setting_ip4_config_error_quark ()

+
GQuark              nm_setting_ip4_config_error_quark   (void);

 

+Registers an error quark for NMSettingIP4Config if necessary.
 

+

 


 
 

 
NM_SETTING_IP4_CONFIG_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingIP4Config errors.

 

 

 

-
NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME

-
#define NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME "dhcp-send-hostname"
+
NM_SETTING_IP4_CONFIG_METHOD

+
#define NM_SETTING_IP4_CONFIG_METHOD             "method"
 

 

 

@@ -332,16 +306,16 @@ not valid with the given IP4 method
 

 

 

-
NM_SETTING_IP4_CONFIG_ERROR

-
#define NM_SETTING_IP4_CONFIG_ERROR nm_setting_ip4_config_error_quark ()
+
NM_SETTING_IP4_CONFIG_ADDRESSES

+
#define NM_SETTING_IP4_CONFIG_ADDRESSES          "addresses"
 

 

 

 

 

 

-
NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS

-
#define NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
+
NM_SETTING_IP4_CONFIG_ROUTES

+
#define NM_SETTING_IP4_CONFIG_ROUTES             "routes"
 

 

 

@@ -356,63 +330,86 @@ not valid with the given IP4 method
 

 

 

-
NM_SETTING_IP4_CONFIG_MAY_FAIL

-
#define NM_SETTING_IP4_CONFIG_MAY_FAIL           "may-fail"
+
NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS

+
#define NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
 

 

 

 

 

 

-
NM_SETTING_IP4_CONFIG_METHOD

-
#define NM_SETTING_IP4_CONFIG_METHOD             "method"
+
NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID

+
#define NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID     "dhcp-client-id"
 

 

 

 

 

 

-
NM_SETTING_IP4_CONFIG_METHOD_AUTO

-
#define NM_SETTING_IP4_CONFIG_METHOD_AUTO       "auto"
+
NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME

+
#define NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME "dhcp-send-hostname"
 

 

-IPv4 configuration should be automatically determined via a method appropriate
-for the hardware interface, ie DHCP or PPP or some other device-specific
-manner.
 

 

 

 

-
NM_SETTING_IP4_CONFIG_METHOD_DISABLED

-
#define NM_SETTING_IP4_CONFIG_METHOD_DISABLED   "disabled"
+
NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME

+
#define NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME      "dhcp-hostname"
 

 

-This connection does not use or require IPv4 address and it should be disabled.
 

 

 

 

-
NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL

-
#define NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL "link-local"
+
NM_SETTING_IP4_CONFIG_NEVER_DEFAULT

+
#define NM_SETTING_IP4_CONFIG_NEVER_DEFAULT      "never-default"
 

 

-IPv4 configuration should be automatically configured for link-local-only
-operation.
 

 

 

 

-
NM_SETTING_IP4_CONFIG_METHOD_MANUAL

-
#define NM_SETTING_IP4_CONFIG_METHOD_MANUAL     "manual"
+
NM_SETTING_IP4_CONFIG_MAY_FAIL

+
#define NM_SETTING_IP4_CONFIG_MAY_FAIL           "may-fail"
 

 

-All necessary IPv4 configuration (addresses, prefix, DNS, etc) is specified
-in the setting's properties.
 

 

 

 

-
NM_SETTING_IP4_CONFIG_METHOD_SHARED

+
NM_SETTING_IP4_CONFIG_METHOD_AUTO

+
#define NM_SETTING_IP4_CONFIG_METHOD_AUTO       "auto"
+

+

+IPv4 configuration should be automatically determined via a method appropriate
+for the hardware interface, ie DHCP or PPP or some other device-specific
+manner.
+

+

+

+

+
NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL

+
#define NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL "link-local"
+

+

+IPv4 configuration should be automatically configured for link-local-only
+operation.
+

+

+

+

+
NM_SETTING_IP4_CONFIG_METHOD_MANUAL

+
#define NM_SETTING_IP4_CONFIG_METHOD_MANUAL     "manual"
+

+

+All necessary IPv4 configuration (addresses, prefix, DNS, etc) is specified
+in the setting's properties.
+

+

+

+

+
NM_SETTING_IP4_CONFIG_METHOD_SHARED

 
#define NM_SETTING_IP4_CONFIG_METHOD_SHARED     "shared"
 

 

@@ -426,74 +423,131 @@ through that interface to the default network.
 

 

 

-
NM_SETTING_IP4_CONFIG_NEVER_DEFAULT

-
#define NM_SETTING_IP4_CONFIG_NEVER_DEFAULT      "never-default"
+
NM_SETTING_IP4_CONFIG_METHOD_DISABLED

+
#define NM_SETTING_IP4_CONFIG_METHOD_DISABLED   "disabled"
 

 

+This connection does not use or require IPv4 address and it should be disabled.
 

 

 

 

-
NM_SETTING_IP4_CONFIG_ROUTES

-
#define NM_SETTING_IP4_CONFIG_ROUTES             "routes"
+
NMIP4Address

+
typedef struct NMIP4Address NMIP4Address;
 

 

 

 

 

 

-
NM_SETTING_IP4_CONFIG_SETTING_NAME

-
#define NM_SETTING_IP4_CONFIG_SETTING_NAME "ipv4"
-

+
nm_ip4_address_new ()

+
NMIP4Address *      nm_ip4_address_new                  (void);

 

+Creates and returns a new NMIP4Address object.
 

+

++++
+
+
+
+
+




Returns :
the new empty NMIP4Address object. [transfer full]
+

 

 

 

-
nm_ip4_address_compare ()

-
gboolean            nm_ip4_address_compare              (NMIP4Address *address,
-                                                         NMIP4Address *other);

+
nm_ip4_address_dup ()

+
NMIP4Address *      nm_ip4_address_dup                  (NMIP4Address *source);

 

-Determines if two NMIP4Address objects contain the same values.
+Copies a given NMIP4Address object and returns the copy.
 

-

+

+++
-
-
-
-
-
-
+
+
-
+

 


 
 
address :
the NMIP4Address
-
other :
the NMIP4Address to compare address to.
source :
the NMIP4Address object to copy
 

 

 
Returns :

-TRUE if the objects contain the same values, FALSE if they do not.the copy of the given NMIP4Address copy. [transfer full]
+
 

 
 

 

 

 

-
nm_ip4_address_dup ()

-
NMIP4Address *      nm_ip4_address_dup                  (NMIP4Address *source);

+
nm_ip4_address_ref ()

+
void                nm_ip4_address_ref                  (NMIP4Address *address);

 

-Copies a given NMIP4Address object and returns the copy.
+Increases the reference count of the object.
+

+

++++
+
+
+
+
+




address :
the NMIP4Address
+

+

+

+

+
nm_ip4_address_unref ()

+
void                nm_ip4_address_unref                (NMIP4Address *address);

+

+Decreases the reference count of the object.  If the reference count
+reaches zero, the object will be destroyed.
 

-

+

+++
+
+
+
+
+

 


address :
the NMIP4Address
+

+

+

+

+
nm_ip4_address_compare ()

+
gboolean            nm_ip4_address_compare              (NMIP4Address *address,
+                                                         NMIP4Address *other);

+

+Determines if two NMIP4Address objects contain the same values.
+

+

++++
-
-
+
+
+
+
+
+
-
+




 
 
source :
the NMIP4Address object to copy
address :
the NMIP4Address
+
other :
the NMIP4Address to compare address to.
 

 

 
Returns :
the copy of the given NMIP4Address copy. [transfer full]
-
+TRUE if the objects contain the same values, FALSE if they do not.
 

 
 

@@ -505,8 +559,11 @@ Copies a given 
 Gets the IPv4 address property of this address object.
 

-

+

+++
@@ -522,13 +579,17 @@ Gets the IPv4 address property of this address object.
 

-
nm_ip4_address_get_gateway ()

-
guint32             nm_ip4_address_get_gateway          (NMIP4Address *address);

+
nm_ip4_address_set_address ()

+
void                nm_ip4_address_set_address          (NMIP4Address *address,
+                                                         guint32 addr);

 

-Gets the IPv4 default gateway property of this address object.
+Sets the IPv4 address property of this object.
 

-

 


 
 

 
address :

 
 

+

+++
@@ -536,8 +597,8 @@ Gets the IPv4 default gateway property of this address object.
 
-
-
+
+

 


 
 

 
address :

 

 
Returns :
the IPv4 gateway address in network byte order
addr :
the IPv4 address in network byte order
 

 
 

@@ -550,8 +611,11 @@ Gets the IPv4 default gateway property of this address object.
 Gets the IPv4 address prefix (ie "24" or "30" etc) property of this address
 object.
 

-

+

+++
@@ -567,46 +631,42 @@ object.
 

-
nm_ip4_address_new ()

-
NMIP4Address *      nm_ip4_address_new                  (void);

-

-Creates and returns a new NMIP4Address object.
-

-

 


 
 

 
address :

 
 

--
-
-
-
-


Returns :
the new empty NMIP4Address object. [transfer full]
-

-

-

-

-
nm_ip4_address_ref ()

-
void                nm_ip4_address_ref                  (NMIP4Address *address);

+
nm_ip4_address_set_prefix ()

+
void                nm_ip4_address_set_prefix           (NMIP4Address *address,
+                                                         guint32 prefix);

 

-Increases the reference count of the object.
+Sets the IPv4 address prefix.
 

-

+

+-
++
+
+
-
+
+
+
+
+
+

 




 
address :

 the NMIP4Address
 
prefix :
the address prefix, a number between 1 and 32 inclusive

 

 

 

 

-
nm_ip4_address_set_address ()

-
void                nm_ip4_address_set_address          (NMIP4Address *address,
-                                                         guint32 addr);

+
nm_ip4_address_get_gateway ()

+
guint32             nm_ip4_address_get_gateway          (NMIP4Address *address);

 

-Sets the IPv4 address property of this object.
+Gets the IPv4 default gateway property of this address object.
 

-

+

+++
@@ -614,8 +674,8 @@ Sets the IPv4 address property of this object.
 
-
-
+
+

 


 
 

 
address :

 

 
addr :
the IPv4 address in network byte order
Returns :
the IPv4 gateway address in network byte order
 

 
 

@@ -628,8 +688,11 @@ Sets the IPv4 address property of this object.
 

 Sets the IPv4 default gateway property of this address object.
 

-

+

+++
@@ -645,40 +708,91 @@ Sets the IPv4 default gateway property of this address object.
 

-
nm_ip4_address_set_prefix ()

-
void                nm_ip4_address_set_prefix           (NMIP4Address *address,
-                                                         guint32 prefix);

+
NMIP4Route

+
typedef struct NMIP4Route NMIP4Route;
+

 

-Sets the IPv4 address prefix.
 

-

 


 
 

 
address :

 
 

+
+

+

+
nm_ip4_route_new ()

+
NMIP4Route *        nm_ip4_route_new                    (void);

+

+Creates and returns a new NMIP4Route object.
+

+

++++
+
+
+
+
+




Returns :
the new empty NMIP4Route object. [transfer full]
+

+

+

+

+
nm_ip4_route_dup ()

+
NMIP4Route *        nm_ip4_route_dup                    (NMIP4Route *source);

+

+Copies a given NMIP4Route object and returns the copy.
+

+

+++
-
-
+
+
-
-
+
+

 


 
 
address :
the NMIP4Address
-
source :
the NMIP4Route object to copy
 

 
prefix :
the address prefix, a number between 1 and 32 inclusive
Returns :
the copy of the given NMIP4Route copy. [transfer full]
+
 

 
 

 

 

 

-
nm_ip4_address_unref ()

-
void                nm_ip4_address_unref                (NMIP4Address *address);

+
nm_ip4_route_ref ()

+
void                nm_ip4_route_ref                    (NMIP4Route *route);

+

+Increases the reference count of the object.
+

+

++++
+
+
+
+
+




route :
the NMIP4Route
+

+

+

+

+
nm_ip4_route_unref ()

+
void                nm_ip4_route_unref                  (NMIP4Route *route);

 

 Decreases the reference count of the object.  If the reference count
 reaches zero, the object will be destroyed.
 

-

+

+++
-
-
+

 


 
address :
the NMIP4Address
+
route :
the NMIP4Route
 
 

 

@@ -691,8 +805,11 @@ reaches zero, the object will be destroyed.
 

 Determines if two NMIP4Route objects contain the same values.
 

-

+

+++
@@ -713,35 +830,42 @@ Determines if two 
 

 

-
nm_ip4_route_dup ()

-
NMIP4Route *        nm_ip4_route_dup                    (NMIP4Route *source);

+
nm_ip4_route_get_dest ()

+
guint32             nm_ip4_route_get_dest               (NMIP4Route *route);

 

-Copies a given NMIP4Route object and returns the copy.
+Gets the IPv4 destination address property of this route object.
 

-

 


 
 

 
route :

+

+++
-
-
+
+
-
+

 


 
 
source :
the NMIP4Route object to copy
route :
the NMIP4Route
+
 

 

 
Returns :
the copy of the given NMIP4Route copy. [transfer full]
-the IPv4 address in network byte order
 

 
 

 

 

 

-
nm_ip4_route_get_dest ()

-
guint32             nm_ip4_route_get_dest               (NMIP4Route *route);

+
nm_ip4_route_set_dest ()

+
void                nm_ip4_route_set_dest               (NMIP4Route *route,
+                                                         guint32 dest);

 

-Gets the IPv4 destination address property of this route object.
+Sets the IPv4 destination address property of this route object.
 

-

+

+++
@@ -749,22 +873,24 @@ Gets the IPv4 destination address property of this route object.
 
-
-
+
+

 


 
 

 
route :

 

 
Returns :
the IPv4 address in network byte order
dest :
the destination address in network byte order
 

 
 

 

 

 

-
nm_ip4_route_get_metric ()

-
guint32             nm_ip4_route_get_metric             (NMIP4Route *route);

+
nm_ip4_route_get_prefix ()

+
guint32             nm_ip4_route_get_prefix             (NMIP4Route *route);

 

-Gets the route metric property of this route object; lower values indicate
-"better" or more preferred routes.
+Gets the IPv4 prefix (ie "24" or "30" etc) of this route.
 

-

+

+++
@@ -773,20 +899,24 @@ Gets the route metric property of this route object; lower values indicate
 
-
+

 


 
 

 
route :

 

 
Returns :
the route metricthe IPv4 prefix
 

 
 

 

 

 

-
nm_ip4_route_get_next_hop ()

-
guint32             nm_ip4_route_get_next_hop           (NMIP4Route *route);

+
nm_ip4_route_set_prefix ()

+
void                nm_ip4_route_set_prefix             (NMIP4Route *route,
+                                                         guint32 prefix);

 

-Gets the IPv4 address of the next hop of this route.
+Sets the IPv4 prefix of this route.
 

-

+

+++
@@ -794,21 +924,24 @@ Gets the IPv4 address of the next hop of this route.
 
-
-
+
+

 


 
 

 
route :

 

 
Returns :
the IPv4 address in network byte order
prefix :
the prefix, a number between 1 and 32 inclusive
 

 
 

 

 

 

-
nm_ip4_route_get_prefix ()

-
guint32             nm_ip4_route_get_prefix             (NMIP4Route *route);

+
nm_ip4_route_get_next_hop ()

+
guint32             nm_ip4_route_get_next_hop           (NMIP4Route *route);

 

-Gets the IPv4 prefix (ie "24" or "30" etc) of this route.
+Gets the IPv4 address of the next hop of this route.
 

-

+

+++
@@ -817,53 +950,50 @@ Gets the IPv4 prefix (ie "24" or "30" etc) of this route.
 
-
+

 


 
 

 
route :

 

 
Returns :
the IPv4 prefixthe IPv4 address in network byte order
 

 
 

 

 

 

-
nm_ip4_route_new ()

-
NMIP4Route *        nm_ip4_route_new                    (void);

-

-Creates and returns a new NMIP4Route object.
-

-

--
-
-
-
-


Returns :
the new empty NMIP4Route object. [transfer full]
-

-

-

-

-
nm_ip4_route_ref ()

-
void                nm_ip4_route_ref                    (NMIP4Route *route);

+
nm_ip4_route_set_next_hop ()

+
void                nm_ip4_route_set_next_hop           (NMIP4Route *route,
+                                                         guint32 next_hop);

 

-Increases the reference count of the object.
+Sets the IPv4 address of the next hop of this route.
 

-

+

+-
++
+
+
-
+
+
+
+
+
+

 




 
route :

 the NMIP4Route
 
next_hop :
the IPv4 address of the next hop in network byte order

 

 

 

 

-
nm_ip4_route_set_dest ()

-
void                nm_ip4_route_set_dest               (NMIP4Route *route,
-                                                         guint32 dest);

+
nm_ip4_route_get_metric ()

+
guint32             nm_ip4_route_get_metric             (NMIP4Route *route);

 

-Sets the IPv4 destination address property of this route object.
+Gets the route metric property of this route object; lower values indicate
+"better" or more preferred routes.
 

-

+

+++
@@ -871,8 +1001,8 @@ Sets the IPv4 destination address property of this route object.
 
-
-
+
+

 


 
 

 
route :

 

 
dest :
the destination address in network byte order
Returns :
the route metric
 

 
 

@@ -886,8 +1016,11 @@ Sets the IPv4 destination address property of this route object.
 Sets the route metric property of this route object; lower values indicate
 "better" or more preferred routes.
 

-

+

+++
@@ -903,78 +1036,55 @@ Sets the route metric property of this route object; lower values indicate
 

-
nm_ip4_route_set_next_hop ()

-
void                nm_ip4_route_set_next_hop           (NMIP4Route *route,
-                                                         guint32 next_hop);

+
NMSettingIP4Config

+
typedef struct _NMSettingIP4Config NMSettingIP4Config;

 

-Sets the IPv4 address of the next hop of this route.
 

-

 


 
 

 
route :

 
 

--
-
-
-
-
-
-
-
-
-
-


route :
the NMIP4Route
-
next_hop :
the IPv4 address of the next hop in network byte order

 

 

 

-
nm_ip4_route_set_prefix ()

-
void                nm_ip4_route_set_prefix             (NMIP4Route *route,
-                                                         guint32 prefix);

+
NMSettingIP4ConfigClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingIP4ConfigClass;
+

 

-Sets the IPv4 prefix of this route.
 

-

--
-
-
-
-
-
-
-
-
-
-


route :
the NMIP4Route
-
prefix :
the prefix, a number between 1 and 32 inclusive

 

 

 

-
nm_ip4_route_unref ()

-
void                nm_ip4_route_unref                  (NMIP4Route *route);

+
nm_setting_ip4_config_new ()

+
NMSetting *         nm_setting_ip4_config_new           (void);

 

-Decreases the reference count of the object.  If the reference count
-reaches zero, the object will be destroyed.
+Creates a new NMSettingIP4Config object with default values.
 

-

+

+++
-
-
+

 


 
route :
the NMIP4Route
+
Returns :
the new empty NMSettingIP4Config object. [transfer full]
 
 

 

 

 

 

-
nm_setting_ip4_config_add_address ()

-
gboolean            nm_setting_ip4_config_add_address   (NMSettingIP4Config *setting,
-                                                         NMIP4Address *address);

-

-Adds a new IPv4 address and associated information to the setting.  The
-given address is duplicated internally and is not changed by this function.
-

-

+
nm_setting_ip4_config_get_method ()

+
const char *        nm_setting_ip4_config_get_method    (NMSettingIP4Config *setting);

+

+++
@@ -982,28 +1092,21 @@ given address is duplicated internally and is not changed by this function.
 
-
-
-
-
-
+

 


 
 

 
setting :

 

 
address :
the new address to add

 
Returns :

-TRUE if the address was added; FALSE if the address was already
-known.the "method" property of the setting
 

 
 

 

 

 

-
nm_setting_ip4_config_add_dns ()

-
gboolean            nm_setting_ip4_config_add_dns       (NMSettingIP4Config *setting,
-                                                         guint32 dns);

-

-Adds a new DNS server to the setting.
-

-

+
nm_setting_ip4_config_get_num_dns ()

+
guint32             nm_setting_ip4_config_get_num_dns   (NMSettingIP4Config *setting);

+

+++
@@ -1011,29 +1114,22 @@ Adds a new DNS server to the setting.
 
-
-
-
-
-
+

 


 
 

 
setting :

 

 
dns :
the IPv4 address (network byte order) of the DNS server to add

 
Returns :

-TRUE if the DNS server was added; FALSE if the server was already
-knownthe number of configured DNS servers
 

 
 

 

 

 

-
nm_setting_ip4_config_add_dns_search ()

-
gboolean            nm_setting_ip4_config_add_dns_search
-                                                        (NMSettingIP4Config *setting,
-                                                         const char *dns_search);

-

-Adds a new DNS search domain to the setting.
-

-

+
nm_setting_ip4_config_get_dns ()

+
guint32             nm_setting_ip4_config_get_dns       (NMSettingIP4Config *setting,
+                                                         guint32 i);

+

+++
@@ -1041,29 +1137,31 @@ Adds a new DNS search domain to the setting.
 
-
-
+
+
-
+

 


 
 

 
setting :

 

 
dns_search :
the search domain to add
i :
index number of the DNS server to return
 

 

 
Returns :

-TRUE if the DNS search domain was added; FALSE if the search
-domain was already knownthe IPv4 address (network byte order) of the DNS server at index
+i
+
 

 
 

 

 

 

-
nm_setting_ip4_config_add_route ()

-
gboolean            nm_setting_ip4_config_add_route     (NMSettingIP4Config *setting,
-                                                         NMIP4Route *route);

+
nm_setting_ip4_config_add_dns ()

+
gboolean            nm_setting_ip4_config_add_dns       (NMSettingIP4Config *setting,
+                                                         guint32 dns);

 

-Adds a new IPv4 route and associated information to the setting.  The
-given route is duplicated internally and is not changed by this function.
+Adds a new DNS server to the setting.
 

-

+

+++
@@ -1071,32 +1169,42 @@ given route is duplicated internally and is not changed by this function.
 
-
-
+
+
+TRUE if the DNS server was added; FALSE if the server was already
+known

 


 
 

 
setting :

 

 
route :
the route to add
dns :
the IPv4 address (network byte order) of the DNS server to add
 

 

 
Returns :

 
-TRUE if the route was added; FALSE if the route was already known.
 

 
 

 

 

 

-
nm_setting_ip4_config_clear_addresses ()

-
void                nm_setting_ip4_config_clear_addresses
-                                                        (NMSettingIP4Config *setting);

+
nm_setting_ip4_config_remove_dns ()

+
void                nm_setting_ip4_config_remove_dns    (NMSettingIP4Config *setting,
+                                                         guint32 i);

 

-Removes all configured addresses.
+Removes the DNS server at index i.
 

-

+

+-
++
+
+
-
+
+
+
+
+
+

 




 
setting :

 the NMSettingIP4Config
 
i :
index number of the DNS server to remove

 

 

 

@@ -1106,8 +1214,11 @@ Removes all configured addresses.
 

 Removes all configured DNS servers.
 

-

+

+++

 


 

 
setting :

 the NMSettingIP4Config
@@ -1117,59 +1228,38 @@ Removes all configured DNS servers.
 
 

 

-
nm_setting_ip4_config_clear_dns_searches ()

-
void                nm_setting_ip4_config_clear_dns_searches
+
nm_setting_ip4_config_get_num_dns_searches ()

+
guint32             nm_setting_ip4_config_get_num_dns_searches
                                                         (NMSettingIP4Config *setting);

-

-Removes all configured DNS search domains.
-

-

+

+-
-
-
-
-

 

setting :
the NMSettingIP4Config
-

-

-

-

-
nm_setting_ip4_config_clear_routes ()

-
void                nm_setting_ip4_config_clear_routes  (NMSettingIP4Config *setting);

-

-Removes all configured routes.
-

-

--
++
+
+
-
-





 
setting :

 the NMSettingIP4Config
 

-

-

-

-
nm_setting_ip4_config_error_quark ()

-
GQuark              nm_setting_ip4_config_error_quark   (void);

-

-Registers an error quark for NMSettingIP4Config if necessary.
-

-

--
+
+
-
-
+
+
+



 
Returns :
the error quark used for NMSettingIP4Config errors.
the number of configured DNS search domains

 

 

 

 

-
nm_setting_ip4_config_get_address ()

-
NMIP4Address *      nm_setting_ip4_config_get_address   (NMSettingIP4Config *setting,
+
nm_setting_ip4_config_get_dns_search ()

+
const char *        nm_setting_ip4_config_get_dns_search
+                                                        (NMSettingIP4Config *setting,
                                                          guint32 i);

-

+

+++
@@ -1178,11 +1268,11 @@ Registers an error quark for 
 
-
+
-
@@ -1190,15 +1280,18 @@ Registers an error quark for 
 

 

-
nm_setting_ip4_config_get_dhcp_client_id ()

-
const char *        nm_setting_ip4_config_get_dhcp_client_id
-                                                        (NMSettingIP4Config *setting);

+
nm_setting_ip4_config_add_dns_search ()

+
gboolean            nm_setting_ip4_config_add_dns_search
+                                                        (NMSettingIP4Config *setting,
+                                                         const char *dns_search);

 

-Returns the value contained in the "dhcp-client-id"
-property.
+Adds a new DNS search domain to the setting.
 

-

 


 
 

 
setting :

 
i :
index number of the address to returnindex number of the DNS search domain to return
 

 

 
Returns :
the address at index i
+the DNS search domain at index i
 
 

 

+

+++
@@ -1206,24 +1299,32 @@ property.
 
+
+
+
+
-
+

 


 
 

 
setting :

 

 
dns_search :
the search domain to add

 
Returns :
the configured Client ID to send to the DHCP server when requesting
-addresses via DHCP.
+TRUE if the DNS search domain was added; FALSE if the search
+domain was already known
 

 
 

 

 

 

-
nm_setting_ip4_config_get_dhcp_hostname ()

-
const char *        nm_setting_ip4_config_get_dhcp_hostname
-                                                        (NMSettingIP4Config *setting);

+
nm_setting_ip4_config_remove_dns_search ()

+
void                nm_setting_ip4_config_remove_dns_search
+                                                        (NMSettingIP4Config *setting,
+                                                         guint32 i);

 

-Returns the value contained in the "dhcp-hostname"
-property.
+Removes the DNS search domain at index i.
 

-

+

+++
@@ -1231,46 +1332,42 @@ property.
 
-
-
+
+

 


 
 

 
setting :

 

 
Returns :
the configured hostname to send to the DHCP server
i :
index number of the DNS search domain
 

 
 

 

 

 

-
nm_setting_ip4_config_get_dhcp_send_hostname ()

-
gboolean            nm_setting_ip4_config_get_dhcp_send_hostname
+
nm_setting_ip4_config_clear_dns_searches ()

+
void                nm_setting_ip4_config_clear_dns_searches
                                                         (NMSettingIP4Config *setting);

 

-Returns the value contained in the "dhcp-send-hostname"
-property.
+Removes all configured DNS search domains.
 

-

+

+-
-
++
+
-
-
-
-
-
-
+

 




 
setting :

 the NMSettingIP4Config
 
Returns :

-TRUE if NetworkManager should send the machine hostname to the
-DHCP server when requesting addresses to allow the server to automatically
-update DNS information for this machine.

 

 

 

-

-
nm_setting_ip4_config_get_dns ()

-
guint32             nm_setting_ip4_config_get_dns       (NMSettingIP4Config *setting,
-                                                         guint32 i);

-

+

+
nm_setting_ip4_config_get_num_addresses ()

+
guint32             nm_setting_ip4_config_get_num_addresses
+                                                        (NMSettingIP4Config *setting);

+

+++
@@ -1278,26 +1375,22 @@ update DNS information for this machine.
-
-
-
-
-
+

 


 
 

 
setting :

 
 

 
i :
index number of the DNS server to return

 
Returns :
the IPv4 address (network byte order) of the DNS server at index
-i
-the number of configured addresses
 

 
 

 

 

 

-
nm_setting_ip4_config_get_dns_search ()

-
const char *        nm_setting_ip4_config_get_dns_search
-                                                        (NMSettingIP4Config *setting,
+
nm_setting_ip4_config_get_address ()

+
NMIP4Address *      nm_setting_ip4_config_get_address   (NMSettingIP4Config *setting,
                                                          guint32 i);

-

+

+++
@@ -1306,11 +1399,11 @@ update DNS information for this machine.
-
+
-
@@ -1318,15 +1411,18 @@ update DNS information for this machine.

-
nm_setting_ip4_config_get_ignore_auto_dns ()

-
gboolean            nm_setting_ip4_config_get_ignore_auto_dns
-                                                        (NMSettingIP4Config *setting);

+
nm_setting_ip4_config_add_address ()

+
gboolean            nm_setting_ip4_config_add_address   (NMSettingIP4Config *setting,
+                                                         NMIP4Address *address);

 

-Returns the value contained in the "ignore-auto-dns"
-property.
+Adds a new IPv4 address and associated information to the setting.  The
+given address is duplicated internally and is not changed by this function.
 

-

 


 
 

 
setting :

 

 

 
i :
index number of the DNS search domain to returnindex number of the address to return
 

 

 
Returns :
the DNS search domain at index i
+the address at index i
 
 

 
 
 
 

+

+++
@@ -1334,25 +1430,32 @@ property.
 
+
+
+
+
+TRUE if the address was added; FALSE if the address was already
+known.

 


 
 

 
setting :

 

 
address :
the new address to add

 
Returns :

 
-TRUE if automatically configured (ie via DHCP) DNS information
-should be ignored.
 

 
 

 

 

 

-
nm_setting_ip4_config_get_ignore_auto_routes ()

-
gboolean            nm_setting_ip4_config_get_ignore_auto_routes
-                                                        (NMSettingIP4Config *setting);

+
nm_setting_ip4_config_remove_address ()

+
void                nm_setting_ip4_config_remove_address
+                                                        (NMSettingIP4Config *setting,
+                                                         guint32 i);

 

-Returns the value contained in the "ignore-auto-routes"
-property.
+Removes the address at index i.
 

-

+

+++
@@ -1360,24 +1463,42 @@ property.
 
-
-
+
+

 


 
 

 
setting :

 

 
Returns :

-TRUE if automatically configured (ie via DHCP) routes should be
-ignored.
i :
index number of the address to remove
 

 
 

 

 

 

-
nm_setting_ip4_config_get_may_fail ()

-
gboolean            nm_setting_ip4_config_get_may_fail  (NMSettingIP4Config *setting);

+
nm_setting_ip4_config_clear_addresses ()

+
void                nm_setting_ip4_config_clear_addresses
+                                                        (NMSettingIP4Config *setting);

 

-Returns the value contained in the "may-fail"
-property.
+Removes all configured addresses.
 

-

+

++++
+
+
+
+
+




setting :
the NMSettingIP4Config
+

+

+

+

+
nm_setting_ip4_config_get_num_routes ()

+
guint32             nm_setting_ip4_config_get_num_routes
+                                                        (NMSettingIP4Config *setting);

+

+++
@@ -1386,19 +1507,21 @@ property.
 
-
+

 


 
 

 
setting :

 

 
Returns :

-TRUE if this connection doesn't require IPv4 addressing to complete
-for the connection to succeed.the number of configured routes
 

 
 

 

 

 

-
nm_setting_ip4_config_get_method ()

-
const char *        nm_setting_ip4_config_get_method    (NMSettingIP4Config *setting);

-

+
nm_setting_ip4_config_get_route ()

+
NMIP4Route *        nm_setting_ip4_config_get_route     (NMSettingIP4Config *setting,
+                                                         guint32 i);

+

+++
@@ -1406,23 +1529,31 @@ for the connection to succeed.
+
+
+
+
-
+

 


 
 

 
setting :

 
 

 
i :
index number of the route to return

 
Returns :
the "method" property of the settingthe route at index i
+
 

 
 

 

 

 

-
nm_setting_ip4_config_get_never_default ()

-
gboolean            nm_setting_ip4_config_get_never_default
-                                                        (NMSettingIP4Config *setting);

+
nm_setting_ip4_config_add_route ()

+
gboolean            nm_setting_ip4_config_add_route     (NMSettingIP4Config *setting,
+                                                         NMIP4Route *route);

 

-Returns the value contained in the "never-default"
-property.
+Adds a new IPv4 route and associated information to the setting.  The
+given route is duplicated internally and is not changed by this function.
 

-

+

+++
@@ -1430,21 +1561,30 @@ property.
 
+
+
+
+
+TRUE if the route was added; FALSE if the route was already known.

 


 
 

 
setting :

 

 
route :
the route to add

 
Returns :

 
-TRUE if this connection should never be the default connection
-for IPv4 addressing
 

 
 

 

 

 

-
nm_setting_ip4_config_get_num_addresses ()

-
guint32             nm_setting_ip4_config_get_num_addresses
-                                                        (NMSettingIP4Config *setting);

-

+
nm_setting_ip4_config_remove_route ()

+
void                nm_setting_ip4_config_remove_route  (NMSettingIP4Config *setting,
+                                                         guint32 i);

+

+Removes the route at index i.
+

+

+++
@@ -1452,38 +1592,45 @@ for IPv4 addressing
-
-
+
+

 


 
 

 
setting :

 
 

 
Returns :
the number of configured addresses
i :
index number of the route
 

 
 

 

 

 

-
nm_setting_ip4_config_get_num_dns ()

-
guint32             nm_setting_ip4_config_get_num_dns   (NMSettingIP4Config *setting);

-

+
nm_setting_ip4_config_clear_routes ()

+
void                nm_setting_ip4_config_clear_routes  (NMSettingIP4Config *setting);

+

+Removes all configured routes.
+

+

+-
-
++
+
-
-
-
-
-
-
+

 




 
setting :

 the NMSettingIP4Config
 
Returns :
the number of configured DNS servers

 

 

 

 

-
nm_setting_ip4_config_get_num_dns_searches ()

-
guint32             nm_setting_ip4_config_get_num_dns_searches
+
nm_setting_ip4_config_get_ignore_auto_routes ()

+
gboolean            nm_setting_ip4_config_get_ignore_auto_routes
                                                         (NMSettingIP4Config *setting);

-

+

+Returns the value contained in the "ignore-auto-routes"
+property.
+

+

+++
@@ -1492,18 +1639,27 @@ for IPv4 addressing
-
+

 


 
 

 
setting :

 

 

 
Returns :
the number of configured DNS search domains
+TRUE if automatically configured (ie via DHCP) routes should be
+ignored.
 

 
 

 

 

 

-
nm_setting_ip4_config_get_num_routes ()

-
guint32             nm_setting_ip4_config_get_num_routes
+
nm_setting_ip4_config_get_ignore_auto_dns ()

+
gboolean            nm_setting_ip4_config_get_ignore_auto_dns
                                                         (NMSettingIP4Config *setting);

-

+

+Returns the value contained in the "ignore-auto-dns"
+property.
+

+

+++
@@ -1512,18 +1668,27 @@ for IPv4 addressing
-
+

 


 
 

 
setting :

 

 

 
Returns :
the number of configured routes
+TRUE if automatically configured (ie via DHCP) DNS information
+should be ignored.
 

 
 

 

 

 

-
nm_setting_ip4_config_get_route ()

-
NMIP4Route *        nm_setting_ip4_config_get_route     (NMSettingIP4Config *setting,
-                                                         guint32 i);

-

+
nm_setting_ip4_config_get_dhcp_client_id ()

+
const char *        nm_setting_ip4_config_get_dhcp_client_id
+                                                        (NMSettingIP4Config *setting);

+

+Returns the value contained in the "dhcp-client-id"
+property.
+

+

+++
@@ -1531,44 +1696,27 @@ for IPv4 addressing
-
-
-
-
-
+

 


 
 

 
setting :

 
 

 
i :
index number of the route to return

 
Returns :
the route at index i
-the configured Client ID to send to the DHCP server when requesting
+addresses via DHCP.
 

 
 

 

 

 

-
nm_setting_ip4_config_new ()

-
NMSetting *         nm_setting_ip4_config_new           (void);

-

-Creates a new NMSettingIP4Config object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSettingIP4Config object. [transfer full]
-

-

-

-

-
nm_setting_ip4_config_remove_address ()

-
void                nm_setting_ip4_config_remove_address
-                                                        (NMSettingIP4Config *setting,
-                                                         guint32 i);

+
nm_setting_ip4_config_get_dhcp_send_hostname ()

+
gboolean            nm_setting_ip4_config_get_dhcp_send_hostname
+                                                        (NMSettingIP4Config *setting);

 

-Removes the address at index i.
+Returns the value contained in the "dhcp-send-hostname"
+property.
 

-

+

+++
@@ -1576,22 +1724,29 @@ Removes the address at index i.
 
-
-
+
+

 


 
 

 
setting :

 

 
i :
index number of the address to remove
Returns :

+TRUE if NetworkManager should send the machine hostname to the
+DHCP server when requesting addresses to allow the server to automatically
+update DNS information for this machine.
 

 
 

 

 

 

-
nm_setting_ip4_config_remove_dns ()

-
void                nm_setting_ip4_config_remove_dns    (NMSettingIP4Config *setting,
-                                                         guint32 i);

+
nm_setting_ip4_config_get_dhcp_hostname ()

+
const char *        nm_setting_ip4_config_get_dhcp_hostname
+                                                        (NMSettingIP4Config *setting);

 

-Removes the DNS server at index i.
+Returns the value contained in the "dhcp-hostname"
+property.
 

-

+

+++
@@ -1599,23 +1754,26 @@ Removes the DNS server at index i.
 
-
-
+
+

 


 
 

 
setting :

 

 
i :
index number of the DNS server to remove
Returns :
the configured hostname to send to the DHCP server
 

 
 

 

 

 

-
nm_setting_ip4_config_remove_dns_search ()

-
void                nm_setting_ip4_config_remove_dns_search
-                                                        (NMSettingIP4Config *setting,
-                                                         guint32 i);

+
nm_setting_ip4_config_get_never_default ()

+
gboolean            nm_setting_ip4_config_get_never_default
+                                                        (NMSettingIP4Config *setting);

 

-Removes the DNS search domain at index i.
+Returns the value contained in the "never-default"
+property.
 

-

+

+++
@@ -1623,22 +1781,27 @@ Removes the DNS search domain at index i
-
-
+
+

 


 
 

 
setting :

 
 

 
i :
index number of the DNS search domain
Returns :

+TRUE if this connection should never be the default connection
+for IPv4 addressing
 

 
 

 

 

 

-
nm_setting_ip4_config_remove_route ()

-
void                nm_setting_ip4_config_remove_route  (NMSettingIP4Config *setting,
-                                                         guint32 i);

+
nm_setting_ip4_config_get_may_fail ()

+
gboolean            nm_setting_ip4_config_get_may_fail  (NMSettingIP4Config *setting);

 

-Removes the route at index i.
+Returns the value contained in the "may-fail"
+property.
 

-

+

+++
@@ -1646,8 +1809,10 @@ Removes the route at index i.
 
-
-
+
+

 


 
 

 
setting :

 

 
i :
index number of the route
Returns :

+TRUE if this connection doesn't require IPv4 addressing to complete
+for the connection to succeed.
 

 
 

@@ -1813,6 +1978,6 @@ or 'disabled' methods because there is no upstream network.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingIP6Config.html b/docs/libnm-util/html/NMSettingIP6Config.html
index cca1efa8..9df4ad93 100644
--- a/docs/libnm-util/html/NMSettingIP6Config.html
+++ b/docs/libnm-util/html/NMSettingIP6Config.html
@@ -3,12 +3,12 @@
 
 
 NMSettingIP6Config
-
+
 
 
 
 
-
+
 
 
 
@@ -41,126 +41,134 @@
 

 

 
Synopsis

-
+
 #include <nm-setting-ip6-config.h>
 
-typedef             NMIP6Address;
-typedef             NMIP6Route;
-                    NMSettingIP6Config;
-                    NMSettingIP6ConfigClass;
+#define             NM_SETTING_IP6_CONFIG_SETTING_NAME
 enum                NMSettingIP6ConfigError;
-enum                NMSettingIP6ConfigPrivacy;
-#define             NM_SETTING_IP6_CONFIG_ADDRESSES
-#define             NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME
+#define             NM_SETTING_IP6_CONFIG_ERROR
+GQuark              nm_setting_ip6_config_error_quark   (void);
+#define             NM_SETTING_IP6_CONFIG_METHOD
 #define             NM_SETTING_IP6_CONFIG_DNS
 #define             NM_SETTING_IP6_CONFIG_DNS_SEARCH
-#define             NM_SETTING_IP6_CONFIG_ERROR
-#define             NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS
+#define             NM_SETTING_IP6_CONFIG_ADDRESSES
+#define             NM_SETTING_IP6_CONFIG_ROUTES
 #define             NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES
-#define             NM_SETTING_IP6_CONFIG_IP6_PRIVACY
+#define             NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS
+#define             NM_SETTING_IP6_CONFIG_NEVER_DEFAULT
 #define             NM_SETTING_IP6_CONFIG_MAY_FAIL
-#define             NM_SETTING_IP6_CONFIG_METHOD
+#define             NM_SETTING_IP6_CONFIG_IP6_PRIVACY
+#define             NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME
+#define             NM_SETTING_IP6_CONFIG_METHOD_IGNORE
 #define             NM_SETTING_IP6_CONFIG_METHOD_AUTO
 #define             NM_SETTING_IP6_CONFIG_METHOD_DHCP
-#define             NM_SETTING_IP6_CONFIG_METHOD_IGNORE
 #define             NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL
 #define             NM_SETTING_IP6_CONFIG_METHOD_MANUAL
 #define             NM_SETTING_IP6_CONFIG_METHOD_SHARED
-#define             NM_SETTING_IP6_CONFIG_NEVER_DEFAULT
-#define             NM_SETTING_IP6_CONFIG_ROUTES
-#define             NM_SETTING_IP6_CONFIG_SETTING_NAME
+enum                NMSettingIP6ConfigPrivacy;
+typedef             NMIP6Address;
+NMIP6Address *      nm_ip6_address_new                  (void);
+NMIP6Address *      nm_ip6_address_dup                  (NMIP6Address *source);
+void                nm_ip6_address_ref                  (NMIP6Address *address);
+void                nm_ip6_address_unref                (NMIP6Address *address);
 gboolean            nm_ip6_address_compare              (NMIP6Address *address,
                                                          NMIP6Address *other);
-NMIP6Address *      nm_ip6_address_dup                  (NMIP6Address *source);
 const struct in6_addr * nm_ip6_address_get_address      (NMIP6Address *address);
-const struct in6_addr * nm_ip6_address_get_gateway      (NMIP6Address *address);
-guint32             nm_ip6_address_get_prefix           (NMIP6Address *address);
-NMIP6Address *      nm_ip6_address_new                  (void);
-void                nm_ip6_address_ref                  (NMIP6Address *address);
 void                nm_ip6_address_set_address          (NMIP6Address *address,
                                                          const struct in6_addr *addr);
-void                nm_ip6_address_set_gateway          (NMIP6Address *address,
-                                                         const struct in6_addr *gateway);
+guint32             nm_ip6_address_get_prefix           (NMIP6Address *address);
 void                nm_ip6_address_set_prefix           (NMIP6Address *address,
                                                          guint32 prefix);
-void                nm_ip6_address_unref                (NMIP6Address *address);
+const struct in6_addr * nm_ip6_address_get_gateway      (NMIP6Address *address);
+void                nm_ip6_address_set_gateway          (NMIP6Address *address,
+                                                         const struct in6_addr *gateway);
+typedef             NMIP6Route;
+NMIP6Route *        nm_ip6_route_new                    (void);
+NMIP6Route *        nm_ip6_route_dup                    (NMIP6Route *source);
+void                nm_ip6_route_ref                    (NMIP6Route *route);
+void                nm_ip6_route_unref                  (NMIP6Route *route);
 gboolean            nm_ip6_route_compare                (NMIP6Route *route,
                                                          NMIP6Route *other);
-NMIP6Route *        nm_ip6_route_dup                    (NMIP6Route *source);
 const struct in6_addr * nm_ip6_route_get_dest           (NMIP6Route *route);
-guint32             nm_ip6_route_get_metric             (NMIP6Route *route);
-const struct in6_addr * nm_ip6_route_get_next_hop       (NMIP6Route *route);
-guint32             nm_ip6_route_get_prefix             (NMIP6Route *route);
-NMIP6Route *        nm_ip6_route_new                    (void);
-void                nm_ip6_route_ref                    (NMIP6Route *route);
 void                nm_ip6_route_set_dest               (NMIP6Route *route,
                                                          const struct in6_addr *dest);
-void                nm_ip6_route_set_metric             (NMIP6Route *route,
-                                                         guint32 metric);
-void                nm_ip6_route_set_next_hop           (NMIP6Route *route,
-                                                         const struct in6_addr *next_hop);
+guint32             nm_ip6_route_get_prefix             (NMIP6Route *route);
 void                nm_ip6_route_set_prefix             (NMIP6Route *route,
                                                          guint32 prefix);
-void                nm_ip6_route_unref                  (NMIP6Route *route);
-gboolean            nm_setting_ip6_config_add_address   (NMSettingIP6Config *setting,
-                                                         NMIP6Address *address);
+const struct in6_addr * nm_ip6_route_get_next_hop       (NMIP6Route *route);
+void                nm_ip6_route_set_next_hop           (NMIP6Route *route,
+                                                         const struct in6_addr *next_hop);
+guint32             nm_ip6_route_get_metric             (NMIP6Route *route);
+void                nm_ip6_route_set_metric             (NMIP6Route *route,
+                                                         guint32 metric);
+                    NMSettingIP6Config;
+                    NMSettingIP6ConfigClass;
+NMSetting *         nm_setting_ip6_config_new           (void);
+const char *        nm_setting_ip6_config_get_method    (NMSettingIP6Config *setting);
+guint32             nm_setting_ip6_config_get_num_dns   (NMSettingIP6Config *setting);
+const struct in6_addr * nm_setting_ip6_config_get_dns   (NMSettingIP6Config *setting,
+                                                         guint32 i);
 gboolean            nm_setting_ip6_config_add_dns       (NMSettingIP6Config *setting,
                                                          const struct in6_addr *dns);
+void                nm_setting_ip6_config_remove_dns    (NMSettingIP6Config *setting,
+                                                         guint32 i);
+void                nm_setting_ip6_config_clear_dns     (NMSettingIP6Config *setting);
+guint32             nm_setting_ip6_config_get_num_dns_searches
+                                                        (NMSettingIP6Config *setting);
+const char *        nm_setting_ip6_config_get_dns_search
+                                                        (NMSettingIP6Config *setting,
+                                                         guint32 i);
 gboolean            nm_setting_ip6_config_add_dns_search
                                                         (NMSettingIP6Config *setting,
                                                          const char *dns_search);
-gboolean            nm_setting_ip6_config_add_route     (NMSettingIP6Config *setting,
-                                                         NMIP6Route *route);
-void                nm_setting_ip6_config_clear_addresses
-                                                        (NMSettingIP6Config *setting);
-void                nm_setting_ip6_config_clear_dns     (NMSettingIP6Config *setting);
+void                nm_setting_ip6_config_remove_dns_search
+                                                        (NMSettingIP6Config *setting,
+                                                         guint32 i);
 void                nm_setting_ip6_config_clear_dns_searches
                                                         (NMSettingIP6Config *setting);
-void                nm_setting_ip6_config_clear_routes  (NMSettingIP6Config *setting);
-GQuark              nm_setting_ip6_config_error_quark   (void);
-NMIP6Address *      nm_setting_ip6_config_get_address   (NMSettingIP6Config *setting,
-                                                         guint32 i);
-const char *        nm_setting_ip6_config_get_dhcp_hostname
+guint32             nm_setting_ip6_config_get_num_addresses
                                                         (NMSettingIP6Config *setting);
-const struct in6_addr * nm_setting_ip6_config_get_dns   (NMSettingIP6Config *setting,
+NMIP6Address *      nm_setting_ip6_config_get_address   (NMSettingIP6Config *setting,
                                                          guint32 i);
-const char *        nm_setting_ip6_config_get_dns_search
+gboolean            nm_setting_ip6_config_add_address   (NMSettingIP6Config *setting,
+                                                         NMIP6Address *address);
+void                nm_setting_ip6_config_remove_address
                                                         (NMSettingIP6Config *setting,
                                                          guint32 i);
-gboolean            nm_setting_ip6_config_get_ignore_auto_dns
-                                                        (NMSettingIP6Config *setting);
-gboolean            nm_setting_ip6_config_get_ignore_auto_routes
-                                                        (NMSettingIP6Config *setting);
-NMSettingIP6ConfigPrivacy nm_setting_ip6_config_get_ip6_privacy
-                                                        (NMSettingIP6Config *setting);
-gboolean            nm_setting_ip6_config_get_may_fail  (NMSettingIP6Config *setting);
-const char *        nm_setting_ip6_config_get_method    (NMSettingIP6Config *setting);
-gboolean            nm_setting_ip6_config_get_never_default
-                                                        (NMSettingIP6Config *setting);
-guint32             nm_setting_ip6_config_get_num_addresses
-                                                        (NMSettingIP6Config *setting);
-guint32             nm_setting_ip6_config_get_num_dns   (NMSettingIP6Config *setting);
-guint32             nm_setting_ip6_config_get_num_dns_searches
+void                nm_setting_ip6_config_clear_addresses
                                                         (NMSettingIP6Config *setting);
 guint32             nm_setting_ip6_config_get_num_routes
                                                         (NMSettingIP6Config *setting);
 NMIP6Route *        nm_setting_ip6_config_get_route     (NMSettingIP6Config *setting,
                                                          guint32 i);
-NMSetting *         nm_setting_ip6_config_new           (void);
-void                nm_setting_ip6_config_remove_address
-                                                        (NMSettingIP6Config *setting,
-                                                         guint32 i);
-void                nm_setting_ip6_config_remove_dns    (NMSettingIP6Config *setting,
-                                                         guint32 i);
-void                nm_setting_ip6_config_remove_dns_search
-                                                        (NMSettingIP6Config *setting,
-                                                         guint32 i);
+gboolean            nm_setting_ip6_config_add_route     (NMSettingIP6Config *setting,
+                                                         NMIP6Route *route);
 void                nm_setting_ip6_config_remove_route  (NMSettingIP6Config *setting,
                                                          guint32 i);
+void                nm_setting_ip6_config_clear_routes  (NMSettingIP6Config *setting);
+gboolean            nm_setting_ip6_config_get_ignore_auto_routes
+                                                        (NMSettingIP6Config *setting);
+gboolean            nm_setting_ip6_config_get_ignore_auto_dns
+                                                        (NMSettingIP6Config *setting);
+const char *        nm_setting_ip6_config_get_dhcp_hostname
+                                                        (NMSettingIP6Config *setting);
+gboolean            nm_setting_ip6_config_get_never_default
+                                                        (NMSettingIP6Config *setting);
+gboolean            nm_setting_ip6_config_get_may_fail  (NMSettingIP6Config *setting);
+NMSettingIP6ConfigPrivacy nm_setting_ip6_config_get_ip6_privacy
+                                                        (NMSettingIP6Config *setting);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingIP6ConfigError
+

+
+  GEnum
+   +----NMSettingIP6ConfigPrivacy
+

 
   GBoxed
    +----NMIP6Address
@@ -174,14 +182,6 @@ const char *        NMSetting
          +----NMSettingIP6Config
 

-
-  GEnum
-   +----NMSettingIP6ConfigError
-

-
-  GEnum
-   +----NMSettingIP6ConfigPrivacy
-

 

 

 
Properties

@@ -209,39 +209,8 @@ properties related to IPv6 addressing, routing, and Domain Name Service
 

 
Details

 

-
NMIP6Address

-
typedef struct NMIP6Address NMIP6Address;
-

-

-

-

-

-

-
NMIP6Route

-
typedef struct NMIP6Route NMIP6Route;
-

-

-

-

-

-

-
NMSettingIP6Config

-
typedef struct _NMSettingIP6Config NMSettingIP6Config;

-

-

-

-

-

-
NMSettingIP6ConfigClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingIP6ConfigClass;
+
NM_SETTING_IP6_CONFIG_SETTING_NAME

+
#define NM_SETTING_IP6_CONFIG_SETTING_NAME "ipv6"
 

 

 

@@ -256,8 +225,11 @@ properties related to IPv6 addressing, routing, and Domain Name Service
 	NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD /*< nick=NotAllowedForMethod >*/
 } NMSettingIP6ConfigError;
 

-

+

+++
@@ -286,58 +258,34 @@ not valid with the given IPv6 method
 

-
enum NMSettingIP6ConfigPrivacy

-
typedef enum {
-	NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN = -1,
-	NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED = 0,
-	NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR = 1,
-	NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR = 2
-} NMSettingIP6ConfigPrivacy;
+
NM_SETTING_IP6_CONFIG_ERROR

+
#define NM_SETTING_IP6_CONFIG_ERROR nm_setting_ip6_config_error_quark ()
 

 

-NMSettingIP6ConfigPrivacy values indicate if and how IPv6 Privacy
-Extensions are used (RFC4941).
 

-

 


 
 

 
NM_SETTING_IP6_CONFIG_ERROR_UNKNOWN

 
 

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN
unknown or no value specified
-
NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED
IPv6 Privacy Extensions are disabled
-
NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR
IPv6 Privacy Extensions
-are enabled, but public addresses are preferred over temporary addresses
-
NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR
IPv6 Privacy Extensions
-are enabled and temporary addresses are preferred over public addresses
-

 

 

 

-
NM_SETTING_IP6_CONFIG_ADDRESSES

-
#define NM_SETTING_IP6_CONFIG_ADDRESSES          "addresses"
-

+
nm_setting_ip6_config_error_quark ()

+
GQuark              nm_setting_ip6_config_error_quark   (void);

 

+Registers an error quark for NMSettingIP6Config if necessary.
 

+

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingIP6Config errors.

 

 

 

-
NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME

-
#define NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME      "dhcp-hostname"
+
NM_SETTING_IP6_CONFIG_METHOD

+
#define NM_SETTING_IP6_CONFIG_METHOD             "method"
 

 

 

@@ -360,16 +308,16 @@ are enabled and temporary addresses are preferred over public addresses
 

 

 

-
NM_SETTING_IP6_CONFIG_ERROR

-
#define NM_SETTING_IP6_CONFIG_ERROR nm_setting_ip6_config_error_quark ()
+
NM_SETTING_IP6_CONFIG_ADDRESSES

+
#define NM_SETTING_IP6_CONFIG_ADDRESSES          "addresses"
 

 

 

 

 

 

-
NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS

-
#define NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
+
NM_SETTING_IP6_CONFIG_ROUTES

+
#define NM_SETTING_IP6_CONFIG_ROUTES             "routes"
 

 

 

@@ -384,8 +332,16 @@ are enabled and temporary addresses are preferred over public addresses
 

 

 

-
NM_SETTING_IP6_CONFIG_IP6_PRIVACY

-
#define NM_SETTING_IP6_CONFIG_IP6_PRIVACY        "ip6-privacy"
+
NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS

+
#define NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
+

+

+

+

+

+

+
NM_SETTING_IP6_CONFIG_NEVER_DEFAULT

+
#define NM_SETTING_IP6_CONFIG_NEVER_DEFAULT      "never-default"
 

 

 

@@ -400,10 +356,28 @@ are enabled and temporary addresses are preferred over public addresses
 

 

 

-
NM_SETTING_IP6_CONFIG_METHOD

-
#define NM_SETTING_IP6_CONFIG_METHOD             "method"
+
NM_SETTING_IP6_CONFIG_IP6_PRIVACY

+
#define NM_SETTING_IP6_CONFIG_IP6_PRIVACY        "ip6-privacy"
+

+

+

+

+

+

+
NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME

+
#define NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME      "dhcp-hostname"
+

+

+

+

+

+

+
NM_SETTING_IP6_CONFIG_METHOD_IGNORE

+
#define NM_SETTING_IP6_CONFIG_METHOD_IGNORE     "ignore"
 

 

+IPv6 is not required or is handled by some other mechanism, and NetworkManager
+should not configure IPv6 for this connection.
 

 

 

@@ -429,16 +403,6 @@ router advertisements should be ignored.
 

 

 

-
NM_SETTING_IP6_CONFIG_METHOD_IGNORE

-
#define NM_SETTING_IP6_CONFIG_METHOD_IGNORE     "ignore"
-

-

-IPv6 is not required or is handled by some other mechanism, and NetworkManager
-should not configure IPv6 for this connection.
-

-

-

-

 
NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL

 
#define NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL "link-local"
 

@@ -474,27 +438,139 @@ supported for IPv6)
 

 

 

-
NM_SETTING_IP6_CONFIG_NEVER_DEFAULT

-
#define NM_SETTING_IP6_CONFIG_NEVER_DEFAULT      "never-default"
+
enum NMSettingIP6ConfigPrivacy

+
typedef enum {
+	NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN = -1,
+	NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED = 0,
+	NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR = 1,
+	NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR = 2
+} NMSettingIP6ConfigPrivacy;
 

 

+NMSettingIP6ConfigPrivacy values indicate if and how IPv6 Privacy
+Extensions are used (RFC4941).
 

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN
unknown or no value specified
+
NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED
IPv6 Privacy Extensions are disabled
+
NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR
IPv6 Privacy Extensions
+are enabled, but public addresses are preferred over temporary addresses
+
NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR
IPv6 Privacy Extensions
+are enabled and temporary addresses are preferred over public addresses
+

 

 

 

-
NM_SETTING_IP6_CONFIG_ROUTES

-
#define NM_SETTING_IP6_CONFIG_ROUTES             "routes"
+
NMIP6Address

+
typedef struct NMIP6Address NMIP6Address;
 

 

 

 

 

 

-
NM_SETTING_IP6_CONFIG_SETTING_NAME

-
#define NM_SETTING_IP6_CONFIG_SETTING_NAME "ipv6"
-

+
nm_ip6_address_new ()

+
NMIP6Address *      nm_ip6_address_new                  (void);

+

+Creates and returns a new NMIP6Address object.
+

+

++++
+
+
+
+
+




Returns :
the new empty NMIP6Address object. [transfer full]
+

+

+

+

+
nm_ip6_address_dup ()

+
NMIP6Address *      nm_ip6_address_dup                  (NMIP6Address *source);

+

+Copies a given NMIP6Address object and returns the copy.
+

+

++++
+
+
+
+
+
+
+
+
+
+
+




source :
the NMIP6Address object to copy
Returns :
the copy of the given NMIP6Address copy. [transfer full]
+

+

+

+

+
nm_ip6_address_ref ()

+
void                nm_ip6_address_ref                  (NMIP6Address *address);

+

+Increases the reference count of the object.
+

+

++++
+
+
+
+
+




address :
the NMIP6Address
+

+

+

+

+
nm_ip6_address_unref ()

+
void                nm_ip6_address_unref                (NMIP6Address *address);

 

+Decreases the reference count of the object.  If the reference count
+reaches zero, the object will be destroyed.
 

+

++++
+
+
+
+
+




address :
the NMIP6Address
+

 

 

 

@@ -504,8 +580,11 @@ supported for IPv6)
 

 Determines if two NMIP6Address objects contain the same values.
 

-

+

+++
@@ -526,35 +605,16 @@ Determines if two 
 

 

-
nm_ip6_address_dup ()

-
NMIP6Address *      nm_ip6_address_dup                  (NMIP6Address *source);

-

-Copies a given NMIP6Address object and returns the copy.
-

-

 


 
 

 
address :

--
-
-
-
-
-
-
-
-
-
-


source :
the NMIP6Address object to copy
Returns :
the copy of the given NMIP6Address copy. [transfer full]
-

-

-

-

 
nm_ip6_address_get_address ()

 
const struct in6_addr * nm_ip6_address_get_address      (NMIP6Address *address);

 

 Gets the IPv6 address property of this address object.
 

-

+

+++
@@ -571,13 +631,17 @@ Gets the IPv6 address property of this address object.
 

-
nm_ip6_address_get_gateway ()

-
const struct in6_addr * nm_ip6_address_get_gateway      (NMIP6Address *address);

+
nm_ip6_address_set_address ()

+
void                nm_ip6_address_set_address          (NMIP6Address *address,
+                                                         const struct in6_addr *addr);

 

-Gets the IPv6 default gateway property of this address object.
+Sets the IPv6 address property of this object.
 

-

 


 
 

 
address :

 
 

+

+++
@@ -585,9 +649,8 @@ Gets the IPv6 default gateway property of this address object.
 
-
-
+
+

 


 
 

 
address :

 

 
Returns :
the IPv6 gateway address. [transfer none]
-
addr :
the IPv6 address
 

 
 

@@ -599,8 +662,11 @@ Gets the IPv6 default gateway property of this address object.
 

 Gets the IPv6 address prefix property of this address object.
 

-

+

+++
@@ -616,46 +682,42 @@ Gets the IPv6 address prefix property of this address object.
 

-
nm_ip6_address_new ()

-
NMIP6Address *      nm_ip6_address_new                  (void);

-

-Creates and returns a new NMIP6Address object.
-

-

 


 
 

 
address :

 
 

--
-
-
-
-


Returns :
the new empty NMIP6Address object. [transfer full]
-

-

-

-

-
nm_ip6_address_ref ()

-
void                nm_ip6_address_ref                  (NMIP6Address *address);

+
nm_ip6_address_set_prefix ()

+
void                nm_ip6_address_set_prefix           (NMIP6Address *address,
+                                                         guint32 prefix);

 

-Increases the reference count of the object.
+Sets the IPv6 address prefix.
 

-

+

+-
++
+
+
-
+
+
+
+
+
+

 




 
address :

 the NMIP6Address
 
prefix :
the address prefix, a number between 0 and 128 inclusive

 

 

 

 

-
nm_ip6_address_set_address ()

-
void                nm_ip6_address_set_address          (NMIP6Address *address,
-                                                         const struct in6_addr *addr);

+
nm_ip6_address_get_gateway ()

+
const struct in6_addr * nm_ip6_address_get_gateway      (NMIP6Address *address);

 

-Sets the IPv6 address property of this object.
+Gets the IPv6 default gateway property of this address object.
 

-

+

+++
@@ -663,8 +725,9 @@ Sets the IPv6 address property of this object.
 
-
-
+
+

 


 
 

 
address :

 

 
addr :
the IPv6 address
Returns :
the IPv6 gateway address. [transfer none]
+
 

 
 

@@ -677,8 +740,11 @@ Sets the IPv6 address property of this object.
 

 Sets the IPv6 default gateway property of this address object.
 

-

+

+++
@@ -694,40 +760,91 @@ Sets the IPv6 default gateway property of this address object.
 

-
nm_ip6_address_set_prefix ()

-
void                nm_ip6_address_set_prefix           (NMIP6Address *address,
-                                                         guint32 prefix);

+
NMIP6Route

+
typedef struct NMIP6Route NMIP6Route;
+

 

-Sets the IPv6 address prefix.
 

-

 


 
 

 
address :

 
 

+
+

+

+
nm_ip6_route_new ()

+
NMIP6Route *        nm_ip6_route_new                    (void);

+

+Creates and returns a new NMIP6Route object.
+

+

+++
+
+
+
+
+

 


Returns :
the new empty NMIP6Route object. [transfer full]
+

+

+

+

+
nm_ip6_route_dup ()

+
NMIP6Route *        nm_ip6_route_dup                    (NMIP6Route *source);

+

+Copies a given NMIP6Route object and returns the copy.
+

+

++++
-
-
+
+
-
-
+
+




 
 
address :
the NMIP6Address
-
source :
the NMIP6Route object to copy
 

 
prefix :
the address prefix, a number between 0 and 128 inclusive
Returns :
the copy of the given NMIP6Route copy. [transfer full]
+
 

 
 

 

 

 

-
nm_ip6_address_unref ()

-
void                nm_ip6_address_unref                (NMIP6Address *address);

+
nm_ip6_route_ref ()

+
void                nm_ip6_route_ref                    (NMIP6Route *route);

+

+Increases the reference count of the object.
+

+

++++
+
+
+
+
+




route :
the NMIP6Route
+

+

+

+

+
nm_ip6_route_unref ()

+
void                nm_ip6_route_unref                  (NMIP6Route *route);

 

 Decreases the reference count of the object.  If the reference count
 reaches zero, the object will be destroyed.
 

-

+

+++
-
-
+

 


 
address :
the NMIP6Address
+
route :
the NMIP6Route
 
 

 

@@ -740,8 +857,11 @@ reaches zero, the object will be destroyed.
 

 Determines if two NMIP6Route objects contain the same values.
 

-

+

+++
@@ -762,35 +882,42 @@ Determines if two 
 

 

-
nm_ip6_route_dup ()

-
NMIP6Route *        nm_ip6_route_dup                    (NMIP6Route *source);

+
nm_ip6_route_get_dest ()

+
const struct in6_addr * nm_ip6_route_get_dest           (NMIP6Route *route);

 

-Copies a given NMIP6Route object and returns the copy.
+Gets the IPv6 destination address property of this route object.
 

-

 


 
 

 
route :

+

+++
-
-
+
+
-
+

 


 
 
source :
the NMIP6Route object to copy
route :
the NMIP6Route
+
 

 

 
Returns :
the copy of the given NMIP6Route copy. [transfer full]
-the IPv6 address
 

 
 

 

 

 

-
nm_ip6_route_get_dest ()

-
const struct in6_addr * nm_ip6_route_get_dest           (NMIP6Route *route);

+
nm_ip6_route_set_dest ()

+
void                nm_ip6_route_set_dest               (NMIP6Route *route,
+                                                         const struct in6_addr *dest);

 

-Gets the IPv6 destination address property of this route object.
+Sets the IPv6 destination address property of this route object.
 

-

+

+++
@@ -798,22 +925,24 @@ Gets the IPv6 destination address property of this route object.
 
-
-
+
+

 


 
 

 
route :

 

 
Returns :
the IPv6 address
dest :
the destination address
 

 
 

 

 

 

-
nm_ip6_route_get_metric ()

-
guint32             nm_ip6_route_get_metric             (NMIP6Route *route);

+
nm_ip6_route_get_prefix ()

+
guint32             nm_ip6_route_get_prefix             (NMIP6Route *route);

 

-Gets the route metric property of this route object; lower values indicate
-"better" or more preferred routes.
+Gets the IPv6 prefix (ie "32" or "64" etc) of this route.
 

-

+

+++
@@ -822,20 +951,24 @@ Gets the route metric property of this route object; lower values indicate
 
-
+

 


 
 

 
route :

 

 
Returns :
the route metricthe IPv6 prefix
 

 
 

 

 

 

-
nm_ip6_route_get_next_hop ()

-
const struct in6_addr * nm_ip6_route_get_next_hop       (NMIP6Route *route);

+
nm_ip6_route_set_prefix ()

+
void                nm_ip6_route_set_prefix             (NMIP6Route *route,
+                                                         guint32 prefix);

 

-Gets the IPv6 address of the next hop of this route.
+Sets the IPv6 prefix of this route.
 

-

+

+++
@@ -843,21 +976,24 @@ Gets the IPv6 address of the next hop of this route.
 
-
-
+
+

 


 
 

 
route :

 

 
Returns :
the IPv6 address
prefix :
the prefix, a number between 1 and 128 inclusive
 

 
 

 

 

 

-
nm_ip6_route_get_prefix ()

-
guint32             nm_ip6_route_get_prefix             (NMIP6Route *route);

+
nm_ip6_route_get_next_hop ()

+
const struct in6_addr * nm_ip6_route_get_next_hop       (NMIP6Route *route);

 

-Gets the IPv6 prefix (ie "32" or "64" etc) of this route.
+Gets the IPv6 address of the next hop of this route.
 

-

+

+++
@@ -866,53 +1002,50 @@ Gets the IPv6 prefix (ie "32" or "64" etc) of this route.
 
-
+

 


 
 

 
route :

 

 
Returns :
the IPv6 prefixthe IPv6 address
 

 
 

 

 

 

-
nm_ip6_route_new ()

-
NMIP6Route *        nm_ip6_route_new                    (void);

-

-Creates and returns a new NMIP6Route object.
-

-

--
-
-
-
-


Returns :
the new empty NMIP6Route object. [transfer full]
-

-

-

-

-
nm_ip6_route_ref ()

-
void                nm_ip6_route_ref                    (NMIP6Route *route);

+
nm_ip6_route_set_next_hop ()

+
void                nm_ip6_route_set_next_hop           (NMIP6Route *route,
+                                                         const struct in6_addr *next_hop);

 

-Increases the reference count of the object.
+Sets the IPv6 address of the next hop of this route.
 

-

+

+-
++
+
+
-
+
+
+
+
+
+

 




 
route :

 the NMIP6Route
 
next_hop :
the IPv6 address of the next hop

 

 

 

 

-
nm_ip6_route_set_dest ()

-
void                nm_ip6_route_set_dest               (NMIP6Route *route,
-                                                         const struct in6_addr *dest);

+
nm_ip6_route_get_metric ()

+
guint32             nm_ip6_route_get_metric             (NMIP6Route *route);

 

-Sets the IPv6 destination address property of this route object.
+Gets the route metric property of this route object; lower values indicate
+"better" or more preferred routes.
 

-

+

+++
@@ -920,8 +1053,8 @@ Sets the IPv6 destination address property of this route object.
 
-
-
+
+

 


 
 

 
route :

 

 
dest :
the destination address
Returns :
the route metric
 

 
 

@@ -935,8 +1068,11 @@ Sets the IPv6 destination address property of this route object.
 Sets the route metric property of this route object; lower values indicate
 "better" or more preferred routes.
 

-

+

+++
@@ -952,78 +1088,55 @@ Sets the route metric property of this route object; lower values indicate
 

-
nm_ip6_route_set_next_hop ()

-
void                nm_ip6_route_set_next_hop           (NMIP6Route *route,
-                                                         const struct in6_addr *next_hop);

+
NMSettingIP6Config

+
typedef struct _NMSettingIP6Config NMSettingIP6Config;

 

-Sets the IPv6 address of the next hop of this route.
 

-

 


 
 

 
route :

 
 

--
-
-
-
-
-
-
-
-
-
-


route :
the NMIP6Route
-
next_hop :
the IPv6 address of the next hop

 

 

 

-
nm_ip6_route_set_prefix ()

-
void                nm_ip6_route_set_prefix             (NMIP6Route *route,
-                                                         guint32 prefix);

+
NMSettingIP6ConfigClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingIP6ConfigClass;
+

 

-Sets the IPv6 prefix of this route.
 

-

--
-
-
-
-
-
-
-
-
-
-


route :
the NMIP6Route
-
prefix :
the prefix, a number between 1 and 128 inclusive

 

 

 

-
nm_ip6_route_unref ()

-
void                nm_ip6_route_unref                  (NMIP6Route *route);

+
nm_setting_ip6_config_new ()

+
NMSetting *         nm_setting_ip6_config_new           (void);

 

-Decreases the reference count of the object.  If the reference count
-reaches zero, the object will be destroyed.
+Creates a new NMSettingIP6Config object with default values.
 

-

+

+++
-
-
+

 


 
route :
the NMIP6Route
+
Returns :
the new empty NMSettingIP6Config object. [transfer full]
 
 

 

 

 

 

-
nm_setting_ip6_config_add_address ()

-
gboolean            nm_setting_ip6_config_add_address   (NMSettingIP6Config *setting,
-                                                         NMIP6Address *address);

-

-Adds a new IPv6 address and associated information to the setting.  The
-given address is duplicated internally and is not changed by this function.
-

-

+
nm_setting_ip6_config_get_method ()

+
const char *        nm_setting_ip6_config_get_method    (NMSettingIP6Config *setting);

+

+++
@@ -1031,28 +1144,21 @@ given address is duplicated internally and is not changed by this function.
 
-
-
-
-
-
+

 


 
 

 
setting :

 

 
address :
the new address to add

 
Returns :

-TRUE if the address was added; FALSE if the address was already
-known.the "method" property of the setting
 

 
 

 

 

 

-
nm_setting_ip6_config_add_dns ()

-
gboolean            nm_setting_ip6_config_add_dns       (NMSettingIP6Config *setting,
-                                                         const struct in6_addr *dns);

-

-Adds a new DNS server to the setting.
-

-

+
nm_setting_ip6_config_get_num_dns ()

+
guint32             nm_setting_ip6_config_get_num_dns   (NMSettingIP6Config *setting);

+

+++
@@ -1060,29 +1166,22 @@ Adds a new DNS server to the setting.
 
-
-
-
-
-
+

 


 
 

 
setting :

 

 
dns :
the IPv6 address of the DNS server to add

 
Returns :

-TRUE if the DNS server was added; FALSE if the server was already
-knownthe number of configured DNS servers
 

 
 

 

 

 

-
nm_setting_ip6_config_add_dns_search ()

-
gboolean            nm_setting_ip6_config_add_dns_search
-                                                        (NMSettingIP6Config *setting,
-                                                         const char *dns_search);

-

-Adds a new DNS search domain to the setting.
-

-

+
nm_setting_ip6_config_get_dns ()

+
const struct in6_addr * nm_setting_ip6_config_get_dns   (NMSettingIP6Config *setting,
+                                                         guint32 i);

+

+++
@@ -1090,29 +1189,30 @@ Adds a new DNS search domain to the setting.
 
-
-
+
+
-
+

 


 
 

 
setting :

 

 
dns_search :
the search domain to add
i :
index number of the DNS server to return
 

 

 
Returns :

-TRUE if the DNS search domain was added; FALSE if the search
-domain was already knownthe IPv6 address of the DNS server at index i. [transfer none]
+
 

 
 

 

 

 

-
nm_setting_ip6_config_add_route ()

-
gboolean            nm_setting_ip6_config_add_route     (NMSettingIP6Config *setting,
-                                                         NMIP6Route *route);

+
nm_setting_ip6_config_add_dns ()

+
gboolean            nm_setting_ip6_config_add_dns       (NMSettingIP6Config *setting,
+                                                         const struct in6_addr *dns);

 

-Adds a new IPv6 route and associated information to the setting.  The
-given route is duplicated internally and is not changed by this function.
+Adds a new DNS server to the setting.
 

-

+

+++
@@ -1120,32 +1220,42 @@ given route is duplicated internally and is not changed by this function.
 
-
-
+
+
+TRUE if the DNS server was added; FALSE if the server was already
+known

 


 
 

 
setting :

 

 
route :
the route to add
dns :
the IPv6 address of the DNS server to add
 

 

 
Returns :

 
-TRUE if the route was added; FALSE if the route was already known.
 

 
 

 

 

 

-
nm_setting_ip6_config_clear_addresses ()

-
void                nm_setting_ip6_config_clear_addresses
-                                                        (NMSettingIP6Config *setting);

+
nm_setting_ip6_config_remove_dns ()

+
void                nm_setting_ip6_config_remove_dns    (NMSettingIP6Config *setting,
+                                                         guint32 i);

 

-Removes all configured addresses.
+Removes the DNS server at index i.
 

-

+

+-
++
+
+
-
+
+
+
+
+
+

 




 
setting :

 the NMSettingIP6Config
 
i :
index number of the DNS server to remove

 

 

 

@@ -1155,8 +1265,11 @@ Removes all configured addresses.
 

 Removes all configured DNS servers.
 

-

+

+++

 


 

 
setting :

 the NMSettingIP6Config
@@ -1166,59 +1279,70 @@ Removes all configured DNS servers.
 
 

 

-
nm_setting_ip6_config_clear_dns_searches ()

-
void                nm_setting_ip6_config_clear_dns_searches
+
nm_setting_ip6_config_get_num_dns_searches ()

+
guint32             nm_setting_ip6_config_get_num_dns_searches
                                                         (NMSettingIP6Config *setting);

-

-Removes all configured DNS search domains.
-

-

+

+-
++
+
+
-
+
+
+
+
+
+

 




 
setting :

 the NMSettingIP6Config
 
Returns :
the number of configured DNS search domains

 

 

 

 

-
nm_setting_ip6_config_clear_routes ()

-
void                nm_setting_ip6_config_clear_routes  (NMSettingIP6Config *setting);

-

-Removes all configured routes.
-

-

+
nm_setting_ip6_config_get_dns_search ()

+
const char *        nm_setting_ip6_config_get_dns_search
+                                                        (NMSettingIP6Config *setting,
+                                                         guint32 i);

+

+-
++
+
+
-
+
+
+
+
+
+
+
+
+
+

 




 
setting :

 the NMSettingIP6Config
 
i :
index number of the DNS search domain to return
Returns :
the DNS search domain at index i
+

 

 

 

 

-
nm_setting_ip6_config_error_quark ()

-
GQuark              nm_setting_ip6_config_error_quark   (void);

+
nm_setting_ip6_config_add_dns_search ()

+
gboolean            nm_setting_ip6_config_add_dns_search
+                                                        (NMSettingIP6Config *setting,
+                                                         const char *dns_search);

 

-Registers an error quark for NMSettingIP6Config if necessary.
+Adds a new DNS search domain to the setting.
 

-

--
-
-
-
-


Returns :
the error quark used for NMSettingIP6Config errors.

-

-

-

-
nm_setting_ip6_config_get_address ()

-
NMIP6Address *      nm_setting_ip6_config_get_address   (NMSettingIP6Config *setting,
-                                                         guint32 i);

-

+

+++
@@ -1226,28 +1350,32 @@ Registers an error quark for 
 
-
-
+
+
-
+

 


 
 

 
setting :

 
i :
index number of the address to return
dns_search :
the search domain to add
 

 

 
Returns :
the address at index i
-
+TRUE if the DNS search domain was added; FALSE if the search
+domain was already known
 

 
 

 

 

 

-
nm_setting_ip6_config_get_dhcp_hostname ()

-
const char *        nm_setting_ip6_config_get_dhcp_hostname
-                                                        (NMSettingIP6Config *setting);

+
nm_setting_ip6_config_remove_dns_search ()

+
void                nm_setting_ip6_config_remove_dns_search
+                                                        (NMSettingIP6Config *setting,
+                                                         guint32 i);

 

-Returns the value contained in the "dhcp-hostname"
-property.
+Removes the DNS search domain at index i.
 

-

+

+++
@@ -1255,20 +1383,42 @@ property.
 
-
-
+
+

 


 
 

 
setting :

 

 
Returns :
the configured hostname to send to the DHCP server
i :
index number of the DNS search domain
 

 
 

-
Since 0.9.8

 

 

 

-
nm_setting_ip6_config_get_dns ()

-
const struct in6_addr * nm_setting_ip6_config_get_dns   (NMSettingIP6Config *setting,
-                                                         guint32 i);

-

+
nm_setting_ip6_config_clear_dns_searches ()

+
void                nm_setting_ip6_config_clear_dns_searches
+                                                        (NMSettingIP6Config *setting);

+

+Removes all configured DNS search domains.
+

+

++++
+
+
+
+
+




setting :
the NMSettingIP6Config
+

+

+

+

+
nm_setting_ip6_config_get_num_addresses ()

+
guint32             nm_setting_ip6_config_get_num_addresses
+                                                        (NMSettingIP6Config *setting);

+

+++
@@ -1276,25 +1426,22 @@ property.
 
-
-
-
-
-
+

 


 
 

 
setting :

 

 
i :
index number of the DNS server to return

 
Returns :
the IPv6 address of the DNS server at index i. [transfer none]
-the number of configured addresses
 

 
 

 

 

 

-
nm_setting_ip6_config_get_dns_search ()

-
const char *        nm_setting_ip6_config_get_dns_search
-                                                        (NMSettingIP6Config *setting,
+
nm_setting_ip6_config_get_address ()

+
NMIP6Address *      nm_setting_ip6_config_get_address   (NMSettingIP6Config *setting,
                                                          guint32 i);

-

+

+++
@@ -1303,11 +1450,11 @@ property.
 
-
+
-
@@ -1315,15 +1462,18 @@ property.
 

-
nm_setting_ip6_config_get_ignore_auto_dns ()

-
gboolean            nm_setting_ip6_config_get_ignore_auto_dns
-                                                        (NMSettingIP6Config *setting);

+
nm_setting_ip6_config_add_address ()

+
gboolean            nm_setting_ip6_config_add_address   (NMSettingIP6Config *setting,
+                                                         NMIP6Address *address);

 

-Returns the value contained in the "ignore-auto-dns"
-property.
+Adds a new IPv6 address and associated information to the setting.  The
+given address is duplicated internally and is not changed by this function.
 

-

 


 
 

 
setting :

 

 
i :
index number of the DNS search domain to returnindex number of the address to return
 

 

 
Returns :
the DNS search domain at index i
+the address at index i
 
 

 
 
 

+

+++
@@ -1331,25 +1481,32 @@ property.
 
+
+
+
+
+TRUE if the address was added; FALSE if the address was already
+known.

 


 
 

 
setting :

 

 
address :
the new address to add

 
Returns :

 
-TRUE if automatically configured (ie via DHCP or router
-advertisements) DNS information should be ignored.
 

 
 

 

 

 

-
nm_setting_ip6_config_get_ignore_auto_routes ()

-
gboolean            nm_setting_ip6_config_get_ignore_auto_routes
-                                                        (NMSettingIP6Config *setting);

+
nm_setting_ip6_config_remove_address ()

+
void                nm_setting_ip6_config_remove_address
+                                                        (NMSettingIP6Config *setting,
+                                                         guint32 i);

 

-Returns the value contained in the "ignore-auto-routes"
-property.
+Removes the address at index i.
 

-

+

+++
@@ -1357,48 +1514,42 @@ property.
 
-
-
+
+

 


 
 

 
setting :

 

 
Returns :

-TRUE if automatically configured (ie via DHCP) routes should be
-ignored.
i :
index number of the address to remove
 

 
 

 

 

 

-
nm_setting_ip6_config_get_ip6_privacy ()

-
NMSettingIP6ConfigPrivacy nm_setting_ip6_config_get_ip6_privacy
+
nm_setting_ip6_config_clear_addresses ()

+
void                nm_setting_ip6_config_clear_addresses
                                                         (NMSettingIP6Config *setting);

 

-Returns the value contained in the "ip6-privacy"
-property.
+Removes all configured addresses.
 

-

+

+-
-
++
+
-
-
-
-
-
-
+

 




 
setting :

 the NMSettingIP6Config
 
Returns :
IPv6 Privacy Extensions configuration value (NMSettingIP6ConfigPrivacy).

 

 

 

 

-
nm_setting_ip6_config_get_may_fail ()

-
gboolean            nm_setting_ip6_config_get_may_fail  (NMSettingIP6Config *setting);

-

-Returns the value contained in the "may-fail"
-property.
-

-

+
nm_setting_ip6_config_get_num_routes ()

+
guint32             nm_setting_ip6_config_get_num_routes
+                                                        (NMSettingIP6Config *setting);

+

+++
@@ -1407,19 +1558,21 @@ property.
 
-
+

 


 
 

 
setting :

 

 
Returns :

-TRUE if this connection doesn't require IPv6 addressing to complete
-for the connection to succeed.the number of configured routes
 

 
 

 

 

 

-
nm_setting_ip6_config_get_method ()

-
const char *        nm_setting_ip6_config_get_method    (NMSettingIP6Config *setting);

-

+
nm_setting_ip6_config_get_route ()

+
NMIP6Route *        nm_setting_ip6_config_get_route     (NMSettingIP6Config *setting,
+                                                         guint32 i);

+

+++
@@ -1427,23 +1580,31 @@ for the connection to succeed.
+
+
+
+
-
+

 


 
 

 
setting :

 
 

 
i :
index number of the route to return

 
Returns :
the "method" property of the settingthe route at index i
+
 

 
 

 

 

 

-
nm_setting_ip6_config_get_never_default ()

-
gboolean            nm_setting_ip6_config_get_never_default
-                                                        (NMSettingIP6Config *setting);

+
nm_setting_ip6_config_add_route ()

+
gboolean            nm_setting_ip6_config_add_route     (NMSettingIP6Config *setting,
+                                                         NMIP6Route *route);

 

-Returns the value contained in the "never-default"
-property.
+Adds a new IPv6 route and associated information to the setting.  The
+given route is duplicated internally and is not changed by this function.
 

-

+

+++
@@ -1451,40 +1612,30 @@ property.
 
-
-
-
-
-

 


 
 

 
setting :

 

 
Returns :

-TRUE if this connection should never be the default connection
-for IPv6 addressing

-

-

-

-
nm_setting_ip6_config_get_num_addresses ()

-
guint32             nm_setting_ip6_config_get_num_addresses
-                                                        (NMSettingIP6Config *setting);

-

--
-
-
-
+
+
-
+


setting :
the NMSettingIP6Config
-
route :
the route to add
 

 

 
Returns :
the number of configured addresses
+TRUE if the route was added; FALSE if the route was already known.
 

 
 

 

 

 

-
nm_setting_ip6_config_get_num_dns ()

-
guint32             nm_setting_ip6_config_get_num_dns   (NMSettingIP6Config *setting);

-

+
nm_setting_ip6_config_remove_route ()

+
void                nm_setting_ip6_config_remove_route  (NMSettingIP6Config *setting,
+                                                         guint32 i);

+

+Removes the route at index i.
+

+

+++
@@ -1492,39 +1643,45 @@ for IPv6 addressing
-
-
+
+

 


 
 

 
setting :

 
 

 
Returns :
the number of configured DNS servers
i :
index number of the route
 

 
 

 

 

 

-
nm_setting_ip6_config_get_num_dns_searches ()

-
guint32             nm_setting_ip6_config_get_num_dns_searches
-                                                        (NMSettingIP6Config *setting);

-

+
nm_setting_ip6_config_clear_routes ()

+
void                nm_setting_ip6_config_clear_routes  (NMSettingIP6Config *setting);

+

+Removes all configured routes.
+

+

+-
-
++
+
-
-
-
-
-
-
+

 




 
setting :

 the NMSettingIP6Config
 
Returns :
the number of configured DNS search domains

 

 

 

 

-
nm_setting_ip6_config_get_num_routes ()

-
guint32             nm_setting_ip6_config_get_num_routes
+
nm_setting_ip6_config_get_ignore_auto_routes ()

+
gboolean            nm_setting_ip6_config_get_ignore_auto_routes
                                                         (NMSettingIP6Config *setting);

-

+

+Returns the value contained in the "ignore-auto-routes"
+property.
+

+

+++
@@ -1533,18 +1690,27 @@ for IPv6 addressing
-
+

 


 
 

 
setting :

 

 

 
Returns :
the number of configured routes
+TRUE if automatically configured (ie via DHCP) routes should be
+ignored.
 

 
 

 

 

 

-
nm_setting_ip6_config_get_route ()

-
NMIP6Route *        nm_setting_ip6_config_get_route     (NMSettingIP6Config *setting,
-                                                         guint32 i);

-

+
nm_setting_ip6_config_get_ignore_auto_dns ()

+
gboolean            nm_setting_ip6_config_get_ignore_auto_dns
+                                                        (NMSettingIP6Config *setting);

+

+Returns the value contained in the "ignore-auto-dns"
+property.
+

+

+++
@@ -1552,44 +1718,28 @@ for IPv6 addressing
-
-
-
-
-
+

 


 
 

 
setting :

 
 

 
i :
index number of the route to return

 
Returns :
the route at index i
-
+TRUE if automatically configured (ie via DHCP or router
+advertisements) DNS information should be ignored.
 

 
 

 

 

 

-
nm_setting_ip6_config_new ()

-
NMSetting *         nm_setting_ip6_config_new           (void);

-

-Creates a new NMSettingIP6Config object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSettingIP6Config object. [transfer full]
-

-

-

-

-
nm_setting_ip6_config_remove_address ()

-
void                nm_setting_ip6_config_remove_address
-                                                        (NMSettingIP6Config *setting,
-                                                         guint32 i);

+
nm_setting_ip6_config_get_dhcp_hostname ()

+
const char *        nm_setting_ip6_config_get_dhcp_hostname
+                                                        (NMSettingIP6Config *setting);

 

-Removes the address at index i.
+Returns the value contained in the "dhcp-hostname"
+property.
 

-

+

+++
@@ -1597,22 +1747,27 @@ Removes the address at index i.
 
-
-
+
+

 


 
 

 
setting :

 

 
i :
index number of the address to remove
Returns :
the configured hostname to send to the DHCP server
 

 
 

+
Since 0.9.8

 

 

 

-
nm_setting_ip6_config_remove_dns ()

-
void                nm_setting_ip6_config_remove_dns    (NMSettingIP6Config *setting,
-                                                         guint32 i);

+
nm_setting_ip6_config_get_never_default ()

+
gboolean            nm_setting_ip6_config_get_never_default
+                                                        (NMSettingIP6Config *setting);

 

-Removes the DNS server at index i.
+Returns the value contained in the "never-default"
+property.
 

-

+

+++
@@ -1620,23 +1775,27 @@ Removes the DNS server at index i.
 
-
-
+
+

 


 
 

 
setting :

 

 
i :
index number of the DNS server to remove
Returns :

+TRUE if this connection should never be the default connection
+for IPv6 addressing
 

 
 

 

 

 

-
nm_setting_ip6_config_remove_dns_search ()

-
void                nm_setting_ip6_config_remove_dns_search
-                                                        (NMSettingIP6Config *setting,
-                                                         guint32 i);

+
nm_setting_ip6_config_get_may_fail ()

+
gboolean            nm_setting_ip6_config_get_may_fail  (NMSettingIP6Config *setting);

 

-Removes the DNS search domain at index i.
+Returns the value contained in the "may-fail"
+property.
 

-

+

+++
@@ -1644,22 +1803,28 @@ Removes the DNS search domain at index i
-
-
+
+

 


 
 

 
setting :

 
 

 
i :
index number of the DNS search domain
Returns :

+TRUE if this connection doesn't require IPv6 addressing to complete
+for the connection to succeed.
 

 
 

 

 

 

-
nm_setting_ip6_config_remove_route ()

-
void                nm_setting_ip6_config_remove_route  (NMSettingIP6Config *setting,
-                                                         guint32 i);

+
nm_setting_ip6_config_get_ip6_privacy ()

+
NMSettingIP6ConfigPrivacy nm_setting_ip6_config_get_ip6_privacy
+                                                        (NMSettingIP6Config *setting);

 

-Removes the route at index i.
+Returns the value contained in the "ip6-privacy"
+property.
 

-

+

+++
@@ -1667,8 +1832,8 @@ Removes the route at index i.
 
-
-
+
+

 


 
 

 
setting :

 

 
i :
index number of the route
Returns :
IPv6 Privacy Extensions configuration value (NMSettingIP6ConfigPrivacy).
 

 
 

@@ -1765,7 +1930,7 @@ in some applications, on the other hand.  The permitted values
 are: 0: disabled, 1: enabled (prefer public address),
 2: enabled (prefer temporary addresses).
 

-
Allowed values: [G_MAXULONG,2]

+
Allowed values: [-1,2]

 
Default value: -1

 

 

@@ -1794,7 +1959,7 @@ of DHCP only, specify 'dhcp'; this  method is only valid for ethernet-
 based hardware.  If 'link-local' is specified, then an IPv6 link-local
 address will be assigned to the interface.  If 'manual' is specified,
 static IP addressing is used and at least one IP address must be given
-in the 'addresses' property.  If 'ignored' is specified, IPv6
+in the 'addresses' property.  If 'ignore' is specified, IPv6
 configuration is not done. This property must be set.  NOTE: the 'shared'
 method are not yet supported.
 

@@ -1829,6 +1994,6 @@ automatic configuration.  Routes cannot be used with the 'shared' or
 
 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingInfiniband.html b/docs/libnm-util/html/NMSettingInfiniband.html
index 03755208..a5c4b46c 100644
--- a/docs/libnm-util/html/NMSettingInfiniband.html
+++ b/docs/libnm-util/html/NMSettingInfiniband.html
@@ -3,12 +3,12 @@
 
 
 NMSettingInfiniband
-
+
 
 
 
 
-
+
 
 
 
@@ -44,34 +44,34 @@
 
 #include <nm-setting-infiniband.h>
 
-                    NMSettingInfiniband;
-                    NMSettingInfinibandClass;
+#define             NM_SETTING_INFINIBAND_SETTING_NAME
 enum                NMSettingInfinibandError;
 #define             NM_SETTING_INFINIBAND_ERROR
+GQuark              nm_setting_infiniband_error_quark   (void);
 #define             NM_SETTING_INFINIBAND_MAC_ADDRESS
 #define             NM_SETTING_INFINIBAND_MTU
-#define             NM_SETTING_INFINIBAND_SETTING_NAME
 #define             NM_SETTING_INFINIBAND_TRANSPORT_MODE
-GQuark              nm_setting_infiniband_error_quark   (void);
+                    NMSettingInfiniband;
+                    NMSettingInfinibandClass;
+NMSetting *         nm_setting_infiniband_new           (void);
 const GByteArray *  nm_setting_infiniband_get_mac_address
                                                         (NMSettingInfiniband *setting);
 guint32             nm_setting_infiniband_get_mtu       (NMSettingInfiniband *setting);
 const char *        nm_setting_infiniband_get_transport_mode
                                                         (NMSettingInfiniband *setting);
-NMSetting *         nm_setting_infiniband_new           (void);
 

 
 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingInfinibandError
+

 
   GObject
    +----NMSetting
          +----NMSettingInfiniband
 

-
-  GEnum
-   +----NMSettingInfinibandError
-

 

 

 
Properties

@@ -91,23 +91,8 @@ necessary for connection to IP-over-InfiniBand networks.
 

 
Details

 

-
NMSettingInfiniband

-
typedef struct _NMSettingInfiniband NMSettingInfiniband;

-

-

-

-

-

-
NMSettingInfinibandClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingInfinibandClass;
+
NM_SETTING_INFINIBAND_SETTING_NAME

+
#define NM_SETTING_INFINIBAND_SETTING_NAME "infiniband"
 

 

 

@@ -121,8 +106,11 @@ necessary for connection to IP-over-InfiniBand networks.
 	NM_SETTING_INFINIBAND_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
 } NMSettingInfinibandError;
 

-

+

+++
@@ -153,6 +141,24 @@ required
 

+
nm_setting_infiniband_error_quark ()

+
GQuark              nm_setting_infiniband_error_quark   (void);

+

+Registers an error quark for NMSettingInfiniband if necessary.
+

+

 


 
 

 
NM_SETTING_INFINIBAND_ERROR_UNKNOWN

 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingInfiniband errors.

+

+

+

 
NM_SETTING_INFINIBAND_MAC_ADDRESS

 
#define NM_SETTING_INFINIBAND_MAC_ADDRESS    "mac-address"
 

@@ -169,32 +175,51 @@ required
 

 

 

-
NM_SETTING_INFINIBAND_SETTING_NAME

-
#define NM_SETTING_INFINIBAND_SETTING_NAME "infiniband"
+
NM_SETTING_INFINIBAND_TRANSPORT_MODE

+
#define NM_SETTING_INFINIBAND_TRANSPORT_MODE "transport-mode"
 

 

 

 

 

 

-
NM_SETTING_INFINIBAND_TRANSPORT_MODE

-
#define NM_SETTING_INFINIBAND_TRANSPORT_MODE "transport-mode"
+
NMSettingInfiniband

+
typedef struct _NMSettingInfiniband NMSettingInfiniband;

+

+

+

+

+

+
NMSettingInfinibandClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingInfinibandClass;
 

 

 

 

 

 

-
nm_setting_infiniband_error_quark ()

-
GQuark              nm_setting_infiniband_error_quark   (void);

+
nm_setting_infiniband_new ()

+
NMSetting *         nm_setting_infiniband_new           (void);

 

-Registers an error quark for NMSettingInfiniband if necessary.
+Creates a new NMSettingInfiniband object with default values.
 

-

+

+++
-
+

 


 

 
Returns :
the error quark used for NMSettingInfiniband errors.the new empty NMSettingInfiniband object. [transfer full]
+
 

 

 

@@ -203,8 +228,11 @@ Registers an error quark for 
nm_setting_infiniband_get_mac_address ()

 
const GByteArray *  nm_setting_infiniband_get_mac_address
                                                         (NMSettingInfiniband *setting);

-

+

+++
@@ -222,8 +250,11 @@ Registers an error quark for 
 
nm_setting_infiniband_get_mtu ()
guint32             nm_setting_infiniband_get_mtu       (NMSettingInfiniband *setting);

-

 


 
 

 
setting :

 

+

+++
@@ -246,8 +277,11 @@ Registers an error quark for 
-

 


 
 

 
setting :

+

+++
 
@@ -261,22 +295,6 @@ Returns the transport mode for this device. Either 'datagram' or
 

 


 

 
setting :

 

 

-

-

-
nm_setting_infiniband_new ()

-
NMSetting *         nm_setting_infiniband_new           (void);

-

-Creates a new NMSettingInfiniband object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSettingInfiniband object. [transfer full]
-

-

 

 

 
Property Details

@@ -313,6 +331,6 @@ The IP-over-InfiniBand transport mode. Either 'datagram' or
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingOlpcMesh.html b/docs/libnm-util/html/NMSettingOlpcMesh.html
index fe2fa095..4b622152 100644
--- a/docs/libnm-util/html/NMSettingOlpcMesh.html
+++ b/docs/libnm-util/html/NMSettingOlpcMesh.html
@@ -3,12 +3,12 @@
 
 
 NMSettingOlpcMesh
-
+
 
 
 
 
-
+
 
 
 
@@ -41,33 +41,33 @@
 

 

 
Synopsis

-
                    NMSettingOlpcMesh;
-                    NMSettingOlpcMeshClass;
+
#define             NM_SETTING_OLPC_MESH_SETTING_NAME
 enum                NMSettingOlpcMeshError;
-#define             NM_SETTING_OLPC_MESH_CHANNEL
-#define             NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS
 #define             NM_SETTING_OLPC_MESH_ERROR
-#define             NM_SETTING_OLPC_MESH_SETTING_NAME
-#define             NM_SETTING_OLPC_MESH_SSID
 GQuark              nm_setting_olpc_mesh_error_quark    (void);
+#define             NM_SETTING_OLPC_MESH_SSID
+#define             NM_SETTING_OLPC_MESH_CHANNEL
+#define             NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS
+                    NMSettingOlpcMesh;
+                    NMSettingOlpcMeshClass;
+NMSetting *         nm_setting_olpc_mesh_new            (void);
+const GByteArray *  nm_setting_olpc_mesh_get_ssid       (NMSettingOlpcMesh *setting);
 guint32             nm_setting_olpc_mesh_get_channel    (NMSettingOlpcMesh *setting);
 const GByteArray *  nm_setting_olpc_mesh_get_dhcp_anycast_address
                                                         (NMSettingOlpcMesh *setting);
-const GByteArray *  nm_setting_olpc_mesh_get_ssid       (NMSettingOlpcMesh *setting);
-NMSetting *         nm_setting_olpc_mesh_new            (void);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingOlpcMeshError
+

 
   GObject
    +----NMSetting
          +----NMSettingOlpcMesh
 

-
-  GEnum
-   +----NMSettingOlpcMeshError
-

 

 

 
Properties

@@ -85,23 +85,8 @@ const 
 
Details

 

-
NMSettingOlpcMesh

-
typedef struct _NMSettingOlpcMesh NMSettingOlpcMesh;

-

-

-

-

-

-
NMSettingOlpcMeshClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingOlpcMeshClass;
+
NM_SETTING_OLPC_MESH_SETTING_NAME

+
#define NM_SETTING_OLPC_MESH_SETTING_NAME "802-11-olpc-mesh"
 

 

 

@@ -115,8 +100,11 @@ const 
+

+++
@@ -139,65 +127,83 @@ required
 

-
NM_SETTING_OLPC_MESH_CHANNEL

-
#define NM_SETTING_OLPC_MESH_CHANNEL              "channel"
+
NM_SETTING_OLPC_MESH_ERROR

+
#define NM_SETTING_OLPC_MESH_ERROR nm_setting_olpc_mesh_error_quark ()
 

 

 

 

-
NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS

-
#define NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS "dhcp-anycast-address"
-

+
nm_setting_olpc_mesh_error_quark ()

+
GQuark              nm_setting_olpc_mesh_error_quark    (void);

 

 

 

-
NM_SETTING_OLPC_MESH_ERROR

-
#define NM_SETTING_OLPC_MESH_ERROR nm_setting_olpc_mesh_error_quark ()
+
NM_SETTING_OLPC_MESH_SSID

+
#define NM_SETTING_OLPC_MESH_SSID                 "ssid"
 

 

 

 

-
NM_SETTING_OLPC_MESH_SETTING_NAME

-
#define NM_SETTING_OLPC_MESH_SETTING_NAME "802-11-olpc-mesh"
+
NM_SETTING_OLPC_MESH_CHANNEL

+
#define NM_SETTING_OLPC_MESH_CHANNEL              "channel"
 

 

 

 

-
NM_SETTING_OLPC_MESH_SSID

-
#define NM_SETTING_OLPC_MESH_SSID                 "ssid"
+
NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS

+
#define NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS "dhcp-anycast-address"
 

 

 

 

-
nm_setting_olpc_mesh_error_quark ()

-
GQuark              nm_setting_olpc_mesh_error_quark    (void);

+
NMSettingOlpcMesh

+
typedef struct _NMSettingOlpcMesh NMSettingOlpcMesh;

 

 

 

-
nm_setting_olpc_mesh_get_channel ()

-
guint32             nm_setting_olpc_mesh_get_channel    (NMSettingOlpcMesh *setting);

+
NMSettingOlpcMeshClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingOlpcMeshClass;
+

 

 

 

-
nm_setting_olpc_mesh_get_dhcp_anycast_address ()

-
const GByteArray *  nm_setting_olpc_mesh_get_dhcp_anycast_address
-                                                        (NMSettingOlpcMesh *setting);

+
nm_setting_olpc_mesh_new ()

+
NMSetting *         nm_setting_olpc_mesh_new            (void);

 

+Creates a new NMSettingOlpcMesh object with default values.
 

+

 


 
 

 
NM_SETTING_OLPC_MESH_ERROR_UNKNOWN

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

++++
+
+
+
+
+




Returns :
the new empty NMSettingOlpcMesh object

 

 

 

@@ -208,18 +214,18 @@ required
 

 

 

-
nm_setting_olpc_mesh_new ()

-
NMSetting *         nm_setting_olpc_mesh_new            (void);

+
nm_setting_olpc_mesh_get_channel ()

+
guint32             nm_setting_olpc_mesh_get_channel    (NMSettingOlpcMesh *setting);

+

+

+

+

+

+
nm_setting_olpc_mesh_get_dhcp_anycast_address ()

+
const GByteArray *  nm_setting_olpc_mesh_get_dhcp_anycast_address
+                                                        (NMSettingOlpcMesh *setting);

 

-Creates a new NMSettingOlpcMesh object with default values.
 

-

--
-
-
-
-


Returns :
the new empty NMSettingOlpcMesh object

 

 

 

@@ -254,6 +260,6 @@ SSID of the mesh network to join.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingPPP.html b/docs/libnm-util/html/NMSettingPPP.html
index c4d92133..9e13b48b 100644
--- a/docs/libnm-util/html/NMSettingPPP.html
+++ b/docs/libnm-util/html/NMSettingPPP.html
@@ -3,12 +3,12 @@
 
 
 NMSettingPPP
-
+
 
 
 
 
-
+
 
 
 
@@ -45,63 +45,63 @@ that require PPP to deliver IP capability

 
 #include <nm-setting-ppp.h>
 
-                    NMSettingPPP;
-                    NMSettingPPPClass;
+#define             NM_SETTING_PPP_SETTING_NAME
 enum                NMSettingPPPError;
-#define             NM_SETTING_PPP_BAUD
-#define             NM_SETTING_PPP_CRTSCTS
 #define             NM_SETTING_PPP_ERROR
-#define             NM_SETTING_PPP_LCP_ECHO_FAILURE
-#define             NM_SETTING_PPP_LCP_ECHO_INTERVAL
-#define             NM_SETTING_PPP_MPPE_STATEFUL
-#define             NM_SETTING_PPP_MRU
-#define             NM_SETTING_PPP_MTU
+GQuark              nm_setting_ppp_error_quark          (void);
 #define             NM_SETTING_PPP_NOAUTH
-#define             NM_SETTING_PPP_NOBSDCOMP
-#define             NM_SETTING_PPP_NODEFLATE
-#define             NM_SETTING_PPP_NO_VJ_COMP
-#define             NM_SETTING_PPP_REFUSE_CHAP
 #define             NM_SETTING_PPP_REFUSE_EAP
+#define             NM_SETTING_PPP_REFUSE_PAP
+#define             NM_SETTING_PPP_REFUSE_CHAP
 #define             NM_SETTING_PPP_REFUSE_MSCHAP
 #define             NM_SETTING_PPP_REFUSE_MSCHAPV2
-#define             NM_SETTING_PPP_REFUSE_PAP
+#define             NM_SETTING_PPP_NOBSDCOMP
+#define             NM_SETTING_PPP_NODEFLATE
+#define             NM_SETTING_PPP_NO_VJ_COMP
 #define             NM_SETTING_PPP_REQUIRE_MPPE
 #define             NM_SETTING_PPP_REQUIRE_MPPE_128
-#define             NM_SETTING_PPP_SETTING_NAME
-GQuark              nm_setting_ppp_error_quark          (void);
-guint32             nm_setting_ppp_get_baud             (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_crtscts          (NMSettingPPP *setting);
-guint32             nm_setting_ppp_get_lcp_echo_failure (NMSettingPPP *setting);
-guint32             nm_setting_ppp_get_lcp_echo_interval
-                                                        (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_mppe_stateful    (NMSettingPPP *setting);
-guint32             nm_setting_ppp_get_mru              (NMSettingPPP *setting);
-guint32             nm_setting_ppp_get_mtu              (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_no_vj_comp       (NMSettingPPP *setting);
+#define             NM_SETTING_PPP_MPPE_STATEFUL
+#define             NM_SETTING_PPP_CRTSCTS
+#define             NM_SETTING_PPP_BAUD
+#define             NM_SETTING_PPP_MRU
+#define             NM_SETTING_PPP_MTU
+#define             NM_SETTING_PPP_LCP_ECHO_FAILURE
+#define             NM_SETTING_PPP_LCP_ECHO_INTERVAL
+                    NMSettingPPP;
+                    NMSettingPPPClass;
+NMSetting *         nm_setting_ppp_new                  (void);
 gboolean            nm_setting_ppp_get_noauth           (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_nobsdcomp        (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_nodeflate        (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_refuse_chap      (NMSettingPPP *setting);
 gboolean            nm_setting_ppp_get_refuse_eap       (NMSettingPPP *setting);
+gboolean            nm_setting_ppp_get_refuse_pap       (NMSettingPPP *setting);
+gboolean            nm_setting_ppp_get_refuse_chap      (NMSettingPPP *setting);
 gboolean            nm_setting_ppp_get_refuse_mschap    (NMSettingPPP *setting);
 gboolean            nm_setting_ppp_get_refuse_mschapv2  (NMSettingPPP *setting);
-gboolean            nm_setting_ppp_get_refuse_pap       (NMSettingPPP *setting);
+gboolean            nm_setting_ppp_get_nobsdcomp        (NMSettingPPP *setting);
+gboolean            nm_setting_ppp_get_nodeflate        (NMSettingPPP *setting);
+gboolean            nm_setting_ppp_get_no_vj_comp       (NMSettingPPP *setting);
 gboolean            nm_setting_ppp_get_require_mppe     (NMSettingPPP *setting);
 gboolean            nm_setting_ppp_get_require_mppe_128 (NMSettingPPP *setting);
-NMSetting *         nm_setting_ppp_new                  (void);
+gboolean            nm_setting_ppp_get_mppe_stateful    (NMSettingPPP *setting);
+gboolean            nm_setting_ppp_get_crtscts          (NMSettingPPP *setting);
+guint32             nm_setting_ppp_get_baud             (NMSettingPPP *setting);
+guint32             nm_setting_ppp_get_mru              (NMSettingPPP *setting);
+guint32             nm_setting_ppp_get_mtu              (NMSettingPPP *setting);
+guint32             nm_setting_ppp_get_lcp_echo_failure (NMSettingPPP *setting);
+guint32             nm_setting_ppp_get_lcp_echo_interval
+                                                        (NMSettingPPP *setting);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingPPPError
+

 
   GObject
    +----NMSetting
          +----NMSettingPPP
 

-
-  GEnum
-   +----NMSettingPPPError
-

 

 

 
Properties

@@ -137,23 +137,8 @@ cable and DSL modems and some mobile broadband devices.
 

 
Details

 

-
NMSettingPPP

-
typedef struct _NMSettingPPP NMSettingPPP;

-

-

-

-

-

-
NMSettingPPPClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingPPPClass;
+
NM_SETTING_PPP_SETTING_NAME

+
#define NM_SETTING_PPP_SETTING_NAME "ppp"
 

 

 

@@ -168,8 +153,11 @@ cable and DSL modems and some mobile broadband devices.
 	NM_SETTING_PPP_ERROR_REQUIRE_MPPE_NOT_ALLOWED /*< nick=RequireMPPENotAllowed >*/
 } NMSettingPPPError;
 

-

+

+++
@@ -198,185 +186,225 @@ with other setting configuration parameters
 

-
NM_SETTING_PPP_BAUD

-
#define NM_SETTING_PPP_BAUD              "baud"
+
NM_SETTING_PPP_ERROR

+
#define NM_SETTING_PPP_ERROR nm_setting_ppp_error_quark ()
 

 

 

 

-
NM_SETTING_PPP_CRTSCTS

-
#define NM_SETTING_PPP_CRTSCTS           "crtscts"
+
nm_setting_ppp_error_quark ()

+
GQuark              nm_setting_ppp_error_quark          (void);

+

+Registers an error quark for NMSettingPPP if necessary.
+

+

 


 
 

 
NM_SETTING_PPP_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingPPP errors.

+

+

+

+
NM_SETTING_PPP_NOAUTH

+
#define NM_SETTING_PPP_NOAUTH            "noauth"
 

 

 

 

 

 

-
NM_SETTING_PPP_ERROR

-
#define NM_SETTING_PPP_ERROR nm_setting_ppp_error_quark ()
+
NM_SETTING_PPP_REFUSE_EAP

+
#define NM_SETTING_PPP_REFUSE_EAP        "refuse-eap"
 

 

 

 

 

 

-
NM_SETTING_PPP_LCP_ECHO_FAILURE

-
#define NM_SETTING_PPP_LCP_ECHO_FAILURE  "lcp-echo-failure"
+
NM_SETTING_PPP_REFUSE_PAP

+
#define NM_SETTING_PPP_REFUSE_PAP        "refuse-pap"
 

 

 

 

 

 

-
NM_SETTING_PPP_LCP_ECHO_INTERVAL

-
#define NM_SETTING_PPP_LCP_ECHO_INTERVAL "lcp-echo-interval"
+
NM_SETTING_PPP_REFUSE_CHAP

+
#define NM_SETTING_PPP_REFUSE_CHAP       "refuse-chap"
 

 

 

 

 

 

-
NM_SETTING_PPP_MPPE_STATEFUL

-
#define NM_SETTING_PPP_MPPE_STATEFUL     "mppe-stateful"
+
NM_SETTING_PPP_REFUSE_MSCHAP

+
#define NM_SETTING_PPP_REFUSE_MSCHAP     "refuse-mschap"
 

 

 

 

 

 

-
NM_SETTING_PPP_MRU

-
#define NM_SETTING_PPP_MRU               "mru"
+
NM_SETTING_PPP_REFUSE_MSCHAPV2

+
#define NM_SETTING_PPP_REFUSE_MSCHAPV2   "refuse-mschapv2"
 

 

 

 

 

 

-
NM_SETTING_PPP_MTU

-
#define NM_SETTING_PPP_MTU               "mtu"
+
NM_SETTING_PPP_NOBSDCOMP

+
#define NM_SETTING_PPP_NOBSDCOMP         "nobsdcomp"
 

 

 

 

 

 

-
NM_SETTING_PPP_NOAUTH

-
#define NM_SETTING_PPP_NOAUTH            "noauth"
+
NM_SETTING_PPP_NODEFLATE

+
#define NM_SETTING_PPP_NODEFLATE         "nodeflate"
 

 

 

 

 

 

-
NM_SETTING_PPP_NOBSDCOMP

-
#define NM_SETTING_PPP_NOBSDCOMP         "nobsdcomp"
+
NM_SETTING_PPP_NO_VJ_COMP

+
#define NM_SETTING_PPP_NO_VJ_COMP        "no-vj-comp"
 

 

 

 

 

 

-
NM_SETTING_PPP_NODEFLATE

-
#define NM_SETTING_PPP_NODEFLATE         "nodeflate"
+
NM_SETTING_PPP_REQUIRE_MPPE

+
#define NM_SETTING_PPP_REQUIRE_MPPE      "require-mppe"
 

 

 

 

 

 

-
NM_SETTING_PPP_NO_VJ_COMP

-
#define NM_SETTING_PPP_NO_VJ_COMP        "no-vj-comp"
+
NM_SETTING_PPP_REQUIRE_MPPE_128

+
#define NM_SETTING_PPP_REQUIRE_MPPE_128  "require-mppe-128"
 

 

 

 

 

 

-
NM_SETTING_PPP_REFUSE_CHAP

-
#define NM_SETTING_PPP_REFUSE_CHAP       "refuse-chap"
+
NM_SETTING_PPP_MPPE_STATEFUL

+
#define NM_SETTING_PPP_MPPE_STATEFUL     "mppe-stateful"
 

 

 

 

 

 

-
NM_SETTING_PPP_REFUSE_EAP

-
#define NM_SETTING_PPP_REFUSE_EAP        "refuse-eap"
+
NM_SETTING_PPP_CRTSCTS

+
#define NM_SETTING_PPP_CRTSCTS           "crtscts"
 

 

 

 

 

 

-
NM_SETTING_PPP_REFUSE_MSCHAP

-
#define NM_SETTING_PPP_REFUSE_MSCHAP     "refuse-mschap"
+
NM_SETTING_PPP_BAUD

+
#define NM_SETTING_PPP_BAUD              "baud"
 

 

 

 

 

 

-
NM_SETTING_PPP_REFUSE_MSCHAPV2

-
#define NM_SETTING_PPP_REFUSE_MSCHAPV2   "refuse-mschapv2"
+
NM_SETTING_PPP_MRU

+
#define NM_SETTING_PPP_MRU               "mru"
 

 

 

 

 

 

-
NM_SETTING_PPP_REFUSE_PAP

-
#define NM_SETTING_PPP_REFUSE_PAP        "refuse-pap"
+
NM_SETTING_PPP_MTU

+
#define NM_SETTING_PPP_MTU               "mtu"
 

 

 

 

 

 

-
NM_SETTING_PPP_REQUIRE_MPPE

-
#define NM_SETTING_PPP_REQUIRE_MPPE      "require-mppe"
+
NM_SETTING_PPP_LCP_ECHO_FAILURE

+
#define NM_SETTING_PPP_LCP_ECHO_FAILURE  "lcp-echo-failure"
 

 

 

 

 

 

-
NM_SETTING_PPP_REQUIRE_MPPE_128

-
#define NM_SETTING_PPP_REQUIRE_MPPE_128  "require-mppe-128"
+
NM_SETTING_PPP_LCP_ECHO_INTERVAL

+
#define NM_SETTING_PPP_LCP_ECHO_INTERVAL "lcp-echo-interval"
 

 

 

 

 

 

-
NM_SETTING_PPP_SETTING_NAME

-
#define NM_SETTING_PPP_SETTING_NAME "ppp"
+
NMSettingPPP

+
typedef struct _NMSettingPPP NMSettingPPP;

+

+

+

+

+

+
NMSettingPPPClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingPPPClass;
 

 

 

 

 

 

-
nm_setting_ppp_error_quark ()

-
GQuark              nm_setting_ppp_error_quark          (void);

+
nm_setting_ppp_new ()

+
NMSetting *         nm_setting_ppp_new                  (void);

 

-Registers an error quark for NMSettingPPP if necessary.
+Creates a new NMSettingPPP object with default values.
 

-

+

+++
-
+

 


 

 
Returns :
the error quark used for NMSettingPPP errors.the new empty NMSettingPPP object. [transfer full]
+
 

 

 

 

 

-
nm_setting_ppp_get_baud ()

-
guint32             nm_setting_ppp_get_baud             (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_noauth ()

+
gboolean            nm_setting_ppp_get_noauth           (NMSettingPPP *setting);

+

+++
@@ -385,17 +413,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "baud" property of the settingthe "noauth" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_crtscts ()

-
gboolean            nm_setting_ppp_get_crtscts          (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_refuse_eap ()

+
gboolean            nm_setting_ppp_get_refuse_eap       (NMSettingPPP *setting);

+

+++
@@ -404,17 +435,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "crtscts" property of the settingthe "refuse-eap" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_lcp_echo_failure ()

-
guint32             nm_setting_ppp_get_lcp_echo_failure (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_refuse_pap ()

+
gboolean            nm_setting_ppp_get_refuse_pap       (NMSettingPPP *setting);

+

+++
@@ -423,18 +457,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "lcp-echo-failure" property of the settingthe "refuse-pap" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_lcp_echo_interval ()

-
guint32             nm_setting_ppp_get_lcp_echo_interval
-                                                        (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_refuse_chap ()

+
gboolean            nm_setting_ppp_get_refuse_chap      (NMSettingPPP *setting);

+

+++
@@ -443,17 +479,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "lcp-echo-interval" property of the settingthe "refuse-chap" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_mppe_stateful ()

-
gboolean            nm_setting_ppp_get_mppe_stateful    (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_refuse_mschap ()

+
gboolean            nm_setting_ppp_get_refuse_mschap    (NMSettingPPP *setting);

+

+++
@@ -462,17 +501,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "mppe-stateful" property of the settingthe "refuse-mschap" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_mru ()

-
guint32             nm_setting_ppp_get_mru              (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_refuse_mschapv2 ()

+
gboolean            nm_setting_ppp_get_refuse_mschapv2  (NMSettingPPP *setting);

+

+++
@@ -481,17 +523,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "mru" property of the settingthe "refuse-mschapv2" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_mtu ()

-
guint32             nm_setting_ppp_get_mtu              (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_nobsdcomp ()

+
gboolean            nm_setting_ppp_get_nobsdcomp        (NMSettingPPP *setting);

+

+++
@@ -500,17 +545,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "mtu" property of the settingthe "nobsdcomp" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_no_vj_comp ()

-
gboolean            nm_setting_ppp_get_no_vj_comp       (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_nodeflate ()

+
gboolean            nm_setting_ppp_get_nodeflate        (NMSettingPPP *setting);

+

+++
@@ -519,17 +567,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "no-vj-comp" property of the settingthe "nodeflate" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_noauth ()

-
gboolean            nm_setting_ppp_get_noauth           (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_no_vj_comp ()

+
gboolean            nm_setting_ppp_get_no_vj_comp       (NMSettingPPP *setting);

+

+++
@@ -538,17 +589,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "noauth" property of the settingthe "no-vj-comp" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_nobsdcomp ()

-
gboolean            nm_setting_ppp_get_nobsdcomp        (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_require_mppe ()

+
gboolean            nm_setting_ppp_get_require_mppe     (NMSettingPPP *setting);

+

+++
@@ -557,17 +611,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "nobsdcomp" property of the settingthe "require-mppe" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_nodeflate ()

-
gboolean            nm_setting_ppp_get_nodeflate        (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_require_mppe_128 ()

+
gboolean            nm_setting_ppp_get_require_mppe_128 (NMSettingPPP *setting);

+

+++
@@ -576,17 +633,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "nodeflate" property of the settingthe "require-mppe-128" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_refuse_chap ()

-
gboolean            nm_setting_ppp_get_refuse_chap      (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_mppe_stateful ()

+
gboolean            nm_setting_ppp_get_mppe_stateful    (NMSettingPPP *setting);

+

+++
@@ -595,17 +655,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "refuse-chap" property of the settingthe "mppe-stateful" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_refuse_eap ()

-
gboolean            nm_setting_ppp_get_refuse_eap       (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_crtscts ()

+
gboolean            nm_setting_ppp_get_crtscts          (NMSettingPPP *setting);

+

+++
@@ -614,17 +677,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "refuse-eap" property of the settingthe "crtscts" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_refuse_mschap ()

-
gboolean            nm_setting_ppp_get_refuse_mschap    (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_baud ()

+
guint32             nm_setting_ppp_get_baud             (NMSettingPPP *setting);

+

+++
@@ -633,17 +699,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "refuse-mschap" property of the settingthe "baud" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_refuse_mschapv2 ()

-
gboolean            nm_setting_ppp_get_refuse_mschapv2  (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_mru ()

+
guint32             nm_setting_ppp_get_mru              (NMSettingPPP *setting);

+

+++
@@ -652,17 +721,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "refuse-mschapv2" property of the settingthe "mru" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_refuse_pap ()

-
gboolean            nm_setting_ppp_get_refuse_pap       (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_mtu ()

+
guint32             nm_setting_ppp_get_mtu              (NMSettingPPP *setting);

+

+++
@@ -671,17 +743,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "refuse-pap" property of the settingthe "mtu" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_require_mppe ()

-
gboolean            nm_setting_ppp_get_require_mppe     (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_lcp_echo_failure ()

+
guint32             nm_setting_ppp_get_lcp_echo_failure (NMSettingPPP *setting);

+

+++
@@ -690,17 +765,21 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "require-mppe" property of the settingthe "lcp-echo-failure" property of the setting
 

 
 

 

 

 

-
nm_setting_ppp_get_require_mppe_128 ()

-
gboolean            nm_setting_ppp_get_require_mppe_128 (NMSettingPPP *setting);

-

+
nm_setting_ppp_get_lcp_echo_interval ()

+
guint32             nm_setting_ppp_get_lcp_echo_interval
+                                                        (NMSettingPPP *setting);

+

+++
@@ -709,27 +788,11 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "require-mppe-128" property of the settingthe "lcp-echo-interval" property of the setting
 

 
 

 

-

-

-
nm_setting_ppp_new ()

-
NMSetting *         nm_setting_ppp_new                  (void);

-

-Creates a new NMSettingPPP object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSettingPPP object. [transfer full]
-

-

 

 

 
Property Details

@@ -920,6 +983,6 @@ be set to TRUE.  If 128-bit MPPE is not available the session will fail.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingPPPOE.html b/docs/libnm-util/html/NMSettingPPPOE.html
index 3f20ccec..fd91a0ad 100644
--- a/docs/libnm-util/html/NMSettingPPPOE.html
+++ b/docs/libnm-util/html/NMSettingPPPOE.html
@@ -3,12 +3,12 @@
 
 
 NMSettingPPPOE
-
+
 
 
 
 
-
+
 
 
 
@@ -44,35 +44,35 @@
 
 #include <nm-setting-pppoe.h>
 
-                    NMSettingPPPOE;
-                    NMSettingPPPOEClass;
+#define             NM_SETTING_PPPOE_SETTING_NAME
 enum                NMSettingPPPOEError;
 #define             NM_SETTING_PPPOE_ERROR
-#define             NM_SETTING_PPPOE_PASSWORD
-#define             NM_SETTING_PPPOE_PASSWORD_FLAGS
+GQuark              nm_setting_pppoe_error_quark        (void);
 #define             NM_SETTING_PPPOE_SERVICE
-#define             NM_SETTING_PPPOE_SETTING_NAME
 #define             NM_SETTING_PPPOE_USERNAME
-GQuark              nm_setting_pppoe_error_quark        (void);
+#define             NM_SETTING_PPPOE_PASSWORD
+#define             NM_SETTING_PPPOE_PASSWORD_FLAGS
+                    NMSettingPPPOE;
+                    NMSettingPPPOEClass;
+NMSetting *         nm_setting_pppoe_new                (void);
+const char *        nm_setting_pppoe_get_service        (NMSettingPPPOE *setting);
+const char *        nm_setting_pppoe_get_username       (NMSettingPPPOE *setting);
 const char *        nm_setting_pppoe_get_password       (NMSettingPPPOE *setting);
 NMSettingSecretFlags nm_setting_pppoe_get_password_flags
                                                         (NMSettingPPPOE *setting);
-const char *        nm_setting_pppoe_get_service        (NMSettingPPPOE *setting);
-const char *        nm_setting_pppoe_get_username       (NMSettingPPPOE *setting);
-NMSetting *         nm_setting_pppoe_new                (void);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingPPPOEError
+

 
   GObject
    +----NMSetting
          +----NMSettingPPPOE
 

-
-  GEnum
-   +----NMSettingPPPOEError
-

 

 

 
Properties

@@ -94,23 +94,8 @@ to provide IP transport, for example cable or DSL modems.
 

 
Details

 

-
NMSettingPPPOE

-
typedef struct _NMSettingPPPOE NMSettingPPPOE;

-

-

-

-

-

-
NMSettingPPPOEClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingPPPOEClass;
+
NM_SETTING_PPPOE_SETTING_NAME

+
#define NM_SETTING_PPPOE_SETTING_NAME "pppoe"
 

 

 

@@ -125,8 +110,11 @@ to provide IP transport, for example cable or DSL modems.
 	NM_SETTING_PPPOE_ERROR_MISSING_PPP_SETTING /*< nick=MissingPPPSetting >*/
 } NMSettingPPPOEError;
 

-

+

+++
@@ -163,65 +151,105 @@ did not contain a required PPP setting for PPP related options
 

-
NM_SETTING_PPPOE_PASSWORD

-
#define NM_SETTING_PPPOE_PASSWORD       "password"
+
nm_setting_pppoe_error_quark ()

+
GQuark              nm_setting_pppoe_error_quark        (void);

+

+Registers an error quark for NMSettingPPPOE if necessary.
+

+

 


 
 

 
NM_SETTING_PPPOE_ERROR_UNKNOWN

 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingPPPOE errors.

+

+

+

+
NM_SETTING_PPPOE_SERVICE

+
#define NM_SETTING_PPPOE_SERVICE        "service"
 

 

 

 

 

 

-
NM_SETTING_PPPOE_PASSWORD_FLAGS

-
#define NM_SETTING_PPPOE_PASSWORD_FLAGS "password-flags"
+
NM_SETTING_PPPOE_USERNAME

+
#define NM_SETTING_PPPOE_USERNAME       "username"
 

 

 

 

 

 

-
NM_SETTING_PPPOE_SERVICE

-
#define NM_SETTING_PPPOE_SERVICE        "service"
+
NM_SETTING_PPPOE_PASSWORD

+
#define NM_SETTING_PPPOE_PASSWORD       "password"
 

 

 

 

 

 

-
NM_SETTING_PPPOE_SETTING_NAME

-
#define NM_SETTING_PPPOE_SETTING_NAME "pppoe"
+
NM_SETTING_PPPOE_PASSWORD_FLAGS

+
#define NM_SETTING_PPPOE_PASSWORD_FLAGS "password-flags"
 

 

 

 

 

 

-
NM_SETTING_PPPOE_USERNAME

-
#define NM_SETTING_PPPOE_USERNAME       "username"
+
NMSettingPPPOE

+
typedef struct _NMSettingPPPOE NMSettingPPPOE;

+

+

+

+

+

+
NMSettingPPPOEClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingPPPOEClass;
 

 

 

 

 

 

-
nm_setting_pppoe_error_quark ()

-
GQuark              nm_setting_pppoe_error_quark        (void);

+
nm_setting_pppoe_new ()

+
NMSetting *         nm_setting_pppoe_new                (void);

 

-Registers an error quark for NMSettingPPPOE if necessary.
+Creates a new NMSettingPPPOE object with default values.
 

-

+

+++
-
+

 


 

 
Returns :
the error quark used for NMSettingPPPOE errors.the new empty NMSettingPPPOE object. [transfer full]
+
 

 

 

 

 

-
nm_setting_pppoe_get_password ()

-
const char *        nm_setting_pppoe_get_password       (NMSettingPPPOE *setting);

-

+
nm_setting_pppoe_get_service ()

+
const char *        nm_setting_pppoe_get_service        (NMSettingPPPOE *setting);

+

+++
@@ -230,18 +258,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "password" property of the settingthe "service" property of the setting
 

 
 

 

 

 

-
nm_setting_pppoe_get_password_flags ()

-
NMSettingSecretFlags nm_setting_pppoe_get_password_flags
-                                                        (NMSettingPPPOE *setting);

-

+
nm_setting_pppoe_get_username ()

+
const char *        nm_setting_pppoe_get_username       (NMSettingPPPOE *setting);

+

+++
@@ -250,18 +280,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the NMSettingSecretFlags pertaining to the "password"
-the "username" property of the setting
 

 
 

 

 

 

-
nm_setting_pppoe_get_service ()

-
const char *        nm_setting_pppoe_get_service        (NMSettingPPPOE *setting);

-

+
nm_setting_pppoe_get_password ()

+
const char *        nm_setting_pppoe_get_password       (NMSettingPPPOE *setting);

+

+++
@@ -270,17 +302,21 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "service" property of the settingthe "password" property of the setting
 

 
 

 

 

 

-
nm_setting_pppoe_get_username ()

-
const char *        nm_setting_pppoe_get_username       (NMSettingPPPOE *setting);

-

+
nm_setting_pppoe_get_password_flags ()

+
NMSettingSecretFlags nm_setting_pppoe_get_password_flags
+                                                        (NMSettingPPPOE *setting);

+

+++
@@ -289,27 +325,12 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "username" property of the settingthe NMSettingSecretFlags pertaining to the "password"
+
 

 
 

 

-

-

-
nm_setting_pppoe_new ()

-
NMSetting *         nm_setting_pppoe_new                (void);

-

-Creates a new NMSettingPPPOE object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSettingPPPOE object. [transfer full]
-

-

 

 

 
Property Details

@@ -356,6 +377,6 @@ Username used to authenticate with the PPPoE service.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingSerial.html b/docs/libnm-util/html/NMSettingSerial.html
index e68a2609..16f6d603 100644
--- a/docs/libnm-util/html/NMSettingSerial.html
+++ b/docs/libnm-util/html/NMSettingSerial.html
@@ -3,12 +3,12 @@
 
 
 NMSettingSerial
-
+
 
 
 
 
-
+
 
 
 
@@ -45,36 +45,36 @@ serial communications

 
 #include <nm-setting-serial.h>
 
-                    NMSettingSerial;
-                    NMSettingSerialClass;
+#define             NM_SETTING_SERIAL_SETTING_NAME
 enum                NMSettingSerialError;
+#define             NM_SETTING_SERIAL_ERROR
+GQuark              nm_setting_serial_error_quark       (void);
 #define             NM_SETTING_SERIAL_BAUD
 #define             NM_SETTING_SERIAL_BITS
-#define             NM_SETTING_SERIAL_ERROR
 #define             NM_SETTING_SERIAL_PARITY
-#define             NM_SETTING_SERIAL_SEND_DELAY
-#define             NM_SETTING_SERIAL_SETTING_NAME
 #define             NM_SETTING_SERIAL_STOPBITS
-GQuark              nm_setting_serial_error_quark       (void);
+#define             NM_SETTING_SERIAL_SEND_DELAY
+                    NMSettingSerial;
+                    NMSettingSerialClass;
+NMSetting *         nm_setting_serial_new               (void);
 guint               nm_setting_serial_get_baud          (NMSettingSerial *setting);
 guint               nm_setting_serial_get_bits          (NMSettingSerial *setting);
 char                nm_setting_serial_get_parity        (NMSettingSerial *setting);
-guint64             nm_setting_serial_get_send_delay    (NMSettingSerial *setting);
 guint               nm_setting_serial_get_stopbits      (NMSettingSerial *setting);
-NMSetting *         nm_setting_serial_new               (void);
+guint64             nm_setting_serial_get_send_delay    (NMSettingSerial *setting);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingSerialError
+

 
   GObject
    +----NMSetting
          +----NMSettingSerial
 

-
-  GEnum
-   +----NMSettingSerialError
-

 

 

 
Properties

@@ -97,23 +97,8 @@ such as mobile broadband or analog telephone connections.
 

 
Details

 

-
NMSettingSerial

-
typedef struct _NMSettingSerial NMSettingSerial;

-

-

-

-

-

-
NMSettingSerialClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingSerialClass;
+
NM_SETTING_SERIAL_SETTING_NAME

+
#define NM_SETTING_SERIAL_SETTING_NAME "serial"
 

 

 

@@ -128,8 +113,11 @@ such as mobile broadband or analog telephone connections.
 	NM_SETTING_SERIAL_ERROR_MISSING_PPP_SETTING /*< nick=MissingPPPSetting >*/
 } NMSettingSerialError;
 

-

+

+++
@@ -158,6 +146,32 @@ setting requires the connection to contain an 
+
NM_SETTING_SERIAL_ERROR

+
#define NM_SETTING_SERIAL_ERROR nm_setting_serial_error_quark ()
+

+

+

+
+

+

+
nm_setting_serial_error_quark ()

+
GQuark              nm_setting_serial_error_quark       (void);

+

+Registers an error quark for NMSettingSerial if necessary.
+

+

 


 
 

 
NM_SETTING_SERIAL_ERROR_UNKNOWN

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingSerial errors.

+

+

+

 
NM_SETTING_SERIAL_BAUD

 
#define NM_SETTING_SERIAL_BAUD "baud"
 

@@ -174,16 +188,16 @@ setting requires the connection to contain an 
-
NM_SETTING_SERIAL_ERROR

-
#define NM_SETTING_SERIAL_ERROR nm_setting_serial_error_quark ()
+
NM_SETTING_SERIAL_PARITY

+
#define NM_SETTING_SERIAL_PARITY "parity"
 

 

 

 

 

 

-
NM_SETTING_SERIAL_PARITY

-
#define NM_SETTING_SERIAL_PARITY "parity"
+
NM_SETTING_SERIAL_STOPBITS

+
#define NM_SETTING_SERIAL_STOPBITS "stopbits"
 

 

 

@@ -198,32 +212,43 @@ setting requires the connection to contain an 
-
NM_SETTING_SERIAL_SETTING_NAME

-
#define NM_SETTING_SERIAL_SETTING_NAME "serial"
-

+
NMSettingSerial

+
typedef struct _NMSettingSerial NMSettingSerial;

 

 

 

 

 

-
NM_SETTING_SERIAL_STOPBITS

-
#define NM_SETTING_SERIAL_STOPBITS "stopbits"
+
NMSettingSerialClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingSerialClass;
 

 

 

 

 

 

-
nm_setting_serial_error_quark ()

-
GQuark              nm_setting_serial_error_quark       (void);

+
nm_setting_serial_new ()

+
NMSetting *         nm_setting_serial_new               (void);

 

-Registers an error quark for NMSettingSerial if necessary.
+Creates a new NMSettingSerial object with default values.
 

-

+

+++
-
+

 


 

 
Returns :
the error quark used for NMSettingSerial errors.the new empty NMSettingSerial object. [transfer full]
+
 

 

 

@@ -231,8 +256,11 @@ Registers an error quark for 
 
nm_setting_serial_get_baud ()

 
guint               nm_setting_serial_get_baud          (NMSettingSerial *setting);

-

+

+++
@@ -250,8 +278,11 @@ Registers an error quark for 
 
nm_setting_serial_get_bits ()
guint               nm_setting_serial_get_bits          (NMSettingSerial *setting);

-

 


 
 

 
setting :

 

+

+++
@@ -269,8 +300,11 @@ Registers an error quark for 
 
nm_setting_serial_get_parity ()
char                nm_setting_serial_get_parity        (NMSettingSerial *setting);

-

 


 
 

 
setting :

 

+

+++
@@ -286,10 +320,13 @@ Registers an error quark for 
-
nm_setting_serial_get_send_delay ()

-
guint64             nm_setting_serial_get_send_delay    (NMSettingSerial *setting);

-

 


 
 

 
setting :

+
nm_setting_serial_get_stopbits ()

+
guint               nm_setting_serial_get_stopbits      (NMSettingSerial *setting);

+

+++
@@ -298,17 +335,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "send-delay" property of the settingthe "stopbits" property of the setting
 

 
 

 

 

 

-
nm_setting_serial_get_stopbits ()

-
guint               nm_setting_serial_get_stopbits      (NMSettingSerial *setting);

-

+
nm_setting_serial_get_send_delay ()

+
guint64             nm_setting_serial_get_send_delay    (NMSettingSerial *setting);

+

+++
@@ -317,27 +357,11 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "stopbits" property of the settingthe "send-delay" property of the setting
 

 
 

 

-

-

-
nm_setting_serial_new ()

-
NMSetting *         nm_setting_serial_new               (void);

-

-Creates a new NMSettingSerial object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSettingSerial object. [transfer full]
-

-

 

 

 
Property Details

@@ -396,6 +420,6 @@ The 1 in '8n1' for example.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingVPN.html b/docs/libnm-util/html/NMSettingVPN.html
index d686803b..afbe41bf 100644
--- a/docs/libnm-util/html/NMSettingVPN.html
+++ b/docs/libnm-util/html/NMSettingVPN.html
@@ -3,12 +3,12 @@
 
 
 NMSettingVPN
-
+
 
 
 
 
-
+
 
 
 
@@ -44,57 +44,57 @@
 
 #include <nm-setting-vpn.h>
 
+#define             NM_SETTING_VPN_SETTING_NAME
+enum                NMSettingVpnError;
+#define             NM_SETTING_VPN_ERROR
+GQuark              nm_setting_vpn_error_quark          (void);
+#define             NM_SETTING_VPN_SERVICE_TYPE
+#define             NM_SETTING_VPN_USER_NAME
+#define             NM_SETTING_VPN_DATA
+#define             NM_SETTING_VPN_SECRETS
                     NMSettingVPN;
                     NMSettingVPNClass;
-enum                NMSettingVpnError;
 void                (*NMVPNIterFunc)                    (const char *key,
                                                          const char *value,
                                                          gpointer user_data);
-#define             NM_SETTING_VPN_DATA
-#define             NM_SETTING_VPN_ERROR
-#define             NM_SETTING_VPN_SECRETS
-#define             NM_SETTING_VPN_SERVICE_TYPE
-#define             NM_SETTING_VPN_SETTING_NAME
-#define             NM_SETTING_VPN_USER_NAME
+NMSetting *         nm_setting_vpn_new                  (void);
+const char *        nm_setting_vpn_get_service_type     (NMSettingVPN *setting);
+const char *        nm_setting_vpn_get_user_name        (NMSettingVPN *setting);
+guint32             nm_setting_vpn_get_num_data_items   (NMSettingVPN *setting);
 void                nm_setting_vpn_add_data_item        (NMSettingVPN *setting,
                                                          const char *key,
                                                          const char *item);
-void                nm_setting_vpn_add_secret           (NMSettingVPN *setting,
-                                                         const char *key,
-                                                         const char *secret);
-GQuark              nm_setting_vpn_error_quark          (void);
+const char *        nm_setting_vpn_get_data_item        (NMSettingVPN *setting,
+                                                         const char *key);
+void                nm_setting_vpn_remove_data_item     (NMSettingVPN *setting,
+                                                         const char *key);
 void                nm_setting_vpn_foreach_data_item    (NMSettingVPN *setting,
                                                          NMVPNIterFunc func,
                                                          gpointer user_data);
-void                nm_setting_vpn_foreach_secret       (NMSettingVPN *setting,
-                                                         NMVPNIterFunc func,
-                                                         gpointer user_data);
-const char *        nm_setting_vpn_get_data_item        (NMSettingVPN *setting,
-                                                         const char *key);
-guint32             nm_setting_vpn_get_num_data_items   (NMSettingVPN *setting);
 guint32             nm_setting_vpn_get_num_secrets      (NMSettingVPN *setting);
+void                nm_setting_vpn_add_secret           (NMSettingVPN *setting,
+                                                         const char *key,
+                                                         const char *secret);
 const char *        nm_setting_vpn_get_secret           (NMSettingVPN *setting,
                                                          const char *key);
-const char *        nm_setting_vpn_get_service_type     (NMSettingVPN *setting);
-const char *        nm_setting_vpn_get_user_name        (NMSettingVPN *setting);
-NMSetting *         nm_setting_vpn_new                  (void);
-void                nm_setting_vpn_remove_data_item     (NMSettingVPN *setting,
-                                                         const char *key);
 void                nm_setting_vpn_remove_secret        (NMSettingVPN *setting,
                                                          const char *key);
+void                nm_setting_vpn_foreach_secret       (NMSettingVPN *setting,
+                                                         NMVPNIterFunc func,
+                                                         gpointer user_data);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingVpnError
+

 
   GObject
    +----NMSetting
          +----NMSettingVPN
 

-
-  GEnum
-   +----NMSettingVpnError
-

 

 

 
Properties

@@ -120,23 +120,8 @@ properties.
 

 
Details

 

-
NMSettingVPN

-
typedef struct _NMSettingVPN NMSettingVPN;

-

-

-

-

-

-
NMSettingVPNClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingVPNClass;
+
NM_SETTING_VPN_SETTING_NAME

+
#define NM_SETTING_VPN_SETTING_NAME "vpn"
 

 

 

@@ -150,8 +135,11 @@ properties.
 	NM_SETTING_VPN_ERROR_MISSING_PROPERTY, /*< nick=MissingProperty >*/
 } NMSettingVpnError;
 

-

+

+++
@@ -174,105 +162,109 @@ required
 

-
NMVPNIterFunc ()

-
void                (*NMVPNIterFunc)                    (const char *key,
-                                                         const char *value,
-                                                         gpointer user_data);

-

 


 
 

 
NM_SETTING_VPN_ERROR_UNKNOWN

 
 

+
NM_SETTING_VPN_ERROR

+
#define NM_SETTING_VPN_ERROR nm_setting_vpn_error_quark ()
+

+

+

+
+

+

+
nm_setting_vpn_error_quark ()

+
GQuark              nm_setting_vpn_error_quark          (void);

+

+Registers an error quark for NMSettingVPN if necessary.
+

+

+-
-
-
-
-
-
-
-
-
-
-
-
-
-
++
+
+
+
+

 

key :
the name of the data or secret item
value :
the value of the data or secret item
user_data :
User data passed to nm_setting_vpn_foreach_data_item() or
-nm_setting_vpn_foreach_secret()
-


Returns :
the error quark used for NMSettingVPN errors.

 

 

 

 

-
NM_SETTING_VPN_DATA

-
#define NM_SETTING_VPN_DATA         "data"
+
NM_SETTING_VPN_SERVICE_TYPE

+
#define NM_SETTING_VPN_SERVICE_TYPE "service-type"
 

 

 

 

 

 

-
NM_SETTING_VPN_ERROR

-
#define NM_SETTING_VPN_ERROR nm_setting_vpn_error_quark ()
+
NM_SETTING_VPN_USER_NAME

+
#define NM_SETTING_VPN_USER_NAME    "user-name"
 

 

 

 

 

 

-
NM_SETTING_VPN_SECRETS

-
#define NM_SETTING_VPN_SECRETS      "secrets"
+
NM_SETTING_VPN_DATA

+
#define NM_SETTING_VPN_DATA         "data"
 

 

 

 

 

 

-
NM_SETTING_VPN_SERVICE_TYPE

-
#define NM_SETTING_VPN_SERVICE_TYPE "service-type"
+
NM_SETTING_VPN_SECRETS

+
#define NM_SETTING_VPN_SECRETS      "secrets"
 

 

 

 

 

 

-
NM_SETTING_VPN_SETTING_NAME

-
#define NM_SETTING_VPN_SETTING_NAME "vpn"
-

+
NMSettingVPN

+
typedef struct _NMSettingVPN NMSettingVPN;

 

 

 

 

 

-
NM_SETTING_VPN_USER_NAME

-
#define NM_SETTING_VPN_USER_NAME    "user-name"
+
NMSettingVPNClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingVPNClass;
 

 

 

 

 

 

-
nm_setting_vpn_add_data_item ()

-
void                nm_setting_vpn_add_data_item        (NMSettingVPN *setting,
-                                                         const char *key,
-                                                         const char *item);

-

-Establishes a relationship between key and item internally in the
-setting which may be retrieved later.  Should not be used to store passwords
-or other secrets, which is what nm_setting_vpn_add_secret() is for.
-

-

+
NMVPNIterFunc ()

+
void                (*NMVPNIterFunc)                    (const char *key,
+                                                         const char *value,
+                                                         gpointer user_data);

+

+++
-
-
+
+
-
-
+
+
-
-
+
@@ -280,16 +272,36 @@ or other secrets, which is what 
-
nm_setting_vpn_add_secret ()

-
void                nm_setting_vpn_add_secret           (NMSettingVPN *setting,
-                                                         const char *key,
-                                                         const char *secret);

+
nm_setting_vpn_new ()

+
NMSetting *         nm_setting_vpn_new                  (void);

-Establishes a relationship between key and secret internally in the
-setting which may be retrieved later.
+Creates a new NMSettingVPN object with default values.
 

-

 


 
 
setting :
the NMSettingVPN
-
key :
the name of the data or secret item
 

 
key :
a name that uniquely identifies the given value item
-
value :
the value of the data or secret item
 

 
item :
the value to be referenced by key
+
user_data :
User data passed to nm_setting_vpn_foreach_data_item() or
+nm_setting_vpn_foreach_secret()
 
 

 
 

+

+++
+
+
+
+
+

 


Returns :
the new empty NMSettingVPN object. [transfer full]
+

+

+

+

+
nm_setting_vpn_get_service_type ()

+
const char *        nm_setting_vpn_get_service_type     (NMSettingVPN *setting);

+

+Returns the service name of the VPN, which identifies the specific VPN
+plugin that should be used to connect to this VPN.
+

+

++++
@@ -297,92 +309,89 @@ setting which may be retrieved later.
 
-
-
-
-
-
-
+
+




 
 

 
setting :

 

 
key :
a name that uniquely identifies the given secret secret
-
secret :
the secret to be referenced by key
-
Returns :
the VPN plugin's service name
 

 
 

 

 

 

-
nm_setting_vpn_error_quark ()

-
GQuark              nm_setting_vpn_error_quark          (void);

-

-Registers an error quark for NMSettingVPN if necessary.
-

-

+
nm_setting_vpn_get_user_name ()

+
const char *        nm_setting_vpn_get_user_name        (NMSettingVPN *setting);

+

+-
++
+
+
+
+
+
+
-
-
+
+
+

 



setting :
the NMSettingVPN
+

 
Returns :
the error quark used for NMSettingVPN errors.
the "user-name" property of the setting

 

 

 

 

-
nm_setting_vpn_foreach_data_item ()

-
void                nm_setting_vpn_foreach_data_item    (NMSettingVPN *setting,
-                                                         NMVPNIterFunc func,
-                                                         gpointer user_data);

+
nm_setting_vpn_get_num_data_items ()

+
guint32             nm_setting_vpn_get_num_data_items   (NMSettingVPN *setting);

 

-Iterates all data items stored in this setting.  It is safe to add, remove,
-and modify data items inside func, though any additions or removals made
-during iteration will not be part of the iteration.
+Gets number of key/value pairs of VPN configuration data.
 

-

+

+++
-
-
-
-
-
-
-
+
+

 


 
 

 
setting :
a NMSettingVPN
-
func :
an user provided function. [scope call]
+the NMSettingVPN
 
 

 
user_data :
data to be passed to func
-
Returns :
the number of VPN plugin specific configuration data items
 

 
 

 

 

 

-
nm_setting_vpn_foreach_secret ()

-
void                nm_setting_vpn_foreach_secret       (NMSettingVPN *setting,
-                                                         NMVPNIterFunc func,
-                                                         gpointer user_data);

+
nm_setting_vpn_add_data_item ()

+
void                nm_setting_vpn_add_data_item        (NMSettingVPN *setting,
+                                                         const char *key,
+                                                         const char *item);

 

-Iterates all secrets stored in this setting.  It is safe to add, remove,
-and modify secrets inside func, though any additions or removals made during
-iteration will not be part of the iteration.
+Establishes a relationship between key and item internally in the
+setting which may be retrieved later.  Should not be used to store passwords
+or other secrets, which is what nm_setting_vpn_add_secret() is for.
 

-

+

+++
-
-
-
+
-
-
+
@@ -397,8 +406,11 @@ iteration will not be part of the iteration.
 Retrieves the data item of a key/value relationship previously established
 by nm_setting_vpn_add_data_item().
 

-

 


 
 

 
setting :
a NMSettingVPN
+the NMSettingVPN
 
 

 
func :
an user provided function. [scope call]
+
key :
a name that uniquely identifies the given value item
 
 

 
user_data :
data to be passed to func
+
item :
the value to be referenced by key
 
 

 

+

+++
@@ -418,13 +430,18 @@ by 
-
nm_setting_vpn_get_num_data_items ()

-
guint32             nm_setting_vpn_get_num_data_items   (NMSettingVPN *setting);

+
nm_setting_vpn_remove_data_item ()

+
void                nm_setting_vpn_remove_data_item     (NMSettingVPN *setting,
+                                                         const char *key);

-Gets number of key/value pairs of VPN configuration data.
+Deletes a key/value relationship previously established by
+nm_setting_vpn_add_data_item().
 

-

 


 
 

 
setting :

 

+

+++
@@ -432,45 +449,59 @@ Gets number of key/value pairs of VPN configuration data.
 
-
-
+
+

 


 
 

 
setting :

 

 
Returns :
the number of VPN plugin specific configuration data items
key :
the name of the data item to remove
 

 
 

 

 

 

-
nm_setting_vpn_get_num_secrets ()

-
guint32             nm_setting_vpn_get_num_secrets      (NMSettingVPN *setting);

+
nm_setting_vpn_foreach_data_item ()

+
void                nm_setting_vpn_foreach_data_item    (NMSettingVPN *setting,
+                                                         NMVPNIterFunc func,
+                                                         gpointer user_data);

 

-Gets number of VPN plugin specific secrets in the setting.
+Iterates all data items stored in this setting.  It is safe to add, remove,
+and modify data items inside func, though any additions or removals made
+during iteration will not be part of the iteration.
 

-

+

+++
-
-
-
+
+
+
+
+
+

 


 
 

 
setting :
the NMSettingVPN
+a NMSettingVPN
 
 

 
Returns :
the number of VPN plugin specific secrets
func :
an user provided function. [scope call]
+
user_data :
data to be passed to func
+
 

 
 

 

 

 

-
nm_setting_vpn_get_secret ()

-
const char *        nm_setting_vpn_get_secret           (NMSettingVPN *setting,
-                                                         const char *key);

+
nm_setting_vpn_get_num_secrets ()

+
guint32             nm_setting_vpn_get_num_secrets      (NMSettingVPN *setting);

 

-Retrieves the secret of a key/value relationship previously established
-by nm_setting_vpn_add_secret().
+Gets number of VPN plugin specific secrets in the setting.
 

-

+

+++
@@ -478,26 +509,27 @@ by key :

-
-
-
-
+

 


 
 

 
setting :
the name of the secret to retrieve

 
Returns :
the secret, if anythe number of VPN plugin specific secrets
 

 
 

 

 

 

-
nm_setting_vpn_get_service_type ()

-
const char *        nm_setting_vpn_get_service_type     (NMSettingVPN *setting);

+
nm_setting_vpn_add_secret ()

+
void                nm_setting_vpn_add_secret           (NMSettingVPN *setting,
+                                                         const char *key,
+                                                         const char *secret);

 

-Returns the service name of the VPN, which identifies the specific VPN
-plugin that should be used to connect to this VPN.
+Establishes a relationship between key and secret internally in the
+setting which may be retrieved later.
 

-

+

+++
@@ -505,18 +537,32 @@ plugin that should be used to connect to this VPN.
 
-
-
+
+
+
+
+
+

 


 
 

 
setting :

 

 
Returns :
the VPN plugin's service name
key :
a name that uniquely identifies the given secret secret
+
secret :
the secret to be referenced by key
+
 

 
 

 

 

 

-
nm_setting_vpn_get_user_name ()

-
const char *        nm_setting_vpn_get_user_name        (NMSettingVPN *setting);

-

+
nm_setting_vpn_get_secret ()

+
const char *        nm_setting_vpn_get_secret           (NMSettingVPN *setting,
+                                                         const char *key);

+

+Retrieves the secret of a key/value relationship previously established
+by nm_setting_vpn_add_secret().
+

+

+++
@@ -524,39 +570,30 @@ plugin that should be used to connect to this VPN.
 
+
+
+
+
-
+

 


 
 

 
setting :

 

 
key :
the name of the secret to retrieve

 
Returns :
the "user-name" property of the settingthe secret, if any
 

 
 

 

 

 

-
nm_setting_vpn_new ()

-
NMSetting *         nm_setting_vpn_new                  (void);

-

-Creates a new NMSettingVPN object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSettingVPN object. [transfer full]
-

-

-

-

-
nm_setting_vpn_remove_data_item ()

-
void                nm_setting_vpn_remove_data_item     (NMSettingVPN *setting,
+
nm_setting_vpn_remove_secret ()

+
void                nm_setting_vpn_remove_secret        (NMSettingVPN *setting,
                                                          const char *key);

 

 Deletes a key/value relationship previously established by
-nm_setting_vpn_add_data_item().
+nm_setting_vpn_add_secret().
 

-

+

+++
@@ -565,31 +602,42 @@ Deletes a key/value relationship previously established by
 
-
+

 


 
 

 
setting :

 

 
key :
the name of the data item to removethe name of the secret to remove
 

 
 

 

 

 

-
nm_setting_vpn_remove_secret ()

-
void                nm_setting_vpn_remove_secret        (NMSettingVPN *setting,
-                                                         const char *key);

+
nm_setting_vpn_foreach_secret ()

+
void                nm_setting_vpn_foreach_secret       (NMSettingVPN *setting,
+                                                         NMVPNIterFunc func,
+                                                         gpointer user_data);

 

-Deletes a key/value relationship previously established by
-nm_setting_vpn_add_secret().
+Iterates all secrets stored in this setting.  It is safe to add, remove,
+and modify secrets inside func, though any additions or removals made during
+iteration will not be part of the iteration.
 

-

+

+++
-
-
-
+
+
+
+
+
+

 


 
 

 
setting :
the NMSettingVPN
+a NMSettingVPN
 
 

 
key :
the name of the secret to remove
func :
an user provided function. [scope call]
+
user_data :
data to be passed to func
+
 

 
 

@@ -643,6 +691,6 @@ VPN connection.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingVlan.html b/docs/libnm-util/html/NMSettingVlan.html
index b1edb3ad..edc209ba 100644
--- a/docs/libnm-util/html/NMSettingVlan.html
+++ b/docs/libnm-util/html/NMSettingVlan.html
@@ -3,12 +3,12 @@
 
 
 NMSettingVlan
-
+
 
 
 
 
-
+
 
 
 
@@ -41,51 +41,55 @@
 

 

 
Synopsis

-
+
 #include <nm-setting-vlan.h>
 
-                    NMSettingVlan;
-                    NMSettingVlanClass;
+#define             NM_SETTING_VLAN_SETTING_NAME
 enum                NMSettingVlanError;
-enum                NMVlanFlags;
-enum                NMVlanPriorityMap;
-#define             NM_SETTING_VLAN_EGRESS_PRIORITY_MAP
 #define             NM_SETTING_VLAN_ERROR
-#define             NM_SETTING_VLAN_FLAGS
-#define             NM_SETTING_VLAN_ID
-#define             NM_SETTING_VLAN_INGRESS_PRIORITY_MAP
+GQuark              nm_setting_vlan_error_quark         (void);
 #define             NM_SETTING_VLAN_INTERFACE_NAME
 #define             NM_SETTING_VLAN_PARENT
-#define             NM_SETTING_VLAN_SETTING_NAME
-gboolean            nm_setting_vlan_add_priority        (NMSettingVlan *setting,
-                                                         NMVlanPriorityMap map,
-                                                         guint32 from,
-                                                         guint32 to);
-gboolean            nm_setting_vlan_add_priority_str    (NMSettingVlan *setting,
-                                                         NMVlanPriorityMap map,
-                                                         const char *str);
-void                nm_setting_vlan_clear_priorities    (NMSettingVlan *setting,
-                                                         NMVlanPriorityMap map);
-GQuark              nm_setting_vlan_error_quark         (void);
-guint32             nm_setting_vlan_get_flags           (NMSettingVlan *setting);
-guint32             nm_setting_vlan_get_id              (NMSettingVlan *setting);
+#define             NM_SETTING_VLAN_ID
+#define             NM_SETTING_VLAN_FLAGS
+#define             NM_SETTING_VLAN_INGRESS_PRIORITY_MAP
+#define             NM_SETTING_VLAN_EGRESS_PRIORITY_MAP
+                    NMSettingVlan;
+                    NMSettingVlanClass;
+enum                NMVlanPriorityMap;
+enum                NMVlanFlags;
+NMSetting *         nm_setting_vlan_new                 (void);
 const char *        nm_setting_vlan_get_interface_name  (NMSettingVlan *setting);
+const char *        nm_setting_vlan_get_parent          (NMSettingVlan *setting);
+guint32             nm_setting_vlan_get_id              (NMSettingVlan *setting);
+guint32             nm_setting_vlan_get_flags           (NMSettingVlan *setting);
 gint32              nm_setting_vlan_get_num_priorities  (NMSettingVlan *setting,
                                                          NMVlanPriorityMap map);
-const char *        nm_setting_vlan_get_parent          (NMSettingVlan *setting);
 gboolean            nm_setting_vlan_get_priority        (NMSettingVlan *setting,
                                                          NMVlanPriorityMap map,
                                                          guint32 idx,
                                                          guint32 *out_from,
                                                          guint32 *out_to);
-NMSetting *         nm_setting_vlan_new                 (void);
+gboolean            nm_setting_vlan_add_priority        (NMSettingVlan *setting,
+                                                         NMVlanPriorityMap map,
+                                                         guint32 from,
+                                                         guint32 to);
 void                nm_setting_vlan_remove_priority     (NMSettingVlan *setting,
                                                          NMVlanPriorityMap map,
                                                          guint32 idx);
+void                nm_setting_vlan_clear_priorities    (NMSettingVlan *setting,
+                                                         NMVlanPriorityMap map);
+gboolean            nm_setting_vlan_add_priority_str    (NMSettingVlan *setting,
+                                                         NMVlanPriorityMap map,
+                                                         const char *str);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingVlanError
+

 
   GObject
    +----NMSetting
@@ -93,16 +97,12 @@ const char *        
   GEnum
-   +----NMSettingVlanError
+   +----NMVlanPriorityMap
 

 
   GEnum
    +----NMVlanFlags
 

-
-  GEnum
-   +----NMVlanPriorityMap
-

 

 

 
Properties

@@ -125,23 +125,8 @@ necessary for connection to VLAN interfaces.
 

 
Details

 

-
NMSettingVlan

-
typedef struct _NMSettingVlan NMSettingVlan;

-

-

-

-

-

-
NMSettingVlanClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingVlanClass;
+
NM_SETTING_VLAN_SETTING_NAME

+
#define NM_SETTING_VLAN_SETTING_NAME "vlan"
 

 

 

@@ -156,8 +141,11 @@ necessary for connection to VLAN interfaces.
 	NM_SETTING_VLAN_ERROR_INVALID_PARENT    /*< nick=InvalidParent >*/
 } NMSettingVlanError;
 

-

+

+++
@@ -186,99 +174,58 @@ necessary for connection to VLAN interfaces.
 

-
enum NMVlanFlags

-
typedef enum {
-	NM_VLAN_FLAG_REORDER_HEADERS = 0x1,
-	NM_VLAN_FLAG_GVRP            = 0x2,
-	NM_VLAN_FLAG_LOOSE_BINDING   = 0x4,
-
-	/* NOTE: if adding flags update nm-setting-vlan.c::verify() */
-} NMVlanFlags;
+
NM_SETTING_VLAN_ERROR

+
#define NM_SETTING_VLAN_ERROR nm_setting_vlan_error_quark ()
 

 

-NMVlanFlags values control the behavior of the VLAN interface.
 

-

 


 
 

 
NM_SETTING_VLAN_ERROR_UNKNOWN

 
 

--
-
-
-
-
-
-
-
-
-
-
-
-
-
-


NM_VLAN_FLAG_REORDER_HEADERS
indicates that this interface should reorder
- outgoing packet headers to look more like a non-VLAN ethernet interface
-
NM_VLAN_FLAG_GVRP
indicates that this interface should use GVRP to register
- itself with it's switch
-
NM_VLAN_FLAG_LOOSE_BINDING
indicates that this interface's operating
- state is tied to the underlying network interface but other details
- (like routing) are not.
-

 

 

 

-
enum NMVlanPriorityMap

-
typedef enum {
-	NM_VLAN_INGRESS_MAP,
-	NM_VLAN_EGRESS_MAP
-} NMVlanPriorityMap;
-

+
nm_setting_vlan_error_quark ()

+
GQuark              nm_setting_vlan_error_quark         (void);

 

-A selector for traffic priority maps; these map Linux SKB priorities
-to 802.1p priorities used in VLANs.
+Registers an error quark for NMSettingVlan if necessary.
 

-

+

+-
-
-
-
-
-
-
-
-
-
++
+
+
+
+

 

NM_VLAN_INGRESS_MAP
map for incoming data
-
NM_VLAN_EGRESS_MAP
map for outgoing data
-


Returns :
the error quark used for NMSettingVlan errors.

 

 

 

 

-
NM_SETTING_VLAN_EGRESS_PRIORITY_MAP

-
#define NM_SETTING_VLAN_EGRESS_PRIORITY_MAP  "egress-priority-map"
+
NM_SETTING_VLAN_INTERFACE_NAME

+
#define NM_SETTING_VLAN_INTERFACE_NAME       "interface-name"
 

 

 

 

 

 

-
NM_SETTING_VLAN_ERROR

-
#define NM_SETTING_VLAN_ERROR nm_setting_vlan_error_quark ()
+
NM_SETTING_VLAN_PARENT

+
#define NM_SETTING_VLAN_PARENT               "parent"
 

 

 

 

 

 

-
NM_SETTING_VLAN_FLAGS

-
#define NM_SETTING_VLAN_FLAGS                "flags"
+
NM_SETTING_VLAN_ID

+
#define NM_SETTING_VLAN_ID                   "id"
 

 

 

 

 

 

-
NM_SETTING_VLAN_ID

-
#define NM_SETTING_VLAN_ID                   "id"
+
NM_SETTING_VLAN_FLAGS

+
#define NM_SETTING_VLAN_FLAGS                "flags"
 

 

 

@@ -293,124 +240,136 @@ to 802.1p priorities used in VLANs.
 

 

 

-
NM_SETTING_VLAN_INTERFACE_NAME

-
#define NM_SETTING_VLAN_INTERFACE_NAME       "interface-name"
+
NM_SETTING_VLAN_EGRESS_PRIORITY_MAP

+
#define NM_SETTING_VLAN_EGRESS_PRIORITY_MAP  "egress-priority-map"
 

 

 

 

 

 

-
NM_SETTING_VLAN_PARENT

-
#define NM_SETTING_VLAN_PARENT               "parent"
-

+
NMSettingVlan

+
typedef struct _NMSettingVlan NMSettingVlan;

 

 

 

 

 

-
NM_SETTING_VLAN_SETTING_NAME

-
#define NM_SETTING_VLAN_SETTING_NAME "vlan"
+
NMSettingVlanClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingVlanClass;
 

 

 

 

 

 

-
nm_setting_vlan_add_priority ()

-
gboolean            nm_setting_vlan_add_priority        (NMSettingVlan *setting,
-                                                         NMVlanPriorityMap map,
-                                                         guint32 from,
-                                                         guint32 to);

-

-Adds a priority mapping to the "ingress_priority_map" or
-"egress_priority_map" properties of the setting. If from is
-already in the given priority map, this function will overwrite the
-existing entry with the new to.
-

-

-If map is NM_VLAN_INGRESS_MAP then from is the incoming 802.1q VLAN
-Priority Code Point (PCP) value, and to is the Linux SKB priority value.
-

+
enum NMVlanPriorityMap

+
typedef enum {
+	NM_VLAN_INGRESS_MAP,
+	NM_VLAN_EGRESS_MAP
+} NMVlanPriorityMap;
+

 

-If map is NM_VLAN_EGRESS_MAP then from is the Linux SKB priority value and
-to is the outgoing 802.1q VLAN Priority Code Point (PCP) value.
+A selector for traffic priority maps; these map Linux SKB priorities
+to 802.1p priorities used in VLANs.
 

-

+

+++
-
-
+
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-

 


 
 
setting :
the NMSettingVlan
+
NM_VLAN_INGRESS_MAP
map for incoming data
 
 

 
map :
the type of priority map
from :
the priority to map to to
+
NM_VLAN_EGRESS_MAP
map for outgoing data
 
 
to :
the priority to map from to
Returns :
TRUE if the new priority mapping was successfully added to the
-list, FALSE if error

 
 

 

 

 

-
nm_setting_vlan_add_priority_str ()

-
gboolean            nm_setting_vlan_add_priority_str    (NMSettingVlan *setting,
-                                                         NMVlanPriorityMap map,
-                                                         const char *str);

+
enum NMVlanFlags

+
typedef enum {
+	NM_VLAN_FLAG_REORDER_HEADERS = 0x1,
+	NM_VLAN_FLAG_GVRP            = 0x2,
+	NM_VLAN_FLAG_LOOSE_BINDING   = 0x4,
+
+	/* NOTE: if adding flags update nm-setting-vlan.c::verify() */
+} NMVlanFlags;
+

 

-Adds a priority map entry into either the "ingress_priority_map"
-or the "egress_priority_map" properties.  The priority map maps
-the Linux SKB priorities to 802.1p priorities.
+NMVlanFlags values control the behavior of the VLAN interface.
 

-

+

+++
-
-
+
-
-
-
-
-
-
+
+
-
-
+
+

 


 
 
setting :
the NMSettingVlan
+
NM_VLAN_FLAG_REORDER_HEADERS
indicates that this interface should reorder
+ outgoing packet headers to look more like a non-VLAN ethernet interface
 
 

 
map :
the type of priority map
str :
the string which contains a priority map, like "3:7"
NM_VLAN_FLAG_GVRP
indicates that this interface should use GVRP to register
+ itself with it's switch
+
 

 
Returns :
TRUE if the entry was successfully added to the list, or it
-overwrote the old value, FALSE if error
NM_VLAN_FLAG_LOOSE_BINDING
indicates that this interface's operating
+ state is tied to the underlying network interface but other details
+ (like routing) are not.
+
 

 
 

 

 

 

-
nm_setting_vlan_clear_priorities ()

-
void                nm_setting_vlan_clear_priorities    (NMSettingVlan *setting,
-                                                         NMVlanPriorityMap map);

+
nm_setting_vlan_new ()

+
NMSetting *         nm_setting_vlan_new                 (void);

 

-Clear all the entires from "ingress_priority_map" or
-"egress_priority_map" properties.
+Creates a new NMSettingVlan object with default values.
 

-

+

++++
+
+
+
+
+




Returns :
the new empty NMSettingVlan object. [transfer full]
+

+

+

+

+
nm_setting_vlan_get_interface_name ()

+
const char *        nm_setting_vlan_get_interface_name  (NMSettingVlan *setting);

+

+++
@@ -418,33 +377,21 @@ Clear all the entires from map :

-
+
+

 


 
 

 
setting :
the type of priority map
Returns :
the "interface_name" property of the setting
 

 
 

 

 

 

-
nm_setting_vlan_error_quark ()

-
GQuark              nm_setting_vlan_error_quark         (void);

-

-Registers an error quark for NMSettingVlan if necessary.
-

-

--
-
-
-
-


Returns :
the error quark used for NMSettingVlan errors.

-

-

-

-
nm_setting_vlan_get_flags ()

-
guint32             nm_setting_vlan_get_flags           (NMSettingVlan *setting);

-

+
nm_setting_vlan_get_parent ()

+
const char *        nm_setting_vlan_get_parent          (NMSettingVlan *setting);

+

+++
@@ -453,7 +400,7 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "flags" property of the settingthe "parent" property of the setting
 

 
 

@@ -462,8 +409,11 @@ Registers an error quark for 
 
nm_setting_vlan_get_id ()

 
guint32             nm_setting_vlan_get_id              (NMSettingVlan *setting);

-

+

+++
@@ -479,10 +429,13 @@ Registers an error quark for 
-
nm_setting_vlan_get_interface_name ()

-
const char *        nm_setting_vlan_get_interface_name  (NMSettingVlan *setting);

-

 


 
 

 
setting :

+
nm_setting_vlan_get_flags ()

+
guint32             nm_setting_vlan_get_flags           (NMSettingVlan *setting);

+

+++
@@ -491,7 +444,7 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "interface_name" property of the settingthe "flags" property of the setting
 

 
 

@@ -506,8 +459,11 @@ Returns the number of entires in the
 "ingress_priority_map" or "egress_priority_map"
 properties of this setting.
 

-

+

+++
@@ -527,25 +483,6 @@ properties of this setting.
 

-
nm_setting_vlan_get_parent ()

-
const char *        nm_setting_vlan_get_parent          (NMSettingVlan *setting);

-

 


 
 

 
setting :

 
 

--
-
-
-
-
-
-
-
-
-
-


setting :
the NMSettingVlan
-
Returns :
the "parent" property of the setting

-

-

-

 
nm_setting_vlan_get_priority ()

 
gboolean            nm_setting_vlan_get_priority        (NMSettingVlan *setting,
                                                          NMVlanPriorityMap map,
@@ -556,8 +493,11 @@ properties of this setting.
 Retrieve one of the entries of the "ingress_priority_map"
 or "egress_priority_map" properties of this setting.
 

-

+

+++
@@ -592,18 +532,55 @@ or 
 

 

-
nm_setting_vlan_new ()

-
NMSetting *         nm_setting_vlan_new                 (void);

+
nm_setting_vlan_add_priority ()

+
gboolean            nm_setting_vlan_add_priority        (NMSettingVlan *setting,
+                                                         NMVlanPriorityMap map,
+                                                         guint32 from,
+                                                         guint32 to);

 

-Creates a new NMSettingVlan object with default values.
+Adds a priority mapping to the "ingress_priority_map" or
+"egress_priority_map" properties of the setting. If from is
+already in the given priority map, this function will overwrite the
+existing entry with the new to.
 

-

 


 
 

 
setting :

+

+If map is NM_VLAN_INGRESS_MAP then from is the incoming 802.1q VLAN
+Priority Code Point (PCP) value, and to is the Linux SKB priority value.
+

+

+If map is NM_VLAN_EGRESS_MAP then from is the Linux SKB priority value and
+to is the outgoing 802.1q VLAN Priority Code Point (PCP) value.
+

+

+-
-
-+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 

Returns :
the new empty NMSettingVlan object. [transfer full]
+


setting :
the NMSettingVlan
 
map :
the type of priority map
from :
the priority to map to to
+
to :
the priority to map from to
Returns :
TRUE if the new priority mapping was successfully added to the
+list, FALSE if error

 

 

 

@@ -617,8 +594,11 @@ Removes the priority map at index idx fr
 "ingress_priority_map" or "egress_priority_map"
 properties.
 

-

+

+++
@@ -636,6 +616,71 @@ properties.
 

 


 
 

 
setting :

 

 

+

+

+
nm_setting_vlan_clear_priorities ()

+
void                nm_setting_vlan_clear_priorities    (NMSettingVlan *setting,
+                                                         NMVlanPriorityMap map);

+

+Clear all the entires from "ingress_priority_map" or
+"egress_priority_map" properties.
+

+

++++
+
+
+
+
+
+
+
+
+
+
+




setting :
the NMSettingVlan
+
map :
the type of priority map

+

+

+

+
nm_setting_vlan_add_priority_str ()

+
gboolean            nm_setting_vlan_add_priority_str    (NMSettingVlan *setting,
+                                                         NMVlanPriorityMap map,
+                                                         const char *str);

+

+Adds a priority map entry into either the "ingress_priority_map"
+or the "egress_priority_map" properties.  The priority map maps
+the Linux SKB priorities to 802.1p priorities.
+

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




setting :
the NMSettingVlan
+
map :
the type of priority map
str :
the string which contains a priority map, like "3:7"
Returns :
TRUE if the entry was successfully added to the list, or it
+overwrote the old value, FALSE if error

+

 

 

 
Property Details

@@ -708,6 +753,6 @@ hardware-specific setting, like 
 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWimax.html b/docs/libnm-util/html/NMSettingWimax.html
index ee30d02e..00676582 100644
--- a/docs/libnm-util/html/NMSettingWimax.html
+++ b/docs/libnm-util/html/NMSettingWimax.html
@@ -3,12 +3,12 @@
 
 
 NMSettingWimax
-
+
 
 
 
 
-
+
 
 
 
@@ -44,30 +44,30 @@
 
 #include <nm-setting-wimax.h>
 
-                    NMSettingWimax;
-                    NMSettingWimaxClass;
+#define             NM_SETTING_WIMAX_SETTING_NAME
 enum                NMSettingWimaxError;
 #define             NM_SETTING_WIMAX_ERROR
-#define             NM_SETTING_WIMAX_MAC_ADDRESS
-#define             NM_SETTING_WIMAX_NETWORK_NAME
-#define             NM_SETTING_WIMAX_SETTING_NAME
 GQuark              nm_setting_wimax_error_quark        (void);
-const GByteArray *  nm_setting_wimax_get_mac_address    (NMSettingWimax *setting);
-const char *        nm_setting_wimax_get_network_name   (NMSettingWimax *setting);
+#define             NM_SETTING_WIMAX_NETWORK_NAME
+#define             NM_SETTING_WIMAX_MAC_ADDRESS
+                    NMSettingWimax;
+                    NMSettingWimaxClass;
 NMSetting *         nm_setting_wimax_new                (void);
+const char *        nm_setting_wimax_get_network_name   (NMSettingWimax *setting);
+const GByteArray *  nm_setting_wimax_get_mac_address    (NMSettingWimax *setting);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingWimaxError
+

 
   GObject
    +----NMSetting
          +----NMSettingWimax
 

-
-  GEnum
-   +----NMSettingWimaxError
-

 

 

 
Properties

@@ -86,17 +86,8 @@ necessary for connection to 802.16e Mobile WiMAX networks.
 

 
Details

 

-
NMSettingWimax

-
typedef struct _NMSettingWimax NMSettingWimax;

-

-

-

-

-

-
NMSettingWimaxClass

-
typedef struct {
-	NMSettingClass parent;
-} NMSettingWimaxClass;
+
NM_SETTING_WIMAX_SETTING_NAME

+
#define NM_SETTING_WIMAX_SETTING_NAME "wimax"
 

 

 

@@ -110,8 +101,11 @@ necessary for connection to 802.16e Mobile WiMAX networks.
 	NM_SETTING_WIMAX_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
 } NMSettingWimaxError;
 

-

+

+++
@@ -142,11 +136,21 @@ required
 

-
NM_SETTING_WIMAX_MAC_ADDRESS

-
#define NM_SETTING_WIMAX_MAC_ADDRESS  "mac-address"
-

+
nm_setting_wimax_error_quark ()

+
GQuark              nm_setting_wimax_error_quark        (void);

 

+Registers an error quark for NMSettingWimax if necessary.
 

+

 


 
 

 
NM_SETTING_WIMAX_ERROR_UNKNOWN

 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingWimax errors.

 

 

 

@@ -158,37 +162,60 @@ required
 

 

 

-
NM_SETTING_WIMAX_SETTING_NAME

-
#define NM_SETTING_WIMAX_SETTING_NAME "wimax"
+
NM_SETTING_WIMAX_MAC_ADDRESS

+
#define NM_SETTING_WIMAX_MAC_ADDRESS  "mac-address"
 

 

 

 

 

 

-
nm_setting_wimax_error_quark ()

-
GQuark              nm_setting_wimax_error_quark        (void);

+
NMSettingWimax

+
typedef struct _NMSettingWimax NMSettingWimax;

 

-Registers an error quark for NMSettingWimax if necessary.
 

-

+
+

+

+
NMSettingWimaxClass

+
typedef struct {
+	NMSettingClass parent;
+} NMSettingWimaxClass;
+

+

+

+

+

+

+
nm_setting_wimax_new ()

+
NMSetting *         nm_setting_wimax_new                (void);

+

+Creates a new NMSettingWimax object with default values.
+

+

+++
-
+

 


 

 
Returns :
the error quark used for NMSettingWimax errors.the new empty NMSettingWimax object
 

 

 

 

 

-
nm_setting_wimax_get_mac_address ()

-
const GByteArray *  nm_setting_wimax_get_mac_address    (NMSettingWimax *setting);

+
nm_setting_wimax_get_network_name ()

+
const char *        nm_setting_wimax_get_network_name   (NMSettingWimax *setting);

 

-Returns the MAC address of a WiMAX device which this connection is locked
-to.
+Returns the WiMAX NSP name (ex "Sprint" or "CLEAR") which identifies the
+specific WiMAX network this setting describes a connection to.
 

-

+

+++
@@ -197,21 +224,24 @@ to.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the MAC addressthe WiMAX NSP name
 

 
 

 

 

 

-
nm_setting_wimax_get_network_name ()

-
const char *        nm_setting_wimax_get_network_name   (NMSettingWimax *setting);

+
nm_setting_wimax_get_mac_address ()

+
const GByteArray *  nm_setting_wimax_get_mac_address    (NMSettingWimax *setting);

 

-Returns the WiMAX NSP name (ex "Sprint" or "CLEAR") which identifies the
-specific WiMAX network this setting describes a connection to.
+Returns the MAC address of a WiMAX device which this connection is locked
+to.
 

-

+

+++
@@ -220,26 +250,11 @@ specific WiMAX network this setting describes a connection to.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the WiMAX NSP namethe MAC address
 

 
 

 

-

-

-
nm_setting_wimax_new ()

-
NMSetting *         nm_setting_wimax_new                (void);

-

-Creates a new NMSettingWimax object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSettingWimax object

-

 

 

 
Property Details

@@ -266,6 +281,6 @@ should use.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWired.html b/docs/libnm-util/html/NMSettingWired.html
index d56f053f..75d9cf16 100644
--- a/docs/libnm-util/html/NMSettingWired.html
+++ b/docs/libnm-util/html/NMSettingWired.html
@@ -3,12 +3,12 @@
 
 
 NMSettingWired
-
+
 
 
 
 
-
+
 
 
 
@@ -44,38 +44,39 @@
 
 #include <nm-setting-wired.h>
 
-                    NMSettingWired;
-                    NMSettingWiredClass;
+#define             NM_SETTING_WIRED_SETTING_NAME
 enum                NMSettingWiredError;
-#define             NM_SETTING_WIRED_AUTO_NEGOTIATE
-#define             NM_SETTING_WIRED_CLONED_MAC_ADDRESS
-#define             NM_SETTING_WIRED_DUPLEX
 #define             NM_SETTING_WIRED_ERROR
+GQuark              nm_setting_wired_error_quark        (void);
+#define             NM_SETTING_WIRED_PORT
+#define             NM_SETTING_WIRED_SPEED
+#define             NM_SETTING_WIRED_DUPLEX
+#define             NM_SETTING_WIRED_AUTO_NEGOTIATE
 #define             NM_SETTING_WIRED_MAC_ADDRESS
+#define             NM_SETTING_WIRED_CLONED_MAC_ADDRESS
 #define             NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST
 #define             NM_SETTING_WIRED_MTU
-#define             NM_SETTING_WIRED_PORT
+#define             NM_SETTING_WIRED_S390_SUBCHANNELS
 #define             NM_SETTING_WIRED_S390_NETTYPE
 #define             NM_SETTING_WIRED_S390_OPTIONS
-#define             NM_SETTING_WIRED_S390_SUBCHANNELS
-#define             NM_SETTING_WIRED_SETTING_NAME
-#define             NM_SETTING_WIRED_SPEED
-gboolean            nm_setting_wired_add_s390_option    (NMSettingWired *setting,
-                                                         const char *key,
-                                                         const char *item);
-GQuark              nm_setting_wired_error_quark        (void);
+                    NMSettingWired;
+                    NMSettingWiredClass;
+NMSetting *         nm_setting_wired_new                (void);
+const char *        nm_setting_wired_get_port           (NMSettingWired *setting);
+guint32             nm_setting_wired_get_speed          (NMSettingWired *setting);
+const char *        nm_setting_wired_get_duplex         (NMSettingWired *setting);
 gboolean            nm_setting_wired_get_auto_negotiate (NMSettingWired *setting);
+const GByteArray *  nm_setting_wired_get_mac_address    (NMSettingWired *setting);
 const GByteArray *  nm_setting_wired_get_cloned_mac_address
                                                         (NMSettingWired *setting);
-const char *        nm_setting_wired_get_duplex         (NMSettingWired *setting);
-const GByteArray *  nm_setting_wired_get_mac_address    (NMSettingWired *setting);
 const GSList *      nm_setting_wired_get_mac_address_blacklist
                                                         (NMSettingWired *setting);
 guint32             nm_setting_wired_get_mtu            (NMSettingWired *setting);
-guint32             nm_setting_wired_get_num_s390_options
+const GPtrArray *   nm_setting_wired_get_s390_subchannels
                                                         (NMSettingWired *setting);
-const char *        nm_setting_wired_get_port           (NMSettingWired *setting);
 const char *        nm_setting_wired_get_s390_nettype   (NMSettingWired *setting);
+guint32             nm_setting_wired_get_num_s390_options
+                                                        (NMSettingWired *setting);
 gboolean            nm_setting_wired_get_s390_option    (NMSettingWired *setting,
                                                          guint32 idx,
                                                          const char **out_key,
@@ -83,25 +84,24 @@ const char *        char *        nm_setting_wired_get_s390_option_by_key
                                                         (NMSettingWired *setting,
                                                          const char *key);
-const GPtrArray *   nm_setting_wired_get_s390_subchannels
-                                                        (NMSettingWired *setting);
-guint32             nm_setting_wired_get_speed          (NMSettingWired *setting);
-NMSetting *         nm_setting_wired_new                (void);
+gboolean            nm_setting_wired_add_s390_option    (NMSettingWired *setting,
+                                                         const char *key,
+                                                         const char *item);
 gboolean            nm_setting_wired_remove_s390_option (NMSettingWired *setting,
                                                          const char *key);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingWiredError
+

 
   GObject
    +----NMSetting
          +----NMSettingWired
 

-
-  GEnum
-   +----NMSettingWiredError
-

 

 

 
Properties

@@ -129,23 +129,8 @@ necessary for connection to Ethernet networks.
 

 
Details

 

-
NMSettingWired

-
typedef struct _NMSettingWired NMSettingWired;

-

-

-

-

-

-
NMSettingWiredClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingWiredClass;
+
NM_SETTING_WIRED_SETTING_NAME

+
#define NM_SETTING_WIRED_SETTING_NAME "802-3-ethernet"
 

 

 

@@ -159,8 +144,11 @@ necessary for connection to Ethernet networks.
 	NM_SETTING_WIRED_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
 } NMSettingWiredError;
 

-

+

+++
@@ -183,80 +171,90 @@ required
 

-
NM_SETTING_WIRED_AUTO_NEGOTIATE

-
#define NM_SETTING_WIRED_AUTO_NEGOTIATE "auto-negotiate"
+
NM_SETTING_WIRED_ERROR

+
#define NM_SETTING_WIRED_ERROR nm_setting_wired_error_quark ()
 

 

 

 

-
NM_SETTING_WIRED_CLONED_MAC_ADDRESS

-
#define NM_SETTING_WIRED_CLONED_MAC_ADDRESS "cloned-mac-address"
-

+
nm_setting_wired_error_quark ()

+
GQuark              nm_setting_wired_error_quark        (void);

 

+Registers an error quark for NMSettingWired if necessary.
 

+

 


 
 

 
NM_SETTING_WIRED_ERROR_UNKNOWN

 
 
 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingWired errors.

 

 

 

-
NM_SETTING_WIRED_DUPLEX

-
#define NM_SETTING_WIRED_DUPLEX "duplex"
+
NM_SETTING_WIRED_PORT

+
#define NM_SETTING_WIRED_PORT "port"
 

 

 

 

 

 

-
NM_SETTING_WIRED_ERROR

-
#define NM_SETTING_WIRED_ERROR nm_setting_wired_error_quark ()
+
NM_SETTING_WIRED_SPEED

+
#define NM_SETTING_WIRED_SPEED "speed"
 

 

 

 

 

 

-
NM_SETTING_WIRED_MAC_ADDRESS

-
#define NM_SETTING_WIRED_MAC_ADDRESS "mac-address"
+
NM_SETTING_WIRED_DUPLEX

+
#define NM_SETTING_WIRED_DUPLEX "duplex"
 

 

 

 

 

 

-
NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST

-
#define NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST "mac-address-blacklist"
+
NM_SETTING_WIRED_AUTO_NEGOTIATE

+
#define NM_SETTING_WIRED_AUTO_NEGOTIATE "auto-negotiate"
 

 

 

 

 

 

-
NM_SETTING_WIRED_MTU

-
#define NM_SETTING_WIRED_MTU "mtu"
+
NM_SETTING_WIRED_MAC_ADDRESS

+
#define NM_SETTING_WIRED_MAC_ADDRESS "mac-address"
 

 

 

 

 

 

-
NM_SETTING_WIRED_PORT

-
#define NM_SETTING_WIRED_PORT "port"
+
NM_SETTING_WIRED_CLONED_MAC_ADDRESS

+
#define NM_SETTING_WIRED_CLONED_MAC_ADDRESS "cloned-mac-address"
 

 

 

 

 

 

-
NM_SETTING_WIRED_S390_NETTYPE

-
#define NM_SETTING_WIRED_S390_NETTYPE "s390-nettype"
+
NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST

+
#define NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST "mac-address-blacklist"
 

 

 

 

 

 

-
NM_SETTING_WIRED_S390_OPTIONS

-
#define NM_SETTING_WIRED_S390_OPTIONS "s390-options"
+
NM_SETTING_WIRED_MTU

+
#define NM_SETTING_WIRED_MTU "mtu"
 

 

 

@@ -271,50 +269,71 @@ required
 

 

 

-
NM_SETTING_WIRED_SETTING_NAME

-
#define NM_SETTING_WIRED_SETTING_NAME "802-3-ethernet"
+
NM_SETTING_WIRED_S390_NETTYPE

+
#define NM_SETTING_WIRED_S390_NETTYPE "s390-nettype"
 

 

 

 

 

 

-
NM_SETTING_WIRED_SPEED

-
#define NM_SETTING_WIRED_SPEED "speed"
+
NM_SETTING_WIRED_S390_OPTIONS

+
#define NM_SETTING_WIRED_S390_OPTIONS "s390-options"
 

 

 

 

 

 

-
nm_setting_wired_add_s390_option ()

-
gboolean            nm_setting_wired_add_s390_option    (NMSettingWired *setting,
-                                                         const char *key,
-                                                         const char *item);

+
NMSettingWired

+
typedef struct _NMSettingWired NMSettingWired;

 

 

 

 

 

-
nm_setting_wired_error_quark ()

-
GQuark              nm_setting_wired_error_quark        (void);

+
NMSettingWiredClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingWiredClass;
+

 

-Registers an error quark for NMSettingWired if necessary.
 

-

+
+

+

+
nm_setting_wired_new ()

+
NMSetting *         nm_setting_wired_new                (void);

+

+Creates a new NMSettingWired object with default values.
+

+

+++
-
+

 


 

 
Returns :
the error quark used for NMSettingWired errors.the new empty NMSettingWired object. [transfer full]
+
 

 

 

 

 

-
nm_setting_wired_get_auto_negotiate ()

-
gboolean            nm_setting_wired_get_auto_negotiate (NMSettingWired *setting);

-

+
nm_setting_wired_get_port ()

+
const char *        nm_setting_wired_get_port           (NMSettingWired *setting);

+

+++
@@ -323,18 +342,20 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "auto-negotiate" property of the settingthe "port" property of the setting
 

 
 

 

 

 

-
nm_setting_wired_get_cloned_mac_address ()

-
const GByteArray *  nm_setting_wired_get_cloned_mac_address
-                                                        (NMSettingWired *setting);

-

+
nm_setting_wired_get_speed ()

+
guint32             nm_setting_wired_get_speed          (NMSettingWired *setting);

+

+++
@@ -343,7 +364,7 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "cloned-mac-address" property of the settingthe "speed" property of the setting
 

 
 

@@ -352,8 +373,11 @@ Registers an error quark for 
 
nm_setting_wired_get_duplex ()

 
const char *        nm_setting_wired_get_duplex         (NMSettingWired *setting);

-

+

+++
@@ -369,10 +393,35 @@ Registers an error quark for 
+
nm_setting_wired_get_auto_negotiate ()

+
gboolean            nm_setting_wired_get_auto_negotiate (NMSettingWired *setting);

+

 


 
 

 
setting :

++++
+
+
+
+
+
+
+
+
+
+
+




setting :
the NMSettingWired
+
Returns :
the "auto-negotiate" property of the setting

+

+

+

 
nm_setting_wired_get_mac_address ()

 
const GByteArray *  nm_setting_wired_get_mac_address    (NMSettingWired *setting);

-

+

+++
@@ -388,11 +437,37 @@ Registers an error quark for 
+
nm_setting_wired_get_cloned_mac_address ()

+
const GByteArray *  nm_setting_wired_get_cloned_mac_address
+                                                        (NMSettingWired *setting);

+

 


 
 

 
setting :

++++
+
+
+
+
+
+
+
+
+
+
+




setting :
the NMSettingWired
+
Returns :
the "cloned-mac-address" property of the setting

+

+

+

 
nm_setting_wired_get_mac_address_blacklist ()

 
const GSList *      nm_setting_wired_get_mac_address_blacklist
                                                         (NMSettingWired *setting);

-

+

+++
@@ -412,8 +487,11 @@ property of the setting. [
 
nm_setting_wired_get_mtu ()

 
guint32             nm_setting_wired_get_mtu            (NMSettingWired *setting);

-

 


 
 

 
setting :

+

+++
@@ -429,16 +507,19 @@ property of the setting. [
-
nm_setting_wired_get_num_s390_options ()

-
guint32             nm_setting_wired_get_num_s390_options
+
nm_setting_wired_get_s390_subchannels ()

+
const GPtrArray *   nm_setting_wired_get_s390_subchannels
                                                         (NMSettingWired *setting);

 

-Returns the number of s390-specific options that should be set for this
-device when it is activated.  This can be used to retrieve each s390
-option individually using nm_setting_wired_get_s390_option().
+Return the list of s390 subchannels that identify the device that this
+connection is applicable to.  The connection should only be used in
+conjunction with that device.
 

-

 


 
 

 
setting :

+

+++
@@ -447,17 +528,27 @@ option individually using Returns :

-
+

 


 
 

 
setting :
the number of s390-specific device options
+GPtrArray of strings, each specifying one
+subchannel the s390 device uses to communicate to the host. [element-type utf8]
+
 

 
 

 

 

 

-
nm_setting_wired_get_port ()

-
const char *        nm_setting_wired_get_port           (NMSettingWired *setting);

-

+
nm_setting_wired_get_s390_nettype ()

+
const char *        nm_setting_wired_get_s390_nettype   (NMSettingWired *setting);

+

+Returns the s390 device type this connection should apply to.  Will be one
+of 'qeth', 'lcs', or 'ctc'.
+

+

+++
@@ -466,21 +557,26 @@ option individually using Returns :

-
+

 


 
 

 
setting :
the "port" property of the settingthe s390 device type
 

 
 

 

 

 

-
nm_setting_wired_get_s390_nettype ()

-
const char *        nm_setting_wired_get_s390_nettype   (NMSettingWired *setting);

+
nm_setting_wired_get_num_s390_options ()

+
guint32             nm_setting_wired_get_num_s390_options
+                                                        (NMSettingWired *setting);

 

-Returns the s390 device type this connection should apply to.  Will be one
-of 'qeth', 'lcs', or 'ctc'.
+Returns the number of s390-specific options that should be set for this
+device when it is activated.  This can be used to retrieve each s390
+option individually using nm_setting_wired_get_s390_option().
 

-

+

+++
@@ -489,7 +585,7 @@ of 'qeth', 'lcs', or 'ctc'.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the s390 device typethe number of s390-specific device options
 

 
 

@@ -508,8 +604,11 @@ are *not* guaranteed to be static across modifications to options done by
 and should not be used to refer to options except for short periods of time
 such as during option iteration.
 

-

+

+++
@@ -553,8 +652,11 @@ currently held by the setting)
 Returns the value associated with the s390-specific option specified by
 key, if it exists.
 

-

 


 
 

 
setting :

+

+++
@@ -567,7 +669,7 @@ Returns the value associated with the s390-specific option specified by
 
-
@@ -575,66 +677,12 @@ setting; the value is owned by the setting and must not be modified

-
nm_setting_wired_get_s390_subchannels ()

-
const GPtrArray *   nm_setting_wired_get_s390_subchannels
-                                                        (NMSettingWired *setting);

-

-Return the list of s390 subchannels that identify the device that this
-connection is applicable to.  The connection should only be used in
-conjunction with that device.
-

-

 


 
 

 
setting :

 

 
Returns :
the value, or NULL if the key/value pair was never added to the
+the value, or NULL if the key/value pair was never added to the
 setting; the value is owned by the setting and must not be modified
 

 
 
 
 

--
-
-
-
-
-
-
-
-
-
-


setting :
the NMSettingWired
-
Returns :

-GPtrArray of strings, each specifying one
-subchannel the s390 device uses to communicate to the host. [element-type utf8]
-

-

-

-

-
nm_setting_wired_get_speed ()

-
guint32             nm_setting_wired_get_speed          (NMSettingWired *setting);

-

--
-
-
-
-
-
-
-
-
-
-


setting :
the NMSettingWired
-
Returns :
the "speed" property of the setting

-

-

-

-
nm_setting_wired_new ()

-
NMSetting *         nm_setting_wired_new                (void);

+
nm_setting_wired_add_s390_option ()

+
gboolean            nm_setting_wired_add_s390_option    (NMSettingWired *setting,
+                                                         const char *key,
+                                                         const char *item);

 

-Creates a new NMSettingWired object with default values.
 

-

--
-
-
-
-


Returns :
the new empty NMSettingWired object. [transfer full]
-

 

 

 

@@ -755,6 +803,7 @@ composed of hexadecimal characters and the period (.) character.
 
  "speed"                    guint                 : Read / Write / Construct

 

 If non-zero, request that the device use only the specified speed.
+
 In Mbit/s, ie 100 == 100Mbit/s.
 

 
Default value: 0

@@ -763,6 +812,6 @@ In Mbit/s, ie 100 == 100Mbit/s.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWireless.html b/docs/libnm-util/html/NMSettingWireless.html
index 3a144270..a792acc9 100644
--- a/docs/libnm-util/html/NMSettingWireless.html
+++ b/docs/libnm-util/html/NMSettingWireless.html
@@ -3,12 +3,12 @@
 
 
 NMSettingWireless
-
+
 
 
 
 
-
+
 
 
 
@@ -44,71 +44,71 @@
 
 #include <nm-setting-wireless.h>
 
-                    NMSettingWireless;
-                    NMSettingWirelessClass;
+#define             NM_SETTING_WIRELESS_SETTING_NAME
 enum                NMSettingWirelessError;
+#define             NM_SETTING_WIRELESS_ERROR
+GQuark              nm_setting_wireless_error_quark     (void);
+#define             NM_SETTING_WIRELESS_SSID
+#define             NM_SETTING_WIRELESS_MODE
 #define             NM_SETTING_WIRELESS_BAND
-#define             NM_SETTING_WIRELESS_BSSID
 #define             NM_SETTING_WIRELESS_CHANNEL
-#define             NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS
-#define             NM_SETTING_WIRELESS_ERROR
-#define             NM_SETTING_WIRELESS_HIDDEN
+#define             NM_SETTING_WIRELESS_BSSID
+#define             NM_SETTING_WIRELESS_RATE
+#define             NM_SETTING_WIRELESS_TX_POWER
 #define             NM_SETTING_WIRELESS_MAC_ADDRESS
+#define             NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS
 #define             NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST
-#define             NM_SETTING_WIRELESS_MODE
+#define             NM_SETTING_WIRELESS_MTU
+#define             NM_SETTING_WIRELESS_SEEN_BSSIDS
+#define             NM_SETTING_WIRELESS_SEC
+#define             NM_SETTING_WIRELESS_HIDDEN
 #define             NM_SETTING_WIRELESS_MODE_ADHOC
 #define             NM_SETTING_WIRELESS_MODE_AP
 #define             NM_SETTING_WIRELESS_MODE_INFRA
-#define             NM_SETTING_WIRELESS_MTU
-#define             NM_SETTING_WIRELESS_RATE
-#define             NM_SETTING_WIRELESS_SEC
-#define             NM_SETTING_WIRELESS_SEEN_BSSIDS
-#define             NM_SETTING_WIRELESS_SETTING_NAME
-#define             NM_SETTING_WIRELESS_SSID
-#define             NM_SETTING_WIRELESS_TX_POWER
-gboolean            nm_setting_wireless_add_seen_bssid  (NMSettingWireless *setting,
-                                                         const char *bssid);
-gboolean            nm_setting_wireless_ap_security_compatible
-                                                        (NMSettingWireless *s_wireless,
-                                                         NMSettingWirelessSecurity *s_wireless_sec,
-                                                         NM80211ApFlags ap_flags,
-                                                         NM80211ApSecurityFlags ap_wpa,
-                                                         NM80211ApSecurityFlags ap_rsn,
-                                                         NM80211Mode ap_mode);
-GQuark              nm_setting_wireless_error_quark     (void);
+                    NMSettingWireless;
+                    NMSettingWirelessClass;
+NMSetting *         nm_setting_wireless_new             (void);
+const GByteArray *  nm_setting_wireless_get_ssid        (NMSettingWireless *setting);
+const char *        nm_setting_wireless_get_mode        (NMSettingWireless *setting);
 const char *        nm_setting_wireless_get_band        (NMSettingWireless *setting);
-const GByteArray *  nm_setting_wireless_get_bssid       (NMSettingWireless *setting);
 guint32             nm_setting_wireless_get_channel     (NMSettingWireless *setting);
+const GByteArray *  nm_setting_wireless_get_bssid       (NMSettingWireless *setting);
+guint32             nm_setting_wireless_get_rate        (NMSettingWireless *setting);
+guint32             nm_setting_wireless_get_tx_power    (NMSettingWireless *setting);
+const GByteArray *  nm_setting_wireless_get_mac_address (NMSettingWireless *setting);
 const GByteArray *  nm_setting_wireless_get_cloned_mac_address
                                                         (NMSettingWireless *setting);
-gboolean            nm_setting_wireless_get_hidden      (NMSettingWireless *setting);
-const GByteArray *  nm_setting_wireless_get_mac_address (NMSettingWireless *setting);
 const GSList *      nm_setting_wireless_get_mac_address_blacklist
                                                         (NMSettingWireless *setting);
-const char *        nm_setting_wireless_get_mode        (NMSettingWireless *setting);
 guint32             nm_setting_wireless_get_mtu         (NMSettingWireless *setting);
+const char *        nm_setting_wireless_get_security    (NMSettingWireless *setting);
+gboolean            nm_setting_wireless_get_hidden      (NMSettingWireless *setting);
+gboolean            nm_setting_wireless_add_seen_bssid  (NMSettingWireless *setting,
+                                                         const char *bssid);
 guint32             nm_setting_wireless_get_num_seen_bssids
                                                         (NMSettingWireless *setting);
-guint32             nm_setting_wireless_get_rate        (NMSettingWireless *setting);
-const char *        nm_setting_wireless_get_security    (NMSettingWireless *setting);
 const char *        nm_setting_wireless_get_seen_bssid  (NMSettingWireless *setting,
                                                          guint32 i);
-const GByteArray *  nm_setting_wireless_get_ssid        (NMSettingWireless *setting);
-guint32             nm_setting_wireless_get_tx_power    (NMSettingWireless *setting);
-NMSetting *         nm_setting_wireless_new             (void);
+gboolean            nm_setting_wireless_ap_security_compatible
+                                                        (NMSettingWireless *s_wireless,
+                                                         NMSettingWirelessSecurity *s_wireless_sec,
+                                                         NM80211ApFlags ap_flags,
+                                                         NM80211ApSecurityFlags ap_wpa,
+                                                         NM80211ApSecurityFlags ap_rsn,
+                                                         NM80211Mode ap_mode);
 

 

 

 
Object Hierarchy

+
+  GEnum
+   +----NMSettingWirelessError
+

 
   GObject
    +----NMSetting
          +----NMSettingWireless
 

-
-  GEnum
-   +----NMSettingWirelessError
-

 

 

 
Properties

@@ -139,23 +139,8 @@ necessary for connection to 802.11 WiFi networks.
 

 
Details

 

-
NMSettingWireless

-
typedef struct _NMSettingWireless NMSettingWireless;

-

-

-

-

-

-
NMSettingWirelessClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingWirelessClass;
+
NM_SETTING_WIRELESS_SETTING_NAME

+
#define NM_SETTING_WIRELESS_SETTING_NAME "802-11-wireless"
 

 

 

@@ -171,8 +156,11 @@ necessary for connection to 802.11 WiFi networks.
 	NM_SETTING_WIRELESS_ERROR_CHANNEL_REQUIRES_BAND     /*< nick=ChannelRequiresBand >*/
 } NMSettingWirelessError;
 

-

+

+++
@@ -207,104 +195,108 @@ set to a value that requires the 
-
NM_SETTING_WIRELESS_BAND

-
#define NM_SETTING_WIRELESS_BAND        "band"
+
NM_SETTING_WIRELESS_ERROR

+
#define NM_SETTING_WIRELESS_ERROR nm_setting_wireless_error_quark ()
 

 

 

 
 

 

-
NM_SETTING_WIRELESS_BSSID

-
#define NM_SETTING_WIRELESS_BSSID       "bssid"
-

+
nm_setting_wireless_error_quark ()

+
GQuark              nm_setting_wireless_error_quark     (void);

 

+Registers an error quark for NMSettingWireless if necessary.
 

+

 


 
 

 
NM_SETTING_WIRELESS_ERROR_UNKNOWN

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingWireless errors.

 

 

 

-
NM_SETTING_WIRELESS_CHANNEL

-
#define NM_SETTING_WIRELESS_CHANNEL     "channel"
+
NM_SETTING_WIRELESS_SSID

+
#define NM_SETTING_WIRELESS_SSID        "ssid"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS

-
#define NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS "cloned-mac-address"
+
NM_SETTING_WIRELESS_MODE

+
#define NM_SETTING_WIRELESS_MODE        "mode"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_ERROR

-
#define NM_SETTING_WIRELESS_ERROR nm_setting_wireless_error_quark ()
+
NM_SETTING_WIRELESS_BAND

+
#define NM_SETTING_WIRELESS_BAND        "band"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_HIDDEN

-
#define NM_SETTING_WIRELESS_HIDDEN      "hidden"
+
NM_SETTING_WIRELESS_CHANNEL

+
#define NM_SETTING_WIRELESS_CHANNEL     "channel"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_MAC_ADDRESS

-
#define NM_SETTING_WIRELESS_MAC_ADDRESS "mac-address"
+
NM_SETTING_WIRELESS_BSSID

+
#define NM_SETTING_WIRELESS_BSSID       "bssid"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST

-
#define NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST "mac-address-blacklist"
+
NM_SETTING_WIRELESS_RATE

+
#define NM_SETTING_WIRELESS_RATE        "rate"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_MODE

-
#define NM_SETTING_WIRELESS_MODE        "mode"
+
NM_SETTING_WIRELESS_TX_POWER

+
#define NM_SETTING_WIRELESS_TX_POWER    "tx-power"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_MODE_ADHOC

-
#define NM_SETTING_WIRELESS_MODE_ADHOC  "adhoc"
+
NM_SETTING_WIRELESS_MAC_ADDRESS

+
#define NM_SETTING_WIRELESS_MAC_ADDRESS "mac-address"
 

 

-Indicates Ad-Hoc mode where no access point is expected to be present.
 

 

 

 

-
NM_SETTING_WIRELESS_MODE_AP

-
#define NM_SETTING_WIRELESS_MODE_AP     "ap"
+
NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS

+
#define NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS "cloned-mac-address"
 

 

-Indicates AP/master mode where the wireless device is started as an access
-point/hotspot.
 

-
Since 0.9.8

 

 

 

-
NM_SETTING_WIRELESS_MODE_INFRA

-
#define NM_SETTING_WIRELESS_MODE_INFRA  "infrastructure"
+
NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST

+
#define NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST "mac-address-blacklist"
 

 

-Indicates infrastructure mode where an access point is expected to be present
-for this connection.
 

 

 

@@ -317,8 +309,8 @@ for this connection.
 

 

 

-
NM_SETTING_WIRELESS_RATE

-
#define NM_SETTING_WIRELESS_RATE        "rate"
+
NM_SETTING_WIRELESS_SEEN_BSSIDS

+
#define NM_SETTING_WIRELESS_SEEN_BSSIDS "seen-bssids"
 

 

 

@@ -333,49 +325,93 @@ for this connection.
 

 

 

-
NM_SETTING_WIRELESS_SEEN_BSSIDS

-
#define NM_SETTING_WIRELESS_SEEN_BSSIDS "seen-bssids"
+
NM_SETTING_WIRELESS_HIDDEN

+
#define NM_SETTING_WIRELESS_HIDDEN      "hidden"
 

 

 

 

 

 

-
NM_SETTING_WIRELESS_SETTING_NAME

-
#define NM_SETTING_WIRELESS_SETTING_NAME "802-11-wireless"
+
NM_SETTING_WIRELESS_MODE_ADHOC

+
#define NM_SETTING_WIRELESS_MODE_ADHOC  "adhoc"
 

 

+Indicates Ad-Hoc mode where no access point is expected to be present.
 

 

 

 

-
NM_SETTING_WIRELESS_SSID

-
#define NM_SETTING_WIRELESS_SSID        "ssid"
+
NM_SETTING_WIRELESS_MODE_AP

+
#define NM_SETTING_WIRELESS_MODE_AP     "ap"
 

 

+Indicates AP/master mode where the wireless device is started as an access
+point/hotspot.
 

+
Since 0.9.8

 

 

 

-
NM_SETTING_WIRELESS_TX_POWER

-
#define NM_SETTING_WIRELESS_TX_POWER    "tx-power"
+
NM_SETTING_WIRELESS_MODE_INFRA

+
#define NM_SETTING_WIRELESS_MODE_INFRA  "infrastructure"
 

 

+Indicates infrastructure mode where an access point is expected to be present
+for this connection.
 

 

 

 

-
nm_setting_wireless_add_seen_bssid ()

-
gboolean            nm_setting_wireless_add_seen_bssid  (NMSettingWireless *setting,
-                                                         const char *bssid);

+
NMSettingWireless

+
typedef struct _NMSettingWireless NMSettingWireless;

 

-Adds a new Wi-Fi AP's BSSID to the previously seen BSSID list of the setting.
-NetworkManager now tracks previously seen BSSIDs internally so this function
-no longer has much use. Actually, changes you make using this function will
-not be preserved.
 

-

+
+

+

+
NMSettingWirelessClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingWirelessClass;
+

+

+

+

+

+

+
nm_setting_wireless_new ()

+
NMSetting *         nm_setting_wireless_new             (void);

+

+Creates a new NMSettingWireless object with default values.
+

+

++++
+
+
+
+
+




Returns :
the new empty NMSettingWireless object. [transfer full]
+

+

+

+

+
nm_setting_wireless_get_ssid ()

+
const GByteArray *  nm_setting_wireless_get_ssid        (NMSettingWireless *setting);

+

+++
@@ -383,96 +419,65 @@ not be preserved.
 
-
-
-
-
-
+

 


 
 

 
setting :

 

 
bssid :
the new BSSID to add to the list

 
Returns :

-TRUE if bssid was already known, FALSE if notthe "ssid" property of the setting
 

 
 

 

 

 

-
nm_setting_wireless_ap_security_compatible ()

-
gboolean            nm_setting_wireless_ap_security_compatible
-                                                        (NMSettingWireless *s_wireless,
-                                                         NMSettingWirelessSecurity *s_wireless_sec,
-                                                         NM80211ApFlags ap_flags,
-                                                         NM80211ApSecurityFlags ap_wpa,
-                                                         NM80211ApSecurityFlags ap_rsn,
-                                                         NM80211Mode ap_mode);

-

-Given a NMSettingWireless and an optional NMSettingWirelessSecurity,
-determine if the configuration given by the settings is compatible with
-the security of an access point using that access point's capability flags
-and mode.  Useful for clients that wish to filter a set of connections
-against a set of access points and determine which connections are
-compatible with which access points.
-

-

+
nm_setting_wireless_get_mode ()

+
const char *        nm_setting_wireless_get_mode        (NMSettingWireless *setting);

+

+++
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+

 


 
 
s_wireless :
a NMSettingWireless
-
s_wireless_sec :
a NMSettingWirelessSecurity or NULL
+
setting :
the NMSettingWireless
 
 

 
ap_flags :
the NM80211ApFlags of the given access point
ap_wpa :
the NM80211ApSecurityFlags of the given access point's WPA
-capabilities
ap_rsn :
the NM80211ApSecurityFlags of the given access point's WPA2/RSN
-capabilities
ap_mode :
the 802.11 mode of the AP, either Ad-Hoc or Infrastructure

 
Returns :

-TRUE if the given settings are compatible with the access point's
-security flags and mode, FALSE if they are not.the "mode" property of the setting
 

 
 

 

 

 

-
nm_setting_wireless_error_quark ()

-
GQuark              nm_setting_wireless_error_quark     (void);

-

-Registers an error quark for NMSettingWireless if necessary.
-

-

+
nm_setting_wireless_get_band ()

+
const char *        nm_setting_wireless_get_band        (NMSettingWireless *setting);

+

+-
++
+
+
+
+
+
+
-
-
+
+
+

 



setting :
the NMSettingWireless
+

 
Returns :
the error quark used for NMSettingWireless errors.
the "band" property of the setting

 

 

 

 

-
nm_setting_wireless_get_band ()

-
const char *        nm_setting_wireless_get_band        (NMSettingWireless *setting);

-

+
nm_setting_wireless_get_channel ()

+
guint32             nm_setting_wireless_get_channel     (NMSettingWireless *setting);

+

+++
@@ -481,7 +486,7 @@ Registers an error quark for 
 
-
+

 


 
 

 
setting :

 
Returns :
the "band" property of the settingthe "channel" property of the setting
 

 
 

@@ -490,8 +495,11 @@ Registers an error quark for 
 
nm_setting_wireless_get_bssid ()

 
const GByteArray *  nm_setting_wireless_get_bssid       (NMSettingWireless *setting);

-

+

+++
@@ -507,10 +515,13 @@ Registers an error quark for 
 

 

-
nm_setting_wireless_get_channel ()

-
guint32             nm_setting_wireless_get_channel     (NMSettingWireless *setting);

-

 


 
 

 
setting :

+
nm_setting_wireless_get_rate ()

+
guint32             nm_setting_wireless_get_rate        (NMSettingWireless *setting);

+

+++
@@ -519,18 +530,20 @@ Registers an error quark for 
 
-
+

 


 
 

 
setting :

 
Returns :
the "channel" property of the settingthe "rate" property of the setting
 

 
 

 

 

 

-
nm_setting_wireless_get_cloned_mac_address ()

-
const GByteArray *  nm_setting_wireless_get_cloned_mac_address
-                                                        (NMSettingWireless *setting);

-

+
nm_setting_wireless_get_tx_power ()

+
guint32             nm_setting_wireless_get_tx_power    (NMSettingWireless *setting);

+

+++
@@ -539,17 +552,20 @@ Registers an error quark for 
 
-
+

 


 
 

 
setting :

 
Returns :
the "cloned-mac-address" property of the settingthe "tx-power" property of the setting
 

 
 

 

 

 

-
nm_setting_wireless_get_hidden ()

-
gboolean            nm_setting_wireless_get_hidden      (NMSettingWireless *setting);

-

+
nm_setting_wireless_get_mac_address ()

+
const GByteArray *  nm_setting_wireless_get_mac_address (NMSettingWireless *setting);

+

+++
@@ -558,17 +574,21 @@ Registers an error quark for 
 
-
+

 


 
 

 
setting :

 
Returns :
the "hidden" property of the settingthe "mac-address" property of the setting
 

 
 

 

 

 

-
nm_setting_wireless_get_mac_address ()

-
const GByteArray *  nm_setting_wireless_get_mac_address (NMSettingWireless *setting);

-

+
nm_setting_wireless_get_cloned_mac_address ()

+
const GByteArray *  nm_setting_wireless_get_cloned_mac_address
+                                                        (NMSettingWireless *setting);

+

+++
@@ -577,7 +597,7 @@ Registers an error quark for 
 
-
+

 


 
 

 
setting :

 
Returns :
the "mac-address" property of the settingthe "cloned-mac-address" property of the setting
 

 
 

@@ -587,8 +607,11 @@ Registers an error quark for 
nm_setting_wireless_get_mac_address_blacklist ()

 
const GSList *      nm_setting_wireless_get_mac_address_blacklist
                                                         (NMSettingWireless *setting);

-

+

+++
@@ -606,10 +629,13 @@ Registers an error quark for 
 

 

-
nm_setting_wireless_get_mode ()

-
const char *        nm_setting_wireless_get_mode        (NMSettingWireless *setting);

-

 


 
 

 
setting :

+
nm_setting_wireless_get_mtu ()

+
guint32             nm_setting_wireless_get_mtu         (NMSettingWireless *setting);

+

+++
@@ -618,17 +644,20 @@ Registers an error quark for 
 
-
+

 


 
 

 
setting :

 
Returns :
the "mode" property of the settingthe "mtu" property of the setting
 

 
 

 

 

 

-
nm_setting_wireless_get_mtu ()

-
guint32             nm_setting_wireless_get_mtu         (NMSettingWireless *setting);

-

+
nm_setting_wireless_get_security ()

+
const char *        nm_setting_wireless_get_security    (NMSettingWireless *setting);

+

+++
@@ -637,18 +666,20 @@ Registers an error quark for 
 
-
+

 


 
 

 
setting :

 
Returns :
the "mtu" property of the settingthe "security" property of the setting
 

 
 

 

 

 

-
nm_setting_wireless_get_num_seen_bssids ()

-
guint32             nm_setting_wireless_get_num_seen_bssids
-                                                        (NMSettingWireless *setting);

-

+
nm_setting_wireless_get_hidden ()

+
gboolean            nm_setting_wireless_get_hidden      (NMSettingWireless *setting);

+

+++
@@ -657,17 +688,27 @@ Registers an error quark for 
 
-
+

 


 
 

 
setting :

 
Returns :
the number of BSSIDs in the previously seen BSSID listthe "hidden" property of the setting
 

 
 

 

 

 

-
nm_setting_wireless_get_rate ()

-
guint32             nm_setting_wireless_get_rate        (NMSettingWireless *setting);

-

+
nm_setting_wireless_add_seen_bssid ()

+
gboolean            nm_setting_wireless_add_seen_bssid  (NMSettingWireless *setting,
+                                                         const char *bssid);

+

+Adds a new Wi-Fi AP's BSSID to the previously seen BSSID list of the setting.
+NetworkManager now tracks previously seen BSSIDs internally so this function
+no longer has much use. Actually, changes you make using this function will
+not be preserved.
+

+

+++
@@ -675,18 +716,27 @@ Registers an error quark for 
 
+
+
+
+
-
+

 


 
 

 
setting :

 
bssid :
the new BSSID to add to the list

 
Returns :
the "rate" property of the setting
+TRUE if bssid was already known, FALSE if not
 

 
 

 

 

 

-
nm_setting_wireless_get_security ()

-
const char *        nm_setting_wireless_get_security    (NMSettingWireless *setting);

-

+
nm_setting_wireless_get_num_seen_bssids ()

+
guint32             nm_setting_wireless_get_num_seen_bssids
+                                                        (NMSettingWireless *setting);

+

+++
@@ -695,7 +745,7 @@ Registers an error quark for 
 
-
+

 


 
 

 
setting :

 
Returns :
the "security" property of the settingthe number of BSSIDs in the previously seen BSSID list
 

 
 

@@ -705,8 +755,11 @@ Registers an error quark for 
nm_setting_wireless_get_seen_bssid ()

 
const char *        nm_setting_wireless_get_seen_bssid  (NMSettingWireless *setting,
                                                          guint32 i);

-

+

+++
@@ -727,58 +780,65 @@ Registers an error quark for 
 

 

-
nm_setting_wireless_get_ssid ()

-
const GByteArray *  nm_setting_wireless_get_ssid        (NMSettingWireless *setting);

-

 


 
 

 
setting :

+
nm_setting_wireless_ap_security_compatible ()

+
gboolean            nm_setting_wireless_ap_security_compatible
+                                                        (NMSettingWireless *s_wireless,
+                                                         NMSettingWirelessSecurity *s_wireless_sec,
+                                                         NM80211ApFlags ap_flags,
+                                                         NM80211ApSecurityFlags ap_wpa,
+                                                         NM80211ApSecurityFlags ap_rsn,
+                                                         NM80211Mode ap_mode);

+

+Given a NMSettingWireless and an optional NMSettingWirelessSecurity,
+determine if the configuration given by the settings is compatible with
+the security of an access point using that access point's capability flags
+and mode.  Useful for clients that wish to filter a set of connections
+against a set of access points and determine which connections are
+compatible with which access points.
+

+

+++
-
-
+
-
-
+
+
-
-

 


 
 
setting :
the NMSettingWireless
+
s_wireless :
a NMSettingWireless
 
 

 
Returns :
the "ssid" property of the setting
s_wireless_sec :
a NMSettingWirelessSecurity or NULL
+
 

-

-

-

-
nm_setting_wireless_get_tx_power ()

-
guint32             nm_setting_wireless_get_tx_power    (NMSettingWireless *setting);

-

--
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+


 
setting :
the NMSettingWireless
-
ap_flags :
the NM80211ApFlags of the given access point
ap_wpa :
the NM80211ApSecurityFlags of the given access point's WPA
+capabilities
ap_rsn :
the NM80211ApSecurityFlags of the given access point's WPA2/RSN
+capabilities
ap_mode :
the 802.11 mode of the AP, either Ad-Hoc or Infrastructure
 

 

 
Returns :
the "tx-power" property of the setting
+TRUE if the given settings are compatible with the access point's
+security flags and mode, FALSE if they are not.
 

 
 

 

-

-

-
nm_setting_wireless_new ()

-
NMSetting *         nm_setting_wireless_new             (void);

-

-Creates a new NMSettingWireless object with default values.
-

-

--
-
-
-
-


Returns :
the new empty NMSettingWireless object. [transfer full]
-

-

 

 

 
Property Details

@@ -855,10 +915,9 @@ of the device (i.e. MAC spoofing).
 
The "mac-address-blacklist" property

 
  "mac-address-blacklist"    GSList_gchararray_*   : Read / Write

 

-If specified, this connection will never apply to the WiFi device
-whose permanent MAC address matches an address in the list.  Each
-MAC address is in the standard hex-digits-and-colons notation.
-(00:11:22:33:44:55).
+A list of permanent MAC addresses of Wi-Fi devices to which this
+connection should never apply.  Each MAC address should be given in the
+standard hex-digits-and-colons notation (eg '00:11:22:33:44:55').
 

 

 

@@ -939,6 +998,6 @@ devices support setting a static transmit power.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWirelessSecurity.html b/docs/libnm-util/html/NMSettingWirelessSecurity.html
index 94ff1432..bdde2c5b 100644
--- a/docs/libnm-util/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm-util/html/NMSettingWirelessSecurity.html
@@ -3,12 +3,12 @@
 
 
 NMSettingWirelessSecurity
-
+
 
 
 
 
-
+
 
 
 
@@ -45,107 +45,102 @@ use WEP, LEAP, WPA or WPA2/RSN security

 
 #include <nm-setting-wireless-security.h>
 
-                    NMSettingWirelessSecurity;
-                    NMSettingWirelessSecurityClass;
+#define             NM_SETTING_WIRELESS_SECURITY_SETTING_NAME
 enum                NMSettingWirelessSecurityError;
+#define             NM_SETTING_WIRELESS_SECURITY_ERROR
+GQuark              nm_setting_wireless_security_error_quark
+                                                        (void);
 enum                NMWepKeyType;
+#define             NM_SETTING_WIRELESS_SECURITY_KEY_MGMT
+#define             NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX
 #define             NM_SETTING_WIRELESS_SECURITY_AUTH_ALG
-#define             NM_SETTING_WIRELESS_SECURITY_ERROR
+#define             NM_SETTING_WIRELESS_SECURITY_PROTO
+#define             NM_SETTING_WIRELESS_SECURITY_PAIRWISE
 #define             NM_SETTING_WIRELESS_SECURITY_GROUP
-#define             NM_SETTING_WIRELESS_SECURITY_KEY_MGMT
-#define             NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD
-#define             NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS
 #define             NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME
-#define             NM_SETTING_WIRELESS_SECURITY_PAIRWISE
-#define             NM_SETTING_WIRELESS_SECURITY_PROTO
-#define             NM_SETTING_WIRELESS_SECURITY_PSK
-#define             NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS
-#define             NM_SETTING_WIRELESS_SECURITY_SETTING_NAME
 #define             NM_SETTING_WIRELESS_SECURITY_WEP_KEY0
 #define             NM_SETTING_WIRELESS_SECURITY_WEP_KEY1
 #define             NM_SETTING_WIRELESS_SECURITY_WEP_KEY2
 #define             NM_SETTING_WIRELESS_SECURITY_WEP_KEY3
 #define             NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS
 #define             NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE
-#define             NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX
-gboolean            nm_setting_wireless_security_add_group
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         const char *group);
-gboolean            nm_setting_wireless_security_add_pairwise
+#define             NM_SETTING_WIRELESS_SECURITY_PSK
+#define             NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS
+#define             NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD
+#define             NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS
+                    NMSettingWirelessSecurity;
+                    NMSettingWirelessSecurityClass;
+NMSetting *         nm_setting_wireless_security_new    (void);
+const char *        nm_setting_wireless_security_get_key_mgmt
+                                                        (NMSettingWirelessSecurity *setting);
+guint32             nm_setting_wireless_security_get_num_protos
+                                                        (NMSettingWirelessSecurity *setting);
+const char *        nm_setting_wireless_security_get_proto
                                                         (NMSettingWirelessSecurity *setting,
-                                                         const char *pairwise);
+                                                         guint32 i);
 gboolean            nm_setting_wireless_security_add_proto
                                                         (NMSettingWirelessSecurity *setting,
                                                          const char *proto);
-void                nm_setting_wireless_security_clear_groups
-                                                        (NMSettingWirelessSecurity *setting);
-void                nm_setting_wireless_security_clear_pairwise
-                                                        (NMSettingWirelessSecurity *setting);
+void                nm_setting_wireless_security_remove_proto
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         guint32 i);
 void                nm_setting_wireless_security_clear_protos
                                                         (NMSettingWirelessSecurity *setting);
-GQuark              nm_setting_wireless_security_error_quark
-                                                        (void);
-const char *        nm_setting_wireless_security_get_auth_alg
+guint32             nm_setting_wireless_security_get_num_pairwise
                                                         (NMSettingWirelessSecurity *setting);
-const char *        nm_setting_wireless_security_get_group
+const char *        nm_setting_wireless_security_get_pairwise
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 i);
-const char *        nm_setting_wireless_security_get_key_mgmt
-                                                        (NMSettingWirelessSecurity *setting);
-const char *        nm_setting_wireless_security_get_leap_password
-                                                        (NMSettingWirelessSecurity *setting);
-NMSettingSecretFlags nm_setting_wireless_security_get_leap_password_flags
-                                                        (NMSettingWirelessSecurity *setting);
-const char *        nm_setting_wireless_security_get_leap_username
+gboolean            nm_setting_wireless_security_add_pairwise
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         const char *pairwise);
+void                nm_setting_wireless_security_remove_pairwise
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         guint32 i);
+void                nm_setting_wireless_security_clear_pairwise
                                                         (NMSettingWirelessSecurity *setting);
 guint32             nm_setting_wireless_security_get_num_groups
                                                         (NMSettingWirelessSecurity *setting);
-guint32             nm_setting_wireless_security_get_num_pairwise
-                                                        (NMSettingWirelessSecurity *setting);
-guint32             nm_setting_wireless_security_get_num_protos
-                                                        (NMSettingWirelessSecurity *setting);
-const char *        nm_setting_wireless_security_get_pairwise
+const char *        nm_setting_wireless_security_get_group
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 i);
-const char *        nm_setting_wireless_security_get_proto
+gboolean            nm_setting_wireless_security_add_group
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         const char *group);
+void                nm_setting_wireless_security_remove_group
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 i);
+void                nm_setting_wireless_security_clear_groups
+                                                        (NMSettingWirelessSecurity *setting);
 const char *        nm_setting_wireless_security_get_psk
                                                         (NMSettingWirelessSecurity *setting);
 NMSettingSecretFlags nm_setting_wireless_security_get_psk_flags
                                                         (NMSettingWirelessSecurity *setting);
-const char *        nm_setting_wireless_security_get_wep_key
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 idx);
-NMSettingSecretFlags nm_setting_wireless_security_get_wep_key_flags
+const char *        nm_setting_wireless_security_get_leap_username
                                                         (NMSettingWirelessSecurity *setting);
-NMWepKeyType        nm_setting_wireless_security_get_wep_key_type
+const char *        nm_setting_wireless_security_get_leap_password
                                                         (NMSettingWirelessSecurity *setting);
-guint32             nm_setting_wireless_security_get_wep_tx_keyidx
+NMSettingSecretFlags nm_setting_wireless_security_get_leap_password_flags
                                                         (NMSettingWirelessSecurity *setting);
-NMSetting *         nm_setting_wireless_security_new    (void);
-void                nm_setting_wireless_security_remove_group
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);
-void                nm_setting_wireless_security_remove_pairwise
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);
-void                nm_setting_wireless_security_remove_proto
+const char *        nm_setting_wireless_security_get_wep_key
                                                         (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);
+                                                         guint32 idx);
 void                nm_setting_wireless_security_set_wep_key
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 idx,
                                                          const char *key);
+guint32             nm_setting_wireless_security_get_wep_tx_keyidx
+                                                        (NMSettingWirelessSecurity *setting);
+const char *        nm_setting_wireless_security_get_auth_alg
+                                                        (NMSettingWirelessSecurity *setting);
+NMSettingSecretFlags nm_setting_wireless_security_get_wep_key_flags
+                                                        (NMSettingWirelessSecurity *setting);
+NMWepKeyType        nm_setting_wireless_security_get_wep_key_type
+                                                        (NMSettingWirelessSecurity *setting);
 

 
 

 
Object Hierarchy

-
-  GObject
-   +----NMSetting
-         +----NMSettingWirelessSecurity
-

 
   GEnum
    +----NMSettingWirelessSecurityError
@@ -154,6 +149,11 @@ const char *        
+  GObject
+   +----NMSetting
+         +----NMSettingWirelessSecurity
+

 

 

 
Properties

@@ -203,23 +203,8 @@ of how WiFi security works, you may want to get copies of the following books.
 

 
Details

 

-
NMSettingWirelessSecurity

-
typedef struct _NMSettingWirelessSecurity NMSettingWirelessSecurity;

-

-

-

-

-

-
NMSettingWirelessSecurityClass

-
typedef struct {
-	NMSettingClass parent;
-
-	/* Padding for future expansion */
-	void (*_reserved1) (void);
-	void (*_reserved2) (void);
-	void (*_reserved3) (void);
-	void (*_reserved4) (void);
-} NMSettingWirelessSecurityClass;
+
NM_SETTING_WIRELESS_SECURITY_SETTING_NAME

+
#define NM_SETTING_WIRELESS_SECURITY_SETTING_NAME "802-11-wireless-security"
 

 

 

@@ -237,8 +222,11 @@ of how WiFi security works, you may want to get copies of the following books.
 	NM_SETTING_WIRELESS_SECURITY_ERROR_SHARED_KEY_REQUIRES_WEP /*< nick=SharedKeyRequiresWEP >*/
 } NMSettingWirelessSecurityError;
 

-

+

+++
@@ -286,6 +274,33 @@ encryption protocol
 

+
NM_SETTING_WIRELESS_SECURITY_ERROR

+
#define NM_SETTING_WIRELESS_SECURITY_ERROR nm_setting_wireless_security_error_quark ()
+

+

+

+

+

+

+
nm_setting_wireless_security_error_quark ()

+
GQuark              nm_setting_wireless_security_error_quark
+                                                        (void);

+

+Registers an error quark for NMSettingWired if necessary.
+

+

 


 
 

 
NM_SETTING_WIRELESS_SECURITY_ERROR_UNKNOWN

 
 

++++
+
+
+
+
+




Returns :
the error quark used for NMSettingWired errors.

+

+

+

 
enum NMWepKeyType

 
typedef enum {
 	NM_WEP_KEY_TYPE_UNKNOWN = 0,
@@ -306,8 +321,11 @@ ASCII keys are also valid WEP passphrases, but since passphrases and ASCII
 keys are hashed differently to determine the actual WEP key the type must be
 specified.
 

-

+

+++
@@ -340,48 +358,48 @@ the actual WEP key using the MD5 hash algorithm.
 

-
NM_SETTING_WIRELESS_SECURITY_AUTH_ALG

-
#define NM_SETTING_WIRELESS_SECURITY_AUTH_ALG "auth-alg"
+
NM_SETTING_WIRELESS_SECURITY_KEY_MGMT

+
#define NM_SETTING_WIRELESS_SECURITY_KEY_MGMT "key-mgmt"
 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_ERROR

-
#define NM_SETTING_WIRELESS_SECURITY_ERROR nm_setting_wireless_security_error_quark ()
+
NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX

+
#define NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX "wep-tx-keyidx"
 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_GROUP

-
#define NM_SETTING_WIRELESS_SECURITY_GROUP "group"
+
NM_SETTING_WIRELESS_SECURITY_AUTH_ALG

+
#define NM_SETTING_WIRELESS_SECURITY_AUTH_ALG "auth-alg"
 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_KEY_MGMT

-
#define NM_SETTING_WIRELESS_SECURITY_KEY_MGMT "key-mgmt"
+
NM_SETTING_WIRELESS_SECURITY_PROTO

+
#define NM_SETTING_WIRELESS_SECURITY_PROTO "proto"
 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD

-
#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD "leap-password"
+
NM_SETTING_WIRELESS_SECURITY_PAIRWISE

+
#define NM_SETTING_WIRELESS_SECURITY_PAIRWISE "pairwise"
 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS

-
#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS "leap-password-flags"
+
NM_SETTING_WIRELESS_SECURITY_GROUP

+
#define NM_SETTING_WIRELESS_SECURITY_GROUP "group"
 

 

 

@@ -396,148 +414,184 @@ the actual WEP key using the MD5 hash algorithm.
 

-
NM_SETTING_WIRELESS_SECURITY_PAIRWISE

-
#define NM_SETTING_WIRELESS_SECURITY_PAIRWISE "pairwise"
+
NM_SETTING_WIRELESS_SECURITY_WEP_KEY0

+
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY0 "wep-key0"
 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_PROTO

-
#define NM_SETTING_WIRELESS_SECURITY_PROTO "proto"
+
NM_SETTING_WIRELESS_SECURITY_WEP_KEY1

+
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY1 "wep-key1"
 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_PSK

-
#define NM_SETTING_WIRELESS_SECURITY_PSK "psk"
+
NM_SETTING_WIRELESS_SECURITY_WEP_KEY2

+
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY2 "wep-key2"
 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS

-
#define NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS "psk-flags"
+
NM_SETTING_WIRELESS_SECURITY_WEP_KEY3

+
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY3 "wep-key3"
 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_SETTING_NAME

-
#define NM_SETTING_WIRELESS_SECURITY_SETTING_NAME "802-11-wireless-security"
+
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS

+
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS "wep-key-flags"
 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_WEP_KEY0

-
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY0 "wep-key0"
+
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE

+
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE "wep-key-type"
 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_WEP_KEY1

-
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY1 "wep-key1"
+
NM_SETTING_WIRELESS_SECURITY_PSK

+
#define NM_SETTING_WIRELESS_SECURITY_PSK "psk"
 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_WEP_KEY2

-
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY2 "wep-key2"
+
NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS

+
#define NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS "psk-flags"
 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_WEP_KEY3

-
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY3 "wep-key3"
+
NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD

+
#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD "leap-password"
 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS

-
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS "wep-key-flags"
+
NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS

+
#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS "leap-password-flags"
 

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE

-
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE "wep-key-type"
-

+
NMSettingWirelessSecurity

+
typedef struct _NMSettingWirelessSecurity NMSettingWirelessSecurity;

 

 

 

-
NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX

-
#define NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX "wep-tx-keyidx"
+
NMSettingWirelessSecurityClass

+
typedef struct {
+	NMSettingClass parent;
+
+	/* Padding for future expansion */
+	void (*_reserved1) (void);
+	void (*_reserved2) (void);
+	void (*_reserved3) (void);
+	void (*_reserved4) (void);
+} NMSettingWirelessSecurityClass;
 

 

 

 

-
nm_setting_wireless_security_add_group ()

-
gboolean            nm_setting_wireless_security_add_group
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         const char *group);

+
nm_setting_wireless_security_new ()

+
NMSetting *         nm_setting_wireless_security_new    (void);

 

-Adds an encryption algorithm to the list of allowed groupwise encryption
-algorithms.  If the list is not empty, then only access points that support
-one or more of the encryption algorithms in the list will be considered
-compatible with this connection.
+Creates a new NMSettingWirelessSecurity object with default values.
 

-

 


 
 

 
NM_WEP_KEY_TYPE_UNKNOWN

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

+

+-
-
-
-
-
++
+
+
+
+
+

 

setting :
the NMSettingWirelessSecurity
-


Returns :
the new empty NMSettingWirelessSecurity object. [transfer full]
+

+

+

+

+
nm_setting_wireless_security_get_key_mgmt ()

+
const char *        nm_setting_wireless_security_get_key_mgmt
+                                                        (NMSettingWirelessSecurity *setting);

+

++++
+
-
-
+
+
-
+




 
group :
the encryption algorithm to add, one of "wep40", "wep104",
-"tkip", or "ccmp"
setting :
the NMSettingWirelessSecurity
+
 

 

 
Returns :

-TRUE if the algorithm was added to the list, FALSE if it was
-already in the listthe "key-mgmt" property of the setting
 

 
 

 

 

 

-
nm_setting_wireless_security_add_pairwise ()

-
gboolean            nm_setting_wireless_security_add_pairwise
+
nm_setting_wireless_security_get_num_protos ()

+
guint32             nm_setting_wireless_security_get_num_protos
+                                                        (NMSettingWirelessSecurity *setting);

+

++++
+
+
+
+
+
+
+
+
+
+
+




setting :
the NMSettingWirelessSecurity
+
Returns :
the number of security protocols this connection allows when
+connecting to secure WiFi networks

+

+

+

+
nm_setting_wireless_security_get_proto ()

+
const char *        nm_setting_wireless_security_get_proto
                                                         (NMSettingWirelessSecurity *setting,
-                                                         const char *pairwise);

-

-Adds an encryption algorithm to the list of allowed pairwise encryption
-algorithms.  If the list is not empty, then only access points that support
-one or more of the encryption algorithms in the list will be considered
-compatible with this connection.
-

-

+                                                         guint32 i);
+

+++
@@ -545,15 +599,13 @@ compatible with this connection.
 
-
-
+
+
-
+

 


 
 

 
setting :

 

 
pairwise :
the encryption algorithm to add, one of "wep40", "wep104",
-"tkip", or "ccmp"
i :
an index into the protocol list
 

 

 
Returns :

-TRUE if the algorithm was added to the list, FALSE if it was
-already in the listthe protocol at index i
+
 

 
 

@@ -572,8 +624,11 @@ protocol list contains only "wpa" but the access point for the SSID specified
 by this connection only supports WPA2/RSN, the connection cannot be used
 with the access point.
 

-

+

+++
@@ -595,38 +650,29 @@ protocol list, or 
-
nm_setting_wireless_security_clear_groups ()

-
void                nm_setting_wireless_security_clear_groups
-                                                        (NMSettingWirelessSecurity *setting);

-

-Removes all algorithms from the allowed list.  If there are no algorithms
-specified then all groupwise encryption algorithms are allowed.
-

-

 


 
 

 
setting :

--
-
-
-
-


setting :
the NMSettingWirelessSecurity
-

-

-

-

-
nm_setting_wireless_security_clear_pairwise ()

-
void                nm_setting_wireless_security_clear_pairwise
-                                                        (NMSettingWirelessSecurity *setting);

+
nm_setting_wireless_security_remove_proto ()

+
void                nm_setting_wireless_security_remove_proto
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         guint32 i);

 

-Removes all algorithms from the allowed list.  If there are no algorithms
-specified then all pairwise encryption algorithms are allowed.
+Removes a protocol from the allowed protocol list.
 

-

+

+-
++
+
+
-
+
+
+
+
+
+

 




 
setting :

 the NMSettingWirelessSecurity
 
i :
index of the protocol to remove

 

 

 

@@ -638,8 +684,11 @@ specified then all pairwise encryption algorithms are allowed.
 Removes all protocols from the allowed list.  If there are no protocols
 specified then all protocols are allowed.
 

-

+

+++

 


 

 
setting :

 the NMSettingWirelessSecurity
@@ -649,27 +698,14 @@ specified then all protocols are allowed.
 
 

 

-
nm_setting_wireless_security_error_quark ()

-
GQuark              nm_setting_wireless_security_error_quark
-                                                        (void);

-

-Registers an error quark for NMSettingWired if necessary.
-

-

--
-
-
-
-


Returns :
the error quark used for NMSettingWired errors.

-

-

-

-
nm_setting_wireless_security_get_auth_alg ()

-
const char *        nm_setting_wireless_security_get_auth_alg
+
nm_setting_wireless_security_get_num_pairwise ()

+
guint32             nm_setting_wireless_security_get_num_pairwise
                                                         (NMSettingWirelessSecurity *setting);

-

+

+++
@@ -678,23 +714,26 @@ Registers an error quark for Returns :

-
+

 


 
 

 
setting :
the "auth-alg" property of the settingthe number of pairwise encryption algorithms in the allowed list
 

 
 

 

 

 

-
nm_setting_wireless_security_get_group ()

-
const char *        nm_setting_wireless_security_get_group
+
nm_setting_wireless_security_get_pairwise ()

+
const char *        nm_setting_wireless_security_get_pairwise
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 i);

 

-Returns the allowed groupwise encryption algorithm from allowed algorithm
+Returns the allowed pairwise encryption algorithm from allowed algorithm
 list.
 

-

+

+++
@@ -703,11 +742,11 @@ list.
 
-
+
-
@@ -715,11 +754,21 @@ list.
 

-
nm_setting_wireless_security_get_key_mgmt ()

-
const char *        nm_setting_wireless_security_get_key_mgmt
-                                                        (NMSettingWirelessSecurity *setting);

-

 


 
 

 
setting :

 

 
i :
index of an item in the allowed groupwise encryption algorithm listindex of an item in the allowed pairwise encryption algorithm list
 

 

 
Returns :
the groupwise encryption algorithm at index i
+the pairwise encryption algorithm at index i
 
 

 
 
 

+
nm_setting_wireless_security_add_pairwise ()

+
gboolean            nm_setting_wireless_security_add_pairwise
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         const char *pairwise);

+

+Adds an encryption algorithm to the list of allowed pairwise encryption
+algorithms.  If the list is not empty, then only access points that support
+one or more of the encryption algorithms in the list will be considered
+compatible with this connection.
+

+

+++
@@ -727,39 +776,34 @@ list.
 
-
-
-
-
-

 


 
 

 
setting :

 

 
Returns :
the "key-mgmt" property of the setting

-

-

-

-
nm_setting_wireless_security_get_leap_password ()

-
const char *        nm_setting_wireless_security_get_leap_password
-                                                        (NMSettingWirelessSecurity *setting);

-

--
-
-
-
+
+
-
+


setting :
the NMSettingWirelessSecurity
-
pairwise :
the encryption algorithm to add, one of "wep40", "wep104",
+"tkip", or "ccmp"
 

 

 
Returns :
the "leap-password" property of the setting
+TRUE if the algorithm was added to the list, FALSE if it was
+already in the list
 

 
 

 

 

 

-
nm_setting_wireless_security_get_leap_password_flags ()

-
NMSettingSecretFlags nm_setting_wireless_security_get_leap_password_flags
-                                                        (NMSettingWirelessSecurity *setting);

-

+
nm_setting_wireless_security_remove_pairwise ()

+
void                nm_setting_wireless_security_remove_pairwise
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         guint32 i);

+

+Removes an encryption algorithm from the allowed pairwise encryption
+algorithm list.
+

+

+++
@@ -767,32 +811,31 @@ list.
 
-
-
+
+

 


 
 

 
setting :

 

 
Returns :
the NMSettingSecretFlags pertaining to the
-"leap-password"
-
i :
the index of an item in the allowed pairwise encryption algorithm list
 

 
 

 

 

 

-
nm_setting_wireless_security_get_leap_username ()

-
const char *        nm_setting_wireless_security_get_leap_username
+
nm_setting_wireless_security_clear_pairwise ()

+
void                nm_setting_wireless_security_clear_pairwise
                                                         (NMSettingWirelessSecurity *setting);

-

+

+Removes all algorithms from the allowed list.  If there are no algorithms
+specified then all pairwise encryption algorithms are allowed.
+

+

+-
-
++
+
-
-
-
-
-
-
+

 




 
setting :

 the NMSettingWirelessSecurity
 
Returns :
the "leap-username" property of the setting

 

 

 

@@ -800,8 +843,11 @@ list.
 
nm_setting_wireless_security_get_num_groups ()

 
guint32             nm_setting_wireless_security_get_num_groups
                                                         (NMSettingWirelessSecurity *setting);

-

+

+++
@@ -817,11 +863,19 @@ list.
 

-
nm_setting_wireless_security_get_num_pairwise ()

-
guint32             nm_setting_wireless_security_get_num_pairwise
-                                                        (NMSettingWirelessSecurity *setting);

-

 


 
 

 
setting :

 
 

+
nm_setting_wireless_security_get_group ()

+
const char *        nm_setting_wireless_security_get_group
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         guint32 i);

+

+Returns the allowed groupwise encryption algorithm from allowed algorithm
+list.
+

+

+++
@@ -829,19 +883,34 @@ list.
 
+
+
+
+
-
+

 


 
 

 
setting :

 

 
i :
index of an item in the allowed groupwise encryption algorithm list

 
Returns :
the number of pairwise encryption algorithms in the allowed listthe groupwise encryption algorithm at index i
+
 

 
 

 
 

 

-
nm_setting_wireless_security_get_num_protos ()

-
guint32             nm_setting_wireless_security_get_num_protos
-                                                        (NMSettingWirelessSecurity *setting);

-

+
nm_setting_wireless_security_add_group ()

+
gboolean            nm_setting_wireless_security_add_group
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         const char *group);

+

+Adds an encryption algorithm to the list of allowed groupwise encryption
+algorithms.  If the list is not empty, then only access points that support
+one or more of the encryption algorithms in the list will be considered
+compatible with this connection.
+

+

+++
@@ -849,25 +918,34 @@ list.
 
+
+
+
+
-
+

 


 
 

 
setting :

 

 
group :
the encryption algorithm to add, one of "wep40", "wep104",
+"tkip", or "ccmp"

 
Returns :
the number of security protocols this connection allows when
-connecting to secure WiFi networks
+TRUE if the algorithm was added to the list, FALSE if it was
+already in the list
 

 
 

 

 

 

-
nm_setting_wireless_security_get_pairwise ()

-
const char *        nm_setting_wireless_security_get_pairwise
+
nm_setting_wireless_security_remove_group ()

+
void                nm_setting_wireless_security_remove_group
                                                         (NMSettingWirelessSecurity *setting,
                                                          guint32 i);

 

-Returns the allowed pairwise encryption algorithm from allowed algorithm
-list.
+Removes an encryption algorithm from the allowed groupwise encryption
+algorithm list.
 

-

+

+++
@@ -876,40 +954,30 @@ list.
 
-
-
-
-
-
+

 


 
 

 
setting :

 

 
i :
index of an item in the allowed pairwise encryption algorithm list
Returns :
the pairwise encryption algorithm at index i
-the index of an item in the allowed groupwise encryption algorithm list
 

 
 

 

 

 

-
nm_setting_wireless_security_get_proto ()

-
const char *        nm_setting_wireless_security_get_proto
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);

-

+
nm_setting_wireless_security_clear_groups ()

+
void                nm_setting_wireless_security_clear_groups
+                                                        (NMSettingWirelessSecurity *setting);

+

+Removes all algorithms from the allowed list.  If there are no algorithms
+specified then all groupwise encryption algorithms are allowed.
+

+

+-
-
++
+
-
-
-
-
-
-
-
-
-
-
+

 




 
setting :

 the NMSettingWirelessSecurity
 
i :
an index into the protocol list
Returns :
the protocol at index i
-

 

 

 

@@ -917,8 +985,11 @@ list.
 
nm_setting_wireless_security_get_psk ()

 
const char *        nm_setting_wireless_security_get_psk
                                                         (NMSettingWirelessSecurity *setting);

-

+

+++
@@ -937,8 +1008,11 @@ list.
 
nm_setting_wireless_security_get_psk_flags ()
NMSettingSecretFlags nm_setting_wireless_security_get_psk_flags
                                                         (NMSettingWirelessSecurity *setting);

-

 


 
 

 
setting :

 

+

+++
@@ -956,12 +1030,14 @@ list.
 

-
nm_setting_wireless_security_get_wep_key ()

-
const char *        nm_setting_wireless_security_get_wep_key
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 idx);

-

 


 
 

 
setting :

 
 

+
nm_setting_wireless_security_get_leap_username ()

+
const char *        nm_setting_wireless_security_get_leap_username
+                                                        (NMSettingWirelessSecurity *setting);

+

+++
@@ -969,23 +1045,22 @@ list.
 
-
-
-
-
-
+

 


 
 

 
setting :

 

 
idx :
the WEP key index (0..3 inclusive)

 
Returns :
the WEP key at the given indexthe "leap-username" property of the setting
 

 
 

 
 

 

-
nm_setting_wireless_security_get_wep_key_flags ()

-
NMSettingSecretFlags nm_setting_wireless_security_get_wep_key_flags
+
nm_setting_wireless_security_get_leap_password ()

+
const char *        nm_setting_wireless_security_get_leap_password
                                                         (NMSettingWirelessSecurity *setting);

-

+

+++
@@ -994,18 +1069,21 @@ list.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the NMSettingSecretFlags pertaining to the all WEP keysthe "leap-password" property of the setting
 

 
 

 

 

 

-
nm_setting_wireless_security_get_wep_key_type ()

-
NMWepKeyType        nm_setting_wireless_security_get_wep_key_type
+
nm_setting_wireless_security_get_leap_password_flags ()

+
NMSettingSecretFlags nm_setting_wireless_security_get_leap_password_flags
                                                         (NMSettingWirelessSecurity *setting);

-

+

+++
@@ -1014,18 +1092,24 @@ list.
 
-
+

 


 
 

 
setting :

 

 
Returns :
the "wep-key-type" property of the settingthe NMSettingSecretFlags pertaining to the
+"leap-password"
+
 

 
 

 

 

 

-
nm_setting_wireless_security_get_wep_tx_keyidx ()

-
guint32             nm_setting_wireless_security_get_wep_tx_keyidx
-                                                        (NMSettingWirelessSecurity *setting);

-

+
nm_setting_wireless_security_get_wep_key ()

+
const char *        nm_setting_wireless_security_get_wep_key
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         guint32 idx);

+

+++
@@ -1033,40 +1117,60 @@ list.
 
+
+
+
+
-
+

 


 
 

 
setting :

 

 
idx :
the WEP key index (0..3 inclusive)

 
Returns :
the "wep-tx-keyidx" property of the settingthe WEP key at the given index
 

 
 

 

 

 

-
nm_setting_wireless_security_new ()

-
NMSetting *         nm_setting_wireless_security_new    (void);

+
nm_setting_wireless_security_set_wep_key ()

+
void                nm_setting_wireless_security_set_wep_key
+                                                        (NMSettingWirelessSecurity *setting,
+                                                         guint32 idx,
+                                                         const char *key);

 

-Creates a new NMSettingWirelessSecurity object with default values.
+Sets a WEP key in the given index.
 

-

+

+-
-
-+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+

 

Returns :
the new empty NMSettingWirelessSecurity object. [transfer full]
+


setting :
the NMSettingWirelessSecurity
 
idx :
the index of the key (0..3 inclusive)
key :
the WEP key as a string, in either hexadecimal, ASCII, or passphrase
+form as determiend by the value of the "wep-key-type"
+property.

 

 

 

 

-
nm_setting_wireless_security_remove_group ()

-
void                nm_setting_wireless_security_remove_group
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);

-

-Removes an encryption algorithm from the allowed groupwise encryption
-algorithm list.
-

-

+
nm_setting_wireless_security_get_wep_tx_keyidx ()

+
guint32             nm_setting_wireless_security_get_wep_tx_keyidx
+                                                        (NMSettingWirelessSecurity *setting);

+

+++
@@ -1074,24 +1178,22 @@ algorithm list.
 
-
-
+
+

 


 
 

 
setting :

 

 
i :
the index of an item in the allowed groupwise encryption algorithm list
Returns :
the "wep-tx-keyidx" property of the setting
 

 
 

 

 

 

-
nm_setting_wireless_security_remove_pairwise ()

-
void                nm_setting_wireless_security_remove_pairwise
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);

-

-Removes an encryption algorithm from the allowed pairwise encryption
-algorithm list.
-

-

+
nm_setting_wireless_security_get_auth_alg ()

+
const char *        nm_setting_wireless_security_get_auth_alg
+                                                        (NMSettingWirelessSecurity *setting);

+

+++
@@ -1099,23 +1201,22 @@ algorithm list.
 
-
-
+
+

 


 
 

 
setting :

 

 
i :
the index of an item in the allowed pairwise encryption algorithm list
Returns :
the "auth-alg" property of the setting
 

 
 

 

 

 

-
nm_setting_wireless_security_remove_proto ()

-
void                nm_setting_wireless_security_remove_proto
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 i);

-

-Removes a protocol from the allowed protocol list.
-

-

+
nm_setting_wireless_security_get_wep_key_flags ()

+
NMSettingSecretFlags nm_setting_wireless_security_get_wep_key_flags
+                                                        (NMSettingWirelessSecurity *setting);

+

+++
@@ -1123,24 +1224,22 @@ Removes a protocol from the allowed protocol list.
 
-
-
+
+

 


 
 

 
setting :

 

 
i :
index of the protocol to remove
Returns :
the NMSettingSecretFlags pertaining to the all WEP keys
 

 
 

 

 

 

-
nm_setting_wireless_security_set_wep_key ()

-
void                nm_setting_wireless_security_set_wep_key
-                                                        (NMSettingWirelessSecurity *setting,
-                                                         guint32 idx,
-                                                         const char *key);

-

-Sets a WEP key in the given index.
-

-

+
nm_setting_wireless_security_get_wep_key_type ()

+
NMWepKeyType        nm_setting_wireless_security_get_wep_key_type
+                                                        (NMSettingWirelessSecurity *setting);

+

+++
@@ -1148,14 +1247,8 @@ Sets a WEP key in the given index.
 
-
-
-
-
-
-
+
+

 


 
 

 
setting :

 

 
idx :
the index of the key (0..3 inclusive)
key :
the WEP key as a string, in either hexadecimal, ASCII, or passphrase
-form as determiend by the value of the "wep-key-type"
-property.
Returns :
the "wep-key-type" property of the setting
 

 
 

@@ -1180,9 +1273,10 @@ the 'leap-username' and 'leap-password' properties must be specified.
 
The "group" property

 
  "group"                    GSList_gchararray_*   : Read / Write

 

-If specified, will only connect to WPA networks that provide the
-specified group/multicast encryption capabilities.  Each element may be
-one of 'wep40', 'wep104', 'tkip', or 'ccmp'.
+A list of group/broadcast encryption algorithms which prevents
+connections to Wi-Fi networks that do not utilize one of the algorithms
+in the list.  For maximum compatibility leave this property empty.  Each
+list element may be one of 'wep40', 'wep104', 'tkip', or 'ccmp'.
 

 

 

@@ -1232,9 +1326,10 @@ The login username for legacy LEAP connections (ie, key-mgmt =
 
The "pairwise" property

 
  "pairwise"                 GSList_gchararray_*   : Read / Write

 

-If specified, will only connect to WPA networks that provide the
-specified pairwise encryption capabilities.  Each element may be one of
-'wep40', 'wep104', 'tkip', or 'ccmp'.
+A list of pairwise encryption algorithms which prevents connections to
+Wi-Fi networks that do not utilize one of the algorithms in the list.  For
+maximum compatibility leave this property empty.  Each list element may
+be one of 'wep40', 'wep104', 'tkip', or 'ccmp'.
 

 
 

@@ -1353,6 +1448,6 @@ Linksys WRT54G) number the keys 1 - 4.
 
 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/annotation-glossary.html b/docs/libnm-util/html/annotation-glossary.html
index b9117001..ae9452da 100644
--- a/docs/libnm-util/html/annotation-glossary.html
+++ b/docs/libnm-util/html/annotation-glossary.html
@@ -3,11 +3,11 @@
 
 
 Annotation Glossary
-
+
 
 
 
-
+
 
 
 
@@ -20,58 +20,53 @@
 		 
 

 

-O
+I
                       | 
                    A
                       | 
-                   I
+                   T
                       | 
-                   E
+                   O
+                      | 
+                   S
                       | 
                    T
                       | 
-                   S
+                   E
                       | 
                    T
 

 

 

-

-Annotation Glossary

-
O

-

-out

-
Parameter for returning results. Default is transfer full.

-
A

-

-allow-none

-
NULL is ok, both for passing and for returning.

+

+Annotation Glossary

 
I

-

-inout

-
Parameter for input and for returning results. Default is transfer full.

-
E

-

-element-type

-
Generics and defining elements of containers and arrays.

+
inout

+
Parameter for input and for returning results. Default is transfer full.

+
A

+
allow-none

+
NULL is ok, both for passing and for returning.

 
T

-

-transfer container

-
Free data container after the code is done.

+
transfer container

+
Free data container after the code is done.

+
O

+
out

+
Parameter for returning results. Default is transfer full.

 
S

-

-scope call

-
The callback is valid only during the call to the method.

+
scope call

+
The callback is valid only during the call to the method.

+
T

+
transfer none

+
Don't free data after the code is done.

+
E

+
element-type

+
Generics and defining elements of containers and arrays.

 
T

-

-transfer full

-
Free data after the code is done.

-

-transfer none

-
Don't free data after the code is done.

+
transfer full

+
Free data after the code is done.

 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/api-index-full.html b/docs/libnm-util/html/api-index-full.html
index b3f8aa63..9d53c16b 100644
--- a/docs/libnm-util/html/api-index-full.html
+++ b/docs/libnm-util/html/api-index-full.html
@@ -3,12 +3,12 @@
 
 
 API Index
-
+
 
 
 
 
-
+
 
 
 
@@ -35,8 +35,8 @@
 
 
 

-

-API Index

+

+API Index

 
C

 

 NMConnection, struct in NMConnection
@@ -589,6 +589,14 @@
 

 

 

+NMSetting8021x:pin, object property in NMSetting8021x
+

+

+

+NMSetting8021x:pin-flags, object property in NMSetting8021x
+

+

+

 NMSetting8021x:private-key, object property in NMSetting8021x
 

 

@@ -4242,6 +4250,6 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html
index 5223862e..5b79f668 100644
--- a/docs/libnm-util/html/ch01.html
+++ b/docs/libnm-util/html/ch01.html
@@ -3,12 +3,12 @@
 
 
 libnm-util API Reference
-
+
 
 
 
 
-
+
 
 
 
@@ -20,9 +20,9 @@
 Next
 
 

-

-libnm-util API Reference

-

+

+libnm-util API Reference

+

 

 NMConnection — Describes a connection to specific network or provider
 

@@ -105,6 +105,6 @@ that require PPP to deliver IP capability
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html
index 667c695c..a7e470a3 100644
--- a/docs/libnm-util/html/index.html
+++ b/docs/libnm-util/html/index.html
@@ -3,10 +3,10 @@
 
 
 libnm-util Reference Manual
-
+
 
 
-
+
 
 
 
@@ -15,14 +15,14 @@
 

 

 

-      for libnm-util 0.9.8.0
+      for libnm-util 0.9.8.8
 
       The latest version of this documentation can be found on-line at
       http://projects.gnome.org/NetworkManager/developers/libnm-util/09/.
     

 
Copyright © 2012 The NetworkManager Authors

 

-

+

 	Permission is granted to copy, distribute and/or modify this
 	document under the terms of the GNU Free
 	Documentation License, Version 1.1 or any later
@@ -46,7 +46,7 @@
 

 

 

-

+

 
libnm-util API Reference

 

 

@@ -135,6 +135,6 @@ that require PPP to deliver IP capability
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/index.sgml b/docs/libnm-util/html/index.sgml
index 604f2d9b..203b6e1b 100644
--- a/docs/libnm-util/html/index.sgml
+++ b/docs/libnm-util/html/index.sgml
@@ -7,35 +7,48 @@
 
 
 
-
-
 
 
 
 
 
 
+
 
+
+
+
+
+
+
 
-
-
+
+
+
+
 
-
 
-
-
-
+
+
+
+
+
+
+
+
+
 
+
+
+
+
+
 
-
-
 
-
 
 
 
 
-
 
 
 
@@ -46,26 +59,13 @@
 
 
 
-
 
 
+
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
 
 
 
@@ -73,67 +73,67 @@
 
 
 
-
-
 
-
 
+
+
+
 
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
 
 
-
-
-
-
+
+
+
+
+
+
+
 
 
 
 
 
+
+
+
+
+
+
+
+
+
+
 
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
 
+
+
+
+
 
-
 
-
-
-
-
-
-
-
-
 
+
+
+
 
-
+
+
+
 
 
 
@@ -143,47 +143,47 @@
 
 
 
-
-
+
 
 
 
 
 
 
-
 
+
 
-
-
-
-
-
-
-
-
 
+
+
+
+
+
 
-
-
-
-
-
+
+
+
+
+
+
 
-
+
+
+
+
+
 
-
 
-
-
-
-
-
 
-
-
 
+
 
+
+
+
+
+
+
 
 
 
@@ -204,41 +204,41 @@
 
 
 
-
-
+
 
 
 
 
-
-
-
 
+
+
+
+
+
 
+
 
 
-
+
 
 
-
-
-
-
-
-
-
+
+
+
+
+
 
+
 
+
 
 
-
-
+
 
+
 
 
-
-
-
+
 
 
 
@@ -259,52 +259,52 @@
 
 
 
-
-
+
 
 
 
 
 
 
+
+
+
+
 
-
 
-
-
-
+
+
+
 
+
 
-
+
+
+
+
 
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
 
-
 
-
-
+
+
+
 
+
 
-
 
-
-
 
+
+
+
 
-
-
-
+
 
 
 
@@ -328,8 +328,7 @@
 
 
 
-
-
+
 
 
 
@@ -338,59 +337,60 @@
 
 
 
+
+
 
 
 
 
 
+
+
 
-
+
+
 
-
-
-
 
-
-
-
-
-
 
 
 
 
 
 
-
-
-
+
+
+
+
+
+
+
+
+
+
 
-
-
+
 
-
-
-
-
-
-
-
-
 
-
 
-
+
+
+
+
+
+
+
+
 
 
+
+
+
 
+
+
+
 
 
-
-
-
-
-
-
 
 
 
@@ -416,23 +416,23 @@
 
 
 
-
-
+
 
 
 
 
 
-
 
-
+
+
 
 
 
-
+
+
+
 
 
-
 
 
 
@@ -443,27 +443,27 @@
 
 
 
-
-
+
 
 
 
 
 
+
+
 
 
-
 
-
-
 
-
+
+
+
+
 
 
 
-
 
-
+
 
 
 
@@ -477,25 +477,25 @@
 
 
 
-
-
+
 
 
 
 
 
 
+
 
+
 
 
-
-
-
+
+
+
 
+
 
 
-
-
 
 
 
@@ -504,19 +504,39 @@
 
 
 
-
 
+
 
 
 
 
-
-
+
 
 
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -533,40 +553,20 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
 
-
 
 
-
-
-
+
 
+
 
-
-
+
 
 
 
@@ -586,20 +586,20 @@
 
 
 
-
-
+
 
 
 
 
 
-
-
-
 
-
-
+
+
+
+
 
+
+
 
 
 
@@ -610,8 +610,7 @@
 
 
 
-
-
+
 
 
 
@@ -619,25 +618,26 @@
 
 
 
+
 
 
-
-
-
-
 
+
+
 
-
-
-
+
+
+
+
+
 
 
 
 
-
-
-
+
 
+
+
 
 
 
@@ -648,30 +648,30 @@
 
 
 
-
-
+
 
 
 
 
-
 
+
+
+
+
 
 
-
 
-
-
-
-
-
+
+
+
+
+
+
+
 
 
-
 
-
-
-
+
 
 
 
@@ -687,22 +687,22 @@
 
 
 
-
-
+
 
 
 
 
 
-
-
-
-
 
-
-
-
+
+
+
+
+
 
+
+
+
 
 
 
@@ -714,22 +714,22 @@
 
 
 
-
-
+
 
 
 
 
 
+
 
 
-
 
-
+
+
+
 
 
 
-
 
 
 
@@ -737,46 +737,46 @@
 
 
 
-
 
+
 
 
 
 
-
-
+
 
 
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
 
-
 
+
+
+
 
-
+
 
+
+
 
 
 
@@ -791,22 +791,22 @@
 
 
 
-
-
+
 
 
 
 
-
-
 
-
-
 
+
+
+
+
+
+
+
 
 
-
-
 
 
 
@@ -818,35 +818,35 @@
 
 
 
-
-
+
 
 
 
 
-
-
-
 
+
+
 
 
 
-
+
+
+
 
 
-
-
-
-
-
-
+
+
+
+
+
+
+
 
-
 
-
-
+
 
-
+
+
 
 
 
@@ -864,7 +864,6 @@
 
 
 
-
 
 
 
@@ -874,111 +873,112 @@
 
 
 
-
+
 
 
 
 
-
+
+
+
+
 
+
 
 
+
+
 
-
-
-
-
-
-
-
-
-
-
 
-
+
+
 
 
 
 
+
+
 
+
+
+
+
+
+
+
 
 
 
-
 
 
-
-
-
-
-
 
-
+
+
+
+
+
 
-
-
+
 
-
-
-
+
 
+
+
+
+
+
 
 
-
-
+
+
+
+
+
+
+
+
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
+
 
-
+
+
 
 
+
 
 
-
-
+
+
+
+
+
+
+
+
 
 
-
-
-
-
-
-
-
-
+
+
+
+
+
 
 
+
 
-
+
+
 
 
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
 
-
+
+
+
 
 
 
@@ -1005,6 +1005,8 @@
 
 
 
+
+
 
 
 
@@ -1012,95 +1014,95 @@
 
 
 
+
 
 
-
 
 
 
 
-
-
-
-
+
 
 
 
 
 
+
+
+
+
+
 
+
+
+
 
-
 
-
-
-
-
-
+
+
 
-
 
-
 
 
 
-
-
-
-
-
-
-
-
+
+
 
+
 
+
+
+
 
-
+
 
-
-
-
-
-
-
-
+
+
+
 
+
 
+
+
+
 
-
-
+
 
-
-
+
+
+
+
+
+
+
+
+
+
 
-
-
-
+
 
-
-
-
-
-
-
-
-
+
 
-
-
-
-
-
+
+
+
 
-
-
+
+
+
+
 
 
-
-
-
-
+
 
+
+
+
+
+
+
+
+
 
 
 
@@ -1116,100 +1118,100 @@
 
 
 
-
-
 
 
+
+
 
 
 
 
-
-
-
-
+
 
 
 
 
 
-
-
-
-
-
-
-
+
+
+
 
 
-
-
+
+
 
-
+
+
 
-
+
+
+
 
 
-
 
 
 
-
-
-
-
-
-
-
-
+
+
+
+
+
+
 
+
 
+
+
+
 
-
+
 
-
-
-
-
-
-
-
+
+
+
 
+
 
+
+
+
 
-
-
+
 
-
-
+
+
+
+
+
+
+
+
+
+
 
-
-
-
+
 
-
-
-
-
-
-
+
 
-
-
-
-
-
-
+
+
+
 
-
-
+
+
+
+
 
 
-
-
-
-
+
 
+
+
+
+
+
+
+
 
 
 
@@ -1229,53 +1231,53 @@
 
 
 
-
-
+
 
 
 
 
 
-
-
 
-
-
-
-
-
+
 
-
-
-
-
 
+
+
 
 
-
+
+
+
 
 
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
 
-
-
-
 
+
+
 
 
-
+
+
+
 
 
-
+
+
+
+
+
+
+
 
 
 
@@ -1302,25 +1304,25 @@
 
 
 
-
-
+
 
 
 
 
 
 
-
-
+
 
-
 
-
-
-
+
+
+
+
+
 
 
-
+
+
 
 
 
@@ -1333,33 +1335,33 @@
 
 
 
-
-
+
 
 
 
 
-
-
 
-
+
 
-
 
+
+
+
+
+
+
+
+
+
 
-
-
-
-
 
-
+
+
 
+
 
-
-
-
-
 
+
 
 
 
@@ -1371,6 +1373,14 @@
 
 
 
+
+
+
+
+
+
+
+
 
 
 
@@ -1381,52 +1391,44 @@
 
 
 
-
+
 
-
-
-
-
-
-
-
-
-
-
-
+
+
 
 
-
-
-
 
 
+
+
+
 
 
-
-
 
 
-
-
-
-
-
-
-
+
+
 
 
-
+
+
+
 
 
-
 
-
-
-
+
+
+
+
+
+
+
+
 
-
+
 
+
 
-
 
+
+
diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html
index b7ff71ec..91e04c2d 100644
--- a/docs/libnm-util/html/libnm-util-nm-utils.html
+++ b/docs/libnm-util/html/libnm-util-nm-utils.html
@@ -3,12 +3,12 @@
 
 
 nm-utils
-
+
 
 
 
 
-
+
 
 
 
@@ -42,77 +42,77 @@
 
 #include <nm-utils.h>
 
-enum                NMUtilsSecurityType;
-#define             NM_UTILS_HWADDR_LEN_MAX
-gboolean            nm_utils_ap_mode_security_valid     (NMUtilsSecurityType type,
-                                                         NMDeviceWifiCapabilities wifi_caps);
+gboolean            nm_utils_init                       (GError **error);
 void                nm_utils_deinit                     (void);
+gboolean            nm_utils_is_empty_ssid              (const guint8 *ssid,
+                                                         int len);
 const char *        nm_utils_escape_ssid                (const guint8 *ssid,
                                                          guint32 len);
-gboolean            nm_utils_file_is_pkcs12             (const char *filename);
+gboolean            nm_utils_same_ssid                  (const GByteArray *ssid1,
+                                                         const GByteArray *ssid2,
+                                                         gboolean ignore_trailing_null);
+char *              nm_utils_ssid_to_utf8               (const GByteArray *ssid);
 GHashTable *        nm_utils_gvalue_hash_dup            (GHashTable *hash);
-GByteArray *        nm_utils_hwaddr_atoba               (const char *asc,
-                                                         int type);
-guint8 *            nm_utils_hwaddr_aton                (const char *asc,
-                                                         int type,
-                                                         gpointer buffer);
-int                 nm_utils_hwaddr_len                 (int type);
-char *              nm_utils_hwaddr_ntoa                (gconstpointer addr,
-                                                         int type);
-int                 nm_utils_hwaddr_type                (int len);
-gboolean            nm_utils_iface_valid_name           (const char *name);
-gboolean            nm_utils_init                       (GError **error);
+void                nm_utils_slist_free                 (GSList *list,
+                                                         GDestroyNotify elem_destroy_fn);
+enum                NMUtilsSecurityType;
+gboolean            nm_utils_security_valid             (NMUtilsSecurityType type,
+                                                         NMDeviceWifiCapabilities wifi_caps,
+                                                         gboolean have_ap,
+                                                         gboolean adhoc,
+                                                         NM80211ApFlags ap_flags,
+                                                         NM80211ApSecurityFlags ap_wpa,
+                                                         NM80211ApSecurityFlags ap_rsn);
+gboolean            nm_utils_ap_mode_security_valid     (NMUtilsSecurityType type,
+                                                         NMDeviceWifiCapabilities wifi_caps);
+gboolean            nm_utils_wep_key_valid              (const char *key,
+                                                         NMWepKeyType wep_type);
+gboolean            nm_utils_wpa_psk_valid              (const char *psk);
 GSList *            nm_utils_ip4_addresses_from_gvalue  (const GValue *value);
 void                nm_utils_ip4_addresses_to_gvalue    (GSList *list,
                                                          GValue *value);
-guint32             nm_utils_ip4_get_default_prefix     (guint32 ip);
-guint32             nm_utils_ip4_netmask_to_prefix      (guint32 netmask);
-guint32             nm_utils_ip4_prefix_to_netmask      (guint32 prefix);
 GSList *            nm_utils_ip4_routes_from_gvalue     (const GValue *value);
 void                nm_utils_ip4_routes_to_gvalue       (GSList *list,
                                                          GValue *value);
+guint32             nm_utils_ip4_netmask_to_prefix      (guint32 netmask);
+guint32             nm_utils_ip4_prefix_to_netmask      (guint32 prefix);
+guint32             nm_utils_ip4_get_default_prefix     (guint32 ip);
 GSList *            nm_utils_ip6_addresses_from_gvalue  (const GValue *value);
 void                nm_utils_ip6_addresses_to_gvalue    (GSList *list,
                                                          GValue *value);
-GSList *            nm_utils_ip6_dns_from_gvalue        (const GValue *value);
-void                nm_utils_ip6_dns_to_gvalue          (GSList *list,
-                                                         GValue *value);
 GSList *            nm_utils_ip6_routes_from_gvalue     (const GValue *value);
 void                nm_utils_ip6_routes_to_gvalue       (GSList *list,
                                                          GValue *value);
-gboolean            nm_utils_is_empty_ssid              (const guint8 *ssid,
-                                                         int len);
-gboolean            nm_utils_is_uuid                    (const char *str);
+GSList *            nm_utils_ip6_dns_from_gvalue        (const GValue *value);
+void                nm_utils_ip6_dns_to_gvalue          (GSList *list,
+                                                         GValue *value);
+char *              nm_utils_uuid_generate              (void);
+char *              nm_utils_uuid_generate_from_string  (const char *s);
 GByteArray *        nm_utils_rsa_key_encrypt            (const GByteArray *data,
                                                          const char *in_password,
                                                          char **out_password,
                                                          GError **error);
-gboolean            nm_utils_same_ssid                  (const GByteArray *ssid1,
-                                                         const GByteArray *ssid2,
-                                                         gboolean ignore_trailing_null);
-gboolean            nm_utils_security_valid             (NMUtilsSecurityType type,
-                                                         NMDeviceWifiCapabilities wifi_caps,
-                                                         gboolean have_ap,
-                                                         gboolean adhoc,
-                                                         NM80211ApFlags ap_flags,
-                                                         NM80211ApSecurityFlags ap_wpa,
-                                                         NM80211ApSecurityFlags ap_rsn);
-void                nm_utils_slist_free                 (GSList *list,
-                                                         GDestroyNotify elem_destroy_fn);
-char *              nm_utils_ssid_to_utf8               (const GByteArray *ssid);
-char *              nm_utils_uuid_generate              (void);
-char *              nm_utils_uuid_generate_from_string  (const char *s);
-gboolean            nm_utils_wep_key_valid              (const char *key,
-                                                         NMWepKeyType wep_type);
+gboolean            nm_utils_file_is_pkcs12             (const char *filename);
+guint32             nm_utils_wifi_freq_to_channel       (guint32 freq);
 guint32             nm_utils_wifi_channel_to_freq       (guint32 channel,
                                                          const char *band);
 guint32             nm_utils_wifi_find_next_channel     (guint32 channel,
                                                          int direction,
                                                          char *band);
-guint32             nm_utils_wifi_freq_to_channel       (guint32 freq);
 gboolean            nm_utils_wifi_is_channel_valid      (guint32 channel,
                                                          const char *band);
-gboolean            nm_utils_wpa_psk_valid              (const char *psk);
+#define             NM_UTILS_HWADDR_LEN_MAX
+int                 nm_utils_hwaddr_len                 (int type);
+int                 nm_utils_hwaddr_type                (int len);
+char *              nm_utils_hwaddr_ntoa                (gconstpointer addr,
+                                                         int type);
+GByteArray *        nm_utils_hwaddr_atoba               (const char *asc,
+                                                         int type);
+guint8 *            nm_utils_hwaddr_aton                (const char *asc,
+                                                         int type,
+                                                         gpointer buffer);
+gboolean            nm_utils_iface_valid_name           (const char *name);
+gboolean            nm_utils_is_uuid                    (const char *str);
 

 

 

@@ -132,132 +132,74 @@ access points and devices, among other things.
 

 
Details

 

-
enum NMUtilsSecurityType

-
typedef enum {
-	NMU_SEC_INVALID = 0,
-	NMU_SEC_NONE,
-	NMU_SEC_STATIC_WEP,
-	NMU_SEC_LEAP,
-	NMU_SEC_DYNAMIC_WEP,
-	NMU_SEC_WPA_PSK,
-	NMU_SEC_WPA_ENTERPRISE,
-	NMU_SEC_WPA2_PSK,
-	NMU_SEC_WPA2_ENTERPRISE
-} NMUtilsSecurityType;
-

+
nm_utils_init ()

+
gboolean            nm_utils_init                       (GError **error);

 

-Describes generic security mechanisms that 802.11 access points may offer.
-Used with nm_utils_security_valid() for checking whether a given access
-point is compatible with a network device.
+Initializes libnm-util; should be called when starting and program that
+uses libnm-util.  Sets up an atexit() handler to ensure de-initialization
+is performed, but calling nm_utils_deinit() to explicitly deinitialize
+libnm-util can also be done.  This function can be called more than once.
 

-

+

+++
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+

 


 
 
NMU_SEC_INVALID
unknown or invalid security, placeholder and not used
-
NMU_SEC_NONE
unencrypted and open
-
NMU_SEC_STATIC_WEP
static WEP keys are used for encryption
-
NMU_SEC_LEAP
Cisco LEAP is used for authentication and for generating the
-dynamic WEP keys automatically
-
NMU_SEC_DYNAMIC_WEP
standard 802.1x is used for authentication and
-generating the dynamic WEP keys automatically
-
NMU_SEC_WPA_PSK
WPA1 is used with Pre-Shared Keys (PSK)
-
NMU_SEC_WPA_ENTERPRISE
WPA1 is used with 802.1x authentication
-
NMU_SEC_WPA2_PSK
WPA2/RSN is used with Pre-Shared Keys (PSK)
+
error :
location to store error, or NULL
 
 

 
NMU_SEC_WPA2_ENTERPRISE
WPA2 is used with 802.1x authentication
-
Returns :
TRUE if the initialization was successful, FALSE on failure.
 

 
 

 

 

 

-
NM_UTILS_HWADDR_LEN_MAX

-
#define NM_UTILS_HWADDR_LEN_MAX 20 /* INFINIBAND_ALEN */
-

+
nm_utils_deinit ()

+
void                nm_utils_deinit                     (void);

 

-The maximum length of a hardware address of a type known by
-nm_utils_hwaddr_len() or nm_utils_hwaddr_aton(). This can be used
-as the size of the buffer passed to nm_utils_hwaddr_aton().
+Frees all resources used internally by libnm-util.  This function is called
+from an atexit() handler, set up by nm_utils_init(), but is safe to be called
+more than once.  Subsequent calls have no effect until nm_utils_init() is
+called again.
 

 

 

 

-
nm_utils_ap_mode_security_valid ()

-
gboolean            nm_utils_ap_mode_security_valid     (NMUtilsSecurityType type,
-                                                         NMDeviceWifiCapabilities wifi_caps);

+
nm_utils_is_empty_ssid ()

+
gboolean            nm_utils_is_empty_ssid              (const guint8 *ssid,
+                                                         int len);

 

-Given a set of device capabilities, and a desired security type to check
-against, determines whether the combination of device capabilities and
-desired security type are valid for AP/Hotspot connections.
+Different manufacturers use different mechanisms for not broadcasting the
+AP's SSID.  This function attempts to detect blank/empty SSIDs using a
+number of known SSID-cloaking methods.
 

-

+

+++
-
-
+
+
-
-
+
-
+

 


 
 
type :
the security type to check device capabilties against,
-e.g. NMU_SEC_STATIC_WEP
-
ssid :
pointer to a buffer containing the SSID data
 

 
wifi_caps :
bitfield of the capabilities of the specific WiFi device, e.g.
-NM_WIFI_DEVICE_CAP_CIPHER_WEP40
+
len :
length of the SSID data in ssid
 
 

 

 
Returns :
TRUE if the device capabilities are compatible with the desired
-type, FALSE if they are not.TRUE if the SSID is "empty", FALSE if it is not
 

 
 

-
Since 0.9.8

-

-

-

-
nm_utils_deinit ()

-
void                nm_utils_deinit                     (void);

-

-Frees all resources used internally by libnm-util.  This function is called
-from an atexit() handler, set up by nm_utils_init(), but is safe to be called
-more than once.  Subsequent calls have no effect until nm_utils_init() is
-called again.
-

 

 

 

@@ -270,8 +212,11 @@ replacing embedded NULLs and non-printable characters with the hexadecimal
 representation of that character.  Intended for debugging only, should not
 be used for display of SSIDs.
 

-

+

+++
@@ -292,73 +237,89 @@ and will be overwritten by subsequent calls to this function

-
nm_utils_file_is_pkcs12 ()

-
gboolean            nm_utils_file_is_pkcs12             (const char *filename);

+
nm_utils_same_ssid ()

+
gboolean            nm_utils_same_ssid                  (const GByteArray *ssid1,
+                                                         const GByteArray *ssid2,
+                                                         gboolean ignore_trailing_null);

 

-Utility function to find out if the filename is in PKCS12 format.
+Earlier versions of the Linux kernel added a NULL byte to the end of the
+SSID to enable easy printing of the SSID on the console or in a terminal,
+but this behavior was problematic (SSIDs are simply byte arrays, not strings)
+and thus was changed.  This function compensates for that behavior at the
+cost of some compatibility with odd SSIDs that may legitimately have trailing
+NULLs, even though that is functionally pointless.
 

-

 


 
 

 
ssid :

 
 
 

+

+++
-
-
+
+
-
-
+
+
-
-

 


 
 
filename :
name of the file to test
ssid1 :
first SSID data to compare
 

 
Returns :
TRUE if the file is PKCS12, FALSE if it is not
ssid2 :
second SSID data to compare
 

-

-

-

-
nm_utils_gvalue_hash_dup ()

-
GHashTable *        nm_utils_gvalue_hash_dup            (GHashTable *hash);

-

-Utility function to duplicate a hash table of GValues.
-

-

--
-
-
+
+
-
+


 
hash :
a GHashTable mapping string:GValue
ignore_trailing_null :
TRUE to ignore one trailing NULL byte
 

 

 
Returns :
a newly allocated duplicated GHashTable, caller must free the
-returned hash with g_hash_table_unref() or g_hash_table_destroy(). [transfer container][element-type utf8 GObject.Value]
-TRUE if the SSIDs are the same, FALSE if they are not
 

 
 

 

 

 

-
nm_utils_hwaddr_atoba ()

-
GByteArray *        nm_utils_hwaddr_atoba               (const char *asc,
-                                                         int type);

+
nm_utils_ssid_to_utf8 ()

+
char *              nm_utils_ssid_to_utf8               (const GByteArray *ssid);

 

-Parses asc and converts it to binary form in a GByteArray. See
-nm_utils_hwaddr_aton() if you don't want a GByteArray.
-

-

--
-
-
-
-
+WiFi SSIDs are byte arrays, they are _not_ strings.  Thus, an SSID may
+contain embedded NULLs and other unprintable characters.  Often it is
+useful to print the SSID out for debugging purposes, but that should be the
+_only_ use of this function.  Do not use this function for any persistent
+storage of the SSID, since the printable SSID returned from this function
+cannot be converted back into the real SSID of the access point.
+

+

+This function does almost everything humanly possible to convert the input
+into a printable UTF-8 string, using roughly the following procedure:
+

+

+1) if the input data is already UTF-8 safe, no conversion is performed
+2) attempts to get the current system language from the LANG environment
+   variable, and depending on the language, uses a table of alternative
+   encodings to try.  For example, if LANG=hu_HU, the table may first try
+   the ISO-8859-2 encoding, and if that fails, try the Windows-1250 encoding.
+   If all fallback encodings fail, replaces non-UTF-8 characters with '?'.
+3) If the system language was unable to be determined, falls back to the
+   ISO-8859-1 encoding, then to the Windows-1251 encoding.
+4) If step 3 fails, replaces non-UTF-8 characters with '?'.
+

+

+Again, this function should be used for debugging and display purposes
+_only_.
+

+


asc :
the ASCII representation of a hardware address

++++
+
-
-
+
+
-
@@ -366,131 +327,264 @@ be parsed. [
-
nm_utils_hwaddr_aton ()

-
guint8 *            nm_utils_hwaddr_aton                (const char *asc,
-                                                         int type,
-                                                         gpointer buffer);

+
nm_utils_gvalue_hash_dup ()

+
GHashTable *        nm_utils_gvalue_hash_dup            (GHashTable *hash);

 

-Parses asc and converts it to binary form in buffer. See
-nm_utils_hwaddr_atoba() if you'd rather have the result in a
-GByteArray.
+Utility function to duplicate a hash table of GValues.
 

-




 
type :
the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND
-
ssid :
a byte array containing the SSID data
 

 

 
Returns :
a new GByteArray, or NULL if asc couldn't
-be parsed. [transfer full]
+an allocated string containing a UTF-8
+representation of the SSID, which must be freed by the caller using g_free().
+Returns NULL on errors. [transfer full]
 
 

 

+

+++
-
-
+
+
-
-
+
+
+

 


 
 
asc :
the ASCII representation of a hardware address
hash :
a GHashTable mapping string:GValue
 

 
type :
the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND
+
Returns :
a newly allocated duplicated GHashTable, caller must free the
+returned hash with g_hash_table_unref() or g_hash_table_destroy(). [transfer container][element-type utf8 GObject.Value]
 
 

+

+

+

+
nm_utils_slist_free ()

+
void                nm_utils_slist_free                 (GSList *list,
+                                                         GDestroyNotify elem_destroy_fn);

+

+Utility function to free a GSList.
+

+

++++
+
-
-
+
+
-
-
+
+




 
buffer :
buffer to store the result into
list :
a GSList
+
 

 
Returns :

-buffer, or NULL if asc couldn't be parsed
elem_destroy_fn :
user function called for each element in list
+
 

 
 

 

 

 

-
nm_utils_hwaddr_len ()

-
int                 nm_utils_hwaddr_len                 (int type);

+
enum NMUtilsSecurityType

+
typedef enum {
+	NMU_SEC_INVALID = 0,
+	NMU_SEC_NONE,
+	NMU_SEC_STATIC_WEP,
+	NMU_SEC_LEAP,
+	NMU_SEC_DYNAMIC_WEP,
+	NMU_SEC_WPA_PSK,
+	NMU_SEC_WPA_ENTERPRISE,
+	NMU_SEC_WPA2_PSK,
+	NMU_SEC_WPA2_ENTERPRISE
+} NMUtilsSecurityType;
+

 

-Returns the length in octets of a hardware address of type type.
+Describes generic security mechanisms that 802.11 access points may offer.
+Used with nm_utils_security_valid() for checking whether a given access
+point is compatible with a network device.
 

-

+

+++
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 


 
 
type :
the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND
+
NMU_SEC_INVALID
unknown or invalid security, placeholder and not used
 
 

 
Returns :
the length
NMU_SEC_NONE
unencrypted and open
+
NMU_SEC_STATIC_WEP
static WEP keys are used for encryption
+
NMU_SEC_LEAP
Cisco LEAP is used for authentication and for generating the
+dynamic WEP keys automatically
+
NMU_SEC_DYNAMIC_WEP
standard 802.1x is used for authentication and
+generating the dynamic WEP keys automatically
+
NMU_SEC_WPA_PSK
WPA1 is used with Pre-Shared Keys (PSK)
+
NMU_SEC_WPA_ENTERPRISE
WPA1 is used with 802.1x authentication
+
NMU_SEC_WPA2_PSK
WPA2/RSN is used with Pre-Shared Keys (PSK)
+
NMU_SEC_WPA2_ENTERPRISE
WPA2 is used with 802.1x authentication
+
 

 
 

 

 

 

-
nm_utils_hwaddr_ntoa ()

-
char *              nm_utils_hwaddr_ntoa                (gconstpointer addr,
-                                                         int type);

+
nm_utils_security_valid ()

+
gboolean            nm_utils_security_valid             (NMUtilsSecurityType type,
+                                                         NMDeviceWifiCapabilities wifi_caps,
+                                                         gboolean have_ap,
+                                                         gboolean adhoc,
+                                                         NM80211ApFlags ap_flags,
+                                                         NM80211ApSecurityFlags ap_wpa,
+                                                         NM80211ApSecurityFlags ap_rsn);

 

-Converts addr to textual form.
+Given a set of device capabilities, and a desired security type to check
+against, determines whether the combination of device, desired security
+type, and AP capabilities intersect.
+

+

+NOTE: this function cannot handle checking security for AP/Hotspot mode;
+use nm_utils_ap_mode_security_valid() instead.
 

-

+

+++
-
-
+
+
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 


 
 
addr :
a binary hardware address
type :
the security type to check AP flags and device capabilties against,
+e.g. NMU_SEC_STATIC_WEP
+
 

 
type :
the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND
+
wifi_caps :
bitfield of the capabilities of the specific WiFi device, e.g.
+NM_WIFI_DEVICE_CAP_CIPHER_WEP40
 
 

 
Returns :
the textual form of addr. [transfer full]
+
have_ap :
whether the ap_flags, ap_wpa, and ap_rsn arguments are valid
adhoc :
whether the capabilities being tested are from an Ad-Hoc AP (IBSS)
ap_flags :
bitfield of AP capabilities, e.g. NM_802_11_AP_FLAGS_PRIVACY
 
 
ap_wpa :
bitfield of AP capabilties derived from the AP's WPA beacon,
+e.g. (NM_802_11_AP_SEC_PAIR_TKIP | NM_802_11_AP_SEC_KEY_MGMT_PSK)
ap_rsn :
bitfield of AP capabilties derived from the AP's RSN/WPA2 beacon,
+e.g. (NM_802_11_AP_SEC_PAIR_CCMP | NM_802_11_AP_SEC_PAIR_TKIP)
Returns :
TRUE if the device capabilities and AP capabilties intersect and are
+compatible with the desired type, FALSE if they are not

 
 

 

 

 

-
nm_utils_hwaddr_type ()

-
int                 nm_utils_hwaddr_type                (int len);

+
nm_utils_ap_mode_security_valid ()

+
gboolean            nm_utils_ap_mode_security_valid     (NMUtilsSecurityType type,
+                                                         NMDeviceWifiCapabilities wifi_caps);

 

-Returns the type (either ARPHRD_ETHER or ARPHRD_INFINIBAND) of the raw
-address given its length.
+Given a set of device capabilities, and a desired security type to check
+against, determines whether the combination of device capabilities and
+desired security type are valid for AP/Hotspot connections.
 

-

+

+++
-
-
+
+
+
+
+
+
-
+

 


 
 
len :
the length of hardware address in bytes
type :
the security type to check device capabilties against,
+e.g. NMU_SEC_STATIC_WEP
+
wifi_caps :
bitfield of the capabilities of the specific WiFi device, e.g.
+NM_WIFI_DEVICE_CAP_CIPHER_WEP40
+
 

 

 
Returns :
the type, either ARPHRD_ETHER or ARPHRD_INFINIBAND, or -1 if
-the address length was not recognizedTRUE if the device capabilities are compatible with the desired
+type, FALSE if they are not.
 

 
 

+
Since 0.9.8

 

 

 

-
nm_utils_iface_valid_name ()

-
gboolean            nm_utils_iface_valid_name           (const char *name);

+
nm_utils_wep_key_valid ()

+
gboolean            nm_utils_wep_key_valid              (const char *key,
+                                                         NMWepKeyType wep_type);

 

-This function is a 1:1 copy of the kernel's interface validation
-function in net/core/dev.c.
+Checks if key is a valid WEP key
 

-

+

+++
-
-
+
+
+
+
+
+
+TRUE if key is a WEP key, FALSE if not

 


 
 
name :
Name of interface
key :
a string that might be a WEP key
wep_type :
the NMWepKeyType type of the WEP key
 

 

 
Returns :

 
-TRUE if interface name is valid, otherwise FALSE is returned.
 

 
 

@@ -498,28 +592,29 @@ function in net/core/dev.c.
 

 

 

-
nm_utils_init ()

-
gboolean            nm_utils_init                       (GError **error);

+
nm_utils_wpa_psk_valid ()

+
gboolean            nm_utils_wpa_psk_valid              (const char *psk);

 

-Initializes libnm-util; should be called when starting and program that
-uses libnm-util.  Sets up an atexit() handler to ensure de-initialization
-is performed, but calling nm_utils_deinit() to explicitly deinitialize
-libnm-util can also be done.  This function can be called more than once.
+Checks if psk is a valid WPA PSK
 

-

+

+++
-
-
+
+
-
+

 


 
 
error :
location to store error, or NULL
-
psk :
a string that might be a WPA PSK
 

 

 
Returns :
TRUE if the initialization was successful, FALSE on failure.
+TRUE if psk is a WPA PSK, FALSE if not
 

 
 

+
Since 0.9.8

 

 

 

@@ -532,8 +627,11 @@ and prefix) into a GSList of GArray may be
 extended in the future.
 

-

+

+++
@@ -555,83 +653,26 @@ extended in the future.
 

 Utility function to convert a GSList of NMIP4Address objects into a
 GPtrArray of GArrays of guint32s representing a list of NetworkManager IPv4
-addresses (which is a tuple of address, gateway, and prefix).   The specific
-format of this serialization is not guaranteed to be stable and may be
-extended in the future.
-

-

 


 
 

 
value :

--
-
-
-
-
-
-
-
-
-
-


list :
a list of NMIP4Address objects. [element-type NMIP4Address]
-
value :
a pointer to a GValue into which to place the converted addresses,
-which should be unset by the caller (when no longer needed) with
-g_value_unset().

-

-

-

-
nm_utils_ip4_get_default_prefix ()

-
guint32             nm_utils_ip4_get_default_prefix     (guint32 ip);

-

-When the Internet was originally set up, various ranges of IP addresses were
-segmented into three network classes: A, B, and C.  This function will return
-a prefix that is associated with the IP address specified defining where it
-falls in the predefined classes.
-

-

--
-
-
-
-
-
-
-
-
-
-


ip :
an IPv4 address (in network byte order)
Returns :
the default class prefix for the given IP

-

-

-

-
nm_utils_ip4_netmask_to_prefix ()

-
guint32             nm_utils_ip4_netmask_to_prefix      (guint32 netmask);

-

--
-
-
-
-
-
-
-
-
-
-


netmask :
an IPv4 netmask in network byte order
Returns :
the CIDR prefix represented by the netmask

-

-

-

-
nm_utils_ip4_prefix_to_netmask ()

-
guint32             nm_utils_ip4_prefix_to_netmask      (guint32 prefix);

-

+addresses (which is a tuple of address, gateway, and prefix).   The specific
+format of this serialization is not guaranteed to be stable and may be
+extended in the future.
+

+

+++
-
-
+
+
-
-
+
+

 


 
 
prefix :
a CIDR prefix
list :
a list of NMIP4Address objects. [element-type NMIP4Address]
+
 

 
Returns :
the netmask represented by the prefix, in network byte order
value :
a pointer to a GValue into which to place the converted addresses,
+which should be unset by the caller (when no longer needed) with
+g_value_unset().
 

 
 

@@ -647,8 +688,11 @@ prefix, and metric) into a GSList of 
+

+++
@@ -674,8 +718,11 @@ routes (which is a tuple of route, next hop, prefix, and metric).   The
 specific format of this serialization is not guaranteed to be stable and may
 be extended in the future.
 

-

 


 
 

 
value :

+

+++
@@ -693,79 +740,97 @@ which should be unset by the caller (when no longer needed) with
 

-
nm_utils_ip6_addresses_from_gvalue ()

-
GSList *            nm_utils_ip6_addresses_from_gvalue  (const GValue *value);

-

-Utility function to convert a GPtrArray of GValueArrays of (GArray of guchars) and guint32
-representing a list of NetworkManager IPv6 addresses (which is a tuple of address,
-prefix, and gateway), into a GSList of NMIP6Address objects.  The specific format of
-this serialization is not guaranteed to be stable and the GValueArray may be
-extended in the future.
-

-

 


 
 

 
list :

 
 

+
nm_utils_ip4_netmask_to_prefix ()

+
guint32             nm_utils_ip4_netmask_to_prefix      (guint32 netmask);

+

+++
-
-
+
+
-
+

 


 
 
value :
gvalue containing a GPtrArray of GValueArrays of (GArray of guchars) and guint32
netmask :
an IPv4 netmask in network byte order
 

 

 
Returns :
a newly allocated GSList of NMIP6Address objects. [transfer full][element-type NetworkManager.IP6Address]
-the CIDR prefix represented by the netmask
 

 
 

 

 

 

-
nm_utils_ip6_addresses_to_gvalue ()

-
void                nm_utils_ip6_addresses_to_gvalue    (GSList *list,
-                                                         GValue *value);

+
nm_utils_ip4_prefix_to_netmask ()

+
guint32             nm_utils_ip4_prefix_to_netmask      (guint32 prefix);

+

++++
+
+
+
+
+
+
+
+
+
+
+




prefix :
a CIDR prefix
Returns :
the netmask represented by the prefix, in network byte order

+

+

+

+
nm_utils_ip4_get_default_prefix ()

+
guint32             nm_utils_ip4_get_default_prefix     (guint32 ip);

 

-Utility function to convert a GSList of NMIP6Address objects into a
-GPtrArray of GValueArrays representing a list of NetworkManager IPv6 addresses
-(which is a tuple of address, prefix, and gateway). The specific format of
-this serialization is not guaranteed to be stable and may be extended in the
-future.
+When the Internet was originally set up, various ranges of IP addresses were
+segmented into three network classes: A, B, and C.  This function will return
+a prefix that is associated with the IP address specified defining where it
+falls in the predefined classes.
 

-

+

+++
-
-
+
+
-
-
+
+

 


 
 
list :
a list of NMIP6Address objects. [element-type NMIP6Address]
-
ip :
an IPv4 address (in network byte order)
 

 
value :
a pointer to a GValue into which to place the converted addresses,
-which should be unset by the caller (when no longer needed) with
-g_value_unset().
Returns :
the default class prefix for the given IP
 

 
 

 

 

 

-
nm_utils_ip6_dns_from_gvalue ()

-
GSList *            nm_utils_ip6_dns_from_gvalue        (const GValue *value);

+
nm_utils_ip6_addresses_from_gvalue ()

+
GSList *            nm_utils_ip6_addresses_from_gvalue  (const GValue *value);

 

-Converts a GValue containing a GPtrArray of IP6 DNS, represented as
-GByteArrays into a GSList of in6_addrs.
+Utility function to convert a GPtrArray of GValueArrays of (GArray of guchars) and guint32
+representing a list of NetworkManager IPv6 addresses (which is a tuple of address,
+prefix, and gateway), into a GSList of NMIP6Address objects.  The specific format of
+this serialization is not guaranteed to be stable and the GValueArray may be
+extended in the future.
 

-

+

+++
-
+
-
@@ -773,26 +838,31 @@ addresses. [
-
nm_utils_ip6_dns_to_gvalue ()

-
void                nm_utils_ip6_dns_to_gvalue          (GSList *list,
+
nm_utils_ip6_addresses_to_gvalue ()

+
void                nm_utils_ip6_addresses_to_gvalue    (GSList *list,
                                                          GValue *value);

 

-Utility function to convert a GSList of 'struct in6_addr' structs into a
-GPtrArray of GByteArrays representing each server's IPv6 addresses in
-network byte order.  The specific format of this serialization is not
-guaranteed to be stable and may be extended in the future.
+Utility function to convert a GSList of NMIP6Address objects into a
+GPtrArray of GValueArrays representing a list of NetworkManager IPv6 addresses
+(which is a tuple of address, prefix, and gateway). The specific format of
+this serialization is not guaranteed to be stable and may be extended in the
+future.
 

-

 


 
 

 
value :
a GValue
-gvalue containing a GPtrArray of GValueArrays of (GArray of guchars) and guint32
 

 

 
Returns :
a GSList of IP6
-addresses. [transfer full][element-type Posix.in6_addr]
+a newly allocated GSList of NMIP6Address objects. [transfer full][element-type NetworkManager.IP6Address]
 
 

 

+

+++
-
+
-
@@ -809,8 +879,11 @@ routes (which is a tuple of destination, prefix, next hop, and metric)
 into a GSList of NMIP6Route objects.  The specific format of this serialization
 is not guaranteed to be stable and may be extended in the future.
 

-

 


 
 

 
list :
a list of NMIP6Route objectsa list of NMIP6Address objects. [element-type NMIP6Address]
+
 

 

 
value :
a pointer to a GValue into which to place the converted DNS server
-addresses, which should be unset by the caller (when no longer needed) with
+a pointer to a GValue into which to place the converted addresses,
+which should be unset by the caller (when no longer needed) with
 g_value_unset().
 

 

+

+++
@@ -837,8 +910,11 @@ representing a list of NetworkManager IPv6 routes (which is a tuple of destinati
 prefix, next hop, and metric).  The specific format of this serialization is not 
 guaranteed to be stable and may be extended in the future.
 

-

 


 
 

 
value :

+

+++
@@ -856,55 +932,103 @@ which should be unset by the caller (when no longer needed) with
 

-
nm_utils_is_empty_ssid ()

-
gboolean            nm_utils_is_empty_ssid              (const guint8 *ssid,
-                                                         int len);

+
nm_utils_ip6_dns_from_gvalue ()

+
GSList *            nm_utils_ip6_dns_from_gvalue        (const GValue *value);

 

-Different manufacturers use different mechanisms for not broadcasting the
-AP's SSID.  This function attempts to detect blank/empty SSIDs using a
-number of known SSID-cloaking methods.
+Converts a GValue containing a GPtrArray of IP6 DNS, represented as
+GByteArrays into a GSList of in6_addrs.
 

-

 


 
 

 
list :

 
 

+

+++
-
-
+
+
-
-
+
+
+

 


 
 
ssid :
pointer to a buffer containing the SSID data
value :
a GValue
+
 

 
len :
length of the SSID data in ssid
+
Returns :
a GSList of IP6
+addresses. [transfer full][element-type Posix.in6_addr]
 
 

+

+

+

+
nm_utils_ip6_dns_to_gvalue ()

+
void                nm_utils_ip6_dns_to_gvalue          (GSList *list,
+                                                         GValue *value);

+

+Utility function to convert a GSList of 'struct in6_addr' structs into a
+GPtrArray of GByteArrays representing each server's IPv6 addresses in
+network byte order.  The specific format of this serialization is not
+guaranteed to be stable and may be extended in the future.
+

+

++++
+
+
+
+
+
-
-
+
+




list :
a list of NMIP6Route objects

 
Returns :
TRUE if the SSID is "empty", FALSE if it is not
value :
a pointer to a GValue into which to place the converted DNS server
+addresses, which should be unset by the caller (when no longer needed) with
+g_value_unset().
 

 
 

 

 

 

-
nm_utils_is_uuid ()

-
gboolean            nm_utils_is_uuid                    (const char *str);

+
nm_utils_uuid_generate ()

+
char *              nm_utils_uuid_generate              (void);

+

++++
+
+
+
+
+




Returns :
a newly allocated UUID suitable for use as the NMSettingConnection
+object's "id": property.  Should be freed with g_free()
+

+

+

+

+
nm_utils_uuid_generate_from_string ()

+
char *              nm_utils_uuid_generate_from_string  (const char *s);

 

-Checks if str is a UUID
+For a given s, this function will always return the same UUID.
 

-

+

+++
-
-
+
+
-
+

 


 
 
str :
a string that might be a UUID
s :
a string to use as the seed for the UUID
 

 

 
Returns :

-TRUE if str is a UUID, FALSE if nota newly allocated UUID suitable for use as the NMSettingConnection
+object's "id": property
 

 
 

-
Since 0.9.8

 

 

 

@@ -918,8 +1042,11 @@ Encrypts the given RSA private key data with the given password (or generates
 a password if no password was given) and converts the data to PEM format
 suitable for writing to a file.
 

-

+

+++
@@ -932,7 +1059,7 @@ suitable for writing to a file.
 
-
@@ -951,365 +1078,358 @@ certificate/private key file. [
-
nm_utils_same_ssid ()

-
gboolean            nm_utils_same_ssid                  (const GByteArray *ssid1,
-                                                         const GByteArray *ssid2,
-                                                         gboolean ignore_trailing_null);

+
nm_utils_file_is_pkcs12 ()

+
gboolean            nm_utils_file_is_pkcs12             (const char *filename);

 

-Earlier versions of the Linux kernel added a NULL byte to the end of the
-SSID to enable easy printing of the SSID on the console or in a terminal,
-but this behavior was problematic (SSIDs are simply byte arrays, not strings)
-and thus was changed.  This function compensates for that behavior at the
-cost of some compatibility with odd SSIDs that may legitimately have trailing
-NULLs, even though that is functionally pointless.
+Utility function to find out if the filename is in PKCS12 format.
 

-

 


 
 

 
data :

 

 
out_password :
if in_password was NULL, a random password will be generated
+if in_password was NULL, a random password will be generated
 and returned in this argument. [out][allow-none]
 
 

+

+++
-
-
-
-
-
-
-
-
-
-
+
+
-
+

 


 
 
ssid1 :
first SSID data to compare
ssid2 :
second SSID data to compare
ignore_trailing_null :
TRUE to ignore one trailing NULL byte
filename :
name of the file to test
 

 

 
Returns :
TRUE if the SSIDs are the same, FALSE if they are notTRUE if the file is PKCS12, FALSE if it is not
 

 
 

 

 

 

-
nm_utils_security_valid ()

-
gboolean            nm_utils_security_valid             (NMUtilsSecurityType type,
-                                                         NMDeviceWifiCapabilities wifi_caps,
-                                                         gboolean have_ap,
-                                                         gboolean adhoc,
-                                                         NM80211ApFlags ap_flags,
-                                                         NM80211ApSecurityFlags ap_wpa,
-                                                         NM80211ApSecurityFlags ap_rsn);

-

-Given a set of device capabilities, and a desired security type to check
-against, determines whether the combination of device, desired security
-type, and AP capabilities intersect.
-

+
nm_utils_wifi_freq_to_channel ()

+
guint32             nm_utils_wifi_freq_to_channel       (guint32 freq);

 

-NOTE: this function cannot handle checking security for AP/Hotspot mode;
-use nm_utils_ap_mode_security_valid() instead.
+Utility function to translate a WiFi frequency to its corresponding channel.
 

-

+

+++
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
+
+

 


 
 
type :
the security type to check AP flags and device capabilties against,
-e.g. NMU_SEC_STATIC_WEP
-
wifi_caps :
bitfield of the capabilities of the specific WiFi device, e.g.
-NM_WIFI_DEVICE_CAP_CIPHER_WEP40
-
have_ap :
whether the ap_flags, ap_wpa, and ap_rsn arguments are valid
adhoc :
whether the capabilities being tested are from an Ad-Hoc AP (IBSS)
freq :
frequency
 

 
ap_flags :
bitfield of AP capabilities, e.g. NM_802_11_AP_FLAGS_PRIVACY
-
Returns :
the channel represented by the frequency or 0
 

+

+

+

+
nm_utils_wifi_channel_to_freq ()

+
guint32             nm_utils_wifi_channel_to_freq       (guint32 channel,
+                                                         const char *band);

+

+Utility function to translate a WiFi channel to its corresponding frequency.
+

+

++++
+
-
-
+
+
-
-
+
+
-
+




 
ap_wpa :
bitfield of AP capabilties derived from the AP's WPA beacon,
-e.g. (NM_802_11_AP_SEC_PAIR_TKIP | NM_802_11_AP_SEC_KEY_MGMT_PSK)
channel :
channel
 

 
ap_rsn :
bitfield of AP capabilties derived from the AP's RSN/WPA2 beacon,
-e.g. (NM_802_11_AP_SEC_PAIR_CCMP | NM_802_11_AP_SEC_PAIR_TKIP)
band :
frequency band for wireless ("a" or "bg")
 

 

 
Returns :
TRUE if the device capabilities and AP capabilties intersect and are
-compatible with the desired type, FALSE if they are notthe frequency represented by the channel of the band,
+or -1 when the freq is invalid, or 0 when the band
+is invalid
 

 
 

 

 

 

-
nm_utils_slist_free ()

-
void                nm_utils_slist_free                 (GSList *list,
-                                                         GDestroyNotify elem_destroy_fn);

+
nm_utils_wifi_find_next_channel ()

+
guint32             nm_utils_wifi_find_next_channel     (guint32 channel,
+                                                         int direction,
+                                                         char *band);

 

-Utility function to free a GSList.
+Utility function to find out next/previous WiFi channel for a channel.
 

-

+

+++
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+

 


 
 
list :
a GSList
-
channel :
current channel
 

 
elem_destroy_fn :
user function called for each element in list
-
direction :
whether going downward (0 or less) or upward (1 or more)
band :
frequency band for wireless ("a" or "bg")
Returns :
the next channel in the specified direction or 0
 

 
 

 

 

 

-
nm_utils_ssid_to_utf8 ()

-
char *              nm_utils_ssid_to_utf8               (const GByteArray *ssid);

-

-WiFi SSIDs are byte arrays, they are _not_ strings.  Thus, an SSID may
-contain embedded NULLs and other unprintable characters.  Often it is
-useful to print the SSID out for debugging purposes, but that should be the
-_only_ use of this function.  Do not use this function for any persistent
-storage of the SSID, since the printable SSID returned from this function
-cannot be converted back into the real SSID of the access point.
-

-

-This function does almost everything humanly possible to convert the input
-into a printable UTF-8 string, using roughly the following procedure:
-

-

-1) if the input data is already UTF-8 safe, no conversion is performed
-2) attempts to get the current system language from the LANG environment
-   variable, and depending on the language, uses a table of alternative
-   encodings to try.  For example, if LANG=hu_HU, the table may first try
-   the ISO-8859-2 encoding, and if that fails, try the Windows-1250 encoding.
-   If all fallback encodings fail, replaces non-UTF-8 characters with '?'.
-3) If the system language was unable to be determined, falls back to the
-   ISO-8859-1 encoding, then to the Windows-1251 encoding.
-4) If step 3 fails, replaces non-UTF-8 characters with '?'.
-

+
nm_utils_wifi_is_channel_valid ()

+
gboolean            nm_utils_wifi_is_channel_valid      (guint32 channel,
+                                                         const char *band);

 

-Again, this function should be used for debugging and display purposes
-_only_.
+Utility function to verify WiFi channel validity.
 

-

+

+++
-
-
+
+
+
+
+
+
-
+

 


 
 
ssid :
a byte array containing the SSID data
channel :
channel
band :
frequency band for wireless ("a" or "bg")
 

 

 
Returns :
an allocated string containing a UTF-8
-representation of the SSID, which must be freed by the caller using g_free().
-Returns NULL on errors. [transfer full]
-TRUE or FALSE
 

 
 

 

 

 

-
nm_utils_uuid_generate ()

-
char *              nm_utils_uuid_generate              (void);

-

--
-
-
-
-


Returns :
a newly allocated UUID suitable for use as the NMSettingConnection
-object's "id": property.  Should be freed with g_free()
-

+
NM_UTILS_HWADDR_LEN_MAX

+
#define NM_UTILS_HWADDR_LEN_MAX 20 /* INFINIBAND_ALEN */
+

+

+The maximum length of a hardware address of a type known by
+nm_utils_hwaddr_len() or nm_utils_hwaddr_aton(). This can be used
+as the size of the buffer passed to nm_utils_hwaddr_aton().
+

 

 

 

-
nm_utils_uuid_generate_from_string ()

-
char *              nm_utils_uuid_generate_from_string  (const char *s);

+
nm_utils_hwaddr_len ()

+
int                 nm_utils_hwaddr_len                 (int type);

 

-For a given s, this function will always return the same UUID.
+Returns the length in octets of a hardware address of type type.
 

-

+

+++
-
-
+
+
-
+

 


 
 
s :
a string to use as the seed for the UUID
type :
the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND
+
 

 

 
Returns :
a newly allocated UUID suitable for use as the NMSettingConnection
-object's "id": propertythe length
 

 
 

 

 

 

-
nm_utils_wep_key_valid ()

-
gboolean            nm_utils_wep_key_valid              (const char *key,
-                                                         NMWepKeyType wep_type);

+
nm_utils_hwaddr_type ()

+
int                 nm_utils_hwaddr_type                (int len);

 

-Checks if key is a valid WEP key
+Returns the type (either ARPHRD_ETHER or ARPHRD_INFINIBAND) of the raw
+address given its length.
 

-

+

+++
-
-
-
-
-
-
+
+
-
+

 


 
 
key :
a string that might be a WEP key
wep_type :
the NMWepKeyType type of the WEP key
len :
the length of hardware address in bytes
 

 

 
Returns :

-TRUE if key is a WEP key, FALSE if notthe type, either ARPHRD_ETHER or ARPHRD_INFINIBAND, or -1 if
+the address length was not recognized
 

 
 

-
Since 0.9.8

 

 

 

-
nm_utils_wifi_channel_to_freq ()

-
guint32             nm_utils_wifi_channel_to_freq       (guint32 channel,
-                                                         const char *band);

+
nm_utils_hwaddr_ntoa ()

+
char *              nm_utils_hwaddr_ntoa                (gconstpointer addr,
+                                                         int type);

 

-Utility function to translate a WiFi channel to its corresponding frequency.
+Converts addr to textual form.
 

-

+

+++
-
-
+
+
-
-
+
+
-
+

 


 
 
channel :
channel
addr :
a binary hardware address
 

 
band :
frequency band for wireless ("a" or "bg")
type :
the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND
+
 

 

 
Returns :
the frequency represented by the channel of the band,
-or -1 when the freq is invalid, or 0 when the band
-is invalidthe textual form of addr. [transfer full]
+
 

 
 

 

 

 

-
nm_utils_wifi_find_next_channel ()

-
guint32             nm_utils_wifi_find_next_channel     (guint32 channel,
-                                                         int direction,
-                                                         char *band);

+
nm_utils_hwaddr_atoba ()

+
GByteArray *        nm_utils_hwaddr_atoba               (const char *asc,
+                                                         int type);

 

-Utility function to find out next/previous WiFi channel for a channel.
+Parses asc and converts it to binary form in a GByteArray. See
+nm_utils_hwaddr_aton() if you don't want a GByteArray.
 

-

+

+++
-
-
-
-
-
-
+
+
-
-
+
+
-
+

 


 
 
channel :
current channel
direction :
whether going downward (0 or less) or upward (1 or more)
asc :
the ASCII representation of a hardware address
 

 
band :
frequency band for wireless ("a" or "bg")
type :
the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND
+
 

 

 
Returns :
the next channel in the specified direction or 0a new GByteArray, or NULL if asc couldn't
+be parsed. [transfer full]
+
 

 
 

 

 

 

-
nm_utils_wifi_freq_to_channel ()

-
guint32             nm_utils_wifi_freq_to_channel       (guint32 freq);

+
nm_utils_hwaddr_aton ()

+
guint8 *            nm_utils_hwaddr_aton                (const char *asc,
+                                                         int type,
+                                                         gpointer buffer);

 

-Utility function to translate a WiFi frequency to its corresponding channel.
+Parses asc and converts it to binary form in buffer. See
+nm_utils_hwaddr_atoba() if you'd rather have the result in a
+GByteArray.
 

-

+

+++
-
-
+
+
+
+
+
+
+
+
+
+
-
+

 


 
 
freq :
frequency
asc :
the ASCII representation of a hardware address
type :
the type of address; either ARPHRD_ETHER or ARPHRD_INFINIBAND
+
buffer :
buffer to store the result into
 

 

 
Returns :
the channel represented by the frequency or 0
+buffer, or NULL if asc couldn't be parsed
 

 
 

 

 

 

-
nm_utils_wifi_is_channel_valid ()

-
gboolean            nm_utils_wifi_is_channel_valid      (guint32 channel,
-                                                         const char *band);

+
nm_utils_iface_valid_name ()

+
gboolean            nm_utils_iface_valid_name           (const char *name);

 

-Utility function to verify WiFi channel validity.
+This function is a 1:1 copy of the kernel's interface validation
+function in net/core/dev.c.
 

-

+

+++
-
-
-
-
-
-
+
+
-
+

 


 
 
channel :
channel
band :
frequency band for wireless ("a" or "bg")
name :
Name of interface
 

 

 
Returns :
TRUE or FALSE
+TRUE if interface name is valid, otherwise FALSE is returned.
 

 
 

+
Since 0.9.8

 

 

 

-
nm_utils_wpa_psk_valid ()

-
gboolean            nm_utils_wpa_psk_valid              (const char *psk);

+
nm_utils_is_uuid ()

+
gboolean            nm_utils_is_uuid                    (const char *str);

 

-Checks if psk is a valid WPA PSK
+Checks if str is a UUID
 

-

+

+++
-
-
+
+
+TRUE if str is a UUID, FALSE if not

 


 
 
psk :
a string that might be a WPA PSK
str :
a string that might be a UUID
 

 

 
Returns :

 
-TRUE if psk is a WPA PSK, FALSE if not
 

 
 

@@ -1319,6 +1439,6 @@ Checks if psk is a valid WPA PSK
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/libnm-util.devhelp2 b/docs/libnm-util/html/libnm-util.devhelp2
index 9f00e53a..f1daa3d4 100644
--- a/docs/libnm-util/html/libnm-util.devhelp2
+++ b/docs/libnm-util/html/libnm-util.devhelp2
@@ -34,31 +34,44 @@
     
   
   
-    
-    
     
     
+    
     
+    
+    
+    
+    
+    
+    
     
-    
-    
+    
+    
+    
+    
     
-    
     
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
+    
+    
+    
+    
+    
     
-    
-    
     
-    
     
     
     
     
-    
     
     
     
@@ -69,98 +82,85 @@
     
     
     
-    
     
     
+    
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
     
     
     
-    
-    
-    
-    
-    
     
-    
-    
-    
     
-    
-    
+    
+    
     
     
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
+    
     
-    
     
-    
-    
-    
-    
-    
-    
-    
-    
     
+    
+    
+    
     
-    
+    
+    
+    
     
-    
-    
+    
     
-    
     
+    
     
-    
-    
-    
-    
-    
-    
-    
-    
     
+    
+    
+    
+    
+    
     
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
     
-    
+    
+    
+    
+    
+    
     
-    
     
-    
-    
-    
-    
-    
     
-    
-    
     
+    
     
+    
+    
+    
+    
+    
+    
     
     
     
@@ -173,38 +173,38 @@
     
     
     
-    
-    
+    
     
-    
-    
-    
     
+    
+    
+    
+    
+    
     
+    
     
     
-    
+    
     
     
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
     
+    
     
+    
     
     
-    
-    
+    
     
+    
     
     
-    
-    
-    
+    
     
     
     
@@ -217,47 +217,47 @@
     
     
     
-    
-    
+    
     
+    
+    
+    
+    
     
-    
     
-    
-    
-    
+    
+    
+    
     
+    
     
-    
+    
+    
+    
+    
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
     
-    
     
-    
-    
+    
+    
+    
     
+    
     
-    
     
-    
-    
     
+    
+    
+    
     
-    
-    
-    
+    
     
     
     
@@ -272,58 +272,58 @@
     
     
     
-    
-    
+    
     
+    
+    
     
+    
+    
     
-    
+    
+    
     
-    
-    
-    
     
-    
-    
-    
-    
-    
     
     
     
     
     
     
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
-    
+    
     
-    
-    
-    
-    
-    
-    
-    
-    
     
-    
     
-    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
+    
+    
+    
     
+    
+    
+    
     
     
-    
-    
-    
-    
-    
-    
     
     
     
@@ -341,93 +341,93 @@
     
     
     
-    
-    
+    
     
-    
     
-    
+    
+    
     
     
     
-    
+    
+    
+    
     
     
-    
     
     
-    
-    
+    
     
+    
+    
     
     
-    
     
-    
-    
     
-    
+    
+    
+    
+    
     
     
     
-    
     
-    
+    
     
     
     
     
     
-    
-    
+    
     
     
+    
     
+    
     
     
-    
-    
-    
+    
+    
+    
     
+    
     
     
-    
-    
     
     
     
     
-    
-    
+    
     
-    
-    
-    
-    
     
-    
-    
-    
+    
     
+    
     
     
+    
+    
+    
+    
     
     
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
     
     
-    
-    
-    
+    
     
+    
     
-    
-    
+    
     
     
     
@@ -439,65 +439,65 @@
     
     
     
-    
-    
+    
     
     
-    
-    
-    
     
-    
-    
+    
+    
+    
+    
     
+    
+    
     
     
-    
-    
+    
     
     
+    
     
     
-    
-    
-    
-    
     
+    
+    
     
-    
-    
-    
+    
+    
+    
+    
+    
     
     
     
     
-    
-    
-    
+    
     
+    
+    
     
     
-    
-    
+    
     
-    
     
+    
+    
+    
+    
     
     
-    
     
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
     
     
-    
     
-    
-    
-    
+    
     
     
     
@@ -505,111 +505,111 @@
     
     
     
-    
-    
+    
     
     
-    
-    
-    
-    
     
-    
-    
-    
+    
+    
+    
+    
+    
     
+    
+    
+    
     
     
     
-    
-    
+    
     
     
+    
     
     
-    
     
-    
+    
+    
+    
     
     
     
-    
     
     
     
-    
-    
+    
     
-    
-    
-    
     
-    
-    
-    
+    
     
     
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
     
+    
+    
+    
     
-    
+    
     
+    
+    
     
     
     
     
     
     
-    
-    
+    
     
-    
-    
     
-    
-    
     
+    
+    
+    
+    
+    
+    
+    
     
     
-    
-    
     
     
     
-    
-    
+    
     
-    
-    
-    
     
+    
+    
     
     
     
-    
+    
+    
+    
     
     
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
     
-    
     
-    
-    
+    
     
-    
+    
+    
     
     
     
@@ -617,111 +617,111 @@
     
     
     
-    
     
     
-    
+    
     
-    
+    
+    
+    
+    
     
+    
     
     
+    
+    
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
     
-    
+    
+    
     
     
     
     
+    
+    
     
+    
+    
+    
+    
+    
+    
+    
     
     
     
-    
     
     
-    
-    
-    
-    
-    
     
-    
+    
+    
+    
+    
+    
     
-    
-    
+    
     
-    
-    
-    
+    
     
+    
+    
+    
+    
+    
     
     
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
     
-    
+    
+    
     
     
+    
     
     
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
     
     
+    
     
-    
+    
+    
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
     
-    
+    
+    
+    
     
     
     
@@ -747,89 +747,91 @@
     
     
     
+    
+    
     
     
     
     
     
-    
-    
-    
-    
+    
     
-    
-    
-    
-    
+    
+    
+    
     
     
-    
-    
+    
+    
     
+    
+    
+    
+    
+    
     
-    
     
-    
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
     
+    
     
+    
+    
+    
     
-    
+    
     
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
     
+    
     
+    
+    
+    
     
-    
-    
+    
     
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
-    
-    
+    
     
-    
-    
-    
-    
-    
-    
-    
-    
+    
     
-    
-    
-    
-    
-    
+    
+    
+    
     
-    
-    
+    
+    
+    
+    
     
     
-    
-    
-    
-    
+    
     
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -842,84 +844,84 @@
     
     
     
-    
-    
-    
-    
+    
     
-    
-    
-    
+    
+    
+    
     
     
-    
-    
+    
+    
     
-    
+    
+    
     
-    
+    
+    
+    
     
     
-    
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
     
+    
     
+    
+    
+    
     
-    
+    
     
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
     
+    
     
+    
+    
+    
     
-    
-    
+    
     
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
-    
-    
+    
     
-    
-    
-    
-    
-    
-    
+    
     
-    
-    
-    
-    
-    
-    
+    
+    
+    
     
-    
-    
+    
+    
+    
+    
     
     
-    
-    
-    
-    
+    
     
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -931,49 +933,49 @@
     
     
     
-    
-    
+    
     
-    
-    
     
-    
-    
-    
-    
-    
+    
     
-    
-    
-    
-    
     
+    
+    
     
     
-    
+    
+    
+    
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
-    
-    
     
+    
+    
     
     
-    
+    
+    
+    
     
     
-    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -992,119 +994,119 @@
     
     
     
-    
-    
+    
     
     
-    
-    
+    
     
-    
     
-    
-    
-    
+    
+    
+    
+    
+    
     
     
-    
+    
+    
     
     
     
     
-    
-    
+    
     
-    
-    
     
-    
+    
     
-    
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
-    
-    
-    
     
-    
+    
+    
     
+    
     
-    
-    
-    
-    
     
+    
     
     
     
     
-    
-    
-    
+    
     
+    
     
-    
+    
+    
     
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
     
     
-    
-    
-    
     
     
+    
+    
+    
     
     
-    
-    
     
     
-    
-    
-    
-    
-    
-    
-    
+    
+    
     
     
-    
+    
+    
+    
     
     
-    
     
-    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
     
     
     
-    
-    
-    
-    
-    
-    
-    
     
     
     
-    
-    
-    
-    
+    
+    
+    
     
     
     
@@ -1145,6 +1147,13 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -1160,13 +1169,6 @@
     
     
     
-    
-    
-    
-    
-    
-    
-    
     
     
     
@@ -1188,11 +1190,11 @@
     
     
     
+    
+    
     
     
     
-    
-    
     
     
     
diff --git a/docs/libnm-util/html/object-tree.html b/docs/libnm-util/html/object-tree.html
index e6ea328c..df07ca9f 100644
--- a/docs/libnm-util/html/object-tree.html
+++ b/docs/libnm-util/html/object-tree.html
@@ -3,12 +3,12 @@
 
 
 Object Hierarchy
-
+
 
 
 
 
-
+
 
 
 
@@ -20,8 +20,8 @@
 Next
 
 

-

-Object Hierarchy

+

+Object Hierarchy

 
     GObject
         NMSetting
@@ -95,6 +95,6 @@
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/libnm-util-sections.txt b/docs/libnm-util/libnm-util-sections.txt
index ad93832e..e70e2682 100644
--- a/docs/libnm-util/libnm-util-sections.txt
+++ b/docs/libnm-util/libnm-util-sections.txt
@@ -1,31 +1,44 @@
 

 nm-connection
 NMConnection
-NMConnection
-NMConnectionClass
 NMConnectionError
 NM_CONNECTION_ERROR
+nm_connection_error_quark
 NM_CONNECTION_PATH
+NMConnection
+NMConnectionClass
+nm_connection_new
+nm_connection_new_from_hash
+nm_connection_duplicate
+nm_connection_create_setting
 nm_connection_add_setting
-nm_connection_clear_secrets
-nm_connection_clear_secrets_with_flags
+nm_connection_remove_setting
+nm_connection_get_setting
+nm_connection_get_setting_by_name
+nm_connection_replace_settings
 nm_connection_compare
-nm_connection_create_setting
 nm_connection_diff
-nm_connection_dump
-nm_connection_duplicate
-nm_connection_error_quark
+nm_connection_verify
+nm_connection_need_secrets
+nm_connection_clear_secrets
+nm_connection_clear_secrets_with_flags
+nm_connection_update_secrets
+nm_connection_set_path
+nm_connection_get_path
+nm_connection_get_virtual_iface_name
+nm_connection_is_type
 nm_connection_for_each_setting_value
+nm_connection_to_hash
+nm_connection_dump
+nm_connection_lookup_setting_type
+nm_connection_lookup_setting_type_by_quark
+nm_connection_get_uuid
 nm_connection_get_id
-nm_connection_get_path
-nm_connection_get_setting
 nm_connection_get_setting_802_1x
-nm_connection_get_setting_adsl
 nm_connection_get_setting_bluetooth
 nm_connection_get_setting_bond
 nm_connection_get_setting_bridge
 nm_connection_get_setting_bridge_port
-nm_connection_get_setting_by_name
 nm_connection_get_setting_cdma
 nm_connection_get_setting_connection
 nm_connection_get_setting_gsm
@@ -36,26 +49,13 @@ nm_connection_get_setting_olpc_mesh
 nm_connection_get_setting_ppp
 nm_connection_get_setting_pppoe
 nm_connection_get_setting_serial
-nm_connection_get_setting_vlan
 nm_connection_get_setting_vpn
 nm_connection_get_setting_wimax
+nm_connection_get_setting_adsl
 nm_connection_get_setting_wired
 nm_connection_get_setting_wireless
 nm_connection_get_setting_wireless_security
-nm_connection_get_uuid
-nm_connection_get_virtual_iface_name
-nm_connection_is_type
-nm_connection_lookup_setting_type
-nm_connection_lookup_setting_type_by_quark
-nm_connection_need_secrets
-nm_connection_new
-nm_connection_new_from_hash
-nm_connection_remove_setting
-nm_connection_replace_settings
-nm_connection_set_path
-nm_connection_to_hash
-nm_connection_update_secrets
-nm_connection_verify
+nm_connection_get_setting_vlan
 
 NM_CONNECTION
 NM_CONNECTION_CLASS
@@ -69,38 +69,38 @@ nm_connection_get_type
 

 nm-setting
 NMSetting
-NMSetting
-NMSettingClass
-NMSettingClearSecretsWithFlagsFn
-NMSettingCompareFlags
-NMSettingDiffResult
 NMSettingError
-NMSettingHashFlags
-NMSettingSecretFlags
-NMSettingValueIterFn
 NM_SETTING_ERROR
-NM_SETTING_NAME
-NM_SETTING_PARAM_FUZZY_IGNORE
+nm_setting_error_quark
+NM_SETTING_PARAM_SERIALIZE
 NM_SETTING_PARAM_REQUIRED
 NM_SETTING_PARAM_SECRET
-NM_SETTING_PARAM_SERIALIZE
-nm_setting_clear_secrets
-nm_setting_clear_secrets_with_flags
+NM_SETTING_PARAM_FUZZY_IGNORE
+NM_SETTING_NAME
+NMSettingSecretFlags
+NMSettingCompareFlags
+NMSetting
+NMSettingClearSecretsWithFlagsFn
+NMSettingClass
+NMSettingValueIterFn
+NMSettingHashFlags
+nm_setting_to_hash
+nm_setting_new_from_hash
+nm_setting_duplicate
+nm_setting_get_name
+nm_setting_verify
 nm_setting_compare
+NMSettingDiffResult
 nm_setting_diff
-nm_setting_duplicate
 nm_setting_enumerate_values
-nm_setting_error_quark
-nm_setting_get_name
-nm_setting_get_secret_flags
-nm_setting_get_virtual_iface_name
-nm_setting_need_secrets
-nm_setting_new_from_hash
-nm_setting_set_secret_flags
-nm_setting_to_hash
 nm_setting_to_string
+nm_setting_clear_secrets
+nm_setting_clear_secrets_with_flags
+nm_setting_need_secrets
 nm_setting_update_secrets
-nm_setting_verify
+nm_setting_get_secret_flags
+nm_setting_set_secret_flags
+nm_setting_get_virtual_iface_name
 
 NM_IS_SETTING
 NM_IS_SETTING_CLASS
@@ -114,111 +114,111 @@ nm_setting_get_type
 

 nm-setting-8021x
 NMSetting8021x
-NMSetting8021x
 NMSetting8021xCKFormat
 NMSetting8021xCKScheme
-NMSetting8021xClass
+NM_SETTING_802_1X_SETTING_NAME
 NMSetting8021xError
-NM_SETTING_802_1X_ALTSUBJECT_MATCHES
+NM_SETTING_802_1X_ERROR
+nm_setting_802_1x_error_quark
+NM_SETTING_802_1X_EAP
+NM_SETTING_802_1X_IDENTITY
 NM_SETTING_802_1X_ANONYMOUS_IDENTITY
+NM_SETTING_802_1X_PAC_FILE
 NM_SETTING_802_1X_CA_CERT
 NM_SETTING_802_1X_CA_PATH
+NM_SETTING_802_1X_SUBJECT_MATCH
+NM_SETTING_802_1X_ALTSUBJECT_MATCHES
 NM_SETTING_802_1X_CLIENT_CERT
-NM_SETTING_802_1X_EAP
-NM_SETTING_802_1X_ERROR
-NM_SETTING_802_1X_IDENTITY
-NM_SETTING_802_1X_PAC_FILE
-NM_SETTING_802_1X_PASSWORD
-NM_SETTING_802_1X_PASSWORD_FLAGS
-NM_SETTING_802_1X_PASSWORD_RAW
-NM_SETTING_802_1X_PASSWORD_RAW_FLAGS
-NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING
-NM_SETTING_802_1X_PHASE1_PEAPLABEL
 NM_SETTING_802_1X_PHASE1_PEAPVER
-NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES
+NM_SETTING_802_1X_PHASE1_PEAPLABEL
+NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING
 NM_SETTING_802_1X_PHASE2_AUTH
 NM_SETTING_802_1X_PHASE2_AUTHEAP
 NM_SETTING_802_1X_PHASE2_CA_CERT
 NM_SETTING_802_1X_PHASE2_CA_PATH
+NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH
+NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES
 NM_SETTING_802_1X_PHASE2_CLIENT_CERT
+NM_SETTING_802_1X_PASSWORD
+NM_SETTING_802_1X_PASSWORD_FLAGS
+NM_SETTING_802_1X_PASSWORD_RAW
+NM_SETTING_802_1X_PASSWORD_RAW_FLAGS
+NM_SETTING_802_1X_PRIVATE_KEY
+NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD
+NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS
 NM_SETTING_802_1X_PHASE2_PRIVATE_KEY
 NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD
 NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS
-NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH
 NM_SETTING_802_1X_PIN
 NM_SETTING_802_1X_PIN_FLAGS
-NM_SETTING_802_1X_PRIVATE_KEY
-NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD
-NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS
-NM_SETTING_802_1X_SETTING_NAME
-NM_SETTING_802_1X_SUBJECT_MATCH
 NM_SETTING_802_1X_SYSTEM_CA_CERTS
-nm_setting_802_1x_add_altsubject_match
+NMSetting8021x
+NMSetting8021xClass
+nm_setting_802_1x_new
+nm_setting_802_1x_get_num_eap_methods
+nm_setting_802_1x_get_eap_method
 nm_setting_802_1x_add_eap_method
-nm_setting_802_1x_add_phase2_altsubject_match
-nm_setting_802_1x_clear_altsubject_matches
+nm_setting_802_1x_remove_eap_method
 nm_setting_802_1x_clear_eap_methods
-nm_setting_802_1x_clear_phase2_altsubject_matches
-nm_setting_802_1x_error_quark
-nm_setting_802_1x_get_altsubject_match
+nm_setting_802_1x_get_identity
 nm_setting_802_1x_get_anonymous_identity
+nm_setting_802_1x_get_pac_file
+nm_setting_802_1x_get_system_ca_certs
+nm_setting_802_1x_get_ca_path
+nm_setting_802_1x_get_phase2_ca_path
+nm_setting_802_1x_get_ca_cert_scheme
 nm_setting_802_1x_get_ca_cert_blob
 nm_setting_802_1x_get_ca_cert_path
-nm_setting_802_1x_get_ca_cert_scheme
-nm_setting_802_1x_get_ca_path
+nm_setting_802_1x_set_ca_cert
+nm_setting_802_1x_get_subject_match
+nm_setting_802_1x_get_num_altsubject_matches
+nm_setting_802_1x_get_altsubject_match
+nm_setting_802_1x_add_altsubject_match
+nm_setting_802_1x_remove_altsubject_match
+nm_setting_802_1x_clear_altsubject_matches
+nm_setting_802_1x_get_client_cert_scheme
 nm_setting_802_1x_get_client_cert_blob
 nm_setting_802_1x_get_client_cert_path
-nm_setting_802_1x_get_client_cert_scheme
-nm_setting_802_1x_get_eap_method
-nm_setting_802_1x_get_identity
-nm_setting_802_1x_get_num_altsubject_matches
-nm_setting_802_1x_get_num_eap_methods
-nm_setting_802_1x_get_num_phase2_altsubject_matches
-nm_setting_802_1x_get_pac_file
-nm_setting_802_1x_get_password
-nm_setting_802_1x_get_password_flags
-nm_setting_802_1x_get_password_raw
-nm_setting_802_1x_get_password_raw_flags
-nm_setting_802_1x_get_phase1_fast_provisioning
-nm_setting_802_1x_get_phase1_peaplabel
+nm_setting_802_1x_set_client_cert
 nm_setting_802_1x_get_phase1_peapver
-nm_setting_802_1x_get_phase2_altsubject_match
+nm_setting_802_1x_get_phase1_peaplabel
+nm_setting_802_1x_get_phase1_fast_provisioning
 nm_setting_802_1x_get_phase2_auth
 nm_setting_802_1x_get_phase2_autheap
+nm_setting_802_1x_get_phase2_ca_cert_scheme
 nm_setting_802_1x_get_phase2_ca_cert_blob
 nm_setting_802_1x_get_phase2_ca_cert_path
-nm_setting_802_1x_get_phase2_ca_cert_scheme
-nm_setting_802_1x_get_phase2_ca_path
+nm_setting_802_1x_set_phase2_ca_cert
+nm_setting_802_1x_get_phase2_subject_match
+nm_setting_802_1x_get_num_phase2_altsubject_matches
+nm_setting_802_1x_get_phase2_altsubject_match
+nm_setting_802_1x_add_phase2_altsubject_match
+nm_setting_802_1x_remove_phase2_altsubject_match
+nm_setting_802_1x_clear_phase2_altsubject_matches
+nm_setting_802_1x_get_phase2_client_cert_scheme
 nm_setting_802_1x_get_phase2_client_cert_blob
 nm_setting_802_1x_get_phase2_client_cert_path
-nm_setting_802_1x_get_phase2_client_cert_scheme
-nm_setting_802_1x_get_phase2_private_key_blob
-nm_setting_802_1x_get_phase2_private_key_format
-nm_setting_802_1x_get_phase2_private_key_password
-nm_setting_802_1x_get_phase2_private_key_password_flags
-nm_setting_802_1x_get_phase2_private_key_path
-nm_setting_802_1x_get_phase2_private_key_scheme
-nm_setting_802_1x_get_phase2_subject_match
+nm_setting_802_1x_set_phase2_client_cert
+nm_setting_802_1x_get_password
+nm_setting_802_1x_get_password_flags
+nm_setting_802_1x_get_password_raw
+nm_setting_802_1x_get_password_raw_flags
 nm_setting_802_1x_get_pin
 nm_setting_802_1x_get_pin_flags
+nm_setting_802_1x_get_private_key_scheme
 nm_setting_802_1x_get_private_key_blob
-nm_setting_802_1x_get_private_key_format
+nm_setting_802_1x_get_private_key_path
+nm_setting_802_1x_set_private_key
 nm_setting_802_1x_get_private_key_password
 nm_setting_802_1x_get_private_key_password_flags
-nm_setting_802_1x_get_private_key_path
-nm_setting_802_1x_get_private_key_scheme
-nm_setting_802_1x_get_subject_match
-nm_setting_802_1x_get_system_ca_certs
-nm_setting_802_1x_new
-nm_setting_802_1x_remove_altsubject_match
-nm_setting_802_1x_remove_eap_method
-nm_setting_802_1x_remove_phase2_altsubject_match
-nm_setting_802_1x_set_ca_cert
-nm_setting_802_1x_set_client_cert
-nm_setting_802_1x_set_phase2_ca_cert
-nm_setting_802_1x_set_phase2_client_cert
+nm_setting_802_1x_get_private_key_format
+nm_setting_802_1x_get_phase2_private_key_scheme
+nm_setting_802_1x_get_phase2_private_key_blob
+nm_setting_802_1x_get_phase2_private_key_path
 nm_setting_802_1x_set_phase2_private_key
-nm_setting_802_1x_set_private_key
+nm_setting_802_1x_get_phase2_private_key_password
+nm_setting_802_1x_get_phase2_private_key_password_flags
+nm_setting_802_1x_get_phase2_private_key_format
 
 NM_IS_SETTING_802_1X
 NM_IS_SETTING_802_1X_CLASS
@@ -232,32 +232,32 @@ nm_setting_802_1x_get_type
 

 nm-setting-adsl
 NMSettingAdsl
-NMSettingAdsl
-NMSettingAdslClass
+NM_SETTING_ADSL_SETTING_NAME
 NMSettingAdslError
-NM_SETTING_ADSL_ENCAPSULATION
-NM_SETTING_ADSL_ENCAPSULATION_LLC
-NM_SETTING_ADSL_ENCAPSULATION_VCMUX
 NM_SETTING_ADSL_ERROR
+nm_setting_adsl_error_quark
+NM_SETTING_ADSL_USERNAME
 NM_SETTING_ADSL_PASSWORD
 NM_SETTING_ADSL_PASSWORD_FLAGS
 NM_SETTING_ADSL_PROTOCOL
-NM_SETTING_ADSL_PROTOCOL_IPOATM
+NM_SETTING_ADSL_ENCAPSULATION
+NM_SETTING_ADSL_VPI
+NM_SETTING_ADSL_VCI
 NM_SETTING_ADSL_PROTOCOL_PPPOA
 NM_SETTING_ADSL_PROTOCOL_PPPOE
-NM_SETTING_ADSL_SETTING_NAME
-NM_SETTING_ADSL_USERNAME
-NM_SETTING_ADSL_VCI
-NM_SETTING_ADSL_VPI
-nm_setting_adsl_error_quark
-nm_setting_adsl_get_encapsulation
+NM_SETTING_ADSL_PROTOCOL_IPOATM
+NM_SETTING_ADSL_ENCAPSULATION_VCMUX
+NM_SETTING_ADSL_ENCAPSULATION_LLC
+NMSettingAdsl
+NMSettingAdslClass
+nm_setting_adsl_new
+nm_setting_adsl_get_username
 nm_setting_adsl_get_password
-nm_setting_adsl_get_password_flags
 nm_setting_adsl_get_protocol
-nm_setting_adsl_get_username
-nm_setting_adsl_get_vci
+nm_setting_adsl_get_encapsulation
 nm_setting_adsl_get_vpi
-nm_setting_adsl_new
+nm_setting_adsl_get_vci
+nm_setting_adsl_get_password_flags
 
 NM_IS_SETTING_ADSL
 NM_IS_SETTING_ADSL_CLASS
@@ -271,19 +271,19 @@ nm_setting_adsl_get_type
 

 nm-setting-bluetooth
 NMSettingBluetooth
-NMSettingBluetooth
-NMSettingBluetoothClass
+NM_SETTING_BLUETOOTH_SETTING_NAME
 NMSettingBluetoothError
-NM_SETTING_BLUETOOTH_BDADDR
 NM_SETTING_BLUETOOTH_ERROR
-NM_SETTING_BLUETOOTH_SETTING_NAME
+nm_setting_bluetooth_error_quark
+NM_SETTING_BLUETOOTH_BDADDR
 NM_SETTING_BLUETOOTH_TYPE
 NM_SETTING_BLUETOOTH_TYPE_DUN
 NM_SETTING_BLUETOOTH_TYPE_PANU
-nm_setting_bluetooth_error_quark
+NMSettingBluetooth
+NMSettingBluetoothClass
+nm_setting_bluetooth_new
 nm_setting_bluetooth_get_bdaddr
 nm_setting_bluetooth_get_connection_type
-nm_setting_bluetooth_new
 
 NM_IS_SETTING_BLUETOOTH
 NM_IS_SETTING_BLUETOOTH_CLASS
@@ -297,29 +297,29 @@ nm_setting_bluetooth_get_type
 

 nm-setting-bond
 NMSettingBond
-NMSettingBond
-NMSettingBondClass
+NM_SETTING_BOND_SETTING_NAME
 NMSettingBondError
 NM_SETTING_BOND_ERROR
+nm_setting_bond_error_quark
 NM_SETTING_BOND_INTERFACE_NAME
 NM_SETTING_BOND_OPTIONS
-NM_SETTING_BOND_OPTION_ARP_INTERVAL
-NM_SETTING_BOND_OPTION_ARP_IP_TARGET
-NM_SETTING_BOND_OPTION_DOWNDELAY
-NM_SETTING_BOND_OPTION_MIIMON
 NM_SETTING_BOND_OPTION_MODE
+NM_SETTING_BOND_OPTION_MIIMON
+NM_SETTING_BOND_OPTION_DOWNDELAY
 NM_SETTING_BOND_OPTION_UPDELAY
-NM_SETTING_BOND_SETTING_NAME
-nm_setting_bond_add_option
-nm_setting_bond_error_quark
+NM_SETTING_BOND_OPTION_ARP_INTERVAL
+NM_SETTING_BOND_OPTION_ARP_IP_TARGET
+NMSettingBond
+NMSettingBondClass
+nm_setting_bond_new
 nm_setting_bond_get_interface_name
 nm_setting_bond_get_num_options
 nm_setting_bond_get_option
 nm_setting_bond_get_option_by_name
-nm_setting_bond_get_option_default
-nm_setting_bond_get_valid_options
-nm_setting_bond_new
+nm_setting_bond_add_option
 nm_setting_bond_remove_option
+nm_setting_bond_get_valid_options
+nm_setting_bond_get_option_default
 
 NM_IS_SETTING_BOND
 NM_IS_SETTING_BOND_CLASS
@@ -333,27 +333,27 @@ nm_setting_bond_get_type
 

 nm-setting-bridge
 NMSettingBridge
-NMSettingBridge
-NMSettingBridgeClass
+NM_SETTING_BRIDGE_SETTING_NAME
 NMSettingBridgeError
-NM_SETTING_BRIDGE_AGEING_TIME
 NM_SETTING_BRIDGE_ERROR
+nm_setting_bridge_error_quark
+NM_SETTING_BRIDGE_INTERFACE_NAME
+NM_SETTING_BRIDGE_STP
+NM_SETTING_BRIDGE_PRIORITY
 NM_SETTING_BRIDGE_FORWARD_DELAY
 NM_SETTING_BRIDGE_HELLO_TIME
-NM_SETTING_BRIDGE_INTERFACE_NAME
 NM_SETTING_BRIDGE_MAX_AGE
-NM_SETTING_BRIDGE_PRIORITY
-NM_SETTING_BRIDGE_SETTING_NAME
-NM_SETTING_BRIDGE_STP
-nm_setting_bridge_error_quark
-nm_setting_bridge_get_ageing_time
+NM_SETTING_BRIDGE_AGEING_TIME
+NMSettingBridge
+NMSettingBridgeClass
+nm_setting_bridge_new
+nm_setting_bridge_get_interface_name
+nm_setting_bridge_get_stp
+nm_setting_bridge_get_priority
 nm_setting_bridge_get_forward_delay
 nm_setting_bridge_get_hello_time
-nm_setting_bridge_get_interface_name
 nm_setting_bridge_get_max_age
-nm_setting_bridge_get_priority
-nm_setting_bridge_get_stp
-nm_setting_bridge_new
+nm_setting_bridge_get_ageing_time
 
 NM_IS_SETTING_BRIDGE
 NM_IS_SETTING_BRIDGE_CLASS
@@ -367,19 +367,19 @@ nm_setting_bridge_get_type
 

 nm-setting-bridge-port
 NMSettingBridgePort
-NMSettingBridgePort
-NMSettingBridgePortClass
+NM_SETTING_BRIDGE_PORT_SETTING_NAME
 NMSettingBridgePortError
 NM_SETTING_BRIDGE_PORT_ERROR
-NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE
-NM_SETTING_BRIDGE_PORT_PATH_COST
-NM_SETTING_BRIDGE_PORT_PRIORITY
-NM_SETTING_BRIDGE_PORT_SETTING_NAME
 nm_setting_bridge_port_error_quark
-nm_setting_bridge_port_get_hairpin_mode
-nm_setting_bridge_port_get_path_cost
-nm_setting_bridge_port_get_priority
+NM_SETTING_BRIDGE_PORT_PRIORITY
+NM_SETTING_BRIDGE_PORT_PATH_COST
+NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE
+NMSettingBridgePort
+NMSettingBridgePortClass
 nm_setting_bridge_port_new
+nm_setting_bridge_port_get_priority
+nm_setting_bridge_port_get_path_cost
+nm_setting_bridge_port_get_hairpin_mode
 
 NM_IS_SETTING_BRIDGE_PORT
 NM_IS_SETTING_BRIDGE_PORT_CLASS
@@ -393,21 +393,21 @@ nm_setting_bridge_port_get_type
 

 nm-setting-cdma
 NMSettingCdma
-NMSettingCdma
-NMSettingCdmaClass
+NM_SETTING_CDMA_SETTING_NAME
 NMSettingCdmaError
 NM_SETTING_CDMA_ERROR
+nm_setting_cdma_error_quark
 NM_SETTING_CDMA_NUMBER
+NM_SETTING_CDMA_USERNAME
 NM_SETTING_CDMA_PASSWORD
 NM_SETTING_CDMA_PASSWORD_FLAGS
-NM_SETTING_CDMA_SETTING_NAME
-NM_SETTING_CDMA_USERNAME
-nm_setting_cdma_error_quark
+NMSettingCdma
+NMSettingCdmaClass
+nm_setting_cdma_new
 nm_setting_cdma_get_number
+nm_setting_cdma_get_username
 nm_setting_cdma_get_password
 nm_setting_cdma_get_password_flags
-nm_setting_cdma_get_username
-nm_setting_cdma_new
 
 NM_IS_SETTING_CDMA
 NM_IS_SETTING_CDMA_CLASS
@@ -421,42 +421,42 @@ nm_setting_cdma_get_type
 

 nm-setting-connection
 NMSettingConnection
-NMSettingConnection
-NMSettingConnectionClass
+NM_SETTING_CONNECTION_SETTING_NAME
 NMSettingConnectionError
-NM_SETTING_CONNECTION_AUTOCONNECT
 NM_SETTING_CONNECTION_ERROR
+nm_setting_connection_error_quark
 NM_SETTING_CONNECTION_ID
-NM_SETTING_CONNECTION_MASTER
-NM_SETTING_CONNECTION_PERMISSIONS
-NM_SETTING_CONNECTION_READ_ONLY
-NM_SETTING_CONNECTION_SECONDARIES
-NM_SETTING_CONNECTION_SETTING_NAME
-NM_SETTING_CONNECTION_SLAVE_TYPE
-NM_SETTING_CONNECTION_TIMESTAMP
-NM_SETTING_CONNECTION_TYPE
 NM_SETTING_CONNECTION_UUID
+NM_SETTING_CONNECTION_TYPE
+NM_SETTING_CONNECTION_AUTOCONNECT
+NM_SETTING_CONNECTION_TIMESTAMP
+NM_SETTING_CONNECTION_READ_ONLY
+NM_SETTING_CONNECTION_PERMISSIONS
 NM_SETTING_CONNECTION_ZONE
-nm_setting_connection_add_permission
-nm_setting_connection_add_secondary
-nm_setting_connection_error_quark
-nm_setting_connection_get_autoconnect
-nm_setting_connection_get_connection_type
+NM_SETTING_CONNECTION_MASTER
+NM_SETTING_CONNECTION_SLAVE_TYPE
+NM_SETTING_CONNECTION_SECONDARIES
+NMSettingConnection
+NMSettingConnectionClass
+nm_setting_connection_new
 nm_setting_connection_get_id
-nm_setting_connection_get_master
+nm_setting_connection_get_uuid
+nm_setting_connection_get_connection_type
+nm_setting_connection_get_autoconnect
+nm_setting_connection_get_timestamp
+nm_setting_connection_get_read_only
 nm_setting_connection_get_num_permissions
-nm_setting_connection_get_num_secondaries
 nm_setting_connection_get_permission
-nm_setting_connection_get_read_only
-nm_setting_connection_get_secondary
-nm_setting_connection_get_slave_type
-nm_setting_connection_get_timestamp
-nm_setting_connection_get_uuid
 nm_setting_connection_get_zone
-nm_setting_connection_is_slave_type
-nm_setting_connection_new
 nm_setting_connection_permissions_user_allowed
+nm_setting_connection_add_permission
 nm_setting_connection_remove_permission
+nm_setting_connection_get_master
+nm_setting_connection_is_slave_type
+nm_setting_connection_get_slave_type
+nm_setting_connection_get_num_secondaries
+nm_setting_connection_get_secondary
+nm_setting_connection_add_secondary
 nm_setting_connection_remove_secondary
 
 NM_IS_SETTING_CONNECTION
@@ -471,37 +471,37 @@ nm_setting_connection_get_type
 

 nm-setting-gsm
 NMSettingGsm
-NMSettingGsm
-NMSettingGsmClass
+NM_SETTING_GSM_SETTING_NAME
 NMSettingGsmError
-NMSettingGsmNetworkBand
-NMSettingGsmNetworkType
-NM_SETTING_GSM_ALLOWED_BANDS
-NM_SETTING_GSM_APN
 NM_SETTING_GSM_ERROR
-NM_SETTING_GSM_HOME_ONLY
-NM_SETTING_GSM_NETWORK_ID
-NM_SETTING_GSM_NETWORK_TYPE
+nm_setting_gsm_error_quark
 NM_SETTING_GSM_NUMBER
+NM_SETTING_GSM_USERNAME
 NM_SETTING_GSM_PASSWORD
 NM_SETTING_GSM_PASSWORD_FLAGS
+NM_SETTING_GSM_APN
+NM_SETTING_GSM_NETWORK_ID
+NM_SETTING_GSM_NETWORK_TYPE
+NM_SETTING_GSM_ALLOWED_BANDS
 NM_SETTING_GSM_PIN
 NM_SETTING_GSM_PIN_FLAGS
-NM_SETTING_GSM_SETTING_NAME
-NM_SETTING_GSM_USERNAME
-nm_setting_gsm_error_quark
-nm_setting_gsm_get_allowed_bands
+NM_SETTING_GSM_HOME_ONLY
+NMSettingGsmNetworkType
+NMSettingGsmNetworkBand
+NMSettingGsm
+NMSettingGsmClass
+nm_setting_gsm_new
+nm_setting_gsm_get_number
+nm_setting_gsm_get_username
+nm_setting_gsm_get_password
 nm_setting_gsm_get_apn
-nm_setting_gsm_get_home_only
 nm_setting_gsm_get_network_id
 nm_setting_gsm_get_network_type
-nm_setting_gsm_get_number
-nm_setting_gsm_get_password
-nm_setting_gsm_get_password_flags
+nm_setting_gsm_get_allowed_bands
 nm_setting_gsm_get_pin
+nm_setting_gsm_get_home_only
 nm_setting_gsm_get_pin_flags
-nm_setting_gsm_get_username
-nm_setting_gsm_new
+nm_setting_gsm_get_password_flags
 
 NM_IS_SETTING_GSM
 NM_IS_SETTING_GSM_CLASS
@@ -515,19 +515,19 @@ nm_setting_gsm_get_type
 

 nm-setting-infiniband
 NMSettingInfiniband
-NMSettingInfiniband
-NMSettingInfinibandClass
+NM_SETTING_INFINIBAND_SETTING_NAME
 NMSettingInfinibandError
 NM_SETTING_INFINIBAND_ERROR
+nm_setting_infiniband_error_quark
 NM_SETTING_INFINIBAND_MAC_ADDRESS
 NM_SETTING_INFINIBAND_MTU
-NM_SETTING_INFINIBAND_SETTING_NAME
 NM_SETTING_INFINIBAND_TRANSPORT_MODE
-nm_setting_infiniband_error_quark
+NMSettingInfiniband
+NMSettingInfinibandClass
+nm_setting_infiniband_new
 nm_setting_infiniband_get_mac_address
 nm_setting_infiniband_get_mtu
 nm_setting_infiniband_get_transport_mode
-nm_setting_infiniband_new
 
 NM_IS_SETTING_INFINIBAND
 NM_IS_SETTING_INFINIBAND_CLASS
@@ -541,84 +541,84 @@ nm_setting_infiniband_get_type
 

 nm-setting-ip4-config
 NMSettingIP4Config
-NMIP4Address
-NMIP4Route
-NMSettingIP4Config
-NMSettingIP4ConfigClass
+NM_SETTING_IP4_CONFIG_SETTING_NAME
 NMSettingIP4ConfigError
-NM_SETTING_IP4_CONFIG_ADDRESSES
-NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID
-NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME
-NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME
+NM_SETTING_IP4_CONFIG_ERROR
+nm_setting_ip4_config_error_quark
+NM_SETTING_IP4_CONFIG_METHOD
 NM_SETTING_IP4_CONFIG_DNS
 NM_SETTING_IP4_CONFIG_DNS_SEARCH
-NM_SETTING_IP4_CONFIG_ERROR
-NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS
+NM_SETTING_IP4_CONFIG_ADDRESSES
+NM_SETTING_IP4_CONFIG_ROUTES
 NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES
+NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS
+NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID
+NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME
+NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME
+NM_SETTING_IP4_CONFIG_NEVER_DEFAULT
 NM_SETTING_IP4_CONFIG_MAY_FAIL
-NM_SETTING_IP4_CONFIG_METHOD
 NM_SETTING_IP4_CONFIG_METHOD_AUTO
-NM_SETTING_IP4_CONFIG_METHOD_DISABLED
 NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL
 NM_SETTING_IP4_CONFIG_METHOD_MANUAL
 NM_SETTING_IP4_CONFIG_METHOD_SHARED
-NM_SETTING_IP4_CONFIG_NEVER_DEFAULT
-NM_SETTING_IP4_CONFIG_ROUTES
-NM_SETTING_IP4_CONFIG_SETTING_NAME
-nm_ip4_address_compare
-nm_ip4_address_dup
-nm_ip4_address_get_address
-nm_ip4_address_get_gateway
-nm_ip4_address_get_prefix
+NM_SETTING_IP4_CONFIG_METHOD_DISABLED
+NMIP4Address
 nm_ip4_address_new
+nm_ip4_address_dup
 nm_ip4_address_ref
+nm_ip4_address_unref
+nm_ip4_address_compare
+nm_ip4_address_get_address
 nm_ip4_address_set_address
-nm_ip4_address_set_gateway
+nm_ip4_address_get_prefix
 nm_ip4_address_set_prefix
-nm_ip4_address_unref
-nm_ip4_route_compare
-nm_ip4_route_dup
-nm_ip4_route_get_dest
-nm_ip4_route_get_metric
-nm_ip4_route_get_next_hop
-nm_ip4_route_get_prefix
+nm_ip4_address_get_gateway
+nm_ip4_address_set_gateway
+NMIP4Route
 nm_ip4_route_new
+nm_ip4_route_dup
 nm_ip4_route_ref
+nm_ip4_route_unref
+nm_ip4_route_compare
+nm_ip4_route_get_dest
 nm_ip4_route_set_dest
-nm_ip4_route_set_metric
-nm_ip4_route_set_next_hop
+nm_ip4_route_get_prefix
 nm_ip4_route_set_prefix
-nm_ip4_route_unref
-nm_setting_ip4_config_add_address
+nm_ip4_route_get_next_hop
+nm_ip4_route_set_next_hop
+nm_ip4_route_get_metric
+nm_ip4_route_set_metric
+NMSettingIP4Config
+NMSettingIP4ConfigClass
+nm_setting_ip4_config_new
+nm_setting_ip4_config_get_method
+nm_setting_ip4_config_get_num_dns
+nm_setting_ip4_config_get_dns
 nm_setting_ip4_config_add_dns
-nm_setting_ip4_config_add_dns_search
-nm_setting_ip4_config_add_route
-nm_setting_ip4_config_clear_addresses
+nm_setting_ip4_config_remove_dns
 nm_setting_ip4_config_clear_dns
-nm_setting_ip4_config_clear_dns_searches
-nm_setting_ip4_config_clear_routes
-nm_setting_ip4_config_error_quark
-nm_setting_ip4_config_get_address
-nm_setting_ip4_config_get_dhcp_client_id
-nm_setting_ip4_config_get_dhcp_hostname
-nm_setting_ip4_config_get_dhcp_send_hostname
-nm_setting_ip4_config_get_dns
+nm_setting_ip4_config_get_num_dns_searches
 nm_setting_ip4_config_get_dns_search
-nm_setting_ip4_config_get_ignore_auto_dns
-nm_setting_ip4_config_get_ignore_auto_routes
-nm_setting_ip4_config_get_may_fail
-nm_setting_ip4_config_get_method
-nm_setting_ip4_config_get_never_default
+nm_setting_ip4_config_add_dns_search
+nm_setting_ip4_config_remove_dns_search
+nm_setting_ip4_config_clear_dns_searches
 nm_setting_ip4_config_get_num_addresses
-nm_setting_ip4_config_get_num_dns
-nm_setting_ip4_config_get_num_dns_searches
+nm_setting_ip4_config_get_address
+nm_setting_ip4_config_add_address
+nm_setting_ip4_config_remove_address
+nm_setting_ip4_config_clear_addresses
 nm_setting_ip4_config_get_num_routes
 nm_setting_ip4_config_get_route
-nm_setting_ip4_config_new
-nm_setting_ip4_config_remove_address
-nm_setting_ip4_config_remove_dns
-nm_setting_ip4_config_remove_dns_search
+nm_setting_ip4_config_add_route
 nm_setting_ip4_config_remove_route
+nm_setting_ip4_config_clear_routes
+nm_setting_ip4_config_get_ignore_auto_routes
+nm_setting_ip4_config_get_ignore_auto_dns
+nm_setting_ip4_config_get_dhcp_client_id
+nm_setting_ip4_config_get_dhcp_send_hostname
+nm_setting_ip4_config_get_dhcp_hostname
+nm_setting_ip4_config_get_never_default
+nm_setting_ip4_config_get_may_fail
 
 NM_IS_SETTING_IP4_CONFIG
 NM_IS_SETTING_IP4_CONFIG_CLASS
@@ -634,84 +634,84 @@ nm_setting_ip4_config_get_type
 

 nm-setting-ip6-config
 NMSettingIP6Config
-NMIP6Address
-NMIP6Route
-NMSettingIP6Config
-NMSettingIP6ConfigClass
+NM_SETTING_IP6_CONFIG_SETTING_NAME
 NMSettingIP6ConfigError
-NMSettingIP6ConfigPrivacy
-NM_SETTING_IP6_CONFIG_ADDRESSES
-NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME
+NM_SETTING_IP6_CONFIG_ERROR
+nm_setting_ip6_config_error_quark
+NM_SETTING_IP6_CONFIG_METHOD
 NM_SETTING_IP6_CONFIG_DNS
 NM_SETTING_IP6_CONFIG_DNS_SEARCH
-NM_SETTING_IP6_CONFIG_ERROR
-NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS
+NM_SETTING_IP6_CONFIG_ADDRESSES
+NM_SETTING_IP6_CONFIG_ROUTES
 NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES
-NM_SETTING_IP6_CONFIG_IP6_PRIVACY
+NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS
+NM_SETTING_IP6_CONFIG_NEVER_DEFAULT
 NM_SETTING_IP6_CONFIG_MAY_FAIL
-NM_SETTING_IP6_CONFIG_METHOD
+NM_SETTING_IP6_CONFIG_IP6_PRIVACY
+NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME
+NM_SETTING_IP6_CONFIG_METHOD_IGNORE
 NM_SETTING_IP6_CONFIG_METHOD_AUTO
 NM_SETTING_IP6_CONFIG_METHOD_DHCP
-NM_SETTING_IP6_CONFIG_METHOD_IGNORE
 NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL
 NM_SETTING_IP6_CONFIG_METHOD_MANUAL
 NM_SETTING_IP6_CONFIG_METHOD_SHARED
-NM_SETTING_IP6_CONFIG_NEVER_DEFAULT
-NM_SETTING_IP6_CONFIG_ROUTES
-NM_SETTING_IP6_CONFIG_SETTING_NAME
-nm_ip6_address_compare
-nm_ip6_address_dup
-nm_ip6_address_get_address
-nm_ip6_address_get_gateway
-nm_ip6_address_get_prefix
+NMSettingIP6ConfigPrivacy
+NMIP6Address
 nm_ip6_address_new
+nm_ip6_address_dup
 nm_ip6_address_ref
+nm_ip6_address_unref
+nm_ip6_address_compare
+nm_ip6_address_get_address
 nm_ip6_address_set_address
-nm_ip6_address_set_gateway
+nm_ip6_address_get_prefix
 nm_ip6_address_set_prefix
-nm_ip6_address_unref
-nm_ip6_route_compare
-nm_ip6_route_dup
-nm_ip6_route_get_dest
-nm_ip6_route_get_metric
-nm_ip6_route_get_next_hop
-nm_ip6_route_get_prefix
+nm_ip6_address_get_gateway
+nm_ip6_address_set_gateway
+NMIP6Route
 nm_ip6_route_new
+nm_ip6_route_dup
 nm_ip6_route_ref
+nm_ip6_route_unref
+nm_ip6_route_compare
+nm_ip6_route_get_dest
 nm_ip6_route_set_dest
-nm_ip6_route_set_metric
-nm_ip6_route_set_next_hop
+nm_ip6_route_get_prefix
 nm_ip6_route_set_prefix
-nm_ip6_route_unref
-nm_setting_ip6_config_add_address
+nm_ip6_route_get_next_hop
+nm_ip6_route_set_next_hop
+nm_ip6_route_get_metric
+nm_ip6_route_set_metric
+NMSettingIP6Config
+NMSettingIP6ConfigClass
+nm_setting_ip6_config_new
+nm_setting_ip6_config_get_method
+nm_setting_ip6_config_get_num_dns
+nm_setting_ip6_config_get_dns
 nm_setting_ip6_config_add_dns
-nm_setting_ip6_config_add_dns_search
-nm_setting_ip6_config_add_route
-nm_setting_ip6_config_clear_addresses
+nm_setting_ip6_config_remove_dns
 nm_setting_ip6_config_clear_dns
-nm_setting_ip6_config_clear_dns_searches
-nm_setting_ip6_config_clear_routes
-nm_setting_ip6_config_error_quark
-nm_setting_ip6_config_get_address
-nm_setting_ip6_config_get_dhcp_hostname
-nm_setting_ip6_config_get_dns
+nm_setting_ip6_config_get_num_dns_searches
 nm_setting_ip6_config_get_dns_search
-nm_setting_ip6_config_get_ignore_auto_dns
-nm_setting_ip6_config_get_ignore_auto_routes
-nm_setting_ip6_config_get_ip6_privacy
-nm_setting_ip6_config_get_may_fail
-nm_setting_ip6_config_get_method
-nm_setting_ip6_config_get_never_default
+nm_setting_ip6_config_add_dns_search
+nm_setting_ip6_config_remove_dns_search
+nm_setting_ip6_config_clear_dns_searches
 nm_setting_ip6_config_get_num_addresses
-nm_setting_ip6_config_get_num_dns
-nm_setting_ip6_config_get_num_dns_searches
+nm_setting_ip6_config_get_address
+nm_setting_ip6_config_add_address
+nm_setting_ip6_config_remove_address
+nm_setting_ip6_config_clear_addresses
 nm_setting_ip6_config_get_num_routes
 nm_setting_ip6_config_get_route
-nm_setting_ip6_config_new
-nm_setting_ip6_config_remove_address
-nm_setting_ip6_config_remove_dns
-nm_setting_ip6_config_remove_dns_search
+nm_setting_ip6_config_add_route
 nm_setting_ip6_config_remove_route
+nm_setting_ip6_config_clear_routes
+nm_setting_ip6_config_get_ignore_auto_routes
+nm_setting_ip6_config_get_ignore_auto_dns
+nm_setting_ip6_config_get_dhcp_hostname
+nm_setting_ip6_config_get_never_default
+nm_setting_ip6_config_get_may_fail
+nm_setting_ip6_config_get_ip6_privacy
 
 NM_IS_SETTING_IP6_CONFIG
 NM_IS_SETTING_IP6_CONFIG_CLASS
@@ -727,19 +727,19 @@ nm_setting_ip6_config_get_type
 

 nm-setting-olpc-mesh
 NMSettingOlpcMesh
-NMSettingOlpcMesh
-NMSettingOlpcMeshClass
+NM_SETTING_OLPC_MESH_SETTING_NAME
 NMSettingOlpcMeshError
-NM_SETTING_OLPC_MESH_CHANNEL
-NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS
 NM_SETTING_OLPC_MESH_ERROR
-NM_SETTING_OLPC_MESH_SETTING_NAME
-NM_SETTING_OLPC_MESH_SSID
 nm_setting_olpc_mesh_error_quark
+NM_SETTING_OLPC_MESH_SSID
+NM_SETTING_OLPC_MESH_CHANNEL
+NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS
+NMSettingOlpcMesh
+NMSettingOlpcMeshClass
+nm_setting_olpc_mesh_new
+nm_setting_olpc_mesh_get_ssid
 nm_setting_olpc_mesh_get_channel
 nm_setting_olpc_mesh_get_dhcp_anycast_address
-nm_setting_olpc_mesh_get_ssid
-nm_setting_olpc_mesh_new
 
 NM_IS_SETTING_OLPC_MESH
 NM_IS_SETTING_OLPC_MESH_CLASS
@@ -753,49 +753,49 @@ nm_setting_olpc_mesh_get_type
 

 nm-setting-ppp
 NMSettingPPP
-NMSettingPPP
-NMSettingPPPClass
+NM_SETTING_PPP_SETTING_NAME
 NMSettingPPPError
-NM_SETTING_PPP_BAUD
-NM_SETTING_PPP_CRTSCTS
 NM_SETTING_PPP_ERROR
-NM_SETTING_PPP_LCP_ECHO_FAILURE
-NM_SETTING_PPP_LCP_ECHO_INTERVAL
-NM_SETTING_PPP_MPPE_STATEFUL
-NM_SETTING_PPP_MRU
-NM_SETTING_PPP_MTU
+nm_setting_ppp_error_quark
 NM_SETTING_PPP_NOAUTH
-NM_SETTING_PPP_NOBSDCOMP
-NM_SETTING_PPP_NODEFLATE
-NM_SETTING_PPP_NO_VJ_COMP
-NM_SETTING_PPP_REFUSE_CHAP
 NM_SETTING_PPP_REFUSE_EAP
+NM_SETTING_PPP_REFUSE_PAP
+NM_SETTING_PPP_REFUSE_CHAP
 NM_SETTING_PPP_REFUSE_MSCHAP
 NM_SETTING_PPP_REFUSE_MSCHAPV2
-NM_SETTING_PPP_REFUSE_PAP
+NM_SETTING_PPP_NOBSDCOMP
+NM_SETTING_PPP_NODEFLATE
+NM_SETTING_PPP_NO_VJ_COMP
 NM_SETTING_PPP_REQUIRE_MPPE
 NM_SETTING_PPP_REQUIRE_MPPE_128
-NM_SETTING_PPP_SETTING_NAME
-nm_setting_ppp_error_quark
-nm_setting_ppp_get_baud
-nm_setting_ppp_get_crtscts
-nm_setting_ppp_get_lcp_echo_failure
-nm_setting_ppp_get_lcp_echo_interval
-nm_setting_ppp_get_mppe_stateful
-nm_setting_ppp_get_mru
-nm_setting_ppp_get_mtu
-nm_setting_ppp_get_no_vj_comp
+NM_SETTING_PPP_MPPE_STATEFUL
+NM_SETTING_PPP_CRTSCTS
+NM_SETTING_PPP_BAUD
+NM_SETTING_PPP_MRU
+NM_SETTING_PPP_MTU
+NM_SETTING_PPP_LCP_ECHO_FAILURE
+NM_SETTING_PPP_LCP_ECHO_INTERVAL
+NMSettingPPP
+NMSettingPPPClass
+nm_setting_ppp_new
 nm_setting_ppp_get_noauth
-nm_setting_ppp_get_nobsdcomp
-nm_setting_ppp_get_nodeflate
-nm_setting_ppp_get_refuse_chap
 nm_setting_ppp_get_refuse_eap
+nm_setting_ppp_get_refuse_pap
+nm_setting_ppp_get_refuse_chap
 nm_setting_ppp_get_refuse_mschap
 nm_setting_ppp_get_refuse_mschapv2
-nm_setting_ppp_get_refuse_pap
+nm_setting_ppp_get_nobsdcomp
+nm_setting_ppp_get_nodeflate
+nm_setting_ppp_get_no_vj_comp
 nm_setting_ppp_get_require_mppe
 nm_setting_ppp_get_require_mppe_128
-nm_setting_ppp_new
+nm_setting_ppp_get_mppe_stateful
+nm_setting_ppp_get_crtscts
+nm_setting_ppp_get_baud
+nm_setting_ppp_get_mru
+nm_setting_ppp_get_mtu
+nm_setting_ppp_get_lcp_echo_failure
+nm_setting_ppp_get_lcp_echo_interval
 
 NM_IS_SETTING_PPP
 NM_IS_SETTING_PPP_CLASS
@@ -809,21 +809,21 @@ nm_setting_ppp_get_type
 

 nm-setting-pppoe
 NMSettingPPPOE
-NMSettingPPPOE
-NMSettingPPPOEClass
+NM_SETTING_PPPOE_SETTING_NAME
 NMSettingPPPOEError
 NM_SETTING_PPPOE_ERROR
-NM_SETTING_PPPOE_PASSWORD
-NM_SETTING_PPPOE_PASSWORD_FLAGS
+nm_setting_pppoe_error_quark
 NM_SETTING_PPPOE_SERVICE
-NM_SETTING_PPPOE_SETTING_NAME
 NM_SETTING_PPPOE_USERNAME
-nm_setting_pppoe_error_quark
-nm_setting_pppoe_get_password
-nm_setting_pppoe_get_password_flags
+NM_SETTING_PPPOE_PASSWORD
+NM_SETTING_PPPOE_PASSWORD_FLAGS
+NMSettingPPPOE
+NMSettingPPPOEClass
+nm_setting_pppoe_new
 nm_setting_pppoe_get_service
 nm_setting_pppoe_get_username
-nm_setting_pppoe_new
+nm_setting_pppoe_get_password
+nm_setting_pppoe_get_password_flags
 
 NM_IS_SETTING_PPPOE
 NM_IS_SETTING_PPPOE_CLASS
@@ -836,30 +836,30 @@ nm_setting_pppoe_get_type
 
 

 nm-setting-private
-NM_SETTING_REGISTER_TYPE
 NM_SETTING_SECRET_FLAGS_ALL
+NM_SETTING_REGISTER_TYPE
 

 
 

 nm-setting-serial
 NMSettingSerial
-NMSettingSerial
-NMSettingSerialClass
+NM_SETTING_SERIAL_SETTING_NAME
 NMSettingSerialError
+NM_SETTING_SERIAL_ERROR
+nm_setting_serial_error_quark
 NM_SETTING_SERIAL_BAUD
 NM_SETTING_SERIAL_BITS
-NM_SETTING_SERIAL_ERROR
 NM_SETTING_SERIAL_PARITY
-NM_SETTING_SERIAL_SEND_DELAY
-NM_SETTING_SERIAL_SETTING_NAME
 NM_SETTING_SERIAL_STOPBITS
-nm_setting_serial_error_quark
+NM_SETTING_SERIAL_SEND_DELAY
+NMSettingSerial
+NMSettingSerialClass
+nm_setting_serial_new
 nm_setting_serial_get_baud
 nm_setting_serial_get_bits
 nm_setting_serial_get_parity
-nm_setting_serial_get_send_delay
 nm_setting_serial_get_stopbits
-nm_setting_serial_new
+nm_setting_serial_get_send_delay
 
 NM_IS_SETTING_SERIAL
 NM_IS_SETTING_SERIAL_CLASS
@@ -873,31 +873,31 @@ nm_setting_serial_get_type
 

 nm-setting-vlan
 NMSettingVlan
-NMSettingVlan
-NMSettingVlanClass
+NM_SETTING_VLAN_SETTING_NAME
 NMSettingVlanError
-NMVlanFlags
-NMVlanPriorityMap
-NM_SETTING_VLAN_EGRESS_PRIORITY_MAP
 NM_SETTING_VLAN_ERROR
-NM_SETTING_VLAN_FLAGS
-NM_SETTING_VLAN_ID
-NM_SETTING_VLAN_INGRESS_PRIORITY_MAP
+nm_setting_vlan_error_quark
 NM_SETTING_VLAN_INTERFACE_NAME
 NM_SETTING_VLAN_PARENT
-NM_SETTING_VLAN_SETTING_NAME
-nm_setting_vlan_add_priority
-nm_setting_vlan_add_priority_str
-nm_setting_vlan_clear_priorities
-nm_setting_vlan_error_quark
-nm_setting_vlan_get_flags
-nm_setting_vlan_get_id
+NM_SETTING_VLAN_ID
+NM_SETTING_VLAN_FLAGS
+NM_SETTING_VLAN_INGRESS_PRIORITY_MAP
+NM_SETTING_VLAN_EGRESS_PRIORITY_MAP
+NMSettingVlan
+NMSettingVlanClass
+NMVlanPriorityMap
+NMVlanFlags
+nm_setting_vlan_new
 nm_setting_vlan_get_interface_name
-nm_setting_vlan_get_num_priorities
 nm_setting_vlan_get_parent
+nm_setting_vlan_get_id
+nm_setting_vlan_get_flags
+nm_setting_vlan_get_num_priorities
 nm_setting_vlan_get_priority
-nm_setting_vlan_new
+nm_setting_vlan_add_priority
 nm_setting_vlan_remove_priority
+nm_setting_vlan_clear_priorities
+nm_setting_vlan_add_priority_str
 
 NM_IS_SETTING_VLAN
 NM_IS_SETTING_VLAN_CLASS
@@ -911,30 +911,30 @@ nm_setting_vlan_get_type
 

 nm-setting-vpn
 NMSettingVPN
-NMSettingVPN
-NMSettingVPNClass
+NM_SETTING_VPN_SETTING_NAME
 NMSettingVpnError
-NMVPNIterFunc
-NM_SETTING_VPN_DATA
 NM_SETTING_VPN_ERROR
-NM_SETTING_VPN_SECRETS
+nm_setting_vpn_error_quark
 NM_SETTING_VPN_SERVICE_TYPE
-NM_SETTING_VPN_SETTING_NAME
 NM_SETTING_VPN_USER_NAME
+NM_SETTING_VPN_DATA
+NM_SETTING_VPN_SECRETS
+NMSettingVPN
+NMSettingVPNClass
+NMVPNIterFunc
+nm_setting_vpn_new
+nm_setting_vpn_get_service_type
+nm_setting_vpn_get_user_name
+nm_setting_vpn_get_num_data_items
 nm_setting_vpn_add_data_item
-nm_setting_vpn_add_secret
-nm_setting_vpn_error_quark
-nm_setting_vpn_foreach_data_item
-nm_setting_vpn_foreach_secret
 nm_setting_vpn_get_data_item
-nm_setting_vpn_get_num_data_items
+nm_setting_vpn_remove_data_item
+nm_setting_vpn_foreach_data_item
 nm_setting_vpn_get_num_secrets
+nm_setting_vpn_add_secret
 nm_setting_vpn_get_secret
-nm_setting_vpn_get_service_type
-nm_setting_vpn_get_user_name
-nm_setting_vpn_new
-nm_setting_vpn_remove_data_item
 nm_setting_vpn_remove_secret
+nm_setting_vpn_foreach_secret
 
 NM_IS_SETTING_VPN
 NM_IS_SETTING_VPN_CLASS
@@ -948,17 +948,17 @@ nm_setting_vpn_get_type
 

 nm-setting-wimax
 NMSettingWimax
-NMSettingWimax
-NMSettingWimaxClass
+NM_SETTING_WIMAX_SETTING_NAME
 NMSettingWimaxError
 NM_SETTING_WIMAX_ERROR
-NM_SETTING_WIMAX_MAC_ADDRESS
-NM_SETTING_WIMAX_NETWORK_NAME
-NM_SETTING_WIMAX_SETTING_NAME
 nm_setting_wimax_error_quark
-nm_setting_wimax_get_mac_address
-nm_setting_wimax_get_network_name
+NM_SETTING_WIMAX_NETWORK_NAME
+NM_SETTING_WIMAX_MAC_ADDRESS
+NMSettingWimax
+NMSettingWimaxClass
 nm_setting_wimax_new
+nm_setting_wimax_get_network_name
+nm_setting_wimax_get_mac_address
 
 NM_IS_SETTING_WIMAX
 NM_IS_SETTING_WIMAX_CLASS
@@ -972,38 +972,38 @@ nm_setting_wimax_get_type
 

 nm-setting-wired
 NMSettingWired
-NMSettingWired
-NMSettingWiredClass
+NM_SETTING_WIRED_SETTING_NAME
 NMSettingWiredError
-NM_SETTING_WIRED_AUTO_NEGOTIATE
-NM_SETTING_WIRED_CLONED_MAC_ADDRESS
-NM_SETTING_WIRED_DUPLEX
 NM_SETTING_WIRED_ERROR
+nm_setting_wired_error_quark
+NM_SETTING_WIRED_PORT
+NM_SETTING_WIRED_SPEED
+NM_SETTING_WIRED_DUPLEX
+NM_SETTING_WIRED_AUTO_NEGOTIATE
 NM_SETTING_WIRED_MAC_ADDRESS
+NM_SETTING_WIRED_CLONED_MAC_ADDRESS
 NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST
 NM_SETTING_WIRED_MTU
-NM_SETTING_WIRED_PORT
+NM_SETTING_WIRED_S390_SUBCHANNELS
 NM_SETTING_WIRED_S390_NETTYPE
 NM_SETTING_WIRED_S390_OPTIONS
-NM_SETTING_WIRED_S390_SUBCHANNELS
-NM_SETTING_WIRED_SETTING_NAME
-NM_SETTING_WIRED_SPEED
-nm_setting_wired_add_s390_option
-nm_setting_wired_error_quark
-nm_setting_wired_get_auto_negotiate
-nm_setting_wired_get_cloned_mac_address
+NMSettingWired
+NMSettingWiredClass
+nm_setting_wired_new
+nm_setting_wired_get_port
+nm_setting_wired_get_speed
 nm_setting_wired_get_duplex
+nm_setting_wired_get_auto_negotiate
 nm_setting_wired_get_mac_address
+nm_setting_wired_get_cloned_mac_address
 nm_setting_wired_get_mac_address_blacklist
 nm_setting_wired_get_mtu
-nm_setting_wired_get_num_s390_options
-nm_setting_wired_get_port
+nm_setting_wired_get_s390_subchannels
 nm_setting_wired_get_s390_nettype
+nm_setting_wired_get_num_s390_options
 nm_setting_wired_get_s390_option
 nm_setting_wired_get_s390_option_by_key
-nm_setting_wired_get_s390_subchannels
-nm_setting_wired_get_speed
-nm_setting_wired_new
+nm_setting_wired_add_s390_option
 nm_setting_wired_remove_s390_option
 
 NM_IS_SETTING_WIRED
@@ -1018,47 +1018,47 @@ nm_setting_wired_get_type
 

 nm-setting-wireless
 NMSettingWireless
-NMSettingWireless
-NMSettingWirelessClass
+NM_SETTING_WIRELESS_SETTING_NAME
 NMSettingWirelessError
+NM_SETTING_WIRELESS_ERROR
+nm_setting_wireless_error_quark
+NM_SETTING_WIRELESS_SSID
+NM_SETTING_WIRELESS_MODE
 NM_SETTING_WIRELESS_BAND
-NM_SETTING_WIRELESS_BSSID
 NM_SETTING_WIRELESS_CHANNEL
-NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS
-NM_SETTING_WIRELESS_ERROR
-NM_SETTING_WIRELESS_HIDDEN
+NM_SETTING_WIRELESS_BSSID
+NM_SETTING_WIRELESS_RATE
+NM_SETTING_WIRELESS_TX_POWER
 NM_SETTING_WIRELESS_MAC_ADDRESS
+NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS
 NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST
-NM_SETTING_WIRELESS_MODE
+NM_SETTING_WIRELESS_MTU
+NM_SETTING_WIRELESS_SEEN_BSSIDS
+NM_SETTING_WIRELESS_SEC
+NM_SETTING_WIRELESS_HIDDEN
 NM_SETTING_WIRELESS_MODE_ADHOC
 NM_SETTING_WIRELESS_MODE_AP
 NM_SETTING_WIRELESS_MODE_INFRA
-NM_SETTING_WIRELESS_MTU
-NM_SETTING_WIRELESS_RATE
-NM_SETTING_WIRELESS_SEC
-NM_SETTING_WIRELESS_SEEN_BSSIDS
-NM_SETTING_WIRELESS_SETTING_NAME
-NM_SETTING_WIRELESS_SSID
-NM_SETTING_WIRELESS_TX_POWER
-nm_setting_wireless_add_seen_bssid
-nm_setting_wireless_ap_security_compatible
-nm_setting_wireless_error_quark
+NMSettingWireless
+NMSettingWirelessClass
+nm_setting_wireless_new
+nm_setting_wireless_get_ssid
+nm_setting_wireless_get_mode
 nm_setting_wireless_get_band
-nm_setting_wireless_get_bssid
 nm_setting_wireless_get_channel
-nm_setting_wireless_get_cloned_mac_address
-nm_setting_wireless_get_hidden
+nm_setting_wireless_get_bssid
+nm_setting_wireless_get_rate
+nm_setting_wireless_get_tx_power
 nm_setting_wireless_get_mac_address
+nm_setting_wireless_get_cloned_mac_address
 nm_setting_wireless_get_mac_address_blacklist
-nm_setting_wireless_get_mode
 nm_setting_wireless_get_mtu
-nm_setting_wireless_get_num_seen_bssids
-nm_setting_wireless_get_rate
 nm_setting_wireless_get_security
+nm_setting_wireless_get_hidden
+nm_setting_wireless_add_seen_bssid
+nm_setting_wireless_get_num_seen_bssids
 nm_setting_wireless_get_seen_bssid
-nm_setting_wireless_get_ssid
-nm_setting_wireless_get_tx_power
-nm_setting_wireless_new
+nm_setting_wireless_ap_security_compatible
 
 NM_IS_SETTING_WIRELESS
 NM_IS_SETTING_WIRELESS_CLASS
@@ -1072,58 +1072,58 @@ nm_setting_wireless_get_type
 

 nm-setting-wireless-security
 NMSettingWirelessSecurity
-NMSettingWirelessSecurity
-NMSettingWirelessSecurityClass
+NM_SETTING_WIRELESS_SECURITY_SETTING_NAME
 NMSettingWirelessSecurityError
+NM_SETTING_WIRELESS_SECURITY_ERROR
+nm_setting_wireless_security_error_quark
 NMWepKeyType
+NM_SETTING_WIRELESS_SECURITY_KEY_MGMT
+NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX
 NM_SETTING_WIRELESS_SECURITY_AUTH_ALG
-NM_SETTING_WIRELESS_SECURITY_ERROR
+NM_SETTING_WIRELESS_SECURITY_PROTO
+NM_SETTING_WIRELESS_SECURITY_PAIRWISE
 NM_SETTING_WIRELESS_SECURITY_GROUP
-NM_SETTING_WIRELESS_SECURITY_KEY_MGMT
-NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD
-NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS
 NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME
-NM_SETTING_WIRELESS_SECURITY_PAIRWISE
-NM_SETTING_WIRELESS_SECURITY_PROTO
-NM_SETTING_WIRELESS_SECURITY_PSK
-NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS
-NM_SETTING_WIRELESS_SECURITY_SETTING_NAME
 NM_SETTING_WIRELESS_SECURITY_WEP_KEY0
 NM_SETTING_WIRELESS_SECURITY_WEP_KEY1
 NM_SETTING_WIRELESS_SECURITY_WEP_KEY2
 NM_SETTING_WIRELESS_SECURITY_WEP_KEY3
 NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS
 NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE
-NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX
-nm_setting_wireless_security_add_group
-nm_setting_wireless_security_add_pairwise
+NM_SETTING_WIRELESS_SECURITY_PSK
+NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS
+NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD
+NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS
+NMSettingWirelessSecurity
+NMSettingWirelessSecurityClass
+nm_setting_wireless_security_new
+nm_setting_wireless_security_get_key_mgmt
+nm_setting_wireless_security_get_num_protos
+nm_setting_wireless_security_get_proto
 nm_setting_wireless_security_add_proto
-nm_setting_wireless_security_clear_groups
-nm_setting_wireless_security_clear_pairwise
+nm_setting_wireless_security_remove_proto
 nm_setting_wireless_security_clear_protos
-nm_setting_wireless_security_error_quark
-nm_setting_wireless_security_get_auth_alg
-nm_setting_wireless_security_get_group
-nm_setting_wireless_security_get_key_mgmt
-nm_setting_wireless_security_get_leap_password
-nm_setting_wireless_security_get_leap_password_flags
-nm_setting_wireless_security_get_leap_username
-nm_setting_wireless_security_get_num_groups
 nm_setting_wireless_security_get_num_pairwise
-nm_setting_wireless_security_get_num_protos
 nm_setting_wireless_security_get_pairwise
-nm_setting_wireless_security_get_proto
+nm_setting_wireless_security_add_pairwise
+nm_setting_wireless_security_remove_pairwise
+nm_setting_wireless_security_clear_pairwise
+nm_setting_wireless_security_get_num_groups
+nm_setting_wireless_security_get_group
+nm_setting_wireless_security_add_group
+nm_setting_wireless_security_remove_group
+nm_setting_wireless_security_clear_groups
 nm_setting_wireless_security_get_psk
 nm_setting_wireless_security_get_psk_flags
+nm_setting_wireless_security_get_leap_username
+nm_setting_wireless_security_get_leap_password
+nm_setting_wireless_security_get_leap_password_flags
 nm_setting_wireless_security_get_wep_key
+nm_setting_wireless_security_set_wep_key
+nm_setting_wireless_security_get_wep_tx_keyidx
+nm_setting_wireless_security_get_auth_alg
 nm_setting_wireless_security_get_wep_key_flags
 nm_setting_wireless_security_get_wep_key_type
-nm_setting_wireless_security_get_wep_tx_keyidx
-nm_setting_wireless_security_new
-nm_setting_wireless_security_remove_group
-nm_setting_wireless_security_remove_pairwise
-nm_setting_wireless_security_remove_proto
-nm_setting_wireless_security_set_wep_key
 
 NM_IS_SETTING_WIRELESS_SECURITY
 NM_IS_SETTING_WIRELESS_SECURITY_CLASS
@@ -1136,48 +1136,48 @@ nm_setting_wireless_security_get_type
 
 

 nm-utils
-NMUtilsSecurityType
-NM_UTILS_HWADDR_LEN_MAX
-nm_utils_ap_mode_security_valid
+nm_utils_init
 nm_utils_deinit
+nm_utils_is_empty_ssid
 nm_utils_escape_ssid
-nm_utils_file_is_pkcs12
+nm_utils_same_ssid
+nm_utils_ssid_to_utf8
 nm_utils_gvalue_hash_dup
-nm_utils_hwaddr_atoba
-nm_utils_hwaddr_aton
-nm_utils_hwaddr_len
-nm_utils_hwaddr_ntoa
-nm_utils_hwaddr_type
-nm_utils_iface_valid_name
-nm_utils_init
+nm_utils_slist_free
+NMUtilsSecurityType
+nm_utils_security_valid
+nm_utils_ap_mode_security_valid
+nm_utils_wep_key_valid
+nm_utils_wpa_psk_valid
 nm_utils_ip4_addresses_from_gvalue
 nm_utils_ip4_addresses_to_gvalue
-nm_utils_ip4_get_default_prefix
-nm_utils_ip4_netmask_to_prefix
-nm_utils_ip4_prefix_to_netmask
 nm_utils_ip4_routes_from_gvalue
 nm_utils_ip4_routes_to_gvalue
+nm_utils_ip4_netmask_to_prefix
+nm_utils_ip4_prefix_to_netmask
+nm_utils_ip4_get_default_prefix
 nm_utils_ip6_addresses_from_gvalue
 nm_utils_ip6_addresses_to_gvalue
-nm_utils_ip6_dns_from_gvalue
-nm_utils_ip6_dns_to_gvalue
 nm_utils_ip6_routes_from_gvalue
 nm_utils_ip6_routes_to_gvalue
-nm_utils_is_empty_ssid
-nm_utils_is_uuid
-nm_utils_rsa_key_encrypt
-nm_utils_same_ssid
-nm_utils_security_valid
-nm_utils_slist_free
-nm_utils_ssid_to_utf8
+nm_utils_ip6_dns_from_gvalue
+nm_utils_ip6_dns_to_gvalue
 nm_utils_uuid_generate
 nm_utils_uuid_generate_from_string
-nm_utils_wep_key_valid
+nm_utils_rsa_key_encrypt
+nm_utils_file_is_pkcs12
+nm_utils_wifi_freq_to_channel
 nm_utils_wifi_channel_to_freq
 nm_utils_wifi_find_next_channel
-nm_utils_wifi_freq_to_channel
 nm_utils_wifi_is_channel_valid
-nm_utils_wpa_psk_valid
+NM_UTILS_HWADDR_LEN_MAX
+nm_utils_hwaddr_len
+nm_utils_hwaddr_type
+nm_utils_hwaddr_ntoa
+nm_utils_hwaddr_atoba
+nm_utils_hwaddr_aton
+nm_utils_iface_valid_name
+nm_utils_is_uuid
 

 
 

diff --git a/docs/libnm-util/tmpl/nm-connection.sgml b/docs/libnm-util/tmpl/nm-connection.sgml
index f6a97532..e8491ee1 100644
--- a/docs/libnm-util/tmpl/nm-connection.sgml
+++ b/docs/libnm-util/tmpl/nm-connection.sgml
@@ -22,99 +22,98 @@ NMConnection
 
 
 
-
+
 
 
 
 
+@NM_CONNECTION_ERROR_UNKNOWN: 
+@NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND: 
+@NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID: 
+@NM_CONNECTION_ERROR_SETTING_NOT_FOUND: 
 
-
+
 
 
 
 
-@nmconnection: the object which received the signal.
 
-
+
+
 
 
 
 
-@nmconnection: the object which received the signal.
-@arg1: 
+@void: 
+@Returns: 
 
-
+
+
 
 
 
 
-
+
+
+
 
 
 
 
-@parent: 
-@secrets_updated: 
 
-
+
 
 
 
 
-@NM_CONNECTION_ERROR_UNKNOWN: 
-@NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND: 
-@NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID: 
-@NM_CONNECTION_ERROR_SETTING_NOT_FOUND: 
+@nmconnection: the object which received the signal.
 
-
+
 
 
 
 
+@nmconnection: the object which received the signal.
+@arg1: 
 
-
-
+
 
 
 
 
-
-
-
+
 
 
 
 
-@connection: 
-@setting: 
-
+@parent: 
+@secrets_updated: 
 
-
+
 
 
 
 
-@connection: 
+@void: 
+@Returns: 
 
 
-
+
 
 
 
 
-@connection: 
-@func: 
-@user_data: 
+@hash: 
+@error: 
+@Returns: 
 
 
-
+
 
 
 
 
-@a: 
-@b: 
-@flags: 
+@connection: 
 @Returns: 
 
 
@@ -127,128 +126,138 @@ NMConnection
 @Returns: 
 
 
-
+
 
 
 
 
-@a: 
-@b: 
-@flags: 
-@out_settings: 
-@Returns: 
+@connection: 
+@setting: 
 
 
-
+
 
 
 
 
 @connection: 
+@setting_type: 
 
 
-
+
 
 
 
 
 @connection: 
+@setting_type: 
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@connection: 
+@name: 
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@func: 
-@user_data: 
+@new_settings: 
+@error: 
+@Returns: 
 
 
-
+
 
 
 
 
-@connection: 
+@a: 
+@b: 
+@flags: 
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
+@a: 
+@b: 
+@flags: 
+@out_settings: 
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@setting_type: 
+@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
+@hints: 
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@Returns: 
+@func: 
+@user_data: 
 
 
-
+
 
 
 
 
 @connection: 
+@setting_name: 
+@secrets: 
+@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@Returns: 
+@path: 
 
 
-
+
 
 
 
@@ -257,71 +266,72 @@ NMConnection
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@name: 
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
+@type: 
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@Returns: 
+@func: 
+@user_data: 
 
 
-
+
 
 
 
 
 @connection: 
+@flags: 
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@Returns: 
 
 
-
+
 
 
 
 
-@connection: 
+@name: 
 @Returns: 
 
 
-
+
 
 
 
 
-@connection: 
+@error_quark: 
 @Returns: 
 
 
-
+
 
 
 
@@ -330,7 +340,7 @@ NMConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -339,7 +349,7 @@ NMConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -348,7 +358,7 @@ NMConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -357,7 +367,7 @@ NMConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -366,7 +376,7 @@ NMConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -375,7 +385,7 @@ NMConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -384,7 +394,7 @@ NMConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -393,7 +403,7 @@ NMConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -402,7 +412,7 @@ NMConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -411,7 +421,7 @@ NMConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -420,7 +430,7 @@ NMConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -429,121 +439,111 @@ NMConnection
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@type: 
 @Returns: 
 
 
-
+
 
 
 
 
-@name: 
+@connection: 
 @Returns: 
 
 
-
+
 
 
 
 
-@error_quark: 
+@connection: 
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@hints: 
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@connection: 
 @Returns: 
 
 
-
+
 
 
 
 
-@hash: 
-@error: 
+@connection: 
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@setting_type: 
+@Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@new_settings: 
-@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@path: 
+@Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@flags: 
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@setting_name: 
-@secrets: 
-@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @connection: 
-@error: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-8021x.sgml b/docs/libnm-util/tmpl/nm-setting-8021x.sgml
index f8ab2c77..881d2e94 100644
--- a/docs/libnm-util/tmpl/nm-setting-8021x.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-8021x.sgml
@@ -22,509 +22,519 @@ NMSetting8021x
 
 
 
-
+
 
 
 
 
+@NM_SETTING_802_1X_CK_FORMAT_UNKNOWN: 
+@NM_SETTING_802_1X_CK_FORMAT_X509: 
+@NM_SETTING_802_1X_CK_FORMAT_RAW_KEY: 
+@NM_SETTING_802_1X_CK_FORMAT_PKCS12: 
 
-
+
 
 
 
 
-
+@NM_SETTING_802_1X_CK_SCHEME_UNKNOWN: 
+@NM_SETTING_802_1X_CK_SCHEME_BLOB: 
+@NM_SETTING_802_1X_CK_SCHEME_PATH: 
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
+@NM_SETTING_802_1X_ERROR_UNKNOWN: 
+@NM_SETTING_802_1X_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_802_1X_ERROR_MISSING_PROPERTY: 
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
+@void: 
+@Returns: 
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@NM_SETTING_802_1X_CK_FORMAT_UNKNOWN: 
-@NM_SETTING_802_1X_CK_FORMAT_X509: 
-@NM_SETTING_802_1X_CK_FORMAT_RAW_KEY: 
-@NM_SETTING_802_1X_CK_FORMAT_PKCS12: 
 
-
+
+
 
 
 
 
-@NM_SETTING_802_1X_CK_SCHEME_UNKNOWN: 
-@NM_SETTING_802_1X_CK_SCHEME_BLOB: 
-@NM_SETTING_802_1X_CK_SCHEME_PATH: 
 
-
+
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
 
-
+
+
 
 
 
 
-@NM_SETTING_802_1X_ERROR_UNKNOWN: 
-@NM_SETTING_802_1X_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_802_1X_ERROR_MISSING_PROPERTY: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@setting: 
-@altsubject_match: 
-@Returns: 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
 
-
+
 
 
 
 
-@setting: 
-@eap: 
+@void: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@phase2_altsubject_match: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@eap: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@i: 
 
 
-
+
 
 
 
 
-@void: 
-@Returns: 
+@setting: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
 @Returns: 
 
 
@@ -537,7 +547,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -546,7 +556,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -555,7 +565,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -564,7 +574,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -573,7 +583,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -582,7 +592,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -591,7 +601,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -600,17 +610,20 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@cert_path: 
+@scheme: 
+@out_format: 
+@error: 
 @Returns: 
 
 
-
+
 
 
 
@@ -628,43 +641,44 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@i: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@altsubject_match: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
+@i: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
 
 
-
+
 
 
 
@@ -673,7 +687,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -682,7 +696,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -691,16 +705,20 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@cert_path: 
+@scheme: 
+@out_format: 
+@error: 
 @Returns: 
 
 
-
+
 
 
 
@@ -709,7 +727,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -718,13 +736,12 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
 @Returns: 
 
 
@@ -746,7 +763,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -755,7 +772,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -764,7 +781,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -773,16 +790,20 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@cert_path: 
+@scheme: 
+@out_format: 
+@error: 
 @Returns: 
 
 
-
+
 
 
 
@@ -791,7 +812,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -800,43 +821,44 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@i: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@phase2_altsubject_match: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
+@i: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
 
 
-
+
 
 
 
@@ -845,7 +867,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -854,7 +876,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -863,16 +885,20 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@cert_path: 
+@scheme: 
+@out_format: 
+@error: 
 @Returns: 
 
 
-
+
 
 
 
@@ -881,7 +907,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -890,7 +916,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -899,7 +925,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -908,7 +934,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -917,7 +943,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -926,7 +952,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -935,7 +961,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -944,7 +970,7 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
@@ -953,128 +979,112 @@ NMSetting8021x
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@key_path: 
+@password: 
+@scheme: 
+@out_format: 
+@error: 
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@cert_path: 
-@scheme: 
-@out_format: 
-@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@cert_path: 
-@scheme: 
-@out_format: 
-@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@cert_path: 
+@key_path: 
+@password: 
 @scheme: 
 @out_format: 
 @error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@cert_path: 
-@scheme: 
-@out_format: 
-@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@key_path: 
-@password: 
-@scheme: 
-@out_format: 
-@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@key_path: 
-@password: 
-@scheme: 
-@out_format: 
-@error: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-adsl.sgml b/docs/libnm-util/tmpl/nm-setting-adsl.sgml
index 0e209bc2..4b3716ef 100644
--- a/docs/libnm-util/tmpl/nm-setting-adsl.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-adsl.sgml
@@ -22,110 +22,95 @@ NMSettingAdsl
 
 
 
-
+
 
 
 
 
 
-
-
 
-
-
-
+
 
 
 
 
-
-
-
-
+@NM_SETTING_ADSL_ERROR_UNKNOWN: 
+@NM_SETTING_ADSL_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_ADSL_ERROR_MISSING_PROPERTY: 
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
+@void: 
+@Returns: 
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
 
-
+
+
 
 
 
 
-@NM_SETTING_ADSL_ERROR_UNKNOWN: 
-@NM_SETTING_ADSL_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_ADSL_ERROR_MISSING_PROPERTY: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
@@ -139,67 +124,82 @@ NMSettingAdsl
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
+
+
 
+
 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
 
 
 
 
-@setting: 
+@void: 
 @Returns: 
 
 
-
+
 
 
 
@@ -208,7 +208,7 @@ NMSettingAdsl
 @Returns: 
 
 
-
+
 
 
 
@@ -226,7 +226,7 @@ NMSettingAdsl
 @Returns: 
 
 
-
+
 
 
 
@@ -235,7 +235,7 @@ NMSettingAdsl
 @Returns: 
 
 
-
+
 
 
 
@@ -244,7 +244,7 @@ NMSettingAdsl
 @Returns: 
 
 
-
+
 
 
 
@@ -253,12 +253,12 @@ NMSettingAdsl
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
index cc64b574..3a9c9773 100644
--- a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
@@ -22,32 +22,12 @@ NMSettingBluetooth
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
+
 
 
 
 
-
-
-
-
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
 
 
 
@@ -59,21 +39,23 @@ NMSettingBluetooth
 @NM_SETTING_BLUETOOTH_ERROR_MISSING_PROPERTY: 
 @NM_SETTING_BLUETOOTH_ERROR_TYPE_SETTING_NOT_FOUND: 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
+@void: 
+@Returns: 
 
 
-
+
 
 
 
@@ -101,25 +83,43 @@ NMSettingBluetooth
 
 
 
-
+
 
 
 
 
-@void: 
-@Returns: 
 
+
+
+
+
 
-
+
 
 
 
 
-@setting: 
+
+
+
+
+
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
+
+
+
+
+@void: 
 @Returns: 
 
 
-
+
 
 
 
@@ -128,12 +128,12 @@ NMSettingBluetooth
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-bond.sgml b/docs/libnm-util/tmpl/nm-setting-bond.sgml
index caa8b37a..2500beed 100644
--- a/docs/libnm-util/tmpl/nm-setting-bond.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-bond.sgml
@@ -22,32 +22,12 @@ NMSettingBond
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
+
 
 
 
 
-
-
 
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
 
 
 
@@ -67,6 +47,15 @@ NMSettingBond
 
 
 
+
+
+
+
+
+@void: 
+@Returns: 
+
+
 
 
 
@@ -81,14 +70,14 @@ NMSettingBond
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
@@ -102,46 +91,55 @@ NMSettingBond
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
+
+
 
-
+
+
+
 
 
 
 
-@setting: 
-@name: 
-@value: 
-@Returns: 
+
+
 
+
 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
 
 
 
@@ -190,35 +188,37 @@ NMSettingBond
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
 @name: 
+@value: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@name: 
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
-
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml b/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml
index 6e1b473b..692cb73d 100644
--- a/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml
@@ -22,48 +22,46 @@ NMSettingBridgePort
 
 
 
-
+
 
 
 
 
 
-
+
+
 
 
 
 
-
+@NM_SETTING_BRIDGE_PORT_ERROR_UNKNOWN: 
+@NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_BRIDGE_PORT_ERROR_MISSING_PROPERTY: 
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
+@void: 
+@Returns: 
 
-
+
+
 
 
 
 
-@NM_SETTING_BRIDGE_PORT_ERROR_UNKNOWN: 
-@NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_BRIDGE_PORT_ERROR_MISSING_PROPERTY: 
 
-
+
+
 
 
 
@@ -77,46 +75,48 @@ NMSettingBridgePort
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
-
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
 
-
+
 
 
 
 
-@setting: 
+@void: 
 @Returns: 
 
 
-
+
 
 
 
@@ -125,7 +125,7 @@ NMSettingBridgePort
 @Returns: 
 
 
-
+
 
 
 
@@ -134,12 +134,12 @@ NMSettingBridgePort
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-bridge.sgml b/docs/libnm-util/tmpl/nm-setting-bridge.sgml
index 7e2cb5a4..bf9593e5 100644
--- a/docs/libnm-util/tmpl/nm-setting-bridge.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-bridge.sgml
@@ -22,149 +22,149 @@ NMSettingBridge
 
 
 
-
+
 
 
 
 
 
-
+
+
 
 
 
 
-
+@NM_SETTING_BRIDGE_ERROR_UNKNOWN: 
+@NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY: 
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
+@void: 
+@Returns: 
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
 
-
+
+
 
 
 
 
-@NM_SETTING_BRIDGE_ERROR_UNKNOWN: 
-@NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
-
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
 
-
+
 
 
 
 
-@setting: 
+@void: 
 @Returns: 
 
 
-
+
 
 
 
@@ -173,7 +173,7 @@ NMSettingBridge
 @Returns: 
 
 
-
+
 
 
 
@@ -182,7 +182,7 @@ NMSettingBridge
 @Returns: 
 
 
-
+
 
 
 
@@ -191,7 +191,7 @@ NMSettingBridge
 @Returns: 
 
 
-
+
 
 
 
@@ -200,7 +200,7 @@ NMSettingBridge
 @Returns: 
 
 
-
+
 
 
 
@@ -209,7 +209,7 @@ NMSettingBridge
 @Returns: 
 
 
-
+
 
 
 
@@ -218,12 +218,12 @@ NMSettingBridge
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-cdma.sgml b/docs/libnm-util/tmpl/nm-setting-cdma.sgml
index 5d065170..4c90acb1 100644
--- a/docs/libnm-util/tmpl/nm-setting-cdma.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-cdma.sgml
@@ -22,61 +22,47 @@ NMSettingCdma
 
 
 
-
+
 
 
 
 
 
-
-
-
-
 
-
+
 
 
 
 
-
-
-
-
+@NM_SETTING_CDMA_ERROR_UNKNOWN: 
+@NM_SETTING_CDMA_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_CDMA_ERROR_MISSING_PROPERTY: 
+@NM_SETTING_CDMA_ERROR_MISSING_SERIAL_SETTING: 
 
-
+
 
 
 
 
-
-
 
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
 
-
+
 
 
 
 
-@NM_SETTING_CDMA_ERROR_UNKNOWN: 
-@NM_SETTING_CDMA_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_CDMA_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_CDMA_ERROR_MISSING_SERIAL_SETTING: 
+@void: 
+@Returns: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
@@ -97,39 +83,53 @@ NMSettingCdma
 
 
 
-
+
 
 
 
 
 
+
+
+
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
+
+
 
+
 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
 
 
 
 
-@setting: 
+@void: 
 @Returns: 
 
 
-
+
 
 
 
@@ -138,7 +138,7 @@ NMSettingCdma
 @Returns: 
 
 
-
+
 
 
 
@@ -147,7 +147,7 @@ NMSettingCdma
 @Returns: 
 
 
-
+
 
 
 
@@ -156,12 +156,12 @@ NMSettingCdma
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-connection.sgml b/docs/libnm-util/tmpl/nm-setting-connection.sgml
index 81d6801c..aa04897e 100644
--- a/docs/libnm-util/tmpl/nm-setting-connection.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-connection.sgml
@@ -22,104 +22,90 @@ NMSettingConnection
 
 
 
-
+
 
 
 
 
 
-
+
+
 
 
 
 
-
+@NM_SETTING_CONNECTION_ERROR_UNKNOWN: 
+@NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY: 
+@NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND: 
+@NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED: 
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
+@void: 
+@Returns: 
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
 
-
+
+
 
 
 
 
-@NM_SETTING_CONNECTION_ERROR_UNKNOWN: 
-@NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND: 
-@NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
@@ -133,101 +119,111 @@ NMSettingConnection
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
-
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@setting: 
-@ptype: 
-@pitem: 
-@detail: 
-@Returns: 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
 
-
+
 
 
 
 
-@setting: 
-@sec_uuid: 
+@void: 
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
-
+
 
 
 
@@ -245,7 +241,7 @@ NMSettingConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -254,7 +250,7 @@ NMSettingConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -263,7 +259,7 @@ NMSettingConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -272,7 +268,7 @@ NMSettingConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -294,7 +290,7 @@ NMSettingConnection
 @Returns: 
 
 
-
+
 
 
 
@@ -303,35 +299,38 @@ NMSettingConnection
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@idx: 
+@uname: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@ptype: 
+@pitem: 
+@detail: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
+@idx: 
 
 
-
+
 
 
 
@@ -340,51 +339,52 @@ NMSettingConnection
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@type: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@type: 
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@uname: 
+@idx: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@idx: 
+@sec_uuid: 
+@Returns: 
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-gsm.sgml b/docs/libnm-util/tmpl/nm-setting-gsm.sgml
index 0d29a11a..d73ab6df 100644
--- a/docs/libnm-util/tmpl/nm-setting-gsm.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-gsm.sgml
@@ -22,121 +22,87 @@ NMSettingGsm
 
 
 
-
+
 
 
 
 
 
-
+
+
 
 
 
 
-
+@NM_SETTING_GSM_ERROR_UNKNOWN: 
+@NM_SETTING_GSM_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_GSM_ERROR_MISSING_PROPERTY: 
+@NM_SETTING_GSM_ERROR_MISSING_SERIAL_SETTING: 
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
+@void: 
+@Returns: 
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
 
-
+
+
 
 
 
 
-@NM_SETTING_GSM_ERROR_UNKNOWN: 
-@NM_SETTING_GSM_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_GSM_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_GSM_ERROR_MISSING_SERIAL_SETTING: 
 
-
+
+
 
 
 
 
-@NM_SETTING_GSM_BAND_UNKNOWN: 
-@NM_SETTING_GSM_BAND_ANY: 
-@NM_SETTING_GSM_BAND_EGSM: 
-@NM_SETTING_GSM_BAND_DCS: 
-@NM_SETTING_GSM_BAND_PCS: 
-@NM_SETTING_GSM_BAND_G850: 
-@NM_SETTING_GSM_BAND_U2100: 
-@NM_SETTING_GSM_BAND_U1800: 
-@NM_SETTING_GSM_BAND_U17IV: 
-@NM_SETTING_GSM_BAND_U800: 
-@NM_SETTING_GSM_BAND_U850: 
-@NM_SETTING_GSM_BAND_U900: 
-@NM_SETTING_GSM_BAND_U17IX: 
-@NM_SETTING_GSM_BAND_U1900: 
-@NM_SETTING_GSM_BAND_U2600: 
 
-
+
+
 
 
 
 
-@NM_SETTING_GSM_NETWORK_TYPE_ANY: 
-@NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA: 
-@NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE: 
-@NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA: 
-@NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE: 
-@NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G: 
-@NM_SETTING_GSM_NETWORK_TYPE_4G: 
+
 
 
 
@@ -145,14 +111,14 @@ NMSettingGsm
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
@@ -166,88 +132,122 @@ NMSettingGsm
 
 
 
-
+
 
 
 
 
+@NM_SETTING_GSM_NETWORK_TYPE_ANY: 
+@NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA: 
+@NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE: 
+@NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA: 
+@NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE: 
+@NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G: 
+@NM_SETTING_GSM_NETWORK_TYPE_4G: 
 
-
-
+
 
 
 
 
+@NM_SETTING_GSM_BAND_UNKNOWN: 
+@NM_SETTING_GSM_BAND_ANY: 
+@NM_SETTING_GSM_BAND_EGSM: 
+@NM_SETTING_GSM_BAND_DCS: 
+@NM_SETTING_GSM_BAND_PCS: 
+@NM_SETTING_GSM_BAND_G850: 
+@NM_SETTING_GSM_BAND_U2100: 
+@NM_SETTING_GSM_BAND_U1800: 
+@NM_SETTING_GSM_BAND_U17IV: 
+@NM_SETTING_GSM_BAND_U800: 
+@NM_SETTING_GSM_BAND_U850: 
+@NM_SETTING_GSM_BAND_U900: 
+@NM_SETTING_GSM_BAND_U17IX: 
+@NM_SETTING_GSM_BAND_U1900: 
+@NM_SETTING_GSM_BAND_U2600: 
 
-
-
+
 
 
 
 
 
-
-
+
 
 
 
 
-
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
 
-
+
 
 
 
 
-@setting: 
+@void: 
 @Returns: 
 
 
-
+
 
 
 
@@ -256,7 +256,7 @@ NMSettingGsm
 @Returns: 
 
 
-
+
 
 
 
@@ -265,7 +265,7 @@ NMSettingGsm
 @Returns: 
 
 
-
+
 
 
 
@@ -274,7 +274,7 @@ NMSettingGsm
 @Returns: 
 
 
-
+
 
 
 
@@ -283,7 +283,7 @@ NMSettingGsm
 @Returns: 
 
 
-
+
 
 
 
@@ -292,7 +292,7 @@ NMSettingGsm
 @Returns: 
 
 
-
+
 
 
 
@@ -301,7 +301,7 @@ NMSettingGsm
 @Returns: 
 
 
-
+
 
 
 
@@ -319,7 +319,7 @@ NMSettingGsm
 @Returns: 
 
 
-
+
 
 
 
@@ -328,7 +328,7 @@ NMSettingGsm
 @Returns: 
 
 
-
+
 
 
 
@@ -337,12 +337,12 @@ NMSettingGsm
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-infiniband.sgml b/docs/libnm-util/tmpl/nm-setting-infiniband.sgml
index 02a59881..39f397eb 100644
--- a/docs/libnm-util/tmpl/nm-setting-infiniband.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-infiniband.sgml
@@ -22,83 +22,92 @@ NMSettingInfiniband
 
 
 
-
+
 
 
 
 
 
-
+
+
 
 
 
 
-
+@NM_SETTING_INFINIBAND_ERROR_UNKNOWN: 
+@NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_INFINIBAND_ERROR_MISSING_PROPERTY: 
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
+@void: 
+@Returns: 
 
-
+
+
 
 
 
 
-@NM_SETTING_INFINIBAND_ERROR_UNKNOWN: 
-@NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_INFINIBAND_ERROR_MISSING_PROPERTY: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
 
 
 
@@ -134,12 +143,3 @@ NMSettingInfiniband
 @Returns: 
 
 
-
-
-
-
-
-@void: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
index 4b915f2b..ea5b49c9 100644
--- a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
@@ -22,106 +22,82 @@ NMSettingIP4Config
 
 
 
-
+
 
 
 
 
 
-
-
-
-
 
-
-
+
 
 
 
 
+@NM_SETTING_IP4_CONFIG_ERROR_UNKNOWN: 
+@NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_IP4_CONFIG_ERROR_MISSING_PROPERTY: 
+@NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD: 
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
+@void: 
+@Returns: 
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
 
-
+
+
 
 
 
 
-@NM_SETTING_IP4_CONFIG_ERROR_UNKNOWN: 
-@NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_IP4_CONFIG_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD: 
 
-
+
+
 
 
 
@@ -135,145 +111,156 @@ NMSettingIP4Config
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+@void: 
+@Returns: 
 
 
-
+
 
 
 
 
+@source: 
+@Returns: 
 
 
-
+
 
 
 
 
+@address: 
 
 
-
+
 
 
 
 
+@address: 
 
 
-
+
 
 
 
 
+@address: 
+@other: 
+@Returns: 
 
 
-
+
 
 
 
 
+@address: 
+@Returns: 
 
 
-
+
 
 
 
 
+@address: 
+@addr: 
 
 
-
+
 
 
 
 
 @address: 
-@other: 
 @Returns: 
 
 
-
+
 
 
 
 
-@source: 
-@Returns: 
+@address: 
+@prefix: 
 
 
-
+
 
 
 
@@ -282,25 +269,22 @@ NMSettingIP4Config
 @Returns: 
 
 
-
+
 
 
 
 
 @address: 
-@Returns: 
+@gateway: 
 
 
-
+
 
 
 
 
-@address: 
-@Returns: 
-
 
-
+
 
 
 
@@ -309,78 +293,78 @@ NMSettingIP4Config
 @Returns: 
 
 
-
+
 
 
 
 
-@address: 
+@source: 
+@Returns: 
 
 
-
+
 
 
 
 
-@address: 
-@addr: 
+@route: 
 
 
-
+
 
 
 
 
-@address: 
-@gateway: 
+@route: 
 
 
-
+
 
 
 
 
-@address: 
-@prefix: 
+@route: 
+@other: 
+@Returns: 
 
 
-
+
 
 
 
 
-@address: 
+@route: 
+@Returns: 
 
 
-
+
 
 
 
 
 @route: 
-@other: 
-@Returns: 
+@dest: 
 
 
-
+
 
 
 
 
-@source: 
+@route: 
 @Returns: 
 
 
-
+
 
 
 
 
 @route: 
-@Returns: 
+@prefix: 
 
 
-
+
 
 
 
@@ -389,16 +373,16 @@ NMSettingIP4Config
 @Returns: 
 
 
-
+
 
 
 
 
 @route: 
-@Returns: 
+@next_hop: 
 
 
-
+
 
 
 
@@ -407,132 +391,149 @@ NMSettingIP4Config
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
-@Returns: 
+@route: 
+@metric: 
 
 
-
+
 
 
 
 
-@route: 
 
+
+
 
-
+
+
+
 
 
 
 
-@route: 
-@dest: 
+
+
 
+
 
-
+
 
 
 
 
-@route: 
-@metric: 
+
+
 
+
 
-
+
 
 
 
 
-@route: 
-@next_hop: 
+
+
 
+
 
-
+
 
 
 
 
-@route: 
-@prefix: 
+
+
 
+
 
-
+
 
 
 
 
-@route: 
+
+
 
+
 
-
+
 
 
 
 
-@setting: 
-@address: 
-@Returns: 
+
+
 
+
 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
 
 
 
 
-@setting: 
-@dns: 
+@void: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@dns_search: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@route: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@dns: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@i: 
 
 
-
+
 
 
 
@@ -540,16 +541,16 @@ NMSettingIP4Config
 @setting: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
-
+
 
 
 
@@ -559,44 +560,43 @@ NMSettingIP4Config
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@dns_search: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
+@i: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
 @Returns: 
 
 
-
+
 
 
 
@@ -606,34 +606,34 @@ NMSettingIP4Config
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@address: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
+@i: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
 
 
-
+
 
 
 
@@ -642,43 +642,44 @@ NMSettingIP4Config
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@i: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@route: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
+@i: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
 
 
-
+
 
 
 
@@ -687,58 +688,57 @@ NMSettingIP4Config
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
index 3e5af03a..df2fbec4 100644
--- a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
@@ -22,269 +22,252 @@ NMSettingIP6Config
 
 
 
-
+
 
 
 
 
 
-
-
-
-
 
-
-
+
 
 
 
 
+@NM_SETTING_IP6_CONFIG_ERROR_UNKNOWN: 
+@NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY: 
+@NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD: 
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
+@void: 
+@Returns: 
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
-
-
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
 
-
+
 
 
 
 
-@NM_SETTING_IP6_CONFIG_ERROR_UNKNOWN: 
-@NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD: 
 
-
+
+
 
 
 
 
-@NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN: 
-@NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED: 
-@NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR: 
-@NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
+@NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN: 
+@NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED: 
+@NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR: 
+@NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR: 
 
-
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+@void: 
+@Returns: 
 
 
-
+
 
 
 
 
+@source: 
+@Returns: 
 
 
-
+
 
 
 
 
+@address: 
 
 
-
+
 
 
 
 
+@address: 
 
 
-
+
 
 
 
 
+@address: 
+@other: 
+@Returns: 
 
 
-
+
 
 
 
 
+@address: 
+@Returns: 
 
 
-
+
 
 
 
 
 @address: 
-@other: 
-@Returns: 
+@addr: 
 
 
-
+
 
 
 
 
-@source: 
+@address: 
 @Returns: 
 
 
-
+
 
 
 
 
 @address: 
-@Returns: 
+@prefix: 
 
 
 
@@ -296,87 +279,84 @@ NMSettingIP6Config
 @Returns: 
 
 
-
+
 
 
 
 
 @address: 
-@Returns: 
+@gateway: 
 
 
-
+
 
 
 
 
-@void: 
-@Returns: 
-
 
-
+
 
 
 
 
-@address: 
+@void: 
+@Returns: 
 
 
-
+
 
 
 
 
-@address: 
-@addr: 
+@source: 
+@Returns: 
 
 
-
+
 
 
 
 
-@address: 
-@gateway: 
+@route: 
 
 
-
+
 
 
 
 
-@address: 
-@prefix: 
+@route: 
 
 
-
+
 
 
 
 
-@address: 
+@route: 
+@other: 
+@Returns: 
 
 
-
+
 
 
 
 
 @route: 
-@other: 
 @Returns: 
 
 
-
+
 
 
 
 
-@source: 
-@Returns: 
+@route: 
+@dest: 
 
 
-
+
 
 
 
@@ -385,13 +365,13 @@ NMSettingIP6Config
 @Returns: 
 
 
-
+
 
 
 
 
 @route: 
-@Returns: 
+@prefix: 
 
 
 
@@ -403,141 +383,162 @@ NMSettingIP6Config
 @Returns: 
 
 
-
+
 
 
 
 
 @route: 
-@Returns: 
+@next_hop: 
 
 
-
+
 
 
 
 
-@void: 
+@route: 
 @Returns: 
 
 
-
+
 
 
 
 
 @route: 
+@metric: 
 
 
-
+
 
 
 
 
-@route: 
-@dest: 
 
+
+
 
-
+
+
+
 
 
 
 
-@route: 
-@metric: 
+
+
 
+
 
-
+
 
 
 
 
-@route: 
-@next_hop: 
+
+
 
+
 
-
+
 
 
 
 
-@route: 
-@prefix: 
+
+
 
+
 
-
+
 
 
 
 
-@route: 
+
+
 
+
 
-
+
 
 
 
 
-@setting: 
-@address: 
-@Returns: 
+
+
 
+
 
-
+
 
 
 
 
-@setting: 
-@dns: 
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
+
+
+
+
+@void: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@dns_search: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@route: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@dns: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@i: 
 
 
-
+
 
 
 
@@ -545,16 +546,16 @@ NMSettingIP6Config
 @setting: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
-
+
 
 
 
@@ -564,36 +565,34 @@ NMSettingIP6Config
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@dns_search: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
 @i: 
-@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
-@Returns: 
 
 
-
+
 
 
 
@@ -602,43 +601,44 @@ NMSettingIP6Config
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@i: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@address: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
+@i: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
 
 
-
+
 
 
 
@@ -647,94 +647,94 @@ NMSettingIP6Config
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@i: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@route: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
+@i: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml b/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
index 9a1e720e..6d525379 100644
--- a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
@@ -22,46 +22,44 @@ NMSettingOlpcMesh
 
 
 
-
+
 
 
 
 
 
-
+
+
 
 
 
 
-
+@NM_SETTING_OLPC_MESH_ERROR_UNKNOWN: 
+@NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY: 
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
+@void: 
+@Returns: 
 
-
+
+
 
 
 
 
-@NM_SETTING_OLPC_MESH_ERROR_UNKNOWN: 
-@NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY: 
+
 
 
 
@@ -77,46 +75,48 @@ NMSettingOlpcMesh
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
-
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
 
-
+
 
 
 
 
-@setting: 
+@void: 
 @Returns: 
 
 
-
+
 
 
 
@@ -125,7 +125,7 @@ NMSettingOlpcMesh
 @Returns: 
 
 
-
+
 
 
 
@@ -134,12 +134,12 @@ NMSettingOlpcMesh
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-ppp.sgml b/docs/libnm-util/tmpl/nm-setting-ppp.sgml
index 90815380..69cf509c 100644
--- a/docs/libnm-util/tmpl/nm-setting-ppp.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-ppp.sgml
@@ -22,159 +22,131 @@ NMSettingPPP
 
 
 
-
+
 
 
 
 
 
-
-
-
-
 
-
+
 
 
 
 
-
+@NM_SETTING_PPP_ERROR_UNKNOWN: 
+@NM_SETTING_PPP_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_PPP_ERROR_MISSING_PROPERTY: 
+@NM_SETTING_PPP_ERROR_REQUIRE_MPPE_NOT_ALLOWED: 
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
+@void: 
+@Returns: 
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
 
-
+
+
 
 
 
 
-@NM_SETTING_PPP_ERROR_UNKNOWN: 
-@NM_SETTING_PPP_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_PPP_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_PPP_ERROR_REQUIRE_MPPE_NOT_ALLOWED: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
@@ -195,109 +167,137 @@ NMSettingPPP
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
 
-
+
 
 
 
 
-@setting: 
+@void: 
 @Returns: 
 
 
-
+
 
 
 
@@ -306,7 +306,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -315,7 +315,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -324,7 +324,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -333,7 +333,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -342,7 +342,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -351,7 +351,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -360,7 +360,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -369,7 +369,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -378,7 +378,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -387,7 +387,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -396,7 +396,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -405,7 +405,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -414,7 +414,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -423,7 +423,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -432,7 +432,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -441,7 +441,7 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
@@ -450,12 +450,12 @@ NMSettingPPP
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
index 3c022169..1ab1ae55 100644
--- a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
@@ -22,54 +22,47 @@ NMSettingPPPOE
 
 
 
-
+
 
 
 
 
 
-
-
-
-
 
-
+
 
 
 
 
-
+@NM_SETTING_PPPOE_ERROR_UNKNOWN: 
+@NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY: 
+@NM_SETTING_PPPOE_ERROR_MISSING_PPP_SETTING: 
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
+@void: 
+@Returns: 
 
-
+
+
 
 
 
 
-@NM_SETTING_PPPOE_ERROR_UNKNOWN: 
-@NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_PPPOE_ERROR_MISSING_PPP_SETTING: 
 
-
+
+
 
 
 
@@ -90,46 +83,53 @@ NMSettingPPPOE
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
 
-
+
 
 
 
 
-@setting: 
+@void: 
 @Returns: 
 
 
-
+
 
 
 
@@ -138,7 +138,7 @@ NMSettingPPPOE
 @Returns: 
 
 
-
+
 
 
 
@@ -147,7 +147,7 @@ NMSettingPPPOE
 @Returns: 
 
 
-
+
 
 
 
@@ -156,12 +156,12 @@ NMSettingPPPOE
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-private.sgml b/docs/libnm-util/tmpl/nm-setting-private.sgml
index 8c990ffc..75ebe7a9 100644
--- a/docs/libnm-util/tmpl/nm-setting-private.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-private.sgml
@@ -22,18 +22,18 @@ nm-setting-private
 
 
 
-
+
 
 
 
 
-@x: 
 
 
-
+
 
 
 
 
+@x: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-serial.sgml b/docs/libnm-util/tmpl/nm-setting-serial.sgml
index f0313441..b79ec0a9 100644
--- a/docs/libnm-util/tmpl/nm-setting-serial.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-serial.sgml
@@ -22,108 +22,117 @@ NMSettingSerial
 
 
 
-
+
 
 
 
 
 
-
+
+
 
 
 
 
-
+@NM_SETTING_SERIAL_ERROR_UNKNOWN: 
+@NM_SETTING_SERIAL_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_SERIAL_ERROR_MISSING_PROPERTY: 
+@NM_SETTING_SERIAL_ERROR_MISSING_PPP_SETTING: 
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
+@void: 
+@Returns: 
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
 
-
+
+
 
 
 
 
-@NM_SETTING_SERIAL_ERROR_UNKNOWN: 
-@NM_SETTING_SERIAL_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_SERIAL_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_SERIAL_ERROR_MISSING_PPP_SETTING: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
 
 
 
@@ -159,15 +168,6 @@ NMSettingSerial
 @Returns: 
 
 
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
 
 
 
@@ -177,12 +177,12 @@ NMSettingSerial
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-vlan.sgml b/docs/libnm-util/tmpl/nm-setting-vlan.sgml
index f7d67364..47b44bd6 100644
--- a/docs/libnm-util/tmpl/nm-setting-vlan.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-vlan.sgml
@@ -22,178 +22,173 @@ NMSettingVlan
 
 
 
-
+
 
 
 
 
 
-
-
 
-
-
-
+
 
 
 
 
-
+@NM_SETTING_VLAN_ERROR_UNKNOWN: 
+@NM_SETTING_VLAN_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_VLAN_ERROR_MISSING_PROPERTY: 
+@NM_SETTING_VLAN_ERROR_INVALID_PARENT: 
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
+@void: 
+@Returns: 
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
 
-
+
+
 
 
 
 
-@NM_SETTING_VLAN_ERROR_UNKNOWN: 
-@NM_SETTING_VLAN_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_VLAN_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_VLAN_ERROR_INVALID_PARENT: 
 
-
+
+
 
 
 
 
-@NM_VLAN_FLAG_REORDER_HEADERS: 
-@NM_VLAN_FLAG_GVRP: 
-@NM_VLAN_FLAG_LOOSE_BINDING: 
 
-
+
+
 
 
 
 
-@NM_VLAN_INGRESS_MAP: 
-@NM_VLAN_EGRESS_MAP: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
 
-
-
+
 
 
 
 
+@NM_VLAN_INGRESS_MAP: 
+@NM_VLAN_EGRESS_MAP: 
 
-
-
+
 
 
 
 
-@setting: 
-@map: 
-@from: 
-@to: 
-@Returns: 
-
+@NM_VLAN_FLAG_REORDER_HEADERS: 
+@NM_VLAN_FLAG_GVRP: 
+@NM_VLAN_FLAG_LOOSE_BINDING: 
 
-
+
 
 
 
 
-@setting: 
-@map: 
-@str: 
+@void: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@map: 
+@Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
-
+
 
 
 
@@ -202,7 +197,7 @@ NMSettingVlan
 @Returns: 
 
 
-
+
 
 
 
@@ -211,35 +206,42 @@ NMSettingVlan
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@map: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
 @map: 
+@idx: 
+@out_from: 
+@out_to: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@map: 
+@from: 
+@to: 
 @Returns: 
 
 
-
+
 
 
 
@@ -247,27 +249,25 @@ NMSettingVlan
 @setting: 
 @map: 
 @idx: 
-@out_from: 
-@out_to: 
-@Returns: 
 
 
-
+
 
 
 
 
-@void: 
-@Returns: 
+@setting: 
+@map: 
 
 
-
+
 
 
 
 
 @setting: 
 @map: 
-@idx: 
+@str: 
+@Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-vpn.sgml b/docs/libnm-util/tmpl/nm-setting-vpn.sgml
index 567776c1..4b323f35 100644
--- a/docs/libnm-util/tmpl/nm-setting-vpn.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-vpn.sgml
@@ -22,60 +22,50 @@ NMSettingVPN
 
 
 
-
+
 
 
 
 
 
-
-
-
-
 
-
+
 
 
 
 
-
+@NM_SETTING_VPN_ERROR_UNKNOWN: 
+@NM_SETTING_VPN_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_VPN_ERROR_MISSING_PROPERTY: 
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
+@void: 
+@Returns: 
 
-
+
+
 
 
 
 
-@NM_SETTING_VPN_ERROR_UNKNOWN: 
-@NM_SETTING_VPN_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_VPN_ERROR_MISSING_PROPERTY: 
 
-
+
+
 
 
 
 
-@key: 
-@value: 
-@user_data: 
 
 
 
@@ -85,129 +75,136 @@ NMSettingVPN
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
 
-
-
+
 
 
 
 
-@setting: 
 @key: 
-@item: 
+@value: 
+@user_data: 
 
 
-
+
 
 
 
 
-@setting: 
-@key: 
-@secret: 
+@void: 
+@Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@func: 
-@user_data: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@func: 
-@user_data: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
 @key: 
-@Returns: 
+@item: 
 
 
-
+
 
 
 
 
 @setting: 
+@key: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
+@key: 
 
 
-
+
 
 
 
 
 @setting: 
-@key: 
-@Returns: 
+@func: 
+@user_data: 
 
 
-
+
 
 
 
@@ -216,25 +213,27 @@ NMSettingVPN
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
+@key: 
+@secret: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
+@key: 
 @Returns: 
 
 
-
+
 
 
 
@@ -243,12 +242,13 @@ NMSettingVPN
 @key: 
 
 
-
+
 
 
 
 
 @setting: 
-@key: 
+@func: 
+@user_data: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wimax.sgml b/docs/libnm-util/tmpl/nm-setting-wimax.sgml
index 0b96fa9f..151e723e 100644
--- a/docs/libnm-util/tmpl/nm-setting-wimax.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wimax.sgml
@@ -22,39 +22,39 @@ NMSettingWimax
 
 
 
-
+
 
 
 
 
 
-
-
-
-
 
-
+
 
 
 
 
-
+@NM_SETTING_WIMAX_ERROR_UNKNOWN: 
+@NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_WIMAX_ERROR_MISSING_PROPERTY: 
+
+
 
 
 
 
-@parent: 
 
-
+
+
 
 
 
 
-@NM_SETTING_WIMAX_ERROR_UNKNOWN: 
-@NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_WIMAX_ERROR_MISSING_PROPERTY: 
+@void: 
+@Returns: 
 
-
+
+
 
 
 
@@ -68,35 +68,35 @@ NMSettingWimax
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@void: 
-@Returns: 
-
+@parent: 
 
-
+
 
 
 
 
-@setting: 
+@void: 
 @Returns: 
 
 
@@ -109,12 +109,12 @@ NMSettingWimax
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wired.sgml b/docs/libnm-util/tmpl/nm-setting-wired.sgml
index 09fb963a..893a9c06 100644
--- a/docs/libnm-util/tmpl/nm-setting-wired.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wired.sgml
@@ -22,88 +22,67 @@ NMSettingWired
 
 
 
-
+
 
 
 
 
 
-
-
-
-
 
-
+
 
 
 
 
-
-
-
-
+@NM_SETTING_WIRED_ERROR_UNKNOWN: 
+@NM_SETTING_WIRED_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_WIRED_ERROR_MISSING_PROPERTY: 
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
+@void: 
+@Returns: 
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
 
-
+
+
 
 
 
 
-@NM_SETTING_WIRED_ERROR_UNKNOWN: 
-@NM_SETTING_WIRED_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_WIRED_ERROR_MISSING_PROPERTY: 
 
-
+
+
 
 
 
@@ -117,95 +96,114 @@ NMSettingWired
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@setting: 
-@key: 
-@item: 
-@Returns: 
+
+
 
+
 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
 
 
 
@@ -214,7 +212,7 @@ NMSettingWired
 @Returns: 
 
 
-
+
 
 
 
@@ -223,7 +221,7 @@ NMSettingWired
 @Returns: 
 
 
-
+
 
 
 
@@ -241,7 +239,7 @@ NMSettingWired
 @Returns: 
 
 
-
+
 
 
 
@@ -250,7 +248,7 @@ NMSettingWired
 @Returns: 
 
 
-
+
 
 
 
@@ -259,7 +257,7 @@ NMSettingWired
 @Returns: 
 
 
-
+
 
 
 
@@ -268,7 +266,7 @@ NMSettingWired
 @Returns: 
 
 
-
+
 
 
 
@@ -277,7 +275,7 @@ NMSettingWired
 @Returns: 
 
 
-
+
 
 
 
@@ -286,7 +284,7 @@ NMSettingWired
 @Returns: 
 
 
-
+
 
 
 
@@ -295,52 +293,54 @@ NMSettingWired
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@idx: 
-@out_key: 
-@out_value: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@key: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@idx: 
+@out_key: 
+@out_value: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@key: 
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
+@key: 
+@item: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml b/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
index 01b16ce9..7c8b7dc8 100644
--- a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
@@ -22,380 +22,381 @@ NMSettingWirelessSecurity
 
 
 
-
+
 
 
 
 
 
-
-
-
-
 
-
+
 
 
 
 
-
+@NM_SETTING_WIRELESS_SECURITY_ERROR_UNKNOWN: 
+@NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_PROPERTY: 
+@NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_802_1X_SETTING: 
+@NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_802_1X: 
+@NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_USERNAME: 
+@NM_SETTING_WIRELESS_SECURITY_ERROR_SHARED_KEY_REQUIRES_WEP: 
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
+@void: 
+@Returns: 
 
-
 
-
+
 
 
 
 
-
+@NM_WEP_KEY_TYPE_UNKNOWN: 
+@NM_WEP_KEY_TYPE_KEY: 
+@NM_WEP_KEY_TYPE_PASSPHRASE: 
+@NM_WEP_KEY_TYPE_LAST: 
+
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
 
-
+
+
 
 
 
 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_UNKNOWN: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_802_1X_SETTING: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_802_1X: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_USERNAME: 
-@NM_SETTING_WIRELESS_SECURITY_ERROR_SHARED_KEY_REQUIRES_WEP: 
 
-
+
+
 
 
 
 
-@NM_WEP_KEY_TYPE_UNKNOWN: 
-@NM_WEP_KEY_TYPE_KEY: 
-@NM_WEP_KEY_TYPE_PASSPHRASE: 
-@NM_WEP_KEY_TYPE_LAST: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
-
-
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@setting: 
-@group: 
-@Returns: 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
 
-
+
 
 
 
 
-@setting: 
-@pairwise: 
+@void: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@proto: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@proto: 
+@Returns: 
 
 
-
+
 
 
 
 
-@void: 
-@Returns: 
+@setting: 
+@i: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@i: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@pairwise: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
+@i: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
 
 
 
@@ -407,42 +408,41 @@ NMSettingWirelessSecurity
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@i: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@group: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
 @i: 
-@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
-@Returns: 
 
 
 
@@ -463,17 +463,16 @@ NMSettingWirelessSecurity
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@idx: 
 @Returns: 
 
 
-
+
 
 
 
@@ -482,7 +481,7 @@ NMSettingWirelessSecurity
 @Returns: 
 
 
-
+
 
 
 
@@ -491,58 +490,59 @@ NMSettingWirelessSecurity
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@idx: 
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
-@Returns: 
+@setting: 
+@idx: 
+@key: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@idx: 
-@key: 
+@Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless.sgml b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
index a74c82ef..e390bb09 100644
--- a/docs/libnm-util/tmpl/nm-setting-wireless.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
@@ -22,119 +22,90 @@ NMSettingWireless
 
 
 
-
+
 
 
 
 
 
-
-
-
-
 
-
+
 
 
 
 
-
-
-
-
+@NM_SETTING_WIRELESS_ERROR_UNKNOWN: 
+@NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY: 
+@NM_SETTING_WIRELESS_ERROR_MISSING_PROPERTY: 
+@NM_SETTING_WIRELESS_ERROR_MISSING_SECURITY_SETTING: 
+@NM_SETTING_WIRELESS_ERROR_CHANNEL_REQUIRES_BAND: 
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
+@void: 
+@Returns: 
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
 
-
 
-
+
 
 
 
 
-
-
-
-
 
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
 
-
+
 
 
 
 
-@NM_SETTING_WIRELESS_ERROR_UNKNOWN: 
-@NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_WIRELESS_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_WIRELESS_ERROR_MISSING_SECURITY_SETTING: 
-@NM_SETTING_WIRELESS_ERROR_CHANNEL_REQUIRES_BAND: 
 
-
+
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
@@ -148,35 +119,35 @@ NMSettingWireless
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
@@ -204,89 +175,112 @@ NMSettingWireless
 
 
 
-
+
 
 
 
 
 
+
+
+
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
+
+
 
+
 
-
+
 
 
 
 
-@setting: 
-@bssid: 
-@Returns: 
+
+
 
+
 
-
+@parent: 
+@_reserved1: 
+@_reserved2: 
+@_reserved3: 
+@_reserved4: 
+
+
 
 
 
 
-@s_wireless: 
-@s_wireless_sec: 
-@ap_flags: 
-@ap_wpa: 
-@ap_rsn: 
-@ap_mode: 
+@void: 
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@setting: 
 @Returns: 
 
 
-
+
 
 
 
@@ -295,7 +289,7 @@ NMSettingWireless
 @Returns: 
 
 
-
+
 
 
 
@@ -313,7 +307,7 @@ NMSettingWireless
 @Returns: 
 
 
-
+
 
 
 
@@ -322,7 +316,7 @@ NMSettingWireless
 @Returns: 
 
 
-
+
 
 
 
@@ -331,7 +325,7 @@ NMSettingWireless
 @Returns: 
 
 
-
+
 
 
 
@@ -340,7 +334,7 @@ NMSettingWireless
 @Returns: 
 
 
-
+
 
 
 
@@ -349,7 +343,7 @@ NMSettingWireless
 @Returns: 
 
 
-
+
 
 
 
@@ -358,7 +352,7 @@ NMSettingWireless
 @Returns: 
 
 
-
+
 
 
 
@@ -367,7 +361,7 @@ NMSettingWireless
 @Returns: 
 
 
-
+
 
 
 
@@ -376,7 +370,7 @@ NMSettingWireless
 @Returns: 
 
 
-
+
 
 
 
@@ -385,7 +379,7 @@ NMSettingWireless
 @Returns: 
 
 
-
+
 
 
 
@@ -394,17 +388,17 @@ NMSettingWireless
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@i: 
+@bssid: 
 @Returns: 
 
 
-
+
 
 
 
@@ -413,21 +407,27 @@ NMSettingWireless
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@i: 
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@s_wireless: 
+@s_wireless_sec: 
+@ap_flags: 
+@ap_wpa: 
+@ap_rsn: 
+@ap_mode: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting.sgml b/docs/libnm-util/tmpl/nm-setting.sgml
index 2067408a..d5df34e5 100644
--- a/docs/libnm-util/tmpl/nm-setting.sgml
+++ b/docs/libnm-util/tmpl/nm-setting.sgml
@@ -22,84 +22,66 @@ NMSetting
 
 
 
-
+
 
 
 
 
+@NM_SETTING_ERROR_UNKNOWN: 
+@NM_SETTING_ERROR_PROPERTY_NOT_FOUND: 
+@NM_SETTING_ERROR_PROPERTY_NOT_SECRET: 
+@NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH: 
 
-
+
 
 
 
 
-
+
+
+
 
 
 
 
-@parent: 
-@verify: 
-@need_secrets: 
-@update_one_secret: 
-@get_secret_flags: 
-@set_secret_flags: 
-@compare_property: 
-@clear_secrets_with_flags: 
-@get_virtual_iface_name: 
-@_reserved1: 
+@void: 
+@Returns: 
 
-
+
+
 
 
 
 
-@setting: 
-@secret: 
-@flags: 
-@user_data: 
-@Returns: 
 
 
-
+
 
 
 
 
-@NM_SETTING_COMPARE_FLAG_EXACT: 
-@NM_SETTING_COMPARE_FLAG_FUZZY: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_ID: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS: 
 
-
+
+
 
 
 
 
-@NM_SETTING_DIFF_RESULT_UNKNOWN: 
-@NM_SETTING_DIFF_RESULT_IN_A: 
-@NM_SETTING_DIFF_RESULT_IN_B: 
 
-
+
+
 
 
 
 
-@NM_SETTING_ERROR_UNKNOWN: 
-@NM_SETTING_ERROR_PROPERTY_NOT_FOUND: 
-@NM_SETTING_ERROR_PROPERTY_NOT_SECRET: 
-@NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH: 
 
-
+
+
 
 
 
 
-@NM_SETTING_HASH_FLAG_ALL: 
-@NM_SETTING_HASH_FLAG_NO_SECRETS: 
-@NM_SETTING_HASH_FLAG_ONLY_SECRETS: 
+
 
 
 
@@ -111,152 +93,171 @@ NMSetting
 @NM_SETTING_SECRET_FLAG_NOT_SAVED: 
 @NM_SETTING_SECRET_FLAG_NOT_REQUIRED: 
 
-
+
 
 
 
 
-@setting: 
-@key: 
-@value: 
-@flags: 
-@user_data: 
-
+@NM_SETTING_COMPARE_FLAG_EXACT: 
+@NM_SETTING_COMPARE_FLAG_FUZZY: 
+@NM_SETTING_COMPARE_FLAG_IGNORE_ID: 
+@NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS: 
+@NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS: 
+@NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS: 
 
-
+
 
 
 
 
 
-
-
+
 
 
 
 
-
-
-
+
 
 
 
 
+@setting: 
+@secret: 
+@flags: 
+@user_data: 
+@Returns: 
 
 
-
+
 
 
 
 
+@parent: 
+@verify: 
+@need_secrets: 
+@update_one_secret: 
+@get_secret_flags: 
+@set_secret_flags: 
+@compare_property: 
+@clear_secrets_with_flags: 
+@get_virtual_iface_name: 
+@_reserved1: 
 
-
-
+
 
 
 
 
+@setting: 
+@key: 
+@value: 
+@flags: 
+@user_data: 
 
 
-
+
 
 
 
 
+@NM_SETTING_HASH_FLAG_ALL: 
+@NM_SETTING_HASH_FLAG_NO_SECRETS: 
+@NM_SETTING_HASH_FLAG_ONLY_SECRETS: 
 
-
-
+
 
 
 
 
 @setting: 
+@flags: 
+@Returns: 
 
 
-
+
 
 
 
 
-@setting: 
-@func: 
-@user_data: 
+@setting_type: 
+@hash: 
+@Returns: 
 
 
-
+
 
 
 
 
-@a: 
-@b: 
-@flags: 
+@setting: 
 @Returns: 
 
 
-
+
 
 
 
 
-@a: 
-@b: 
-@flags: 
-@invert_results: 
-@results: 
+@setting: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@all_settings: 
+@error: 
 @Returns: 
 
 
-
+
 
 
 
 
-@setting: 
-@func: 
-@user_data: 
+@a: 
+@b: 
+@flags: 
+@Returns: 
 
 
-
+
 
 
 
 
-@void: 
-@Returns: 
-
+@NM_SETTING_DIFF_RESULT_UNKNOWN: 
+@NM_SETTING_DIFF_RESULT_IN_A: 
+@NM_SETTING_DIFF_RESULT_IN_B: 
 
-
+
 
 
 
 
-@setting: 
+@a: 
+@b: 
+@flags: 
+@invert_results: 
+@results: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@secret_name: 
-@out_flags: 
-@error: 
-@Returns: 
+@func: 
+@user_data: 
 
 
-
+
 
 
 
@@ -265,75 +266,74 @@ NMSetting
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@Returns: 
 
 
-
+
 
 
 
 
-@setting_type: 
-@hash: 
-@Returns: 
+@setting: 
+@func: 
+@user_data: 
 
 
-
+
 
 
 
 
 @setting: 
-@secret_name: 
-@flags: 
-@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@flags: 
+@secrets: 
+@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
+@secret_name: 
+@out_flags: 
+@error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@secrets: 
+@secret_name: 
+@flags: 
 @error: 
 @Returns: 
 
 
-
+
 
 
 
 
 @setting: 
-@all_settings: 
-@error: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/tmpl/nm-utils.sgml b/docs/libnm-util/tmpl/nm-utils.sgml
index acb59fe9..f4ae27dd 100644
--- a/docs/libnm-util/tmpl/nm-utils.sgml
+++ b/docs/libnm-util/tmpl/nm-utils.sgml
@@ -22,44 +22,31 @@ nm-utils
 
 
 
-
-
-
-
-
-@NMU_SEC_INVALID: 
-@NMU_SEC_NONE: 
-@NMU_SEC_STATIC_WEP: 
-@NMU_SEC_LEAP: 
-@NMU_SEC_DYNAMIC_WEP: 
-@NMU_SEC_WPA_PSK: 
-@NMU_SEC_WPA_ENTERPRISE: 
-@NMU_SEC_WPA2_PSK: 
-@NMU_SEC_WPA2_ENTERPRISE: 
-
-
+
 
 
 
 
+@error: 
+@Returns: 
 
 
-
+
 
 
 
 
-@type: 
-@wifi_caps: 
-@Returns: 
+@void: 
 
 
-
+
 
 
 
 
-@void: 
+@ssid: 
+@len: 
+@Returns: 
 
 
 
@@ -72,88 +59,100 @@ nm-utils
 @Returns: 
 
 
-
+
 
 
 
 
-@filename: 
+@ssid1: 
+@ssid2: 
+@ignore_trailing_null: 
 @Returns: 
 
 
-
+
 
 
 
 
-@hash: 
+@ssid: 
 @Returns: 
 
 
-
+
 
 
 
 
-@asc: 
-@type: 
+@hash: 
 @Returns: 
 
 
-
+
 
 
 
 
-@asc: 
-@type: 
-@buffer: 
-@Returns: 
+@list: 
+@elem_destroy_fn: 
 
 
-
+
 
 
 
 
-@type: 
-@Returns: 
-
+@NMU_SEC_INVALID: 
+@NMU_SEC_NONE: 
+@NMU_SEC_STATIC_WEP: 
+@NMU_SEC_LEAP: 
+@NMU_SEC_DYNAMIC_WEP: 
+@NMU_SEC_WPA_PSK: 
+@NMU_SEC_WPA_ENTERPRISE: 
+@NMU_SEC_WPA2_PSK: 
+@NMU_SEC_WPA2_ENTERPRISE: 
 
-
+
 
 
 
 
-@addr: 
 @type: 
+@wifi_caps: 
+@have_ap: 
+@adhoc: 
+@ap_flags: 
+@ap_wpa: 
+@ap_rsn: 
 @Returns: 
 
 
-
+
 
 
 
 
-@len: 
+@type: 
+@wifi_caps: 
 @Returns: 
 
 
-
+
 
 
 
 
-@name: 
+@key: 
+@wep_type: 
 @Returns: 
 
 
-
+
 
 
 
 
-@error: 
+@psk: 
 @Returns: 
 
 
@@ -175,49 +174,49 @@ nm-utils
 @value: 
 
 
-
+
 
 
 
 
-@ip: 
+@value: 
 @Returns: 
 
 
-
+
 
 
 
 
-@netmask: 
-@Returns: 
+@list: 
+@value: 
 
 
-
+
 
 
 
 
-@prefix: 
+@netmask: 
 @Returns: 
 
 
-
+
 
 
 
 
-@value: 
+@prefix: 
 @Returns: 
 
 
-
+
 
 
 
 
-@list: 
-@value: 
+@ip: 
+@Returns: 
 
 
 
@@ -238,7 +237,7 @@ nm-utils
 @value: 
 
 
-
+
 
 
 
@@ -247,7 +246,7 @@ nm-utils
 @Returns: 
 
 
-
+
 
 
 
@@ -256,7 +255,7 @@ nm-utils
 @value: 
 
 
-
+
 
 
 
@@ -265,7 +264,7 @@ nm-utils
 @Returns: 
 
 
-
+
 
 
 
@@ -274,22 +273,21 @@ nm-utils
 @value: 
 
 
-
+
 
 
 
 
-@ssid: 
-@len: 
+@void: 
 @Returns: 
 
 
-
+
 
 
 
 
-@str: 
+@s: 
 @Returns: 
 
 
@@ -305,124 +303,126 @@ nm-utils
 @Returns: 
 
 
-
+
 
 
 
 
-@ssid1: 
-@ssid2: 
-@ignore_trailing_null: 
+@filename: 
 @Returns: 
 
 
-
+
 
 
 
 
-@type: 
-@wifi_caps: 
-@have_ap: 
-@adhoc: 
-@ap_flags: 
-@ap_wpa: 
-@ap_rsn: 
+@freq: 
 @Returns: 
 
 
-
+
 
 
 
 
-@list: 
-@elem_destroy_fn: 
+@channel: 
+@band: 
+@Returns: 
 
 
-
+
 
 
 
 
-@ssid: 
+@channel: 
+@direction: 
+@band: 
 @Returns: 
 
 
-
+
 
 
 
 
-@void: 
+@channel: 
+@band: 
 @Returns: 
 
 
-
+
 
 
 
 
-@s: 
+
+
+
+
+
+
+
+@type: 
 @Returns: 
 
 
-
+
 
 
 
 
-@key: 
-@wep_type: 
+@len: 
 @Returns: 
 
 
-
+
 
 
 
 
-@channel: 
-@band: 
+@addr: 
+@type: 
 @Returns: 
 
 
-
+
 
 
 
 
-@channel: 
-@direction: 
-@band: 
+@asc: 
+@type: 
 @Returns: 
 
 
-
+
 
 
 
 
-@freq: 
+@asc: 
+@type: 
+@buffer: 
 @Returns: 
 
 
-
+
 
 
 
 
-@channel: 
-@band: 
+@name: 
 @Returns: 
 
 
-
+
 
 
 
 
-@psk: 
+@str: 
 @Returns: 
 
 
diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml
index 68f4aad3..fe98bd59 100644
--- a/docs/libnm-util/version.xml
+++ b/docs/libnm-util/version.xml
@@ -1 +1 @@
-0.9.8.0
+0.9.8.8
diff --git a/examples/C/Makefile.in b/examples/C/Makefile.in
index cb73369b..25d3bbcd 100644
--- a/examples/C/Makefile.in
+++ b/examples/C/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,23 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,7 +79,7 @@ build_triplet = @build@
 host_triplet = @host@
 @WITH_QT_TRUE@am__append_1 = qt
 subdir = examples/C
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
@@ -72,21 +99,28 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -94,9 +128,29 @@ am__can_run_installinfo = \
   esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = glib qt
@@ -267,7 +321,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGCONFIG_PATH = @PKGCONFIG_PATH@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@@ -282,6 +335,8 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@
+SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@
 SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
 SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
 SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
@@ -405,22 +460,25 @@ clean-libtool:
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -435,57 +493,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -501,12 +514,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -518,15 +526,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -535,6 +539,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -695,22 +714,20 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/examples/C/glib/Makefile.in b/examples/C/glib/Makefile.in
index c043e776..3e4ae066 100644
--- a/examples/C/glib/Makefile.in
+++ b/examples/C/glib/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -61,7 +88,8 @@ noinst_PROGRAMS = add-connection-dbus-glib$(EXEEXT) \
 	monitor-nm-running-GDBus$(EXEEXT) \
 	monitor-nm-state-GDBus$(EXEEXT)
 subdir = examples/C/glib
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
@@ -93,6 +121,7 @@ add_connection_dbus_glib_DEPENDENCIES =  \
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 am_add_connection_libnm_glib_OBJECTS =  \
 	add-connection-libnm-glib.$(OBJEXT)
 add_connection_libnm_glib_OBJECTS =  \
@@ -143,6 +172,18 @@ monitor_nm_running_dbus_glib_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 am_monitor_nm_state_GDBus_OBJECTS = monitor-nm-state-GDBus.$(OBJEXT)
 monitor_nm_state_GDBus_OBJECTS = $(am_monitor_nm_state_GDBus_OBJECTS)
 monitor_nm_state_GDBus_DEPENDENCIES = $(am__DEPENDENCIES_1)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -155,20 +196,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(add_connection_dbus_glib_SOURCES) \
 	$(add_connection_libnm_glib_SOURCES) \
 	$(get_active_connections_dbus_glib_SOURCES) \
@@ -192,6 +229,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -336,7 +390,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGCONFIG_PATH = @PKGCONFIG_PATH@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@@ -351,6 +404,8 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@
+SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@
 SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
 SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
 SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
@@ -548,30 +603,39 @@ clean-noinstPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
+
 add-connection-dbus-glib$(EXEEXT): $(add_connection_dbus_glib_OBJECTS) $(add_connection_dbus_glib_DEPENDENCIES) $(EXTRA_add_connection_dbus_glib_DEPENDENCIES) 
 	@rm -f add-connection-dbus-glib$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(add_connection_dbus_glib_OBJECTS) $(add_connection_dbus_glib_LDADD) $(LIBS)
+
 add-connection-libnm-glib$(EXEEXT): $(add_connection_libnm_glib_OBJECTS) $(add_connection_libnm_glib_DEPENDENCIES) $(EXTRA_add_connection_libnm_glib_DEPENDENCIES) 
 	@rm -f add-connection-libnm-glib$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(add_connection_libnm_glib_OBJECTS) $(add_connection_libnm_glib_LDADD) $(LIBS)
+
 get-active-connections-dbus-glib$(EXEEXT): $(get_active_connections_dbus_glib_OBJECTS) $(get_active_connections_dbus_glib_DEPENDENCIES) $(EXTRA_get_active_connections_dbus_glib_DEPENDENCIES) 
 	@rm -f get-active-connections-dbus-glib$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(get_active_connections_dbus_glib_OBJECTS) $(get_active_connections_dbus_glib_LDADD) $(LIBS)
+
 get-ap-info-libnm-glib$(EXEEXT): $(get_ap_info_libnm_glib_OBJECTS) $(get_ap_info_libnm_glib_DEPENDENCIES) $(EXTRA_get_ap_info_libnm_glib_DEPENDENCIES) 
 	@rm -f get-ap-info-libnm-glib$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(get_ap_info_libnm_glib_OBJECTS) $(get_ap_info_libnm_glib_LDADD) $(LIBS)
+
 list-connections-dbus-glib$(EXEEXT): $(list_connections_dbus_glib_OBJECTS) $(list_connections_dbus_glib_DEPENDENCIES) $(EXTRA_list_connections_dbus_glib_DEPENDENCIES) 
 	@rm -f list-connections-dbus-glib$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(list_connections_dbus_glib_OBJECTS) $(list_connections_dbus_glib_LDADD) $(LIBS)
+
 list-connections-libnm-glib$(EXEEXT): $(list_connections_libnm_glib_OBJECTS) $(list_connections_libnm_glib_DEPENDENCIES) $(EXTRA_list_connections_libnm_glib_DEPENDENCIES) 
 	@rm -f list-connections-libnm-glib$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(list_connections_libnm_glib_OBJECTS) $(list_connections_libnm_glib_LDADD) $(LIBS)
+
 monitor-nm-running-GDBus$(EXEEXT): $(monitor_nm_running_GDBus_OBJECTS) $(monitor_nm_running_GDBus_DEPENDENCIES) $(EXTRA_monitor_nm_running_GDBus_DEPENDENCIES) 
 	@rm -f monitor-nm-running-GDBus$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(monitor_nm_running_GDBus_OBJECTS) $(monitor_nm_running_GDBus_LDADD) $(LIBS)
+
 monitor-nm-running-dbus-glib$(EXEEXT): $(monitor_nm_running_dbus_glib_OBJECTS) $(monitor_nm_running_dbus_glib_DEPENDENCIES) $(EXTRA_monitor_nm_running_dbus_glib_DEPENDENCIES) 
 	@rm -f monitor-nm-running-dbus-glib$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(monitor_nm_running_dbus_glib_OBJECTS) $(monitor_nm_running_dbus_glib_LDADD) $(LIBS)
+
 monitor-nm-state-GDBus$(EXEEXT): $(monitor_nm_state_GDBus_OBJECTS) $(monitor_nm_state_GDBus_DEPENDENCIES) $(EXTRA_monitor_nm_state_GDBus_DEPENDENCIES) 
 	@rm -f monitor-nm-state-GDBus$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(monitor_nm_state_GDBus_OBJECTS) $(monitor_nm_state_GDBus_LDADD) $(LIBS)
@@ -619,26 +683,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -650,15 +703,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -667,6 +716,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -808,18 +872,19 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstPROGRAMS ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/examples/C/qt/Makefile.in b/examples/C/qt/Makefile.in
index 603dbdf1..7c51cff7 100644
--- a/examples/C/qt/Makefile.in
+++ b/examples/C/qt/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -55,7 +82,8 @@ noinst_PROGRAMS = add-connection-wired$(EXEEXT) \
 	list-connections$(EXEEXT) change-ipv4-addresses$(EXEEXT) \
 	monitor-nm-running$(EXEEXT)
 subdir = examples/C/qt
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
@@ -84,6 +112,7 @@ add_connection_wired_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 am_change_ipv4_addresses_OBJECTS = change-ipv4-addresses.$(OBJEXT)
 change_ipv4_addresses_OBJECTS = $(am_change_ipv4_addresses_OBJECTS)
 change_ipv4_addresses_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@@ -96,6 +125,18 @@ am_monitor_nm_running_OBJECTS = monitor-nm-running.$(OBJEXT)
 monitor_nm_running_OBJECTS = $(am_monitor_nm_running_OBJECTS)
 monitor_nm_running_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -108,20 +149,16 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
 AM_V_CXX = $(am__v_CXX_@AM_V@)
 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo "  CXX   " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
 CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo "  CXXLD " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
 SOURCES = $(add_connection_wired_SOURCES) \
 	$(change_ipv4_addresses_SOURCES) $(list_connections_SOURCES) \
 	$(monitor_nm_running_SOURCES)
@@ -133,6 +170,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -277,7 +331,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGCONFIG_PATH = @PKGCONFIG_PATH@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@@ -292,6 +345,8 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@
+SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@
 SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
 SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
 SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
@@ -454,15 +509,19 @@ clean-noinstPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
+
 add-connection-wired$(EXEEXT): $(add_connection_wired_OBJECTS) $(add_connection_wired_DEPENDENCIES) $(EXTRA_add_connection_wired_DEPENDENCIES) 
 	@rm -f add-connection-wired$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(add_connection_wired_OBJECTS) $(add_connection_wired_LDADD) $(LIBS)
+
 change-ipv4-addresses$(EXEEXT): $(change_ipv4_addresses_OBJECTS) $(change_ipv4_addresses_DEPENDENCIES) $(EXTRA_change_ipv4_addresses_DEPENDENCIES) 
 	@rm -f change-ipv4-addresses$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(change_ipv4_addresses_OBJECTS) $(change_ipv4_addresses_LDADD) $(LIBS)
+
 list-connections$(EXEEXT): $(list_connections_OBJECTS) $(list_connections_DEPENDENCIES) $(EXTRA_list_connections_DEPENDENCIES) 
 	@rm -f list-connections$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(list_connections_OBJECTS) $(list_connections_LDADD) $(LIBS)
+
 monitor-nm-running$(EXEEXT): $(monitor_nm_running_OBJECTS) $(monitor_nm_running_DEPENDENCIES) $(EXTRA_monitor_nm_running_DEPENDENCIES) 
 	@rm -f monitor-nm-running$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(monitor_nm_running_OBJECTS) $(monitor_nm_running_LDADD) $(LIBS)
@@ -505,26 +564,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -536,15 +584,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -553,6 +597,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -698,18 +757,19 @@ uninstall-am:
 
 .MAKE: all check install install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstPROGRAMS ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
 
 
 monitor-nm-running.moc: monitor-nm-running.cpp
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 35044e24..045c6141 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,23 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,7 +78,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = examples
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
@@ -71,21 +98,28 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -93,9 +127,29 @@ am__can_run_installinfo = \
   esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -266,7 +320,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGCONFIG_PATH = @PKGCONFIG_PATH@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@@ -281,6 +334,8 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@
+SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@
 SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
 SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
 SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
@@ -410,22 +465,25 @@ clean-libtool:
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -440,57 +498,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -506,12 +519,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -523,15 +531,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -540,6 +544,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -700,22 +719,20 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/examples/dispatcher/Makefile.in b/examples/dispatcher/Makefile.in
index b3c40d22..e14ae85a 100644
--- a/examples/dispatcher/Makefile.in
+++ b/examples/dispatcher/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,23 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,7 +78,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = examples/dispatcher
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
@@ -71,12 +98,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -84,6 +117,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -226,7 +260,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGCONFIG_PATH = @PKGCONFIG_PATH@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@@ -241,6 +274,8 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@
+SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@
 SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
 SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
 SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
@@ -364,11 +399,11 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -504,15 +539,16 @@ uninstall-am:
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/examples/python/Makefile.in b/examples/python/Makefile.in
index c2bed95e..a2d54eaf 100644
--- a/examples/python/Makefile.in
+++ b/examples/python/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,23 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,7 +78,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = examples/python
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
@@ -71,12 +98,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -84,6 +117,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -226,7 +260,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGCONFIG_PATH = @PKGCONFIG_PATH@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@@ -241,6 +274,8 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@
+SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@
 SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
 SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
 SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
@@ -366,11 +401,11 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -506,15 +541,16 @@ uninstall-am:
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
 
 	vpn.py \
 	update-secrets.py \
diff --git a/examples/ruby/Makefile.in b/examples/ruby/Makefile.in
index 6093b2bb..caf315e3 100644
--- a/examples/ruby/Makefile.in
+++ b/examples/ruby/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,23 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,7 +78,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = examples/ruby
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
@@ -71,12 +98,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -84,6 +117,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -226,7 +260,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGCONFIG_PATH = @PKGCONFIG_PATH@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@@ -241,6 +274,8 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@
+SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@
 SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
 SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
 SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
@@ -366,11 +401,11 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -506,15 +541,16 @@ uninstall-am:
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/examples/shell/Makefile.in b/examples/shell/Makefile.in
index 54fd2c49..c14a9e38 100644
--- a/examples/shell/Makefile.in
+++ b/examples/shell/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,23 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,7 +78,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = examples/shell
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
@@ -71,12 +98,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -84,6 +117,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -226,7 +260,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGCONFIG_PATH = @PKGCONFIG_PATH@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@@ -241,6 +274,8 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@
+SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@
 SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
 SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
 SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
@@ -368,11 +403,11 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -508,15 +543,16 @@ uninstall-am:
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/gtk-doc.make b/gtk-doc.make
index 1f75dfdc..3b5bed0e 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -74,33 +74,42 @@ $(REPORT_FILES): sgml-build.stamp
 
 #### setup ####
 
+GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_$(V))
+GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SETUP_0=@echo "  DOC   Preparing build";
+
 setup-build.stamp:
-	-@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    echo '  DOC   Preparing build'; \
+	-$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
 	    files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
 	    if test "x$$files" != "x" ; then \
 	        for file in $$files ; do \
 	            test -f $(abs_srcdir)/$$file && \
-	                cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \
+	                cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
 	        done; \
 	    fi; \
 	    test -d $(abs_srcdir)/tmpl && \
 	        { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
 	        chmod -R u+w $(abs_builddir)/tmpl; } \
 	fi
-	@touch setup-build.stamp
+	$(AM_V_at)touch setup-build.stamp
 
 #### scan ####
 
+GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V))
+GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_SCAN_0=@echo "  DOC   Scanning header files";
+
+GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_$(V))
+GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_INTROSPECT_0=@echo "  DOC   Introspecting gobjects";
+
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-	@echo '  DOC   Scanning header files'
-	@_source_dir='' ; \
+	$(GTK_DOC_V_SCAN)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
 	gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
-	@if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
-	    echo "  DOC   Introspecting gobjects"; \
+	$(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    scanobj_options=""; \
 	    gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
 	    if test "$(?)" = "0"; then \
@@ -115,22 +124,25 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
 	        test -f $$i || touch $$i ; \
 	    done \
 	fi
-	@touch scan-build.stamp
+	$(AM_V_at)touch scan-build.stamp
 
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
 	@true
 
 #### templates ####
 
+GTK_DOC_V_TMPL=$(GTK_DOC_V_TMPL_$(V))
+GTK_DOC_V_TMPL_=$(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_TMPL_0=@echo "  DOC   Rebuilding template files";
+
 tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	@echo '  DOC   Rebuilding template files'
-	@gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	$(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+	$(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
 	  if test -w $(abs_srcdir) ; then \
 	    cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
 	  fi \
 	fi
-	@touch tmpl-build.stamp
+	$(AM_V_at)touch tmpl-build.stamp
 
 tmpl.stamp: tmpl-build.stamp
 	@true
@@ -140,26 +152,34 @@ $(srcdir)/tmpl/*.sgml:
 
 #### xml ####
 
+GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V))
+GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XML_0=@echo "  DOC   Building XML";
+
 sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-	@echo '  DOC   Building XML'
-	@-chmod -R u+w $(srcdir)
-	@_source_dir='' ; \
+	$(GTK_DOC_V_XML)-chmod -R u+w $(srcdir) && _source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
 	gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
-	@touch sgml-build.stamp
+	$(AM_V_at)touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
 	@true
 
 #### html ####
 
+GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V))
+GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_HTML_0=@echo "  DOC   Building HTML";
+
+GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V))
+GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_XREF_0=@echo "  DOC   Fixing cross-references";
+
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo '  DOC   Building HTML'
-	@rm -rf html
-	@mkdir html
-	@mkhtml_options=""; \
+	$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
+	mkhtml_options=""; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
 	if test "$(?)" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
@@ -180,16 +200,18 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
 	  fi; \
 	done;
-	@echo '  DOC   Fixing cross-references'
-	@gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-	@touch html-build.stamp
+	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+	$(AM_V_at)touch html-build.stamp
 
 #### pdf ####
 
+GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V))
+GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY))
+GTK_DOC_V_PDF_0=@echo "  DOC   Building PDF";
+
 pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo '  DOC   Building PDF'
-	@rm -f $(DOC_MODULE).pdf
-	@mkpdf_options=""; \
+	$(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
+	mkpdf_options=""; \
 	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
 	if test "$(?)" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
@@ -206,7 +228,7 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	  done; \
 	fi; \
 	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
-	@touch pdf-build.stamp
+	$(AM_V_at)touch pdf-build.stamp
 
 ##############
 
@@ -222,7 +244,7 @@ distclean-local:
 	    rm -rf tmpl; \
 	fi
 
-maintainer-clean-local: clean
+maintainer-clean-local:
 	@rm -rf xml html
 
 install-data-local:
@@ -259,7 +281,7 @@ uninstall-local:
 # Require gtk-doc when making dist
 #
 if ENABLE_GTK_DOC
-dist-check-gtkdoc:
+dist-check-gtkdoc: docs
 else
 dist-check-gtkdoc:
 	@echo "*** gtk-doc must be installed and enabled in order to make dist"
diff --git a/include/Makefile.in b/include/Makefile.in
index 950999f8..dfe0a4a4 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -52,8 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = include
-DIST_COMMON = $(NetworkManagerinclude_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/nm-version.h.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(srcdir)/nm-version.h.in $(NetworkManagerinclude_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
@@ -73,12 +100,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = nm-version.h
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -115,6 +148,23 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(NetworkManagerincludedir)"
 HEADERS = $(NetworkManagerinclude_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -259,7 +309,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGCONFIG_PATH = @PKGCONFIG_PATH@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@@ -274,6 +323,8 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@
+SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@
 SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
 SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
 SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
@@ -433,26 +484,15 @@ uninstall-NetworkManagerincludeHEADERS:
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(NetworkManagerincludedir)'; $(am__uninstall_files_from_dir)
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -464,15 +504,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -481,6 +517,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -620,10 +671,10 @@ uninstall-am: uninstall-NetworkManagerincludeHEADERS
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool ctags distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool cscopelist-am ctags ctags-am distclean \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install \
 	install-NetworkManagerincludeHEADERS install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
 	install-exec-am install-html install-html-am install-info \
@@ -631,7 +682,7 @@ uninstall-am: uninstall-NetworkManagerincludeHEADERS
 	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
 	uninstall-NetworkManagerincludeHEADERS uninstall-am
 
 
diff --git a/include/NetworkManager.h b/include/NetworkManager.h
index d45ad07b..ebdb329e 100644
--- a/include/NetworkManager.h
+++ b/include/NetworkManager.h
@@ -95,6 +95,27 @@ typedef enum {
 /* For backwards compat */
 #define NM_STATE_CONNECTED NM_STATE_CONNECTED_GLOBAL
 
+/**
+ * NMConnectivityState:
+ * @NM_CONNECTIVITY_UNKNOWN: Network connectivity is unknown.
+ * @NM_CONNECTIVITY_NONE: The host is not connected to any network.
+ * @NM_CONNECTIVITY_PORTAL: The host is behind a captive portal and
+ *   cannot reach the full Internet.
+ * @NM_CONNECTIVITY_LIMITED: The host is connected to a network, but
+ *   does not appear to be able to reach the full Internet.
+ * @NM_CONNECTIVITY_FULL: The host is connected to a network, and
+ *   appears to be able to reach the full Internet.
+ *
+ * Since: 0.9.8.4
+ */
+typedef enum {
+	NM_CONNECTIVITY_UNKNOWN,
+	NM_CONNECTIVITY_NONE,
+	NM_CONNECTIVITY_PORTAL,
+	NM_CONNECTIVITY_LIMITED,
+	NM_CONNECTIVITY_FULL
+} NMConnectivityState;
+
 /**
  * NMDeviceType:
  * @NM_DEVICE_TYPE_UNKNOWN: unknown device
diff --git a/install-sh b/install-sh
deleted file mode 100755
index 6781b987..00000000
--- a/install-sh
+++ /dev/null
@@ -1,520 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2009-04-28.21; # UTC
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-
-nl='
-'
-IFS=" ""	$nl"
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
-
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
-
-chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
-mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
-stripprog=${STRIPPROG-strip}
-
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chgrpcmd=
-chmodcmd=$chmodprog
-chowncmd=
-mvcmd=$mvprog
-rmcmd="$rmprog -f"
-stripcmd=
-
-src=
-dst=
-dir_arg=
-dst_arg=
-
-copy_on_change=false
-no_target_directory=
-
-usage="\
-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
-     --help     display this help and exit.
-     --version  display version info and exit.
-
-  -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
-  -d            create directories instead of installing files.
-  -g GROUP      $chgrpprog installed files to GROUP.
-  -m MODE       $chmodprog installed files to MODE.
-  -o USER       $chownprog installed files to USER.
-  -s            $stripprog installed files.
-  -t DIRECTORY  install into DIRECTORY.
-  -T            report an error if DSTFILE is a directory.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-  RMPROG STRIPPROG
-"
-
-while test $# -ne 0; do
-  case $1 in
-    -c) ;;
-
-    -C) copy_on_change=true;;
-
-    -d) dir_arg=true;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-	shift;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
-
-    -o) chowncmd="$chownprog $2"
-	shift;;
-
-    -s) stripcmd=$stripprog;;
-
-    -t) dst_arg=$2
-	shift;;
-
-    -T) no_target_directory=true;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    --)	shift
-	break;;
-
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
-
-    *)  break;;
-  esac
-  shift
-done
-
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-  # When -d is used, all remaining arguments are directories to create.
-  # When -t is used, the destination is already specified.
-  # Otherwise, the last argument is the destination.  Remove it from $@.
-  for arg
-  do
-    if test -n "$dst_arg"; then
-      # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dst_arg"
-      shift # fnord
-    fi
-    shift # arg
-    dst_arg=$arg
-  done
-fi
-
-if test $# -eq 0; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call `install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
-
-  # Set umask so as not to create temps with too-generous modes.
-  # However, 'strip' requires both read and write access to temps.
-  case $mode in
-    # Optimize common cases.
-    *644) cp_umask=133;;
-    *755) cp_umask=22;;
-
-    *[0-7])
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw='% 200'
-      fi
-      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-    *)
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw=,u+rw
-      fi
-      cp_umask=$mode$u_plus_rw;;
-  esac
-fi
-
-for src
-do
-  # Protect names starting with `-'.
-  case $src in
-    -*) src=./$src;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    dstdir=$dst
-    test -d "$dstdir"
-    dstdir_status=$?
-  else
-
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dst_arg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-
-    dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
-
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
-	exit 1
-      fi
-      dstdir=$dst
-      dst=$dstdir/`basename "$src"`
-      dstdir_status=0
-    else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X\(//\)[^/]' \| \
-	     X"$dst" : 'X\(//\)$' \| \
-	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\).*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
-      test -d "$dstdir"
-      dstdir_status=$?
-    fi
-  fi
-
-  obsolete_mkdir_used=false
-
-  if test $dstdir_status != 0; then
-    case $posix_mkdir in
-      '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
-    esac
-
-    if
-      $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-      )
-    then :
-    else
-
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
-      # or it failed possibly due to a race condition.  Create the
-      # directory the slow way, step by step, checking for races as we go.
-
-      case $dstdir in
-	/*) prefix='/';;
-	-*) prefix='./';;
-	*)  prefix='';;
-      esac
-
-      eval "$initialize_posix_glob"
-
-      oIFS=$IFS
-      IFS=/
-      $posix_glob set -f
-      set fnord $dstdir
-      shift
-      $posix_glob set +f
-      IFS=$oIFS
-
-      prefixes=
-
-      for d
-      do
-	test -z "$d" && continue
-
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
-      done
-
-      if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
-      fi
-    fi
-  fi
-
-  if test -n "$dir_arg"; then
-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-  else
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-
-    # Copy the file name to the temp name.
-    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
-    # If -C, don't bother to copy if it wouldn't change the file.
-    if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
-       set X $old && old=:$2:$4:$5:$6 &&
-       set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
-       test "$old" = "$new" &&
-       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-    then
-      rm -f "$dsttmp"
-    else
-      # Rename the file to the real destination.
-      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-
-      # The rename failed, perhaps because mv can't rename something else
-      # to itself, or perhaps because mv is so ancient that it does not
-      # support -f.
-      {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
-
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
-      }
-    fi || exit 1
-
-    trap '' 0
-  fi
-done
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/introspection/Makefile.in b/introspection/Makefile.in
index 70707b3c..a7e09542 100644
--- a/introspection/Makefile.in
+++ b/introspection/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,23 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,7 +78,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = introspection
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(srcdir)/all.xml.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
@@ -72,12 +99,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = all.xml
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -85,6 +118,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -227,7 +261,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGCONFIG_PATH = @PKGCONFIG_PATH@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@@ -242,6 +275,8 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@
+SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@
 SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
 SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
 SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
@@ -397,11 +432,11 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -537,15 +572,16 @@ uninstall-am:
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/introspection/nm-active-connection.xml b/introspection/nm-active-connection.xml
index d90565ae..b6a3c48d 100644
--- a/introspection/nm-active-connection.xml
+++ b/introspection/nm-active-connection.xml
@@ -14,7 +14,11 @@
       The path of the connection.
     
     
-      A specific object associated with the active connection.
+      
+        A specific object associated with the active connection.  This property
+        reflects the specific object used during connection activation, and will
+        not change over the lifetime of the ActiveConnection once set.
+      
     
     
       
diff --git a/introspection/nm-manager.xml b/introspection/nm-manager.xml
index 6f3c8cac..a0e27732 100644
--- a/introspection/nm-manager.xml
+++ b/introspection/nm-manager.xml
@@ -244,6 +244,19 @@
       
     
 
+    
+      
+      
+      
+	Re-check the network connectivity state.
+      
+      
+        
+          The current connectivity state.
+        
+      
+    
+
     
       
         The overall networking state as determined by the NetworkManager daemon,
@@ -302,6 +315,25 @@
       
     
 
+    
+      
+        The object path of the "primary" active connection being used
+        to access the network. In particular, if there is no VPN
+        active, or the VPN does not have the default route, then this
+        indicates the connection that has the default route. If there
+        is a VPN active with the default route, then this indicates
+        the connection that contains the route to the VPN endpoint.
+      
+    
+
+    
+      
+        The object path of an active connection that is currently
+        being activated and which is expected to become the new
+        PrimaryConnection when it finishes activating.
+      
+    
+
     
       
         NetworkManager version.
@@ -325,6 +357,12 @@
       
     
 
+    
+      
+        The network connectivity state.
+      
+    
+
     
       
         NetworkManager's properties changed.
@@ -405,5 +443,39 @@
       
     
 
+    
+      
+        Describes the network-connectivity state.
+      
+      
+        
+          Network connectivity is unknown.
+        
+      
+      
+        
+          The host is not connected to any network.
+        
+      
+      
+        
+          The host is behind a captive portal and cannot reach the
+          full Internet.
+        
+      
+      
+        
+          The host is connected to a network, but does not appear to
+	  be able to reach the full Internet.
+        
+      
+      
+        
+	  The host is connected to a network, and appears to be able
+	  to reach the full Internet
+        
+      
+    
+
   
 
diff --git a/introspection/nm-secret-agent.xml b/introspection/nm-secret-agent.xml
index 81a1321b..48dde703 100644
--- a/introspection/nm-secret-agent.xml
+++ b/introspection/nm-secret-agent.xml
@@ -17,7 +17,11 @@
         
             
                 Retrieve and return stored secrets, if any, or request new
-                secrets from the agent's user.
+                secrets from the agent's user.  If user interaction is allowed
+                and the user enters new secrets, the agent is expected to save
+                the new secrets to persistent storage (if the secret's flags
+                include AGENT_OWNED) as NetworkManager will not send these
+                secrets back to the same agent via a SaveSecrets() call.
             
             
             
@@ -46,7 +50,9 @@
                     Array of strings of key names in the requested setting for
                     which NetworkManager thinks a secrets may be required,
                     and/or well-known identifiers and data that may be useful
-                    to the client in processing the secrets request. The Agent
+                    to the client in processing the secrets request.  Note that
+                    it's not always possible to determine which secret is
+                    required, so in some cases no hints may be given.  The Agent
                     should return any secrets it has, or that it thinks are
                     required, regardless of what hints NetworkManager sends
                     in this request.
@@ -109,14 +115,17 @@
         
             
                 Cancel a pending GetSecrets request for secrets of the given
-                connection.  Any matching request should be canceled.
+                connection.  Any GetSecrets request with the same
+                'connection_path' and 'setting_name' that are given in a
+                CancelGetSecrets request should be canceled.
             
             
             
             
                 
-                    Object path of the connection for which, if secrets are being
-                    requested, the request should be canceled.
+                    Object path of the connection for which, if secrets for
+                    the given 'setting_name' are being requested, the request
+                    should be canceled.
                 
             
             
diff --git a/introspection/nm-settings.xml b/introspection/nm-settings.xml
index 301cde76..c7914668 100644
--- a/introspection/nm-settings.xml
+++ b/introspection/nm-settings.xml
@@ -8,7 +8,7 @@
 
     
       
-        List the connections stored by this Settings object.
+        List the saved network connections known to NetworkManager.
       
       
       
@@ -37,7 +37,10 @@
 
     
       
-        Add new connection.
+        Add new connection and save it to disk.  This operation does not start
+        the network connection unless (1) device is idle and able to connect to
+        the network described by the new connection, and (2) the connection
+        is allowed to be started automatically.
       
       
       
@@ -88,7 +91,14 @@
 
     
       
-        Emitted when a new connection has been added.
+        Emitted when a new connection has been added after NetworkManager has
+        started up and initialized.  This signal is not emitted for connections
+        read while starting up, because NetworkManager's D-Bus service is only
+        available after all connections have been read, and to prevent spamming
+        listeners with too many signals at one time.  To retrieve the initial
+        connection list, call the ListConnections() method once, and then listen
+        for individual Settings.NewConnection and Settings.Connection.Deleted
+        signals for further updates.
       
       
         
diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am
index b8eee472..c692a3ca 100644
--- a/libnm-glib/Makefile.am
+++ b/libnm-glib/Makefile.am
@@ -148,7 +148,7 @@ libnm_glib_la_LIBADD = \
 SYMBOL_VIS_FILE=$(srcdir)/libnm-glib.ver
 
 libnm_glib_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \
-	-version-info "9:0:5"
+	-version-info "10:0:6"
 
 noinst_PROGRAMS = libnm-glib-test
 
diff --git a/libnm-glib/Makefile.in b/libnm-glib/Makefile.in
index df3e843b..4a94d03a 100644
--- a/libnm-glib/Makefile.in
+++ b/libnm-glib/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -19,23 +18,51 @@
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -58,10 +85,10 @@ noinst_PROGRAMS = libnm-glib-test$(EXEEXT)
 @HAVE_INTROSPECTION_TRUE@am__append_1 = NMClient-1.0.gir
 @HAVE_INTROSPECTION_TRUE@am__append_2 = $(gir_DATA) $(typelib_DATA)
 subdir = libnm-glib
-DIST_COMMON = $(libdeprecated_HEADERS) $(libnminclude_HEADERS) \
-	$(libnmvpn_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/libnm-glib-vpn.pc.in \
-	$(srcdir)/libnm-glib.pc.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(srcdir)/libnm-glib.pc.in $(srcdir)/libnm-glib-vpn.pc.in \
+	$(top_srcdir)/build-aux/depcomp $(libdeprecated_HEADERS) \
+	$(libnminclude_HEADERS) $(libnmvpn_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
@@ -123,6 +150,7 @@ libdeprecated_nm_glib_la_OBJECTS =  \
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libnm_glib_test_la_DEPENDENCIES =  \
 	$(top_builddir)/libnm-util/libnm-util.la $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -218,6 +246,18 @@ libnm_glib_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libnm_glib_test_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	-o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -230,33 +270,30 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libdeprecated_nm_glib_la_SOURCES) \
 	$(libnm_glib_test_la_SOURCES) $(libnm_glib_vpn_la_SOURCES) \
 	$(libnm_glib_la_SOURCES) $(libnm_glib_test_SOURCES)
 DIST_SOURCES = $(libdeprecated_nm_glib_la_SOURCES) \
 	$(libnm_glib_test_la_SOURCES) $(libnm_glib_vpn_la_SOURCES) \
 	$(libnm_glib_la_SOURCES) $(libnm_glib_test_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -267,9 +304,29 @@ HEADERS = $(libdeprecated_HEADERS) $(libnminclude_HEADERS) \
 	$(libnmvpn_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -440,7 +497,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGCONFIG_PATH = @PKGCONFIG_PATH@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@@ -455,6 +511,8 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@
+SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@
 SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
 SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
 SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
@@ -675,7 +733,7 @@ libnm_glib_la_LIBADD = \
 
 SYMBOL_VIS_FILE = $(srcdir)/libnm-glib.ver
 libnm_glib_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \
-	-version-info "9:0:5"
+	-version-info "10:0:6"
 
 libnm_glib_test_SOURCES = libnm-glib-test.c
 libnm_glib_test_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
@@ -770,6 +828,7 @@ libnm-glib.pc: $(top_builddir)/config.status $(srcdir)/libnm-glib.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 libnm-glib-vpn.pc: $(top_builddir)/config.status $(srcdir)/libnm-glib-vpn.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
@@ -796,27 +855,35 @@ uninstall-libLTLIBRARIES:
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(lib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 libdeprecated-nm-glib.la: $(libdeprecated_nm_glib_la_OBJECTS) $(libdeprecated_nm_glib_la_DEPENDENCIES) $(EXTRA_libdeprecated_nm_glib_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(LINK)  $(libdeprecated_nm_glib_la_OBJECTS) $(libdeprecated_nm_glib_la_LIBADD) $(LIBS)
+
 libnm-glib-test.la: $(libnm_glib_test_la_OBJECTS) $(libnm_glib_test_la_DEPENDENCIES) $(EXTRA_libnm_glib_test_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libnm_glib_test_la_LINK)  $(libnm_glib_test_la_OBJECTS) $(libnm_glib_test_la_LIBADD) $(LIBS)
+
 libnm-glib-vpn.la: $(libnm_glib_vpn_la_OBJECTS) $(libnm_glib_vpn_la_DEPENDENCIES) $(EXTRA_libnm_glib_vpn_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libnm_glib_vpn_la_LINK) -rpath $(libdir) $(libnm_glib_vpn_la_OBJECTS) $(libnm_glib_vpn_la_LIBADD) $(LIBS)
+
 libnm-glib.la: $(libnm_glib_la_OBJECTS) $(libnm_glib_la_DEPENDENCIES) $(EXTRA_libnm_glib_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libnm_glib_la_LINK) -rpath $(libdir) $(libnm_glib_la_OBJECTS) $(libnm_glib_la_LIBADD) $(LIBS)
 
@@ -828,6 +895,7 @@ clean-noinstPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
+
 libnm-glib-test$(EXEEXT): $(libnm_glib_test_OBJECTS) $(libnm_glib_test_DEPENDENCIES) $(EXTRA_libnm_glib_test_DEPENDENCIES) 
 	@rm -f libnm-glib-test$(EXEEXT)
 	$(AM_V_CCLD)$(libnm_glib_test_LINK) $(libnm_glib_test_OBJECTS) $(libnm_glib_test_LDADD) $(LIBS)
@@ -1512,22 +1580,25 @@ uninstall-libnmvpnHEADERS:
 	dir='$(DESTDIR)$(libnmvpndir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -1542,57 +1613,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -1608,12 +1634,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -1625,15 +1646,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -1642,6 +1659,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -1822,19 +1854,18 @@ uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \
 	uninstall-libnmvpnHEADERS uninstall-pkgconfigDATA \
 	uninstall-typelibDATA
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
-	check-am ctags-recursive install install-am install-strip \
-	tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am check-local clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
-	clean-noinstPROGRAMS ctags ctags-recursive distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-girDATA \
-	install-html install-html-am install-info install-info-am \
+.MAKE: $(am__recursive_targets) all check check-am install install-am \
+	install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am check-local clean clean-generic clean-libLTLIBRARIES \
+	clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-girDATA install-html \
+	install-html-am install-info install-info-am \
 	install-libLTLIBRARIES install-libdeprecatedHEADERS \
 	install-libnmincludeHEADERS install-libnmvpnHEADERS \
 	install-man install-pdf install-pdf-am install-pkgconfigDATA \
@@ -1842,7 +1873,7 @@ uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \
 	installcheck installcheck-am installdirs installdirs-am \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-girDATA uninstall-libLTLIBRARIES \
 	uninstall-libdeprecatedHEADERS uninstall-libnmincludeHEADERS \
 	uninstall-libnmvpnHEADERS uninstall-pkgconfigDATA \
diff --git a/libnm-glib/libnm-glib.ver b/libnm-glib/libnm-glib.ver
index 571bc7d2..b7d33211 100644
--- a/libnm-glib/libnm-glib.ver
+++ b/libnm-glib/libnm-glib.ver
@@ -31,14 +31,20 @@ global:
 	nm_active_connection_new;
 	nm_client_activate_connection;
 	nm_client_add_and_activate_connection;
+	nm_client_check_connectivity;
+	nm_client_check_connectivity_async;
+	nm_client_check_connectivity_finish;
 	nm_client_deactivate_connection;
+	nm_client_get_activating_connection;
 	nm_client_get_active_connections;
+	nm_client_get_connectivity;
 	nm_client_get_device_by_iface;
 	nm_client_get_device_by_path;
 	nm_client_get_devices;
 	nm_client_get_logging;
 	nm_client_get_manager_running;
 	nm_client_get_permission_result;
+	nm_client_get_primary_connection;
 	nm_client_get_state;
 	nm_client_get_type;
 	nm_client_get_version;
diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c
index 3ffa7b9e..9226d350 100644
--- a/libnm-glib/nm-client.c
+++ b/libnm-glib/nm-client.c
@@ -60,6 +60,9 @@ typedef struct {
 	NMState state;
 	GPtrArray *devices;
 	GPtrArray *active_connections;
+	NMConnectivityState connectivity;
+	NMActiveConnection *primary_connection;
+	NMActiveConnection *activating_connection;
 
 	DBusGProxyCall *perm_call;
 	GHashTable *permissions;
@@ -93,6 +96,9 @@ enum {
 	PROP_WIMAX_ENABLED,
 	PROP_WIMAX_HARDWARE_ENABLED,
 	PROP_ACTIVE_CONNECTIONS,
+	PROP_CONNECTIVITY,
+	PROP_PRIMARY_CONNECTION,
+	PROP_ACTIVATING_CONNECTION,
 
 	LAST_PROP
 };
@@ -161,6 +167,9 @@ register_properties (NMClient *client)
 		{ NM_CLIENT_WIMAX_ENABLED,             &priv->wimax_enabled },
 		{ NM_CLIENT_WIMAX_HARDWARE_ENABLED,    &priv->wimax_hw_enabled },
 		{ NM_CLIENT_ACTIVE_CONNECTIONS,        &priv->active_connections, NULL, NM_TYPE_ACTIVE_CONNECTION },
+		{ NM_CLIENT_CONNECTIVITY,              &priv->connectivity },
+		{ NM_CLIENT_PRIMARY_CONNECTION,        &priv->primary_connection, NULL, NM_TYPE_ACTIVE_CONNECTION },
+		{ NM_CLIENT_ACTIVATING_CONNECTION,     &priv->activating_connection, NULL, NM_TYPE_ACTIVE_CONNECTION },
 		{ NULL },
 	};
 
@@ -464,7 +473,7 @@ static void
 recheck_pending_activations (NMClient *self, const char *failed_path, GError *error)
 {
 	NMClientPrivate *priv = NM_CLIENT_GET_PRIVATE (self);
-	GSList *iter;
+	GSList *iter, *next;
 	const GPtrArray *active_connections;
 	gboolean found_in_active = FALSE;
 	gboolean found_in_pending = FALSE;
@@ -479,9 +488,11 @@ recheck_pending_activations (NMClient *self, const char *failed_path, GError *er
 	 * If the connection to activate doesn't make it to active_connections,
 	 * due to an error, we have to call the callback for failed_path.
 	 */
-	for (iter = priv->pending_activations; iter; iter = g_slist_next (iter)) {
+	for (iter = priv->pending_activations; iter; iter = next) {
 		ActivateInfo *info = iter->data;
 
+		next = g_slist_next (iter);
+
 		if (!found_in_pending && failed_path && g_strcmp0 (failed_path, info->active_path) == 0) {
 			found_in_pending = TRUE;
 			ainfo = info;
@@ -542,7 +553,7 @@ activate_cb (DBusGProxy *proxy,
  * @device: (allow-none): the #NMDevice
  * @specific_object: (allow-none): the object path of a connection-type-specific
  *   object this activation should use. This parameter is currently ignored for
- *   wired and mobile broadband connections, and the value of NULL should be used
+ *   wired and mobile broadband connections, and the value of %NULL should be used
  *   (ie, no specific object).  For WiFi or WiMAX connections, pass the object
  *   path of a #NMAccessPoint or #NMWimaxNsp owned by @device, which you can
  *   get using nm_object_get_path(), and which will be used to complete the
@@ -618,12 +629,12 @@ add_activate_cb (DBusGProxy *proxy,
  * nm_client_add_and_activate_connection:
  * @client: a #NMClient
  * @partial: (allow-none): an #NMConnection to add; the connection may be
- *   partially filled (or even NULL) and will be completed by NetworkManager
+ *   partially filled (or even %NULL) and will be completed by NetworkManager
  *   using the given @device and @specific_object before being added
  * @device: the #NMDevice
  * @specific_object: (allow-none): the object path of a connection-type-specific
  *   object this activation should use. This parameter is currently ignored for
- *   wired and mobile broadband connections, and the value of NULL should be used
+ *   wired and mobile broadband connections, and the value of %NULL should be used
  *   (ie, no specific object).  For WiFi or WiMAX connections, pass the object
  *   path of a #NMAccessPoint or #NMWimaxNsp owned by @device, which you can
  *   get using nm_object_get_path(), and which will be used to complete the
@@ -1125,6 +1136,58 @@ nm_client_set_logging (NMClient *client, const char *level, const char *domains,
 	return TRUE;
 }
 
+/**
+ * nm_client_get_primary_connection:
+ * @client: an #NMClient
+ *
+ * Gets the #NMActiveConnection corresponding to the primary active
+ * network device.
+ *
+ * In particular, when there is no VPN active, or the VPN does not
+ * have the default route, this returns the active connection that has
+ * the default route. If there is a VPN active with the default route,
+ * then this function returns the active connection that contains the
+ * route to the VPN endpoint.
+ *
+ * If there is no default route, or the default route is over a
+ * non-NetworkManager-recognized device, this will return %NULL.
+ *
+ * Returns: (transfer none): the appropriate #NMActiveConnection, if
+ * any
+ *
+ * Since: 0.9.8.4
+ */
+NMActiveConnection *
+nm_client_get_primary_connection (NMClient *client)
+{
+	g_return_val_if_fail (NM_IS_CLIENT (client), NULL);
+
+	_nm_object_ensure_inited (NM_OBJECT (client));
+	return NM_CLIENT_GET_PRIVATE (client)->primary_connection;
+}
+
+/**
+ * nm_client_get_activating_connection:
+ * @client: an #NMClient
+ *
+ * Gets the #NMActiveConnection corresponding to a
+ * currently-activating connection that is expected to become the new
+ * #NMClient:primary-connection upon successful activation.
+ *
+ * Returns: (transfer none): the appropriate #NMActiveConnection, if
+ * any.
+ *
+ * Since: 0.9.8.4
+ */
+NMActiveConnection *
+nm_client_get_activating_connection (NMClient *client)
+{
+	g_return_val_if_fail (NM_IS_CLIENT (client), NULL);
+
+	_nm_object_ensure_inited (NM_OBJECT (client));
+	return NM_CLIENT_GET_PRIVATE (client)->activating_connection;
+}
+
 /****************************************************************/
 
 static void
@@ -1251,6 +1314,197 @@ client_device_removed (NMObject *client, NMObject *device)
 	g_signal_emit (client, signals[DEVICE_REMOVED], 0, device);
 }
 
+/**
+ * nm_client_get_connectivity:
+ * @client: an #NMClient
+ *
+ * Gets the current network connectivity state. Contrast
+ * nm_client_check_connectivity() and
+ * nm_client_check_connectivity_async(), which re-check the
+ * connectivity state first before returning any information.
+ *
+ * Returns: the current connectivity state
+ * Since: 0.9.8.4
+ */
+NMConnectivityState
+nm_client_get_connectivity (NMClient *client)
+{
+	NMClientPrivate *priv;
+
+	g_return_val_if_fail (NM_IS_CLIENT (client), NM_STATE_UNKNOWN);
+	priv = NM_CLIENT_GET_PRIVATE (client);
+
+	_nm_object_ensure_inited (NM_OBJECT (client));
+
+	return priv->connectivity;
+}
+
+/**
+ * nm_client_check_connectivity:
+ * @client: an #NMClient
+ * @cancellable: a #GCancellable
+ * @error: return location for a #GError
+ *
+ * Updates the network connectivity state and returns the (new)
+ * current state. Contrast nm_client_get_connectivity(), which returns
+ * the most recent known state without re-checking.
+ *
+ * This is a blocking call; use nm_client_check_connectivity_async()
+ * if you do not want to block.
+ *
+ * Returns: the (new) current connectivity state
+ * Since: 0.9.8.4
+ */
+NMConnectivityState
+nm_client_check_connectivity (NMClient *client,
+                              GCancellable *cancellable,
+                              GError **error)
+{
+	NMClientPrivate *priv;
+	NMConnectivityState connectivity;
+
+	g_return_val_if_fail (NM_IS_CLIENT (client), NM_CONNECTIVITY_UNKNOWN);
+	priv = NM_CLIENT_GET_PRIVATE (client);
+
+	if (!dbus_g_proxy_call (priv->client_proxy, "CheckConnectivity", error,
+	                        G_TYPE_INVALID,
+	                        G_TYPE_UINT, &connectivity,
+	                        G_TYPE_INVALID))
+		connectivity = NM_CONNECTIVITY_UNKNOWN;
+
+	return connectivity;
+}
+
+typedef struct {
+	NMClient *client;
+	DBusGProxyCall *call;
+	GCancellable *cancellable;
+	guint cancelled_id;
+	NMConnectivityState connectivity;
+} CheckConnectivityData;
+
+static void
+check_connectivity_data_free (CheckConnectivityData *ccd)
+{
+	if (ccd->cancellable) {
+		if (ccd->cancelled_id)
+			g_signal_handler_disconnect (ccd->cancellable, ccd->cancelled_id);
+		g_object_unref (ccd->cancellable);
+	}
+
+	g_slice_free (CheckConnectivityData, ccd);
+}
+
+static void
+check_connectivity_cb (DBusGProxy *proxy,
+                       DBusGProxyCall *call,
+                       gpointer user_data)
+{
+	GSimpleAsyncResult *simple = user_data;
+	CheckConnectivityData *ccd = g_simple_async_result_get_op_res_gpointer (simple);
+	GError *error = NULL;
+
+	if (!dbus_g_proxy_end_call (proxy, call, &error,
+	                            G_TYPE_UINT, &ccd->connectivity,
+	                            G_TYPE_INVALID))
+		g_simple_async_result_take_error (simple, error);
+
+	g_simple_async_result_complete (simple);
+	g_object_unref (simple);
+}
+
+static void
+check_connectivity_cancelled_cb (GCancellable *cancellable,
+                                 gpointer user_data)
+{
+	GSimpleAsyncResult *simple = user_data;
+	CheckConnectivityData *ccd = g_simple_async_result_get_op_res_gpointer (simple);
+
+	g_signal_handler_disconnect (cancellable, ccd->cancelled_id);
+	ccd->cancelled_id = 0;
+
+	dbus_g_proxy_cancel_call (NM_CLIENT_GET_PRIVATE (ccd->client)->client_proxy, ccd->call);
+	g_simple_async_result_complete_in_idle (simple);
+}
+
+/**
+ * nm_client_check_connectivity_async:
+ * @client: an #NMClient
+ * @cancellable: a #GCancellable
+ * @callback: callback to call with the result
+ * @user_data: data for @callback.
+ *
+ * Asynchronously updates the network connectivity state and invokes
+ * @callback when complete. Contrast nm_client_get_connectivity(),
+ * which (immediately) returns the most recent known state without
+ * re-checking, and nm_client_check_connectivity(), which blocks.
+ *
+ * Since: 0.9.8.4
+ */
+void
+nm_client_check_connectivity_async (NMClient *client,
+                                    GCancellable *cancellable,
+                                    GAsyncReadyCallback callback,
+                                    gpointer user_data)
+{
+	NMClientPrivate *priv;
+	GSimpleAsyncResult *simple;
+	CheckConnectivityData *ccd;
+
+	g_return_if_fail (NM_IS_CLIENT (client));
+	priv = NM_CLIENT_GET_PRIVATE (client);
+
+	ccd = g_slice_new (CheckConnectivityData);
+	ccd->client = client;
+
+	simple = g_simple_async_result_new (G_OBJECT (client), callback, user_data,
+	                                    nm_client_check_connectivity_async);
+	g_simple_async_result_set_op_res_gpointer (simple, ccd, (GDestroyNotify) check_connectivity_data_free);
+
+	if (cancellable) {
+		ccd->cancellable = g_object_ref (cancellable);
+		ccd->cancelled_id = g_signal_connect (cancellable, "cancelled",
+		                                      G_CALLBACK (check_connectivity_cancelled_cb),
+		                                      simple);
+		g_simple_async_result_set_check_cancellable (simple, cancellable);
+	}
+
+	ccd->call = dbus_g_proxy_begin_call (priv->client_proxy, "CheckConnectivity",
+	                                     check_connectivity_cb, simple, NULL,
+	                                     G_TYPE_INVALID);
+}
+
+/**
+ * nm_client_check_connectivity_finish:
+ * @client: an #NMClient
+ * @result: the #GAsyncResult
+ * @error: return location for a #GError
+ *
+ * Retrieves the result of an nm_client_check_connectivity_async()
+ * call.
+ *
+ * Returns: the (new) current connectivity state
+ * Since: 0.9.8.4
+ */
+NMConnectivityState
+nm_client_check_connectivity_finish (NMClient *client,
+                                     GAsyncResult *result,
+                                     GError **error)
+{
+	GSimpleAsyncResult *simple;
+	CheckConnectivityData *ccd;
+
+	g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (client), nm_client_check_connectivity_async), NM_CONNECTIVITY_UNKNOWN);
+
+	simple = G_SIMPLE_ASYNC_RESULT (result);
+	ccd = g_simple_async_result_get_op_res_gpointer (simple);
+
+	if (g_simple_async_result_propagate_error (simple, error))
+		return NM_CONNECTIVITY_UNKNOWN;
+
+	return ccd->connectivity;
+}
+
 /****************************************************************/
 
 /**
@@ -1677,6 +1931,8 @@ dispose (GObject *object)
 
 	free_devices (client, FALSE);
 	free_active_connections (client, FALSE);
+	g_clear_object (&priv->primary_connection);
+	g_clear_object (&priv->activating_connection);
 
 	g_slist_foreach (priv->pending_activations, (GFunc) activate_info_free, NULL);
 	g_slist_free (priv->pending_activations);
@@ -1785,6 +2041,15 @@ get_property (GObject *object,
 	case PROP_ACTIVE_CONNECTIONS:
 		g_value_set_boxed (value, nm_client_get_active_connections (self));
 		break;
+	case PROP_CONNECTIVITY:
+		g_value_set_uint (value, priv->connectivity);
+		break;
+	case PROP_PRIMARY_CONNECTION:
+		g_value_set_object (value, priv->primary_connection);
+		break;
+	case PROP_ACTIVATING_CONNECTION:
+		g_value_set_object (value, priv->activating_connection);
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -1951,6 +2216,53 @@ nm_client_class_init (NMClientClass *client_class)
 						   NM_TYPE_OBJECT_ARRAY,
 						   G_PARAM_READABLE));
 
+	/**
+	 * NMClient:connectivity:
+	 *
+	 * The network connectivity state.
+	 *
+	 * Since: 0.9.8.4
+	 */
+	g_object_class_install_property
+		(object_class, PROP_CONNECTIVITY,
+		 g_param_spec_uint (NM_CLIENT_CONNECTIVITY,
+		                    "Connectivity",
+		                    "Connectivity state",
+		                    NM_CONNECTIVITY_UNKNOWN, NM_CONNECTIVITY_FULL, NM_CONNECTIVITY_UNKNOWN,
+		                    G_PARAM_READABLE));
+
+	/**
+	 * NMClient:primary-connection:
+	 *
+	 * The #NMActiveConnection of the device with the default route;
+	 * see nm_client_get_primary_connection() for more details.
+	 *
+	 * Since: 0.9.8.4
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_PRIMARY_CONNECTION,
+		 g_param_spec_object (NM_CLIENT_PRIMARY_CONNECTION,
+		                      "Primary connection",
+		                      "Primary connection",
+		                      NM_TYPE_ACTIVE_CONNECTION,
+		                      G_PARAM_READABLE));
+
+	/**
+	 * NMClient:activating-connection:
+	 *
+	 * The #NMActiveConnection of the activating connection that is
+	 * likely to become the new #NMClient:primary-connection.
+	 *
+	 * Since: 0.9.8.4
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_ACTIVATING_CONNECTION,
+		 g_param_spec_object (NM_CLIENT_ACTIVATING_CONNECTION,
+		                      "Activating connection",
+		                      "Activating connection",
+		                      NM_TYPE_ACTIVE_CONNECTION,
+		                      G_PARAM_READABLE));
+
 	/* signals */
 
 	/**
diff --git a/libnm-glib/nm-client.h b/libnm-glib/nm-client.h
index 6c83e4ce..b4da609f 100644
--- a/libnm-glib/nm-client.h
+++ b/libnm-glib/nm-client.h
@@ -32,6 +32,7 @@
 #include "nm-object.h"
 #include "nm-device.h"
 #include "nm-active-connection.h"
+#include "nm-vpn-connection.h"
 
 G_BEGIN_DECLS
 
@@ -53,6 +54,9 @@ G_BEGIN_DECLS
 #define NM_CLIENT_WIMAX_ENABLED "wimax-enabled"
 #define NM_CLIENT_WIMAX_HARDWARE_ENABLED "wimax-hardware-enabled"
 #define NM_CLIENT_ACTIVE_CONNECTIONS "active-connections"
+#define NM_CLIENT_CONNECTIVITY "connectivity"
+#define NM_CLIENT_PRIMARY_CONNECTION "primary-connection"
+#define NM_CLIENT_ACTIVATING_CONNECTION "activating-connection"
 
 /**
  * NMClientPermission:
@@ -212,6 +216,22 @@ NMClientPermissionResult nm_client_get_permission_result (NMClient *client,
 gboolean nm_client_get_logging (NMClient *client, char **level, char **domains, GError **error);
 gboolean nm_client_set_logging (NMClient *client, const char *level, const char *domains, GError **error);
 
+NMConnectivityState nm_client_get_connectivity          (NMClient *client);
+
+NMConnectivityState nm_client_check_connectivity        (NMClient *client,
+                                                         GCancellable *cancellable,
+                                                         GError **error);
+void                nm_client_check_connectivity_async  (NMClient *client,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+NMConnectivityState nm_client_check_connectivity_finish (NMClient *client,
+                                                         GAsyncResult *result,
+                                                         GError **error);
+
+NMActiveConnection *nm_client_get_primary_connection (NMClient *client);
+NMActiveConnection *nm_client_get_activating_connection (NMClient *client);
+
 G_END_DECLS
 
 #endif /* NM_CLIENT_H */
diff --git a/libnm-glib/nm-device-wimax.c b/libnm-glib/nm-device-wimax.c
index 62e3f772..881fce5f 100644
--- a/libnm-glib/nm-device-wimax.c
+++ b/libnm-glib/nm-device-wimax.c
@@ -369,7 +369,7 @@ nm_device_wimax_get_tx_power (NMDeviceWimax *self)
  *
  * Gets the ID of the serving Base Station when the device is connected.
  *
- * Returns: the ID of the serving Base Station, or NULL
+ * Returns: the ID of the serving Base Station, or %NULL
  **/
 const char *
 nm_device_wimax_get_bsid (NMDeviceWimax *self)
diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c
index 5f492e2c..1c4fd736 100644
--- a/libnm-glib/nm-device.c
+++ b/libnm-glib/nm-device.c
@@ -205,6 +205,11 @@ device_state_change_reloaded (GObject *object,
 	NMDevice *self = NM_DEVICE (object);
 	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
 	StateChangeData *data = user_data;
+	NMDeviceState old_state = data->old_state;
+	NMDeviceState new_state = data->new_state;
+	NMDeviceStateReason reason = data->reason;
+
+	g_slice_free (StateChangeData, data);
 
 	_nm_object_reload_properties_finish (NM_OBJECT (object), result, NULL);
 
@@ -213,17 +218,16 @@ device_state_change_reloaded (GObject *object,
 	 * they'll finish in the right order. In that case, only emit the signal
 	 * for the last one.
 	 */
-	if (priv->last_seen_state != data->new_state)
+	if (priv->last_seen_state != new_state)
 		return;
 
 	/* Ensure that nm_device_get_state() will return the right value even if
 	 * we haven't processed the corresponding PropertiesChanged yet.
 	 */
-	priv->state = data->new_state;
+	priv->state = new_state;
 
 	g_signal_emit (self, signals[STATE_CHANGED], 0,
-	               data->new_state, data->old_state, data->reason);
-	g_slice_free (StateChangeData, data);
+	               new_state, old_state, reason);
 }
 
 static void
@@ -1252,7 +1256,7 @@ nm_device_get_state (NMDevice *device)
 /**
  * nm_device_get_state_reason:
  * @device: a #NMDevice
- * @reason: (out) (allow-none): location to store reason (#NMDeviceStateReason), or NULL
+ * @reason: (out) (allow-none): location to store reason (#NMDeviceStateReason), or %NULL
  *
  * Gets the current #NMDevice state (return value) and the reason for entering
  * the state (@reason argument).
@@ -1364,39 +1368,33 @@ get_decoded_property (GUdevDevice *device, const char *property)
 	return unescaped;
 }
 
-static void
-_device_update_description (NMDevice *device)
+static char *
+_get_udev_property (NMDevice *device,
+                    const char *enc_prop,  /* ID_XXX_ENC */
+                    const char *db_prop)   /* ID_XXX_FROM_DATABASE */
 {
-	NMDevicePrivate *priv;
+	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (device);
 	const char *subsys[3] = { "net", "tty", NULL };
 	GUdevDevice *udev_device = NULL, *tmpdev, *olddev;
 	const char *ifname;
 	guint32 count = 0;
-	const char *vendor, *model;
-
-	g_return_if_fail (NM_IS_DEVICE (device));
-	priv = NM_DEVICE_GET_PRIVATE (device);
+	char *enc_value = NULL, *db_value = NULL;
 
 	if (!priv->client) {
 		priv->client = g_udev_client_new (subsys);
 		if (!priv->client)
-			return;
+			return NULL;
 	}
 
 	ifname = nm_device_get_iface (device);
 	if (!ifname)
-		return;
+		return NULL;
 
 	udev_device = g_udev_client_query_by_subsystem_and_name (priv->client, "net", ifname);
 	if (!udev_device)
 		udev_device = g_udev_client_query_by_subsystem_and_name (priv->client, "tty", ifname);
 	if (!udev_device)
-		return;
-
-	g_free (priv->product);
-	priv->product = NULL;
-	g_free (priv->vendor);
-	priv->vendor = NULL;
+		return NULL;
 
 	/* Walk up the chain of the device and its parents a few steps to grab
 	 * vendor and device ID information off it.
@@ -1406,12 +1404,11 @@ _device_update_description (NMDevice *device)
 	 * as g_udev_device_get_parent() returns a ref-ed object.
 	 */
 	tmpdev = g_object_ref (udev_device);
-	while ((count++ < 3) && tmpdev && (!priv->vendor || !priv->product)) {
-		if (!priv->vendor)
-			priv->vendor = get_decoded_property (tmpdev, "ID_VENDOR_ENC");
-
-		if (!priv->product)
-			priv->product = get_decoded_property (tmpdev, "ID_MODEL_ENC");
+	while ((count++ < 3) && tmpdev && !enc_value) {
+		if (!enc_value)
+			enc_value = get_decoded_property (tmpdev, enc_prop);
+		if (!db_value)
+			db_value = g_strdup (g_udev_device_get_property (tmpdev, db_prop));
 
 		olddev = tmpdev;
 		tmpdev = g_udev_device_get_parent (tmpdev);
@@ -1424,42 +1421,18 @@ _device_update_description (NMDevice *device)
 	if (tmpdev)
 		g_object_unref (tmpdev);
 
-	/* If we didn't get strings directly from the device, try database strings */
+	/* Balance the initial g_udev_client_query_by_subsystem_and_name() */
+	g_object_unref (udev_device);
 
-	/* Again, ref the original device as we need to unref it every iteration
-	 * since g_udev_device_get_parent() returns a refed object.
+	/* Prefer the the encoded value which comes directly from the device
+	 * over the hwdata database value.
 	 */
-	tmpdev = g_object_ref (udev_device);
-	count = 0;
-	while ((count++ < 3) && tmpdev && (!priv->vendor || !priv->product)) {
-		if (!priv->vendor) {
-			vendor = g_udev_device_get_property (tmpdev, "ID_VENDOR_FROM_DATABASE");
-			if (vendor)
-				priv->vendor = g_strdup (vendor);
-		}
-
-		if (!priv->product) {
-			model = g_udev_device_get_property (tmpdev, "ID_MODEL_FROM_DATABASE");
-			if (model)
-				priv->product = g_strdup (model);
-		}
-
-		olddev = tmpdev;
-		tmpdev = g_udev_device_get_parent (tmpdev);
-		g_object_unref (olddev);
+	if (enc_value) {
+		g_free (db_value);
+		return enc_value;
 	}
 
-	/* Unref the last device if we found what we needed before running out
-	 * of parents.
-	 */
-	if (tmpdev)
-		g_object_unref (tmpdev);
-
-	/* Balance the initial g_udev_client_query_by_subsystem_and_name() */
-	g_object_unref (udev_device);
-
-	_nm_object_queue_notify (NM_OBJECT (device), NM_DEVICE_VENDOR);
-	_nm_object_queue_notify (NM_OBJECT (device), NM_DEVICE_PRODUCT);
+	return db_value;
 }
 
 /**
@@ -1479,8 +1452,14 @@ nm_device_get_product (NMDevice *device)
 	g_return_val_if_fail (NM_IS_DEVICE (device), NULL);
 
 	priv = NM_DEVICE_GET_PRIVATE (device);
-	if (!priv->product)
-		_device_update_description (device);
+	if (!priv->product) {
+		priv->product = _get_udev_property (device, "ID_MODEL_ENC", "ID_MODEL_FROM_DATABASE");
+		if (!priv->product) {
+			/* Sometimes ID_PRODUCT_FROM_DATABASE is used? */
+			priv->product = _get_udev_property (device, "ID_MODEL_ENC", "ID_PRODUCT_FROM_DATABASE");
+		}
+		_nm_object_queue_notify (NM_OBJECT (device), NM_DEVICE_PRODUCT);
+	}
 	return priv->product;
 }
 
@@ -1501,8 +1480,10 @@ nm_device_get_vendor (NMDevice *device)
 	g_return_val_if_fail (NM_IS_DEVICE (device), NULL);
 
 	priv = NM_DEVICE_GET_PRIVATE (device);
-	if (!priv->vendor)
-		_device_update_description (device);
+	if (!priv->vendor) {
+		priv->vendor = _get_udev_property (device, "ID_VENDOR_ENC", "ID_VENDOR_FROM_DATABASE");
+		_nm_object_queue_notify (NM_OBJECT (device), NM_DEVICE_VENDOR);
+	}
 	return priv->vendor;
 }
 
diff --git a/libnm-glib/nm-dhcp4-config.c b/libnm-glib/nm-dhcp4-config.c
index 89ccf25e..b8d7dcdd 100644
--- a/libnm-glib/nm-dhcp4-config.c
+++ b/libnm-glib/nm-dhcp4-config.c
@@ -163,8 +163,7 @@ nm_dhcp4_config_class_init (NMDHCP4ConfigClass *config_class)
 	 *
 	 * The #GHashTable containing options of the configuration.
 	 *
-	 * Type: GLib.HashTable
-	 * Element-Type: utf8,GObject.Value
+	 * Type: GLib.HashTable(utf8,GObject.Value)
 	 **/
 	g_object_class_install_property
 		(object_class, PROP_OPTIONS,
diff --git a/libnm-glib/nm-dhcp6-config.c b/libnm-glib/nm-dhcp6-config.c
index 88b3b103..fd1e6526 100644
--- a/libnm-glib/nm-dhcp6-config.c
+++ b/libnm-glib/nm-dhcp6-config.c
@@ -163,8 +163,7 @@ nm_dhcp6_config_class_init (NMDHCP6ConfigClass *config_class)
 	 *
 	 * The #GHashTable containing options of the configuration.
 	 *
-	 * Type: GLib.HashTable
-	 * Element-Type: utf8,GObject.Value
+	 * Type: GLib.HashTable(utf8,GObject.Value)
 	 **/
 	g_object_class_install_property
 		(object_class, PROP_OPTIONS,
diff --git a/libnm-glib/nm-ip6-config.c b/libnm-glib/nm-ip6-config.c
index 988dcd30..9efc32ee 100644
--- a/libnm-glib/nm-ip6-config.c
+++ b/libnm-glib/nm-ip6-config.c
@@ -166,9 +166,9 @@ nm_ip6_config_get_addresses (NMIP6Config *config)
  *
  * Gets the domain name servers (DNS).
  *
- * Returns: (element-type Posix.in6_addr): a #GSList containing elements of type
- * 'struct in6_addr' which contain the addresses of nameservers of the configuration.
- * This is the internal copy used by the configuration and must not be modified.
+ * Returns: a #GSList containing elements of type 'struct in6_addr' which
+ * contain the addresses of nameservers of the configuration.  This is the
+ * internal copy used by the configuration and must not be modified.
  **/
 const GSList *
 nm_ip6_config_get_nameservers (NMIP6Config *config)
diff --git a/libnm-glib/nm-object.c b/libnm-glib/nm-object.c
index af659bd1..7696673b 100644
--- a/libnm-glib/nm-object.c
+++ b/libnm-glib/nm-object.c
@@ -525,6 +525,17 @@ create_async_complete (GObject *object, NMObjectTypeAsyncData *async_data)
 	g_slice_free (NMObjectTypeAsyncData, async_data);
 }
 
+static const char *
+nm_object_or_connection_get_path (gpointer instance)
+{
+	if (NM_IS_OBJECT (instance))
+		return nm_object_get_path (instance);
+	else if (NM_IS_CONNECTION (instance))
+		return nm_connection_get_path (instance);
+
+	g_assert_not_reached ();
+}
+
 static void
 async_inited (GObject *source, GAsyncResult *result, gpointer user_data)
 {
@@ -534,7 +545,7 @@ async_inited (GObject *source, GAsyncResult *result, gpointer user_data)
 
 	if (!g_async_initable_init_finish (G_ASYNC_INITABLE (object), result, &error)) {
 		g_warning ("Could not create object for %s: %s",
-		           nm_object_get_path (NM_OBJECT (object)), error->message);
+		           nm_object_or_connection_get_path (object), error->message);
 		g_error_free (error);
 		g_object_unref (object);
 		object = NULL;
@@ -634,8 +645,10 @@ add_to_object_array_unique (GPtrArray *array, GObject *obj)
 
 	if (obj != NULL) {
 		for (i = 0; i < array->len; i++) {
-			if (g_ptr_array_index (array, i) == obj)
+			if (g_ptr_array_index (array, i) == obj) {
+				g_object_unref (obj);
 				return;
+			}
 		}
 		g_ptr_array_add (array, obj);
 	}
@@ -1399,6 +1412,7 @@ _nm_object_reload_properties_async (NMObject *object, GAsyncReadyCallback callba
 
 	if (!priv->property_interfaces && !priv->pseudo_properties) {
 		g_simple_async_result_complete_in_idle (simple);
+		g_object_unref (simple);
 		return;
 	}
 
diff --git a/libnm-glib/nm-remote-connection.c b/libnm-glib/nm-remote-connection.c
index ebb6a7b6..b5c2821f 100644
--- a/libnm-glib/nm-remote-connection.c
+++ b/libnm-glib/nm-remote-connection.c
@@ -222,7 +222,7 @@ get_secrets_cb (DBusGProxy *proxy, DBusGProxyCall *proxy_call, gpointer user_dat
  * @connection: the #NMRemoteConnection
  * @setting_name: the #NMSetting object name to get secrets for
  * @callback: (scope async): a function to be called when the update completes;
- * must not be NULL
+ * must not be %NULL
  * @user_data: (closure): caller-specific data to be passed to @callback
  *
  * Request the connection's secrets.
@@ -428,6 +428,7 @@ init_get_settings_cb (DBusGProxy *proxy,
 	}
 
 	g_simple_async_result_complete (init_data->result);
+	g_object_unref (init_data->result);
 	g_slice_free (NMRemoteConnectionInitData, init_data);
 }
 
diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c
index 0e95ef0a..989528cb 100644
--- a/libnm-glib/nm-remote-settings.c
+++ b/libnm-glib/nm-remote-settings.c
@@ -178,7 +178,7 @@ add_connection_info_complete (NMRemoteSettings *self,
  *
  * Returns the %NMRemoteConnection representing the connection at @path.
  *
- * Returns: (transfer none): the remote connection object on success, or NULL if the object was
+ * Returns: (transfer none): the remote connection object on success, or %NULL if the object was
  *  not known
  **/
 NMRemoteConnection *
@@ -204,7 +204,7 @@ nm_remote_settings_get_connection_by_path (NMRemoteSettings *settings, const cha
  *
  * Returns the %NMRemoteConnection identified by @uuid.
  *
- * Returns: (transfer none): the remote connection object on success, or NULL if the object was
+ * Returns: (transfer none): the remote connection object on success, or %NULL if the object was
  *  not known
  **/
 NMRemoteConnection *
@@ -643,7 +643,7 @@ save_hostname_cb (DBusGProxy *proxy,
 /**
  * nm_remote_settings_save_hostname:
  * @settings: the %NMRemoteSettings
- * @hostname: the new persistent hostname to set, or NULL to clear any existing
+ * @hostname: the new persistent hostname to set, or %NULL to clear any existing
  *  persistent hostname
  * @callback: (scope async) (allow-none): callback to be called when the
  * hostname operation completes
diff --git a/libnm-glib/nm-secret-agent.c b/libnm-glib/nm-secret-agent.c
index bfa4fcfc..e7dcbbb5 100644
--- a/libnm-glib/nm-secret-agent.c
+++ b/libnm-glib/nm-secret-agent.c
@@ -681,7 +681,7 @@ auto_register_cb (gpointer user_data)
  * existing secrets without user interaction, or requesting entirely new
  * secrets from the user.
  *
- * VFunc: get_secrets
+ * Virtual: get_secrets
  */
 void
 nm_secret_agent_get_secrets (NMSecretAgent *self,
@@ -721,7 +721,7 @@ nm_secret_agent_get_secrets (NMSecretAgent *self,
  * Asyncronously ensure that all secrets inside @connection
  * are stored to disk.
  *
- * VFunc: save_secrets
+ * Virtual: save_secrets
  */
 void
 nm_secret_agent_save_secrets (NMSecretAgent *self,
@@ -752,7 +752,7 @@ nm_secret_agent_save_secrets (NMSecretAgent *self,
  * Asynchronously ask the agent to delete all saved secrets belonging to
  * @connection.
  *
- * VFunc: delete_secrets
+ * Virtual: delete_secrets
  */
 void
 nm_secret_agent_delete_secrets (NMSecretAgent *self,
diff --git a/libnm-glib/nm-secret-agent.h b/libnm-glib/nm-secret-agent.h
index dbc027c7..eabe9866 100644
--- a/libnm-glib/nm-secret-agent.h
+++ b/libnm-glib/nm-secret-agent.h
@@ -195,12 +195,12 @@ typedef struct {
 
 	/* 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',
+	 * this method, as the arguments will freed (except for 'self', 'callback',
 	 * and 'user_data' of course).  If the request is canceled, the callback
 	 * should still be called, but with the NM_SECRET_AGENT_ERROR_AGENT_CANCELED
 	 * error.
 	 */
-	void (*get_secrets) (NMSecretAgent *agent,
+	void (*get_secrets) (NMSecretAgent *self,
 	                     NMConnection *connection,
 	                     const char *connection_path,
 	                     const char *setting_name,
@@ -215,17 +215,17 @@ typedef struct {
 	 * call, sending the NM_SECRET_AGENT_ERROR/NM_SECRET_AGENT_ERROR_AGENT_CANCELED
 	 * error to that callback.
 	 */
-	void (*cancel_get_secrets) (NMSecretAgent *agent,
+	void (*cancel_get_secrets) (NMSecretAgent *self,
 	                            const char *connection_path,
 	                            const char *setting_name);
 
 	/* Called when the subclass should save the secrets contained in the
 	 * connection to backing storage.  Subclass must copy or reference any
 	 * arguments it may require after returning from this method, as the
-	 * arguments will freed (except for 'agent', 'callback', and 'user_data'
+	 * arguments will freed (except for 'self', 'callback', and 'user_data'
 	 * of course).
 	 */
-	void (*save_secrets) (NMSecretAgent *agent,
+	void (*save_secrets) (NMSecretAgent *self,
 	                      NMConnection *connection,
 	                      const char *connection_path,
 	                      NMSecretAgentSaveSecretsFunc callback,
@@ -234,10 +234,10 @@ typedef struct {
 	/* 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'
+	 * arguments will freed (except for 'self', 'callback', and 'user_data'
 	 * of course).
 	 */
-	void (*delete_secrets) (NMSecretAgent *agent,
+	void (*delete_secrets) (NMSecretAgent *self,
 	                        NMConnection *connection,
 	                        const char *connection_path,
 	                        NMSecretAgentDeleteSecretsFunc callback,
diff --git a/libnm-glib/tests/Makefile.in b/libnm-glib/tests/Makefile.in
index 636e81f2..ef9fb9b9 100644
--- a/libnm-glib/tests/Makefile.in
+++ b/libnm-glib/tests/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -54,7 +81,8 @@ host_triplet = @host@
 @ENABLE_TESTS_TRUE@noinst_PROGRAMS =  \
 @ENABLE_TESTS_TRUE@	test-remote-settings-client$(EXEEXT)
 subdir = libnm-glib/tests
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
@@ -88,6 +116,19 @@ am__DEPENDENCIES_1 =
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -100,20 +141,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(test_remote_settings_client_SOURCES)
 DIST_SOURCES = $(am__test_remote_settings_client_SOURCES_DIST)
 am__can_run_installinfo = \
@@ -121,6 +158,23 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -265,7 +319,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGCONFIG_PATH = @PKGCONFIG_PATH@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@@ -280,6 +333,8 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@
+SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@
 SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
 SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
 SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
@@ -430,6 +485,7 @@ clean-noinstPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
+
 test-remote-settings-client$(EXEEXT): $(test_remote_settings_client_OBJECTS) $(test_remote_settings_client_DEPENDENCIES) $(EXTRA_test_remote_settings_client_DEPENDENCIES) 
 	@rm -f test-remote-settings-client$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_remote_settings_client_OBJECTS) $(test_remote_settings_client_LDADD) $(LIBS)
@@ -483,26 +539,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -514,15 +559,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -531,6 +572,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -674,9 +730,9 @@ uninstall-am:
 
 .MAKE: check-am install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
-	clean-generic clean-libtool clean-noinstPROGRAMS ctags \
-	distclean distclean-compile distclean-generic \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \
+	clean-generic clean-libtool clean-noinstPROGRAMS cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
@@ -686,7 +742,7 @@ uninstall-am:
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am
+	tags tags-am uninstall uninstall-am
 
 
 @ENABLE_TESTS_TRUE@check-local: test-remote-settings-client
diff --git a/libnm-util/Makefile.in b/libnm-util/Makefile.in
index 3652377a..7fac11bd 100644
--- a/libnm-util/Makefile.in
+++ b/libnm-util/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,23 +17,51 @@
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -68,8 +95,9 @@ host_triplet = @host@
 @HAVE_INTROSPECTION_TRUE@am__append_13 = NetworkManager-1.0.gir
 @HAVE_INTROSPECTION_TRUE@am__append_14 = $(gir_DATA) $(typelib_DATA)
 subdir = libnm-util
-DIST_COMMON = $(libnm_util_include_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/libnm-util.pc.in COPYING
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(srcdir)/libnm-util.pc.in $(top_srcdir)/build-aux/depcomp \
+	$(libnm_util_include_HEADERS) COPYING
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
@@ -174,6 +202,7 @@ libnm_util_la_OBJECTS = $(am_libnm_util_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libnm_util_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(libnm_util_la_LDFLAGS) $(LDFLAGS) -o $@
@@ -186,6 +215,18 @@ am__libtest_crypto_la_SOURCES_DIST = crypto.c crypto_gnutls.c \
 am_libtest_crypto_la_OBJECTS = libtest_crypto_la-crypto.lo \
 	$(am__objects_5) $(am__objects_6)
 libtest_crypto_la_OBJECTS = $(am_libtest_crypto_la_OBJECTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -198,30 +239,27 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(libnm_util_la_SOURCES) $(libtest_crypto_la_SOURCES)
 DIST_SOURCES = $(am__libnm_util_la_SOURCES_DIST) \
 	$(am__libtest_crypto_la_SOURCES_DIST)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -231,9 +269,29 @@ DATA = $(gir_DATA) $(pkgconfig_DATA) $(typelib_DATA)
 HEADERS = $(libnm_util_include_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -404,7 +462,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGCONFIG_PATH = @PKGCONFIG_PATH@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@@ -419,6 +476,8 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@
+SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@
 SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
 SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
 SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
@@ -651,6 +710,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 libnm-util.pc: $(top_builddir)/config.status $(srcdir)/libnm-util.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
@@ -677,23 +737,29 @@ uninstall-libLTLIBRARIES:
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(lib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(noinst_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 libnm-util.la: $(libnm_util_la_OBJECTS) $(libnm_util_la_DEPENDENCIES) $(EXTRA_libnm_util_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libnm_util_la_LINK) -rpath $(libdir) $(libnm_util_la_OBJECTS) $(libnm_util_la_LIBADD) $(LIBS)
+
 libtest-crypto.la: $(libtest_crypto_la_OBJECTS) $(libtest_crypto_la_DEPENDENCIES) $(EXTRA_libtest_crypto_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(LINK)  $(libtest_crypto_la_OBJECTS) $(libtest_crypto_la_LIBADD) $(LIBS)
 
@@ -1080,22 +1146,25 @@ uninstall-libnm_util_includeHEADERS:
 	dir='$(DESTDIR)$(libnm_util_includedir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -1110,57 +1179,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -1176,12 +1200,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -1193,15 +1212,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -1210,6 +1225,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -1388,29 +1418,27 @@ uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \
 	uninstall-libnm_util_includeHEADERS uninstall-pkgconfigDATA \
 	uninstall-typelibDATA
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
-	check-am ctags-recursive install install-am install-strip \
-	tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am check-local clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
-	ctags ctags-recursive distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-girDATA install-html \
-	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-libnm_util_includeHEADERS \
-	install-man install-pdf install-pdf-am install-pkgconfigDATA \
-	install-ps install-ps-am install-strip install-typelibDATA \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-girDATA uninstall-libLTLIBRARIES \
-	uninstall-libnm_util_includeHEADERS uninstall-pkgconfigDATA \
-	uninstall-typelibDATA
+.MAKE: $(am__recursive_targets) all check check-am install install-am \
+	install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am check-local clean clean-generic clean-libLTLIBRARIES \
+	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-girDATA install-html install-html-am \
+	install-info install-info-am install-libLTLIBRARIES \
+	install-libnm_util_includeHEADERS install-man install-pdf \
+	install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
+	install-strip install-typelibDATA installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-girDATA \
+	uninstall-libLTLIBRARIES uninstall-libnm_util_includeHEADERS \
+	uninstall-pkgconfigDATA uninstall-typelibDATA
 
 include $(GLIB_MAKEFILE)
 
diff --git a/libnm-util/crypto.c b/libnm-util/crypto.c
index 949ee812..0cad7f60 100644
--- a/libnm-util/crypto.c
+++ b/libnm-util/crypto.c
@@ -238,19 +238,25 @@ parse_old_openssl_key_file (const GByteArray *contents,
 		             _("Could not decode private key."));
 		goto parse_error;
 	}
+	g_string_free (str, TRUE);
 
 	if (lines)
 		g_strfreev (lines);
 
 	bindata = g_byte_array_sized_new (tmp_len);
 	g_byte_array_append (bindata, tmp, tmp_len);
+	g_free (tmp);
+
 	*out_iv = iv;
 	*out_cipher = cipher;
 	return bindata;
 
 parse_error:
+	g_free (tmp);
 	g_free (cipher);
 	g_free (iv);
+	if (str)
+		g_string_free (str, TRUE);
 	if (lines)
 		g_strfreev (lines);
 	return NULL;
diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c
index 47a9ec09..15b1685f 100644
--- a/libnm-util/nm-connection.c
+++ b/libnm-util/nm-connection.c
@@ -285,7 +285,7 @@ nm_connection_lookup_setting_type_by_quark (GQuark error_quark)
  *
  * Create a new #NMSetting object of the desired type, given a setting name.
  *
- * Returns: (transfer full): the new setting object, or NULL if the setting name was unknown
+ * Returns: (transfer full): the new setting object, or %NULL if the setting name was unknown
  **/
 NMSetting *
 nm_connection_create_setting (const char *name)
@@ -361,7 +361,7 @@ nm_connection_remove_setting (NMConnection *connection, GType setting_type)
  * Gets the #NMSetting with the given #GType, if one has been previously added
  * to the #NMConnection.
  *
- * Returns: (transfer none): the #NMSetting, or NULL if no setting of that type was previously
+ * Returns: (transfer none): the #NMSetting, or %NULL if no setting of that type was previously
  * added to the #NMConnection
  **/
 NMSetting *
@@ -382,7 +382,7 @@ nm_connection_get_setting (NMConnection *connection, GType setting_type)
  * Gets the #NMSetting with the given name, if one has been previously added
  * the the #NMConnection.
  *
- * Returns: (transfer none): the #NMSetting, or NULL if no setting with that name was previously
+ * Returns: (transfer none): the #NMSetting, or %NULL if no setting with that name was previously
  * added to the #NMConnection
  **/
 NMSetting *
@@ -821,12 +821,12 @@ setting_priority_compare (gconstpointer a, gconstpointer b)
 /**
  * nm_connection_need_secrets:
  * @connection: the #NMConnection
- * @hints: (out callee-allocates) (element-type utf8) (allow-none) (transfer full):
- *   the address of a pointer to a #GPtrArray, initialized to NULL, which on
+ * @hints: (out) (element-type utf8) (allow-none) (transfer container):
+ *   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()
+ *   and must free the array itself with g_ptr_array_free(), but not free its
+ *   elements
  *
  * 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
@@ -1112,9 +1112,9 @@ nm_connection_get_path (NMConnection *connection)
  * Returns the name of the virtual kernel interface which the connection
  * needs to use if specified in the settings. This function abstracts all
  * connection types which require this functionality. For all other
- * connection types, this function will return NULL.
+ * connection types, this function will return %NULL.
  *
- * Returns: Name of the kernel interface or NULL
+ * Returns: Name of the kernel interface or %NULL
  */
 const char *
 nm_connection_get_virtual_iface_name (NMConnection *connection)
@@ -1152,7 +1152,7 @@ nm_connection_new (void)
  * nm_connection_to_hash() for a description of the expected hash table.
  *
  * Returns: the new #NMConnection object, populated with settings created
- * from the values in the hash table, or NULL if the connection failed to
+ * from the values in the hash table, or %NULL if the connection failed to
  * validate
  **/
 NMConnection *
@@ -1257,7 +1257,7 @@ nm_connection_get_id (NMConnection *connection)
  *
  * A shortcut to return any #NMSetting8021x the connection might contain.
  *
- * Returns: (transfer none): an #NMSetting8021x if the connection contains one, otherwise NULL
+ * Returns: (transfer none): an #NMSetting8021x if the connection contains one, otherwise %NULL
  **/
 NMSetting8021x *
 nm_connection_get_setting_802_1x (NMConnection *connection)
@@ -1274,7 +1274,7 @@ nm_connection_get_setting_802_1x (NMConnection *connection)
  *
  * A shortcut to return any #NMSettingBluetooth the connection might contain.
  *
- * Returns: (transfer none): an #NMSettingBluetooth if the connection contains one, otherwise NULL
+ * Returns: (transfer none): an #NMSettingBluetooth if the connection contains one, otherwise %NULL
  **/
 NMSettingBluetooth *
 nm_connection_get_setting_bluetooth (NMConnection *connection)
@@ -1291,7 +1291,7 @@ nm_connection_get_setting_bluetooth (NMConnection *connection)
  *
  * A shortcut to return any #NMSettingBond the connection might contain.
  *
- * Returns: (transfer none): an #NMSettingBond if the connection contains one, otherwise NULL
+ * Returns: (transfer none): an #NMSettingBond if the connection contains one, otherwise %NULL
  **/
 NMSettingBond *
 nm_connection_get_setting_bond (NMConnection *connection)
@@ -1308,7 +1308,7 @@ nm_connection_get_setting_bond (NMConnection *connection)
  *
  * A shortcut to return any #NMSettingBridge the connection might contain.
  *
- * Returns: (transfer none): an #NMSettingBridge if the connection contains one, otherwise NULL
+ * Returns: (transfer none): an #NMSettingBridge if the connection contains one, otherwise %NULL
  **/
 NMSettingBridge *
 nm_connection_get_setting_bridge (NMConnection *connection)
@@ -1325,7 +1325,7 @@ nm_connection_get_setting_bridge (NMConnection *connection)
  *
  * A shortcut to return any #NMSettingCdma the connection might contain.
  *
- * Returns: (transfer none): an #NMSettingCdma if the connection contains one, otherwise NULL
+ * Returns: (transfer none): an #NMSettingCdma if the connection contains one, otherwise %NULL
  **/
 NMSettingCdma *
 nm_connection_get_setting_cdma (NMConnection *connection)
@@ -1342,7 +1342,7 @@ nm_connection_get_setting_cdma (NMConnection *connection)
  *
  * A shortcut to return any #NMSettingConnection the connection might contain.
  *
- * Returns: (transfer none): an #NMSettingConnection if the connection contains one, otherwise NULL
+ * Returns: (transfer none): an #NMSettingConnection if the connection contains one, otherwise %NULL
  **/
 NMSettingConnection *
 nm_connection_get_setting_connection (NMConnection *connection)
@@ -1359,7 +1359,7 @@ nm_connection_get_setting_connection (NMConnection *connection)
  *
  * A shortcut to return any #NMSettingGsm the connection might contain.
  *
- * Returns: (transfer none): an #NMSettingGsm if the connection contains one, otherwise NULL
+ * Returns: (transfer none): an #NMSettingGsm if the connection contains one, otherwise %NULL
  **/
 NMSettingGsm *
 nm_connection_get_setting_gsm (NMConnection *connection)
@@ -1376,7 +1376,7 @@ nm_connection_get_setting_gsm (NMConnection *connection)
  *
  * A shortcut to return any #NMSettingInfiniband the connection might contain.
  *
- * Returns: (transfer none): an #NMSettingInfiniband if the connection contains one, otherwise NULL
+ * Returns: (transfer none): an #NMSettingInfiniband if the connection contains one, otherwise %NULL
  **/
 NMSettingInfiniband *
 nm_connection_get_setting_infiniband (NMConnection *connection)
@@ -1393,7 +1393,7 @@ nm_connection_get_setting_infiniband (NMConnection *connection)
  *
  * A shortcut to return any #NMSettingIP4Config the connection might contain.
  *
- * Returns: (transfer none): an #NMSettingIP4Config if the connection contains one, otherwise NULL
+ * Returns: (transfer none): an #NMSettingIP4Config if the connection contains one, otherwise %NULL
  **/
 NMSettingIP4Config *
 nm_connection_get_setting_ip4_config (NMConnection *connection)
@@ -1410,7 +1410,7 @@ nm_connection_get_setting_ip4_config (NMConnection *connection)
  *
  * A shortcut to return any #NMSettingIP6Config the connection might contain.
  *
- * Returns: (transfer none): an #NMSettingIP6Config if the connection contains one, otherwise NULL
+ * Returns: (transfer none): an #NMSettingIP6Config if the connection contains one, otherwise %NULL
  **/
 NMSettingIP6Config *
 nm_connection_get_setting_ip6_config (NMConnection *connection)
@@ -1427,7 +1427,7 @@ nm_connection_get_setting_ip6_config (NMConnection *connection)
  *
  * A shortcut to return any #NMSettingOlpcMesh the connection might contain.
  *
- * Returns: (transfer none): an #NMSettingOlpcMesh if the connection contains one, otherwise NULL
+ * Returns: (transfer none): an #NMSettingOlpcMesh if the connection contains one, otherwise %NULL
  **/
 NMSettingOlpcMesh *
 nm_connection_get_setting_olpc_mesh (NMConnection *connection)
@@ -1444,7 +1444,7 @@ nm_connection_get_setting_olpc_mesh (NMConnection *connection)
  *
  * A shortcut to return any #NMSettingPPP the connection might contain.
  *
- * Returns: (transfer none): an #NMSettingPPP if the connection contains one, otherwise NULL
+ * Returns: (transfer none): an #NMSettingPPP if the connection contains one, otherwise %NULL
  **/
 NMSettingPPP *
 nm_connection_get_setting_ppp (NMConnection *connection)
@@ -1461,7 +1461,7 @@ nm_connection_get_setting_ppp (NMConnection *connection)
  *
  * A shortcut to return any #NMSettingPPPOE the connection might contain.
  *
- * Returns: (transfer none): an #NMSettingPPPOE if the connection contains one, otherwise NULL
+ * Returns: (transfer none): an #NMSettingPPPOE if the connection contains one, otherwise %NULL
  **/
 NMSettingPPPOE *
 nm_connection_get_setting_pppoe (NMConnection *connection)
@@ -1478,7 +1478,7 @@ nm_connection_get_setting_pppoe (NMConnection *connection)
  *
  * A shortcut to return any #NMSettingSerial the connection might contain.
  *
- * Returns: (transfer none): an #NMSettingSerial if the connection contains one, otherwise NULL
+ * Returns: (transfer none): an #NMSettingSerial if the connection contains one, otherwise %NULL
  **/
 NMSettingSerial *
 nm_connection_get_setting_serial (NMConnection *connection)
@@ -1495,7 +1495,7 @@ nm_connection_get_setting_serial (NMConnection *connection)
  *
  * A shortcut to return any #NMSettingVPN the connection might contain.
  *
- * Returns: (transfer none): an #NMSettingVPN if the connection contains one, otherwise NULL
+ * Returns: (transfer none): an #NMSettingVPN if the connection contains one, otherwise %NULL
  **/
 NMSettingVPN *
 nm_connection_get_setting_vpn (NMConnection *connection)
@@ -1512,7 +1512,7 @@ nm_connection_get_setting_vpn (NMConnection *connection)
  *
  * A shortcut to return any #NMSettingWimax the connection might contain.
  *
- * Returns: (transfer none): an #NMSettingWimax if the connection contains one, otherwise NULL
+ * Returns: (transfer none): an #NMSettingWimax if the connection contains one, otherwise %NULL
  **/
 NMSettingWimax *
 nm_connection_get_setting_wimax (NMConnection *connection)
@@ -1529,7 +1529,7 @@ nm_connection_get_setting_wimax (NMConnection *connection)
  *
  * A shortcut to return any #NMSettingWired the connection might contain.
  *
- * Returns: (transfer none): an #NMSettingWired if the connection contains one, otherwise NULL
+ * Returns: (transfer none): an #NMSettingWired if the connection contains one, otherwise %NULL
  **/
 NMSettingWired *
 nm_connection_get_setting_wired (NMConnection *connection)
@@ -1546,7 +1546,7 @@ nm_connection_get_setting_wired (NMConnection *connection)
  *
  * A shortcut to return any #NMSettingAdsl the connection might contain.
  *
- * Returns: (transfer none): an #NMSettingAdsl if the connection contains one, otherwise NULL
+ * Returns: (transfer none): an #NMSettingAdsl if the connection contains one, otherwise %NULL
  **/
 NMSettingAdsl *
 nm_connection_get_setting_adsl (NMConnection *connection)
@@ -1563,7 +1563,7 @@ nm_connection_get_setting_adsl (NMConnection *connection)
  *
  * A shortcut to return any #NMSettingWireless the connection might contain.
  *
- * Returns: (transfer none): an #NMSettingWireless if the connection contains one, otherwise NULL
+ * Returns: (transfer none): an #NMSettingWireless if the connection contains one, otherwise %NULL
  **/
 NMSettingWireless *
 nm_connection_get_setting_wireless (NMConnection *connection)
@@ -1580,7 +1580,7 @@ nm_connection_get_setting_wireless (NMConnection *connection)
  *
  * A shortcut to return any #NMSettingWirelessSecurity the connection might contain.
  *
- * Returns: (transfer none): an #NMSettingWirelessSecurity if the connection contains one, otherwise NULL
+ * Returns: (transfer none): an #NMSettingWirelessSecurity if the connection contains one, otherwise %NULL
  **/
 NMSettingWirelessSecurity *
 nm_connection_get_setting_wireless_security (NMConnection *connection)
@@ -1597,7 +1597,7 @@ nm_connection_get_setting_wireless_security (NMConnection *connection)
  *
  * A shortcut to return any #NMSettingBridgePort the connection might contain.
  *
- * Returns: (transfer none): an #NMSettingBridgePort if the connection contains one, otherwise NULL
+ * Returns: (transfer none): an #NMSettingBridgePort if the connection contains one, otherwise %NULL
  **/
 NMSettingBridgePort *
 nm_connection_get_setting_bridge_port (NMConnection *connection)
@@ -1614,7 +1614,7 @@ nm_connection_get_setting_bridge_port (NMConnection *connection)
  *
  * A shortcut to return any #NMSettingVlan the connection might contain.
  *
- * Returns: (transfer none): an #NMSettingVlan if the connection contains one, otherwise NULL
+ * Returns: (transfer none): an #NMSettingVlan if the connection contains one, otherwise %NULL
  **/
 NMSettingVlan *
 nm_connection_get_setting_vlan (NMConnection *connection)
diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c
index 32eda889..0a9a2104 100644
--- a/libnm-util/nm-setting-8021x.c
+++ b/libnm-util/nm-setting-8021x.c
@@ -488,7 +488,7 @@ path_to_scheme_value (const char *path)
  * @cert_path: when @scheme is set to either %NM_SETTING_802_1X_CK_SCHEME_PATH
  *   or %NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the 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
+ *   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
@@ -538,29 +538,23 @@ nm_setting_802_1x_set_ca_cert (NMSetting8021x *self,
 	data = crypto_load_and_verify_certificate (cert_path, &format, error);
 	if (data) {
 		/* wpa_supplicant can only use raw x509 CA certs */
-		switch (format) {
-		case NM_CRYPTO_FILE_FORMAT_X509:
+		if (format == NM_CRYPTO_FILE_FORMAT_X509) {
 			if (out_format)
 				*out_format = NM_SETTING_802_1X_CK_FORMAT_X509;
-			break;
-		default:
-			g_byte_array_free (data, TRUE);
-			data = NULL;
-			g_set_error (error,
-			             NM_SETTING_802_1X_ERROR,
-			             NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
-			             NM_SETTING_802_1X_CA_CERT);
-			break;
-		}
 
-		if (data) {
 			if (scheme == NM_SETTING_802_1X_CK_SCHEME_BLOB)
-				priv->ca_cert = data;
+				priv->ca_cert = g_byte_array_ref (data);
 			else if (scheme == NM_SETTING_802_1X_CK_SCHEME_PATH)
 				priv->ca_cert = path_to_scheme_value (cert_path);
 			else
 				g_assert_not_reached ();
+		} else {
+			g_set_error (error,
+			             NM_SETTING_802_1X_ERROR,
+			             NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
+			             NM_SETTING_802_1X_CA_CERT);
 		}
+		g_byte_array_unref (data);
 	}
 
 	return priv->ca_cert != NULL;
@@ -572,7 +566,7 @@ nm_setting_802_1x_set_ca_cert (NMSetting8021x *self,
  *
  * Returns: the #NMSetting8021x: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
+ * server certificate, or %NULL no subject verification is to be
  * performed.
  **/
 const char *
@@ -765,7 +759,7 @@ nm_setting_802_1x_get_client_cert_path (NMSetting8021x *setting)
  * @cert_path: when @scheme is set to either %NM_SETTING_802_1X_CK_SCHEME_PATH
  *   or %NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the client
  *   certificate file (PEM, DER, or PKCS#12 format).  The path must be UTF-8
- *   encoded; use g_filename_to_utf8() to convert if needed.  Passing NULL with
+ *   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
@@ -818,19 +812,20 @@ nm_setting_802_1x_set_client_cert (NMSetting8021x *self,
 
 	data = crypto_load_and_verify_certificate (cert_path, &format, error);
 	if (data) {
-		/* wpa_supplicant can only use raw x509 CA certs */
+		gboolean valid = FALSE;
+
 		switch (format) {
 		case NM_CRYPTO_FILE_FORMAT_X509:
 			if (out_format)
 				*out_format = NM_SETTING_802_1X_CK_FORMAT_X509;
+			valid = TRUE;
 			break;
 		case NM_CRYPTO_FILE_FORMAT_PKCS12:
 			if (out_format)
 				*out_format = NM_SETTING_802_1X_CK_FORMAT_PKCS12;
+			valid = TRUE;
 			break;
 		default:
-			g_byte_array_free (data, TRUE);
-			data = NULL;
 			g_set_error (error,
 			             NM_SETTING_802_1X_ERROR,
 			             NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
@@ -838,14 +833,15 @@ nm_setting_802_1x_set_client_cert (NMSetting8021x *self,
 			break;
 		}
 
-		if (data) {
+		if (valid) {
 			if (scheme == NM_SETTING_802_1X_CK_SCHEME_BLOB)
-				priv->client_cert = data;
+				priv->client_cert = g_byte_array_ref (data);
 			else if (scheme == NM_SETTING_802_1X_CK_SCHEME_PATH)
 				priv->client_cert = path_to_scheme_value (cert_path);
 			else
 				g_assert_not_reached ();
 		}
+		g_byte_array_unref (data);
 	}
 
 	return priv->client_cert != NULL;
@@ -857,7 +853,7 @@ nm_setting_802_1x_set_client_cert (NMSetting8021x *self,
  *
  * Returns: the "phase 1" PEAP version to be used when authenticating with
  *  EAP-PEAP as contained in the #NMSetting8021x:phase1-peapver property.  Valid
- *  values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).
+ *  values are %NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).
  **/
 const char *
 nm_setting_802_1x_get_phase1_peapver (NMSetting8021x *setting)
@@ -873,7 +869,7 @@ nm_setting_802_1x_get_phase1_peapver (NMSetting8021x *setting)
  *
  * Returns: whether the "phase 1" PEAP label is new-style or old-style, to be
  *  used when authenticating with EAP-PEAP, as contained in the
- *  #NMSetting8021x:phase1-peaplabel property.  Valid values are NULL (unset),
+ *  #NMSetting8021x: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.
  **/
@@ -1028,7 +1024,7 @@ nm_setting_802_1x_get_phase2_ca_cert_path (NMSetting8021x *setting)
  * @cert_path: when @scheme is set to either %NM_SETTING_802_1X_CK_SCHEME_PATH
  *   or %NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" 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
+ *   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
@@ -1078,29 +1074,23 @@ nm_setting_802_1x_set_phase2_ca_cert (NMSetting8021x *self,
 	data = crypto_load_and_verify_certificate (cert_path, &format, error);
 	if (data) {
 		/* wpa_supplicant can only use raw x509 CA certs */
-		switch (format) {
-		case NM_CRYPTO_FILE_FORMAT_X509:
+		if (format == NM_CRYPTO_FILE_FORMAT_X509) {
 			if (out_format)
 				*out_format = NM_SETTING_802_1X_CK_FORMAT_X509;
-			break;
-		default:
-			g_byte_array_free (data, TRUE);
-			data = NULL;
-			g_set_error (error,
-			             NM_SETTING_802_1X_ERROR,
-			             NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
-			             NM_SETTING_802_1X_PHASE2_CA_CERT);
-			break;
-		}
 
-		if (data) {
 			if (scheme == NM_SETTING_802_1X_CK_SCHEME_BLOB)
-				priv->phase2_ca_cert = data;
+				priv->phase2_ca_cert = g_byte_array_ref (data);
 			else if (scheme == NM_SETTING_802_1X_CK_SCHEME_PATH)
 				priv->phase2_ca_cert = path_to_scheme_value (cert_path);
 			else
 				g_assert_not_reached ();
+		} else {
+			g_set_error (error,
+			             NM_SETTING_802_1X_ERROR,
+			             NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
+			             NM_SETTING_802_1X_PHASE2_CA_CERT);
 		}
+		g_byte_array_unref (data);
 	}
 
 	return priv->phase2_ca_cert != NULL;
@@ -1112,7 +1102,7 @@ nm_setting_802_1x_set_phase2_ca_cert (NMSetting8021x *self,
  *
  * Returns: the #NMSetting8021x: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
+ * authentication server certificate, or %NULL no subject verification
  * is to be performed.
  **/
 const char *
@@ -1309,7 +1299,7 @@ nm_setting_802_1x_get_phase2_client_cert_path (NMSetting8021x *setting)
  * @cert_path: when @scheme is set to either %NM_SETTING_802_1X_CK_SCHEME_PATH
  *   or %NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" client
  *   certificate file (PEM, DER, or PKCS#12 format).  The path must be UTF-8
- *   encoded; use g_filename_to_utf8() to convert if needed.  Passing NULL with
+ *   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
@@ -1362,19 +1352,21 @@ nm_setting_802_1x_set_phase2_client_cert (NMSetting8021x *self,
 
 	data = crypto_load_and_verify_certificate (cert_path, &format, error);
 	if (data) {
+		gboolean valid = FALSE;
+
 		/* wpa_supplicant can only use raw x509 CA certs */
 		switch (format) {
 		case NM_CRYPTO_FILE_FORMAT_X509:
 			if (out_format)
 				*out_format = NM_SETTING_802_1X_CK_FORMAT_X509;
+			valid = TRUE;
 			break;
 		case NM_CRYPTO_FILE_FORMAT_PKCS12:
 			if (out_format)
 				*out_format = NM_SETTING_802_1X_CK_FORMAT_PKCS12;
+			valid = TRUE;
 			break;
 		default:
-			g_byte_array_free (data, TRUE);
-			data = NULL;
 			g_set_error (error,
 			             NM_SETTING_802_1X_ERROR,
 			             NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
@@ -1382,14 +1374,15 @@ nm_setting_802_1x_set_phase2_client_cert (NMSetting8021x *self,
 			break;
 		}
 
-		if (data) {
+		if (valid) {
 			if (scheme == NM_SETTING_802_1X_CK_SCHEME_BLOB)
-				priv->phase2_client_cert = data;
+				priv->phase2_client_cert = g_byte_array_ref (data);
 			else if (scheme == NM_SETTING_802_1X_CK_SCHEME_PATH)
 				priv->phase2_client_cert = path_to_scheme_value (cert_path);
 			else
 				g_assert_not_reached ();
 		}
+		g_byte_array_unref (data);
 	}
 
 	return priv->phase2_client_cert != NULL;
@@ -1579,7 +1572,7 @@ file_to_byte_array (const char *filename)
  * @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 PKCS#12 format).  The path must be UTF-8 encoded; use
- *   g_filename_to_utf8() to convert if needed.  Passing NULL with any @scheme
+ *   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,
@@ -1872,7 +1865,7 @@ nm_setting_802_1x_get_phase2_private_key_path (NMSetting8021x *setting)
  * @key_path: when @scheme is set to either %NM_SETTING_802_1X_CK_SCHEME_PATH or
  *   %NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" private
  *   key file (PEM, DER, or PKCS#12 format).  The path must be UTF-8 encoded;
- *   use g_filename_to_utf8() to convert if needed.  Passing NULL with any
+ *   use g_filename_to_utf8() to convert if needed.  Passing %NULL with any
  *   @scheme clears the private key.
  * @password: password used to decrypt the private key, or %NULL if the password
  *   is unknown.  If the password is given but fails to decrypt the private key,
@@ -2580,6 +2573,7 @@ finalize (GObject *object)
 	g_free (priv->password);
 	if (priv->password_raw)
 		g_byte_array_free (priv->password_raw, TRUE);
+	g_free (priv->pin);
 
 	nm_utils_slist_free (priv->eap, g_free);
 	nm_utils_slist_free (priv->altsubject_matches, g_free);
@@ -2791,6 +2785,13 @@ set_property (GObject *object, guint prop_id,
 	case PROP_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS:
 		priv->phase2_private_key_password_flags = g_value_get_uint (value);
 		break;
+	case PROP_PIN:
+		g_free (priv->pin);
+		priv->pin = g_value_dup_string (value);
+		break;
+	case PROP_PIN_FLAGS:
+		priv->pin_flags = g_value_get_uint (value);
+		break;
 	case PROP_SYSTEM_CA_CERTS:
 		priv->system_ca_certs = g_value_get_boolean (value);
 		break;
@@ -2895,6 +2896,12 @@ get_property (GObject *object, guint prop_id,
 	case PROP_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS:
 		g_value_set_uint (value, priv->phase2_private_key_password_flags);
 		break;
+	case PROP_PIN:
+		g_value_set_string (value, priv->pin);
+		break;
+	case PROP_PIN_FLAGS:
+		g_value_set_uint (value, priv->pin_flags);
+		break;
 	case PROP_SYSTEM_CA_CERTS:
 		g_value_set_boolean (value, priv->system_ca_certs);
 		break;
@@ -3354,7 +3361,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
 		(object_class, PROP_PASSWORD,
 		 g_param_spec_string (NM_SETTING_802_1X_PASSWORD,
 						  "Password",
-						  "Password used for EAP authentication methods.",
+						  "UTF-8 encoded password used for EAP authentication methods.",
 						  NULL,
 						  G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_SECRET));
 
@@ -3384,7 +3391,12 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
 		(object_class, PROP_PASSWORD_RAW,
 		 _nm_param_spec_specialized (NM_SETTING_802_1X_PASSWORD_RAW,
 		                             "Password byte array",
-		                             "Password used for EAP authentication methods as a byte array",
+		                             "Password used for EAP authentication "
+		                             "methods, given as a byte array to allow "
+		                             "passwords in other encodings than UTF-8 "
+		                             "to be used.  If both 'password' and "
+		                             "'password-raw' are given, 'password' is "
+		                             "preferred.",
 		                             DBUS_TYPE_G_UCHAR_ARRAY,
 		                             G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_SECRET));
 
@@ -3558,6 +3570,33 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
 		                    NM_SETTING_SECRET_FLAG_NONE,
 		                    G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
 
+	/**
+	 * NMSetting8021x:pin:
+	 *
+	 * PIN used for EAP authentication methods.
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_PIN,
+		 g_param_spec_string (NM_SETTING_802_1X_PIN,
+		                      "PIN",
+		                      "PIN used for EAP authentication methods.",
+		                      NULL,
+		                      G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_SECRET));
+
+	/**
+	 * NMSetting8021x:pin-flags:
+	 *
+	 * Flags indicating how to handle #NMSetting8021x:pin:.
+	 **/
+	g_object_class_install_property (object_class, PROP_PIN_FLAGS,
+		 g_param_spec_uint (NM_SETTING_802_1X_PIN_FLAGS,
+		                    "PIN Flags",
+		                    "Flags indicating how to handle the 802.1x PIN.",
+		                    NM_SETTING_SECRET_FLAG_NONE,
+		                    NM_SETTING_SECRET_FLAGS_ALL,
+		                    NM_SETTING_SECRET_FLAG_NONE,
+		                    G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
+
 	/**
 	 * NMSetting8021x:system-ca-certs:
 	 *
diff --git a/libnm-util/nm-setting-bluetooth.c b/libnm-util/nm-setting-bluetooth.c
index 161b3715..e81e5333 100644
--- a/libnm-util/nm-setting-bluetooth.c
+++ b/libnm-util/nm-setting-bluetooth.c
@@ -216,6 +216,7 @@ finalize (GObject *object)
 
 	if (priv->bdaddr)
 		g_byte_array_free (priv->bdaddr, TRUE);
+	g_free (priv->type);
 
 	G_OBJECT_CLASS (nm_setting_bluetooth_parent_class)->finalize (object);
 }
diff --git a/libnm-util/nm-setting-bond.c b/libnm-util/nm-setting-bond.c
index a3dbd766..e8e7b639 100644
--- a/libnm-util/nm-setting-bond.c
+++ b/libnm-util/nm-setting-bond.c
@@ -257,11 +257,16 @@ gboolean nm_setting_bond_add_option (NMSettingBond *setting,
 
 	g_hash_table_insert (priv->options, g_strdup (name), g_strdup (value));
 
-	if (!strcmp (name, NM_SETTING_BOND_OPTION_MIIMON)) {
+	if (   !strcmp (name, NM_SETTING_BOND_OPTION_MIIMON)
+	    && strcmp (value, "0") != 0) {
 		g_hash_table_remove (priv->options, NM_SETTING_BOND_OPTION_ARP_INTERVAL);
 		g_hash_table_remove (priv->options, NM_SETTING_BOND_OPTION_ARP_IP_TARGET);
-	} else if (!strcmp (name, NM_SETTING_BOND_OPTION_ARP_INTERVAL))
+	} else if (   !strcmp (name, NM_SETTING_BOND_OPTION_ARP_INTERVAL)
+	           && strcmp (value, "0") != 0) {
 		g_hash_table_remove (priv->options, NM_SETTING_BOND_OPTION_MIIMON);
+		g_hash_table_remove (priv->options, NM_SETTING_BOND_OPTION_DOWNDELAY);
+		g_hash_table_remove (priv->options, NM_SETTING_BOND_OPTION_UPDELAY);
+	}
 
 	return TRUE;
 }
@@ -293,7 +298,7 @@ nm_setting_bond_remove_option (NMSettingBond *setting,
  *
  * Returns a list of valid bond options.
  *
- * Returns: (transfer none): a NULL-terminated array of strings of valid bond options.
+ * Returns: (transfer none): a %NULL-terminated array of strings of valid bond options.
  **/
 const char **
 nm_setting_bond_get_valid_options  (NMSettingBond *setting)
diff --git a/libnm-util/nm-setting-connection.c b/libnm-util/nm-setting-connection.c
index d4de1253..4d990643 100644
--- a/libnm-util/nm-setting-connection.c
+++ b/libnm-util/nm-setting-connection.c
@@ -276,7 +276,7 @@ nm_setting_connection_get_num_permissions (NMSettingConnection *setting)
  * @out_ptype: on return, the permission type (at this time, always "user")
  * @out_pitem: on return, the permission item (formatted accoring to @ptype, see
  * #NMSettingConnection:permissions for more detail
- * @out_detail: on return, the permission detail (at this time, always NULL)
+ * @out_detail: on return, the permission detail (at this time, always %NULL)
  *
  * Retrieve one of the entries of the #NMSettingConnection:permissions property
  * of this setting.
@@ -773,6 +773,7 @@ finalize (GObject *object)
 	g_free (priv->master);
 	g_free (priv->slave_type);
 	nm_utils_slist_free (priv->permissions, (GDestroyNotify) permission_free);
+	nm_utils_slist_free (priv->secondaries, g_free);
 
 	G_OBJECT_CLASS (nm_setting_connection_parent_class)->finalize (object);
 }
diff --git a/libnm-util/nm-setting-gsm.c b/libnm-util/nm-setting-gsm.c
index ea83c73c..41e080ba 100644
--- a/libnm-util/nm-setting-gsm.c
+++ b/libnm-util/nm-setting-gsm.c
@@ -684,20 +684,20 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class)
 		                    "not all devices allow frequency band control.",
 		                    NM_SETTING_GSM_BAND_UNKNOWN,
 		                    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_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_BAND_ANY,
 		                    G_PARAM_READWRITE | G_PARAM_CONSTRUCT | NM_SETTING_PARAM_SERIALIZE));
 
diff --git a/libnm-util/nm-setting-ip4-config.c b/libnm-util/nm-setting-ip4-config.c
index c6becefb..90534c12 100644
--- a/libnm-util/nm-setting-ip4-config.c
+++ b/libnm-util/nm-setting-ip4-config.c
@@ -678,6 +678,15 @@ nm_setting_ip4_config_get_may_fail (NMSettingIP4Config *setting)
 	return NM_SETTING_IP4_CONFIG_GET_PRIVATE (setting)->may_fail;
 }
 
+static gint
+find_setting_by_name (gconstpointer a, gconstpointer b)
+{
+	NMSetting *setting = NM_SETTING (a);
+	const char *str = (const char *) b;
+
+	return strcmp (nm_setting_get_name (setting), str);
+}
+
 static gboolean
 verify (NMSetting *setting, GSList *all_settings, GError **error)
 {
@@ -737,6 +746,22 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
 		return FALSE;
 	}
 
+	/* Disabled method is not allowed when IPv6 is set to 'ignore' */
+	if (!strcmp (priv->method, NM_SETTING_IP4_CONFIG_METHOD_DISABLED)) {
+		GSList *list = g_slist_find_custom (all_settings, NM_SETTING_IP6_CONFIG_SETTING_NAME, find_setting_by_name);
+		if (list) {
+			NMSettingIP6Config *s_ip6 = g_slist_nth_data (list, 0);
+			if (   s_ip6
+			    && !g_strcmp0 (nm_setting_ip6_config_get_method (s_ip6), NM_SETTING_IP6_CONFIG_METHOD_IGNORE)) {
+				g_set_error (error,
+				             NM_SETTING_IP4_CONFIG_ERROR,
+				             NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY,
+				             NM_SETTING_IP4_CONFIG_METHOD);
+				return FALSE;
+			}
+		}
+	}
+
 	if (priv->dhcp_client_id && !strlen (priv->dhcp_client_id)) {
 		g_set_error (error,
 		             NM_SETTING_IP4_CONFIG_ERROR,
@@ -818,6 +843,8 @@ finalize (GObject *object)
 	NMSettingIP4ConfigPrivate *priv = NM_SETTING_IP4_CONFIG_GET_PRIVATE (self);
 
 	g_free (priv->method);
+	g_free (priv->dhcp_hostname);
+	g_free (priv->dhcp_client_id);
 
 	g_array_free (priv->dns, TRUE);
 
diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c
index 81857134..b83e3dab 100644
--- a/libnm-util/nm-setting-ip6-config.c
+++ b/libnm-util/nm-setting-ip6-config.c
@@ -662,6 +662,15 @@ nm_setting_ip6_config_get_ip6_privacy (NMSettingIP6Config *setting)
 	return NM_SETTING_IP6_CONFIG_GET_PRIVATE (setting)->ip6_privacy;
 }
 
+static gint
+find_setting_by_name (gconstpointer a, gconstpointer b)
+{
+	NMSetting *setting = NM_SETTING (a);
+	const char *str = (const char *) b;
+
+	return strcmp (nm_setting_get_name (setting), str);
+}
+
 static gboolean
 verify (NMSetting *setting, GSList *all_settings, GError **error)
 {
@@ -720,6 +729,22 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
 		return FALSE;
 	}
 
+	/* Method 'ignore' is not allowed when IPv4 is set to 'disabled' */
+	if (!strcmp (priv->method, NM_SETTING_IP6_CONFIG_METHOD_IGNORE)) {
+		GSList *list = g_slist_find_custom (all_settings, NM_SETTING_IP4_CONFIG_SETTING_NAME, find_setting_by_name);
+		if (list) {
+			NMSettingIP4Config *s_ip4 = g_slist_nth_data (list, 0);
+			if (   s_ip4
+			    && !g_strcmp0 (nm_setting_ip4_config_get_method (s_ip4), NM_SETTING_IP4_CONFIG_METHOD_DISABLED)) {
+				g_set_error (error,
+				             NM_SETTING_IP6_CONFIG_ERROR,
+				             NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY,
+				             NM_SETTING_IP6_CONFIG_METHOD);
+				return FALSE;
+			}
+		}
+	}
+
 	if (priv->dhcp_hostname && !strlen (priv->dhcp_hostname)) {
 		g_set_error (error,
 		             NM_SETTING_IP6_CONFIG_ERROR,
@@ -744,6 +769,8 @@ finalize (GObject *object)
 	NMSettingIP6ConfigPrivate *priv = NM_SETTING_IP6_CONFIG_GET_PRIVATE (object);
 
 	g_free (priv->method);
+	g_free (priv->dhcp_hostname);
+
 	g_slist_free (priv->dns);
 
 	nm_utils_slist_free (priv->dns_search, g_free);
@@ -762,7 +789,10 @@ set_property (GObject *object, guint prop_id,
 	switch (prop_id) {
 	case PROP_METHOD:
 		g_free (priv->method);
-		priv->method = g_value_dup_string (value);
+		if (g_strcmp0 (g_value_get_string (value), "disabled") == 0)
+			priv->method = g_strdup (NM_SETTING_IP6_CONFIG_METHOD_IGNORE);
+		else
+			priv->method = g_value_dup_string (value);
 		break;
 	case PROP_DNS:
 		nm_utils_slist_free (priv->dns, g_free);
@@ -876,7 +906,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
 	 * based hardware.  If 'link-local' is specified, then an IPv6 link-local
 	 * address will be assigned to the interface.  If 'manual' is specified,
 	 * static IP addressing is used and at least one IP address must be given
-	 * in the 'addresses' property.  If 'ignored' is specified, IPv6
+	 * in the 'addresses' property.  If 'ignore' is specified, IPv6
 	 * configuration is not done. This property must be set.  NOTE: the 'shared'
 	 * method are not yet supported.
 	 **/
@@ -894,7 +924,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
 						      "address will be assigned to the interface.  If "
 						      "'manual' is specified, static IP addressing is "
 						      "used and at least one IP address must be given in "
-						      " the 'addresses' property.  If 'ignored' is "
+						      " the 'addresses' property.  If 'ignore' is "
 						      "specified, IPv6 configuration is not done. This "
 						      "property must be set.  NOTE: the 'shared' method"
 						      "is not yet supported.",
diff --git a/libnm-util/nm-setting-pppoe.c b/libnm-util/nm-setting-pppoe.c
index 2785dfa9..f37ec000 100644
--- a/libnm-util/nm-setting-pppoe.c
+++ b/libnm-util/nm-setting-pppoe.c
@@ -257,6 +257,18 @@ get_property (GObject *object, guint prop_id,
 	}
 }
 
+static void
+finalize (GObject *object)
+{
+	NMSettingPPPOEPrivate *priv = NM_SETTING_PPPOE_GET_PRIVATE (object);
+
+	g_free (priv->username);
+	g_free (priv->password);
+	g_free (priv->service);
+
+	G_OBJECT_CLASS (nm_setting_pppoe_parent_class)->finalize (object);
+}
+
 static void
 nm_setting_pppoe_class_init (NMSettingPPPOEClass *setting_class)
 {
@@ -268,6 +280,7 @@ nm_setting_pppoe_class_init (NMSettingPPPOEClass *setting_class)
 	/* virtual methods */
 	object_class->set_property = set_property;
 	object_class->get_property = get_property;
+	object_class->finalize     = finalize;
 	parent_class->verify       = verify;
 	parent_class->need_secrets = need_secrets;
 
diff --git a/libnm-util/nm-setting-vlan.c b/libnm-util/nm-setting-vlan.c
index df7f0702..da1cb7f8 100644
--- a/libnm-util/nm-setting-vlan.c
+++ b/libnm-util/nm-setting-vlan.c
@@ -407,8 +407,8 @@ nm_setting_vlan_remove_priority (NMSettingVlan *setting,
 	list = get_map (setting, map);
 	g_return_if_fail (idx < g_slist_length (list));
 
-	item = g_slist_nth_data (list, idx);
-	priority_map_free ((PriorityMap *) item);
+	item = g_slist_nth (list, idx);
+	priority_map_free ((PriorityMap *) (item->data));
 	set_map (setting, map, g_slist_delete_link (list, item));
 }
 
@@ -636,6 +636,8 @@ finalize (GObject *object)
 	g_free (priv->parent);
 	nm_utils_slist_free (priv->ingress_priority_map, g_free);
 	nm_utils_slist_free (priv->egress_priority_map, g_free);
+
+	G_OBJECT_CLASS (nm_setting_vlan_parent_class)->finalize (object);
 }
 
 static void
diff --git a/libnm-util/nm-setting-wired.c b/libnm-util/nm-setting-wired.c
index f44d6df6..6d1afc67 100644
--- a/libnm-util/nm-setting-wired.c
+++ b/libnm-util/nm-setting-wired.c
@@ -349,7 +349,7 @@ nm_setting_wired_get_s390_option (NMSettingWired *setting,
  * Returns the value associated with the s390-specific option specified by
  * @key, if it exists.
  *
- * Returns: the value, or NULL if the key/value pair was never added to the
+ * Returns: the value, or %NULL if the key/value pair was never added to the
  * setting; the value is owned by the setting and must not be modified
  **/
 const char *
@@ -537,6 +537,11 @@ finalize (GObject *object)
 
 	nm_utils_slist_free (priv->mac_address_blacklist, g_free);
 
+	if (priv->s390_subchannels) {
+		g_ptr_array_foreach (priv->s390_subchannels, (GFunc) g_free, NULL);
+		g_ptr_array_free (priv->s390_subchannels, TRUE);
+	}
+
 	G_OBJECT_CLASS (nm_setting_wired_parent_class)->finalize (object);
 }
 
diff --git a/libnm-util/nm-setting-wireless-security.c b/libnm-util/nm-setting-wireless-security.c
index 5dec266f..9e4becca 100644
--- a/libnm-util/nm-setting-wireless-security.c
+++ b/libnm-util/nm-setting-wireless-security.c
@@ -1301,38 +1301,44 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting
 	/**
 	 * NMSettingWirelessSecurity:pairwise:
 	 *
-	 * If specified, will only connect to WPA networks that provide the
-	 * specified pairwise encryption capabilities.  Each element may be one of
-	 * 'wep40', 'wep104', 'tkip', or 'ccmp'.
+	 * A list of pairwise encryption algorithms which prevents connections to
+	 * Wi-Fi networks that do not utilize one of the algorithms in the list.  For
+	 * maximum compatibility leave this property empty.  Each list element may
+	 * be one of 'wep40', 'wep104', 'tkip', or 'ccmp'.
 	 **/
 	g_object_class_install_property
 		(object_class, PROP_PAIRWISE,
 		 _nm_param_spec_specialized (NM_SETTING_WIRELESS_SECURITY_PAIRWISE,
-							   "Pairwise",
-							   "If specified, will only connect to WPA networks "
-							   "that provide the specified pairwise encryption "
-							   "capabilities.  Each element may be one of 'wep40', "
-							   "'wep104', 'tkip', or 'ccmp'.",
-							   DBUS_TYPE_G_LIST_OF_STRING,
-							   G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
+		                       "Pairwise",
+		                       "A list of pairwise encryption algorithms which "
+		                       "prevents connections to Wi-Fi networks that do "
+		                       "not utilize one of the algorithms in the list. "
+		                       "For maximum compatibility leave this property "
+		                       "empty.  Each list element may be one of 'wep40', "
+		                       "'wep104', 'tkip' or 'ccmp'.",
+		                       DBUS_TYPE_G_LIST_OF_STRING,
+		                       G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
 
 	/**
 	 * NMSettingWirelessSecurity:group:
 	 *
-	 * If specified, will only connect to WPA networks that provide the
-	 * specified group/multicast encryption capabilities.  Each element may be
-	 * one of 'wep40', 'wep104', 'tkip', or 'ccmp'.
+	 * A list of group/broadcast encryption algorithms which prevents
+	 * connections to Wi-Fi networks that do not utilize one of the algorithms
+	 * in the list.  For maximum compatibility leave this property empty.  Each
+	 * list element may be one of 'wep40', 'wep104', 'tkip', or 'ccmp'.
 	 **/
 	g_object_class_install_property
 		(object_class, PROP_GROUP,
 		 _nm_param_spec_specialized (NM_SETTING_WIRELESS_SECURITY_GROUP,
-							   "Group",
-							   "If specified, will only connect to WPA networks "
-							   "that provide the specified group/multicast "
-							   "encryption capabilities.  Each element may be "
-							   "one of 'wep40', 'wep104', 'tkip', or 'ccmp'.",
-							   DBUS_TYPE_G_LIST_OF_STRING,
-							   G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
+		                       "Group",
+		                       "A list of group/broadcast encryption algorithms "
+		                       "which prevents connections to Wi-Fi networks "
+		                       "that do not utilize one of the algorithms in "
+		                       "the list.  For maximum compatibility leave this "
+		                       "property empty.  Each list element may be one "
+		                       " of 'wep40', 'wep104', 'tkip', or 'ccmp'.",
+		                       DBUS_TYPE_G_LIST_OF_STRING,
+		                       G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
 
 	/**
 	 * NMSettingWirelessSecurity:leap-username:
diff --git a/libnm-util/nm-setting-wireless.c b/libnm-util/nm-setting-wireless.c
index ace22cbc..1cd07c92 100644
--- a/libnm-util/nm-setting-wireless.c
+++ b/libnm-util/nm-setting-wireless.c
@@ -1048,19 +1048,19 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class)
 	/**
 	 * NMSettingWireless:mac-address-blacklist:
 	 *
-	 * If specified, this connection will never apply to the WiFi device
-	 * whose permanent MAC address matches an address in the list.  Each
-	 * MAC address is in the standard hex-digits-and-colons notation.
-	 * (00:11:22:33:44:55).
+	 * A list of permanent MAC addresses of Wi-Fi devices to which this
+	 * connection should never apply.  Each MAC address should be given in the
+	 * standard hex-digits-and-colons notation (eg '00:11:22:33:44:55').
 	 **/
 	g_object_class_install_property
 		(object_class, PROP_MAC_ADDRESS_BLACKLIST,
 		 _nm_param_spec_specialized (NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST,
 		                             "MAC Address Blacklist",
-		                             "If specified, this connection will never apply to "
-		                             "the WiFi device whose permanent MAC address matches "
-		                             "an address in the list.  Each MAC address is in the "
-		                             "standard hex-digits-and-colons notation (00:11:22:33:44:55).",
+		                             "A list of permanent MAC addresses of Wi-Fi "
+		                             "devices to which this connection should "
+		                             "never apply.  Each MAC address should be "
+		                             "given in the standard hex-digits-and-colons "
+		                             "notation (eg '00:11:22:33:44:55').",
 		                             DBUS_TYPE_G_LIST_OF_STRING,
 		                             G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE));
 
diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c
index 21dab0ba..f80c72b8 100644
--- a/libnm-util/nm-setting.c
+++ b/libnm-util/nm-setting.c
@@ -200,7 +200,7 @@ one_property_cb (gpointer key, gpointer val, gpointer user_data)
  * property names and value types.
  * 
  * Returns: a new #NMSetting object populated with the properties from the
- * hash table, or NULL on failure
+ * hash table, or %NULL on failure
  **/
 NMSetting *
 nm_setting_new_from_hash (GType setting_type, GHashTable *hash)
@@ -690,10 +690,10 @@ nm_setting_clear_secrets_with_flags (NMSetting *setting,
  * guide to what secrets may be required, because in some circumstances, there
  * is no way to conclusively determine exactly which secrets are needed.
  *
- * Returns: (transfer full) (element-type utf8): a #GPtrArray containing the property names of secrets of the
- * #NMSetting which may be required; the caller owns the array
- * and must free the each array element with g_free(), as well as the array
- * itself with g_ptr_array_free()
+ * Returns: (transfer container) (element-type utf8): a #GPtrArray containing
+ * the property names of secrets of the #NMSetting which may be required; the
+ * caller owns the array and must free it with g_ptr_array_free(), but must not
+ * free the elements.
  **/
 GPtrArray *
 nm_setting_need_secrets (NMSetting *setting)
@@ -754,8 +754,8 @@ update_one_secret (NMSetting *setting, const char *key, GValue *value, GError **
  * Update the setting's secrets, given a hash table of secrets intended for that
  * setting (deserialized from D-Bus for example).
  * 
- * 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
+ * Returns: %TRUE if the secrets were successfully updated, %FALSE on failure to
+ * update one or more of the secrets.
  **/
 gboolean
 nm_setting_update_secrets (NMSetting *setting, GHashTable *secrets, GError **error)
diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c
index f955afbf..16adb2ba 100644
--- a/libnm-util/nm-utils.c
+++ b/libnm-util/nm-utils.c
@@ -292,7 +292,7 @@ nm_utils_deinit (void)
  *
  * Returns: (transfer full): an allocated string containing a UTF-8
  * representation of the SSID, which must be freed by the caller using g_free().
- * Returns NULL on errors.
+ * Returns %NULL on errors.
  **/
 char *
 nm_utils_ssid_to_utf8 (const GByteArray *ssid)
@@ -1432,7 +1432,8 @@ nm_utils_wep_key_valid (const char *key, NMWepKeyType wep_type)
 		return FALSE;
 
 	keylen = strlen (key);
-	if (wep_type == NM_WEP_KEY_TYPE_KEY || NM_WEP_KEY_TYPE_UNKNOWN) {
+	if (   wep_type == NM_WEP_KEY_TYPE_KEY
+	    || wep_type == NM_WEP_KEY_TYPE_UNKNOWN) {
 		if (keylen == 10 || keylen == 26) {
 			/* Hex key */
 			for (i = 0; i < keylen; i++) {
@@ -2211,7 +2212,7 @@ utils_bin2hexstr (const char *bytes, int len, int final_len)
  * nm_utils_rsa_key_encrypt:
  * @data: RSA private key data to be encrypted
  * @in_password: (allow-none): existing password to use, if any
- * @out_password: (out) (allow-none): if @in_password was NULL, a random password will be generated
+ * @out_password: (out) (allow-none): if @in_password was %NULL, a random password will be generated
  *  and returned in this argument
  * @error: detailed error information on return, if an error occurred
  *
@@ -2758,5 +2759,12 @@ nm_utils_is_uuid (const char *str)
 		p++;
 	}
 
-	return (num_dashes == 4) && (p - str == 36);
+	if ((num_dashes == 4) && (p - str == 36))
+		return TRUE;
+
+	/* Backwards compat for older configurations */
+	if ((num_dashes == 0) && (p - str == 40))
+		return TRUE;
+
+	return FALSE;
 }
diff --git a/libnm-util/tests/Makefile.in b/libnm-util/tests/Makefile.in
index ee830f75..622f3d21 100644
--- a/libnm-util/tests/Makefile.in
+++ b/libnm-util/tests/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -56,7 +83,8 @@ host_triplet = @host@
 @ENABLE_TESTS_TRUE@	test-general$(EXEEXT) \
 @ENABLE_TESTS_TRUE@	test-setting-8021x$(EXEEXT)
 subdir = libnm-util/tests
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
@@ -88,6 +116,7 @@ am__DEPENDENCIES_1 =
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 am__test_general_SOURCES_DIST = test-general.c
 @ENABLE_TESTS_TRUE@am_test_general_OBJECTS =  \
 @ENABLE_TESTS_TRUE@	test_general-test-general.$(OBJEXT)
@@ -114,6 +143,18 @@ test_settings_defaults_OBJECTS = $(am_test_settings_defaults_OBJECTS)
 @ENABLE_TESTS_TRUE@test_settings_defaults_DEPENDENCIES =  \
 @ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-util/libnm-util.la \
 @ENABLE_TESTS_TRUE@	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -126,20 +167,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(test_crypto_SOURCES) $(test_general_SOURCES) \
 	$(test_secrets_SOURCES) $(test_setting_8021x_SOURCES) \
 	$(test_settings_defaults_SOURCES)
@@ -148,13 +185,14 @@ DIST_SOURCES = $(am__test_crypto_SOURCES_DIST) \
 	$(am__test_secrets_SOURCES_DIST) \
 	$(am__test_setting_8021x_SOURCES_DIST) \
 	$(am__test_settings_defaults_SOURCES_DIST)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -162,9 +200,29 @@ am__can_run_installinfo = \
   esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = certs
@@ -335,7 +393,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGCONFIG_PATH = @PKGCONFIG_PATH@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@@ -350,6 +407,8 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@
+SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@
 SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
 SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
 SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
@@ -541,18 +600,23 @@ clean-noinstPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
+
 test-crypto$(EXEEXT): $(test_crypto_OBJECTS) $(test_crypto_DEPENDENCIES) $(EXTRA_test_crypto_DEPENDENCIES) 
 	@rm -f test-crypto$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_crypto_OBJECTS) $(test_crypto_LDADD) $(LIBS)
+
 test-general$(EXEEXT): $(test_general_OBJECTS) $(test_general_DEPENDENCIES) $(EXTRA_test_general_DEPENDENCIES) 
 	@rm -f test-general$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_general_OBJECTS) $(test_general_LDADD) $(LIBS)
+
 test-secrets$(EXEEXT): $(test_secrets_OBJECTS) $(test_secrets_DEPENDENCIES) $(EXTRA_test_secrets_DEPENDENCIES) 
 	@rm -f test-secrets$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_secrets_OBJECTS) $(test_secrets_LDADD) $(LIBS)
+
 test-setting-8021x$(EXEEXT): $(test_setting_8021x_OBJECTS) $(test_setting_8021x_DEPENDENCIES) $(EXTRA_test_setting_8021x_DEPENDENCIES) 
 	@rm -f test-setting-8021x$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_setting_8021x_OBJECTS) $(test_setting_8021x_LDADD) $(LIBS)
+
 test-settings-defaults$(EXEEXT): $(test_settings_defaults_OBJECTS) $(test_settings_defaults_DEPENDENCIES) $(EXTRA_test_settings_defaults_DEPENDENCIES) 
 	@rm -f test-settings-defaults$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_settings_defaults_OBJECTS) $(test_settings_defaults_LDADD) $(LIBS)
@@ -667,22 +731,25 @@ clean-libtool:
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -697,57 +764,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -763,12 +785,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -780,15 +797,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -797,6 +810,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -964,23 +992,22 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \
-	ctags-recursive install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am check-local clean clean-generic \
-	clean-libtool clean-noinstPROGRAMS ctags ctags-recursive \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am
+.MAKE: $(am__recursive_targets) check-am install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am check-local clean clean-generic clean-libtool \
+	clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am
 
 
 @ENABLE_TESTS_TRUE@check-local: test-settings-defaults test-crypto test-secrets
diff --git a/libnm-util/tests/certs/Makefile.in b/libnm-util/tests/certs/Makefile.in
index 9b8f9d3d..0b70b59c 100644
--- a/libnm-util/tests/certs/Makefile.in
+++ b/libnm-util/tests/certs/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -24,23 +23,51 @@
 #	-name "test-pkcs12" \
 #	-out test-cert.p12
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -60,7 +87,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = libnm-util/tests/certs
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
@@ -80,12 +107,18 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -93,6 +126,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -235,7 +269,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGCONFIG_PATH = @PKGCONFIG_PATH@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@@ -250,6 +283,8 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@
+SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@
 SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
 SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
 SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
@@ -385,11 +420,11 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -525,15 +560,16 @@ uninstall-am:
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/libnm-util/tests/test-general.c b/libnm-util/tests/test-general.c
index 7c5399df..9576f05a 100644
--- a/libnm-util/tests/test-general.c
+++ b/libnm-util/tests/test-general.c
@@ -1362,6 +1362,29 @@ test_hwaddr_aton_malformed (void)
 	g_assert (nm_utils_hwaddr_aton ("0:1a:2B:3:a@%%", ARPHRD_ETHER, buf) == NULL);
 }
 
+static void
+test_setting_old_uuid (void)
+{
+	GError *error = NULL;
+	NMSetting *setting;
+	gboolean success;
+
+	/* NetworkManager-0.9.4.0 generated 40-character UUIDs with no dashes,
+	 * like this one. Test that we maintain compatibility. */
+	const char *uuid = "f43bec2cdd60e5da381ebb1eb1fa39f3cc52660c";
+
+	setting = nm_setting_connection_new ();
+	g_object_set (G_OBJECT (setting),
+	              NM_SETTING_CONNECTION_ID, "uuidtest",
+	              NM_SETTING_CONNECTION_UUID, uuid,
+	              NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME,
+	              NULL);
+
+	success = nm_setting_verify (NM_SETTING (setting), NULL, &error);
+	g_assert_no_error (error);
+	g_assert (success == TRUE);
+}
+
 int main (int argc, char **argv)
 {
 	GError *error = NULL;
@@ -1393,6 +1416,7 @@ int main (int argc, char **argv)
 	test_setting_compare_vpn_secrets (NM_SETTING_SECRET_FLAG_NOT_SAVED, NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS, TRUE);
 	test_setting_compare_vpn_secrets (NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS, TRUE);
 	test_setting_compare_vpn_secrets (NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_COMPARE_FLAG_EXACT, FALSE);
+	test_setting_old_uuid ();
 
 	test_connection_to_hash_setting_name ();
 	test_setting_connection_permissions_helpers ();
diff --git a/ltmain.sh b/ltmain.sh
deleted file mode 100755
index aa5624c8..00000000
--- a/ltmain.sh
+++ /dev/null
@@ -1,9636 +0,0 @@
-
-# libtool (GNU libtool) 2.4
-# Written by Gordon Matzigkeit , 1996
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-# This is free software; see the source for copying conditions.  There is NO
-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# GNU Libtool is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html,
-# or obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# Usage: $progname [OPTION]... [MODE-ARG]...
-#
-# Provide generalized library-building support services.
-#
-#       --config             show all configuration variables
-#       --debug              enable verbose shell tracing
-#   -n, --dry-run            display commands without modifying any files
-#       --features           display basic configuration information and exit
-#       --mode=MODE          use operation mode MODE
-#       --preserve-dup-deps  don't remove duplicate dependency libraries
-#       --quiet, --silent    don't print informational messages
-#       --no-quiet, --no-silent
-#                            print informational messages (default)
-#       --tag=TAG            use configuration variables from tag TAG
-#   -v, --verbose            print more informational messages than default
-#       --no-verbose         don't print the extra informational messages
-#       --version            print version information
-#   -h, --help, --help-all   print short, long, or detailed help message
-#
-# MODE must be one of the following:
-#
-#         clean              remove files from the build directory
-#         compile            compile a source file into a libtool object
-#         execute            automatically set library path, then run a program
-#         finish             complete the installation of libtool libraries
-#         install            install libraries or executables
-#         link               create a library or an executable
-#         uninstall          remove libraries from an installed directory
-#
-# MODE-ARGS vary depending on the MODE.  When passed as first option,
-# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
-# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
-#
-# When reporting a bug, please describe a test case to reproduce it and
-# include the following information:
-#
-#         host-triplet:	$host
-#         shell:		$SHELL
-#         compiler:		$LTCC
-#         compiler flags:		$LTCFLAGS
-#         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4
-#         automake:	$automake_version
-#         autoconf:	$autoconf_version
-#
-# Report bugs to .
-# GNU libtool home page: .
-# General help using GNU software: .
-
-PROGRAM=libtool
-PACKAGE=libtool
-VERSION=2.4
-TIMESTAMP=""
-package_revision=1.3293
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-}
-
-# NLS nuisances: We save the old values to restore during execute mode.
-lt_user_locale=
-lt_safe_locale=
-for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-do
-  eval "if test \"\${$lt_var+set}\" = set; then
-          save_$lt_var=\$$lt_var
-          $lt_var=C
-	  export $lt_var
-	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
-	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
-	fi"
-done
-LC_ALL=C
-LANGUAGE=C
-export LANGUAGE LC_ALL
-
-$lt_unset CDPATH
-
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
-
-
-
-: ${CP="cp -f"}
-test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
-: ${LN_S="ln -s"}
-: ${MAKE="make"}
-: ${MKDIR="mkdir"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-: ${SED="/bin/sed"}
-: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-: ${Xsed="$SED -e 1s/^X//"}
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
-EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
-
-exit_status=$EXIT_SUCCESS
-
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS=" 	$lt_nl"
-
-dirname="s,/[^/]*$,,"
-basename="s,^.*/,,"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
-    if test "X$func_dirname_result" = "X${1}"; then
-      func_dirname_result="${3}"
-    else
-      func_dirname_result="$func_dirname_result${2}"
-    fi
-} # func_dirname may be replaced by extended shell implementation
-
-
-# func_basename file
-func_basename ()
-{
-    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-} # func_basename may be replaced by extended shell implementation
-
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-    # Extract subdirectory from the argument.
-    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
-    if test "X$func_dirname_result" = "X${1}"; then
-      func_dirname_result="${3}"
-    else
-      func_dirname_result="$func_dirname_result${2}"
-    fi
-    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
-} # func_dirname_and_basename may be replaced by extended shell implementation
-
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-    case ${2} in
-      .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-      *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-    esac
-} # func_stripname may be replaced by extended shell implementation
-
-
-# These SED scripts presuppose an absolute path with a trailing slash.
-pathcar='s,^/\([^/]*\).*$,\1,'
-pathcdr='s,^/[^/]*,,'
-removedotparts=':dotsl
-		s@/\./@/@g
-		t dotsl
-		s,/\.$,/,'
-collapseslashes='s@/\{1,\}@/@g'
-finalslash='s,/*$,/,'
-
-# func_normal_abspath PATH
-# Remove doubled-up and trailing slashes, "." path components,
-# and cancel out any ".." path components in PATH after making
-# it an absolute path.
-#             value returned in "$func_normal_abspath_result"
-func_normal_abspath ()
-{
-  # Start from root dir and reassemble the path.
-  func_normal_abspath_result=
-  func_normal_abspath_tpath=$1
-  func_normal_abspath_altnamespace=
-  case $func_normal_abspath_tpath in
-    "")
-      # Empty path, that just means $cwd.
-      func_stripname '' '/' "`pwd`"
-      func_normal_abspath_result=$func_stripname_result
-      return
-    ;;
-    # The next three entries are used to spot a run of precisely
-    # two leading slashes without using negated character classes;
-    # we take advantage of case's first-match behaviour.
-    ///*)
-      # Unusual form of absolute path, do nothing.
-    ;;
-    //*)
-      # Not necessarily an ordinary path; POSIX reserves leading '//'
-      # and for example Cygwin uses it to access remote file shares
-      # over CIFS/SMB, so we conserve a leading double slash if found.
-      func_normal_abspath_altnamespace=/
-    ;;
-    /*)
-      # Absolute path, do nothing.
-    ;;
-    *)
-      # Relative path, prepend $cwd.
-      func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
-    ;;
-  esac
-  # Cancel out all the simple stuff to save iterations.  We also want
-  # the path to end with a slash for ease of parsing, so make sure
-  # there is one (and only one) here.
-  func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
-  while :; do
-    # Processed it all yet?
-    if test "$func_normal_abspath_tpath" = / ; then
-      # If we ascended to the root using ".." the result may be empty now.
-      if test -z "$func_normal_abspath_result" ; then
-        func_normal_abspath_result=/
-      fi
-      break
-    fi
-    func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$pathcar"`
-    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$pathcdr"`
-    # Figure out what to do with it
-    case $func_normal_abspath_tcomponent in
-      "")
-        # Trailing empty path component, ignore it.
-      ;;
-      ..)
-        # Parent dir; strip last assembled component from result.
-        func_dirname "$func_normal_abspath_result"
-        func_normal_abspath_result=$func_dirname_result
-      ;;
-      *)
-        # Actual path component, append it.
-        func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
-      ;;
-    esac
-  done
-  # Restore leading double-slash if one was found on entry.
-  func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
-}
-
-# func_relative_path SRCDIR DSTDIR
-# generates a relative path from SRCDIR to DSTDIR, with a trailing
-# slash if non-empty, suitable for immediately appending a filename
-# without needing to append a separator.
-#             value returned in "$func_relative_path_result"
-func_relative_path ()
-{
-  func_relative_path_result=
-  func_normal_abspath "$1"
-  func_relative_path_tlibdir=$func_normal_abspath_result
-  func_normal_abspath "$2"
-  func_relative_path_tbindir=$func_normal_abspath_result
-
-  # Ascend the tree starting from libdir
-  while :; do
-    # check if we have found a prefix of bindir
-    case $func_relative_path_tbindir in
-      $func_relative_path_tlibdir)
-        # found an exact match
-        func_relative_path_tcancelled=
-        break
-        ;;
-      $func_relative_path_tlibdir*)
-        # found a matching prefix
-        func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
-        func_relative_path_tcancelled=$func_stripname_result
-        if test -z "$func_relative_path_result"; then
-          func_relative_path_result=.
-        fi
-        break
-        ;;
-      *)
-        func_dirname $func_relative_path_tlibdir
-        func_relative_path_tlibdir=${func_dirname_result}
-        if test "x$func_relative_path_tlibdir" = x ; then
-          # Have to descend all the way to the root!
-          func_relative_path_result=../$func_relative_path_result
-          func_relative_path_tcancelled=$func_relative_path_tbindir
-          break
-        fi
-        func_relative_path_result=../$func_relative_path_result
-        ;;
-    esac
-  done
-
-  # Now calculate path; take care to avoid doubling-up slashes.
-  func_stripname '' '/' "$func_relative_path_result"
-  func_relative_path_result=$func_stripname_result
-  func_stripname '/' '/' "$func_relative_path_tcancelled"
-  if test "x$func_stripname_result" != x ; then
-    func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
-  fi
-
-  # Normalisation. If bindir is libdir, return empty string,
-  # else relative path ending with a slash; either way, target
-  # file name can be directly appended.
-  if test ! -z "$func_relative_path_result"; then
-    func_stripname './' '' "$func_relative_path_result/"
-    func_relative_path_result=$func_stripname_result
-  fi
-}
-
-# The name of this program:
-func_dirname_and_basename "$progpath"
-progname=$func_basename_result
-
-# Make sure we have an absolute path for reexecution:
-case $progpath in
-  [\\/]*|[A-Za-z]:\\*) ;;
-  *[\\/]*)
-     progdir=$func_dirname_result
-     progdir=`cd "$progdir" && pwd`
-     progpath="$progdir/$progname"
-     ;;
-  *)
-     save_IFS="$IFS"
-     IFS=:
-     for progdir in $PATH; do
-       IFS="$save_IFS"
-       test -x "$progdir/$progname" && break
-     done
-     IFS="$save_IFS"
-     test -n "$progdir" || progdir=`pwd`
-     progpath="$progdir/$progname"
-     ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution that turns a string into a regex matching for the
-# string literally.
-sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
-
-# Sed substitution that converts a w32 file name or path
-# which contains forward slashes, into one that contains
-# (escaped) backslashes.  A very naive implementation.
-lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-
-# Re-`\' parameter expansions in output of double_quote_subst that were
-# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
-# in input to double_quote_subst, that '$' was protected from expansion.
-# Since each input `\' is now two `\'s, look for any number of runs of
-# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
-bs='\\'
-bs2='\\\\'
-bs4='\\\\\\\\'
-dollar='\$'
-sed_double_backslash="\
-  s/$bs4/&\\
-/g
-  s/^$bs2$dollar/$bs&/
-  s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
-  s/\n//g"
-
-# Standard options:
-opt_dry_run=false
-opt_help=false
-opt_quiet=false
-opt_verbose=false
-opt_warning=:
-
-# func_echo arg...
-# Echo program name prefixed message, along with the current mode
-# name if it has been set yet.
-func_echo ()
-{
-    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
-}
-
-# func_verbose arg...
-# Echo program name prefixed message in verbose mode only.
-func_verbose ()
-{
-    $opt_verbose && func_echo ${1+"$@"}
-
-    # A bug in bash halts the script if the last line of a function
-    # fails when set -e is in force, so we need another command to
-    # work around that:
-    :
-}
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO "$*"
-}
-
-# func_error arg...
-# Echo program name prefixed message to standard error.
-func_error ()
-{
-    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
-}
-
-# func_warning arg...
-# Echo program name prefixed warning message to standard error.
-func_warning ()
-{
-    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
-
-    # bash bug again:
-    :
-}
-
-# func_fatal_error arg...
-# Echo program name prefixed message to standard error, and exit.
-func_fatal_error ()
-{
-    func_error ${1+"$@"}
-    exit $EXIT_FAILURE
-}
-
-# func_fatal_help arg...
-# Echo program name prefixed message to standard error, followed by
-# a help hint, and exit.
-func_fatal_help ()
-{
-    func_error ${1+"$@"}
-    func_fatal_error "$help"
-}
-help="Try \`$progname --help' for more information."  ## default
-
-
-# func_grep expression filename
-# Check whether EXPRESSION matches any line of FILENAME, without output.
-func_grep ()
-{
-    $GREP "$1" "$2" >/dev/null 2>&1
-}
-
-
-# func_mkdir_p directory-path
-# Make sure the entire path to DIRECTORY-PATH is available.
-func_mkdir_p ()
-{
-    my_directory_path="$1"
-    my_dir_list=
-
-    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
-
-      # Protect directory names starting with `-'
-      case $my_directory_path in
-        -*) my_directory_path="./$my_directory_path" ;;
-      esac
-
-      # While some portion of DIR does not yet exist...
-      while test ! -d "$my_directory_path"; do
-        # ...make a list in topmost first order.  Use a colon delimited
-	# list incase some portion of path contains whitespace.
-        my_dir_list="$my_directory_path:$my_dir_list"
-
-        # If the last portion added has no slash in it, the list is done
-        case $my_directory_path in */*) ;; *) break ;; esac
-
-        # ...otherwise throw away the child directory and loop
-        my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
-      done
-      my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
-
-      save_mkdir_p_IFS="$IFS"; IFS=':'
-      for my_dir in $my_dir_list; do
-	IFS="$save_mkdir_p_IFS"
-        # mkdir can fail with a `File exist' error if two processes
-        # try to create one of the directories concurrently.  Don't
-        # stop in that case!
-        $MKDIR "$my_dir" 2>/dev/null || :
-      done
-      IFS="$save_mkdir_p_IFS"
-
-      # Bail out if we (or some other process) failed to create a directory.
-      test -d "$my_directory_path" || \
-        func_fatal_error "Failed to create \`$1'"
-    fi
-}
-
-
-# func_mktempdir [string]
-# Make a temporary directory that won't clash with other running
-# libtool processes, and avoids race conditions if possible.  If
-# given, STRING is the basename for that directory.
-func_mktempdir ()
-{
-    my_template="${TMPDIR-/tmp}/${1-$progname}"
-
-    if test "$opt_dry_run" = ":"; then
-      # Return a directory name, but don't create it in dry-run mode
-      my_tmpdir="${my_template}-$$"
-    else
-
-      # If mktemp works, use that first and foremost
-      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
-
-      if test ! -d "$my_tmpdir"; then
-        # Failing that, at least try and use $RANDOM to avoid a race
-        my_tmpdir="${my_template}-${RANDOM-0}$$"
-
-        save_mktempdir_umask=`umask`
-        umask 0077
-        $MKDIR "$my_tmpdir"
-        umask $save_mktempdir_umask
-      fi
-
-      # If we're not in dry-run mode, bomb out on failure
-      test -d "$my_tmpdir" || \
-        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
-    fi
-
-    $ECHO "$my_tmpdir"
-}
-
-
-# func_quote_for_eval arg
-# Aesthetically quote ARG to be evaled later.
-# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
-# is double-quoted, suitable for a subsequent eval, whereas
-# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
-# which are still active within double quotes backslashified.
-func_quote_for_eval ()
-{
-    case $1 in
-      *[\\\`\"\$]*)
-	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
-      *)
-        func_quote_for_eval_unquoted_result="$1" ;;
-    esac
-
-    case $func_quote_for_eval_unquoted_result in
-      # Double-quote args containing shell metacharacters to delay
-      # word splitting, command substitution and and variable
-      # expansion for a subsequent eval.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
-        ;;
-      *)
-        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
-    esac
-}
-
-
-# func_quote_for_expand arg
-# Aesthetically quote ARG to be evaled later; same as above,
-# but do not quote variable references.
-func_quote_for_expand ()
-{
-    case $1 in
-      *[\\\`\"]*)
-	my_arg=`$ECHO "$1" | $SED \
-	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
-      *)
-        my_arg="$1" ;;
-    esac
-
-    case $my_arg in
-      # Double-quote args containing shell metacharacters to delay
-      # word splitting and command substitution for a subsequent eval.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-        my_arg="\"$my_arg\""
-        ;;
-    esac
-
-    func_quote_for_expand_result="$my_arg"
-}
-
-
-# func_show_eval cmd [fail_exp]
-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.
-func_show_eval ()
-{
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
-
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
-      eval "func_echo $func_quote_for_expand_result"
-    }
-
-    if ${opt_dry_run-false}; then :; else
-      eval "$my_cmd"
-      my_status=$?
-      if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
-      fi
-    fi
-}
-
-
-# func_show_eval_locale cmd [fail_exp]
-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.  Use the saved locale for evaluation.
-func_show_eval_locale ()
-{
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
-
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
-      eval "func_echo $func_quote_for_expand_result"
-    }
-
-    if ${opt_dry_run-false}; then :; else
-      eval "$lt_user_locale
-	    $my_cmd"
-      my_status=$?
-      eval "$lt_safe_locale"
-      if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
-      fi
-    fi
-}
-
-# func_tr_sh
-# Turn $1 into a string suitable for a shell variable name.
-# Result is stored in $func_tr_sh_result.  All characters
-# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
-# if $1 begins with a digit, a '_' is prepended as well.
-func_tr_sh ()
-{
-  case $1 in
-  [0-9]* | *[!a-zA-Z0-9_]*)
-    func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
-    ;;
-  * )
-    func_tr_sh_result=$1
-    ;;
-  esac
-}
-
-
-# func_version
-# Echo version message to standard output and exit.
-func_version ()
-{
-    $opt_debug
-
-    $SED -n '/(C)/!b go
-	:more
-	/\./!{
-	  N
-	  s/\n# / /
-	  b more
-	}
-	:go
-	/^# '$PROGRAM' (GNU /,/# warranty; / {
-        s/^# //
-	s/^# *$//
-        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
-        p
-     }' < "$progpath"
-     exit $?
-}
-
-# func_usage
-# Echo short help message to standard output and exit.
-func_usage ()
-{
-    $opt_debug
-
-    $SED -n '/^# Usage:/,/^#  *.*--help/ {
-        s/^# //
-	s/^# *$//
-	s/\$progname/'$progname'/
-	p
-    }' < "$progpath"
-    echo
-    $ECHO "run \`$progname --help | more' for full usage"
-    exit $?
-}
-
-# func_help [NOEXIT]
-# Echo long help message to standard output and exit,
-# unless 'noexit' is passed as argument.
-func_help ()
-{
-    $opt_debug
-
-    $SED -n '/^# Usage:/,/# Report bugs to/ {
-	:print
-        s/^# //
-	s/^# *$//
-	s*\$progname*'$progname'*
-	s*\$host*'"$host"'*
-	s*\$SHELL*'"$SHELL"'*
-	s*\$LTCC*'"$LTCC"'*
-	s*\$LTCFLAGS*'"$LTCFLAGS"'*
-	s*\$LD*'"$LD"'*
-	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
-	p
-	d
-     }
-     /^# .* home page:/b print
-     /^# General help using/b print
-     ' < "$progpath"
-    ret=$?
-    if test -z "$1"; then
-      exit $ret
-    fi
-}
-
-# func_missing_arg argname
-# Echo program name prefixed message to standard error and set global
-# exit_cmd.
-func_missing_arg ()
-{
-    $opt_debug
-
-    func_error "missing argument for $1."
-    exit_cmd=exit
-}
-
-
-# func_split_short_opt shortopt
-# Set func_split_short_opt_name and func_split_short_opt_arg shell
-# variables after splitting SHORTOPT after the 2nd character.
-func_split_short_opt ()
-{
-    my_sed_short_opt='1s/^\(..\).*$/\1/;q'
-    my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
-
-    func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
-    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
-} # func_split_short_opt may be replaced by extended shell implementation
-
-
-# func_split_long_opt longopt
-# Set func_split_long_opt_name and func_split_long_opt_arg shell
-# variables after splitting LONGOPT at the `=' sign.
-func_split_long_opt ()
-{
-    my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
-    my_sed_long_arg='1s/^--[^=]*=//'
-
-    func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
-    func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
-} # func_split_long_opt may be replaced by extended shell implementation
-
-exit_cmd=:
-
-
-
-
-
-magic="%%%MAGIC variable%%%"
-magic_exe="%%%MAGIC EXE variable%%%"
-
-# Global variables.
-nonopt=
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-    eval "${1}=\$${1}\${2}"
-} # func_append may be replaced by extended shell implementation
-
-# func_append_quoted var value
-# Quote VALUE and append to the end of shell variable VAR, separated
-# by a space.
-func_append_quoted ()
-{
-    func_quote_for_eval "${2}"
-    eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
-} # func_append_quoted may be replaced by extended shell implementation
-
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-    func_arith_result=`expr "${@}"`
-} # func_arith may be replaced by extended shell implementation
-
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-    func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
-} # func_len may be replaced by extended shell implementation
-
-
-# func_lo2o object
-func_lo2o ()
-{
-    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-} # func_lo2o may be replaced by extended shell implementation
-
-
-# func_xform libobj-or-source
-func_xform ()
-{
-    func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
-} # func_xform may be replaced by extended shell implementation
-
-
-# func_fatal_configuration arg...
-# Echo program name prefixed message to standard error, followed by
-# a configuration failure hint, and exit.
-func_fatal_configuration ()
-{
-    func_error ${1+"$@"}
-    func_error "See the $PACKAGE documentation for more information."
-    func_fatal_error "Fatal configuration error."
-}
-
-
-# func_config
-# Display the configuration for all the tags in this script.
-func_config ()
-{
-    re_begincf='^# ### BEGIN LIBTOOL'
-    re_endcf='^# ### END LIBTOOL'
-
-    # Default configuration.
-    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
-
-    # Now print the configurations for the tags.
-    for tagname in $taglist; do
-      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
-    done
-
-    exit $?
-}
-
-# func_features
-# Display the features supported by this script.
-func_features ()
-{
-    echo "host: $host"
-    if test "$build_libtool_libs" = yes; then
-      echo "enable shared libraries"
-    else
-      echo "disable shared libraries"
-    fi
-    if test "$build_old_libs" = yes; then
-      echo "enable static libraries"
-    else
-      echo "disable static libraries"
-    fi
-
-    exit $?
-}
-
-# func_enable_tag tagname
-# Verify that TAGNAME is valid, and either flag an error and exit, or
-# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
-# variable here.
-func_enable_tag ()
-{
-  # Global variable:
-  tagname="$1"
-
-  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
-  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
-  sed_extractcf="/$re_begincf/,/$re_endcf/p"
-
-  # Validate tagname.
-  case $tagname in
-    *[!-_A-Za-z0-9,/]*)
-      func_fatal_error "invalid tag name: $tagname"
-      ;;
-  esac
-
-  # Don't test for the "default" C tag, as we know it's
-  # there but not specially marked.
-  case $tagname in
-    CC) ;;
-    *)
-      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
-	taglist="$taglist $tagname"
-
-	# Evaluate the configuration.  Be careful to quote the path
-	# and the sed script, to avoid splitting on whitespace, but
-	# also don't use non-portable quotes within backquotes within
-	# quotes we have to do it in 2 steps:
-	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
-	eval "$extractedcf"
-      else
-	func_error "ignoring unknown tag $tagname"
-      fi
-      ;;
-  esac
-}
-
-# func_check_version_match
-# Ensure that we are using m4 macros, and libtool script from the same
-# release of libtool.
-func_check_version_match ()
-{
-  if test "$package_revision" != "$macro_revision"; then
-    if test "$VERSION" != "$macro_version"; then
-      if test -z "$macro_version"; then
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from an older release.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-      else
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-      fi
-    else
-      cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
-$progname: of $PACKAGE $VERSION and run autoconf again.
-_LT_EOF
-    fi
-
-    exit $EXIT_MISMATCH
-  fi
-}
-
-
-# Shorthand for --mode=foo, only valid as the first argument
-case $1 in
-clean|clea|cle|cl)
-  shift; set dummy --mode clean ${1+"$@"}; shift
-  ;;
-compile|compil|compi|comp|com|co|c)
-  shift; set dummy --mode compile ${1+"$@"}; shift
-  ;;
-execute|execut|execu|exec|exe|ex|e)
-  shift; set dummy --mode execute ${1+"$@"}; shift
-  ;;
-finish|finis|fini|fin|fi|f)
-  shift; set dummy --mode finish ${1+"$@"}; shift
-  ;;
-install|instal|insta|inst|ins|in|i)
-  shift; set dummy --mode install ${1+"$@"}; shift
-  ;;
-link|lin|li|l)
-  shift; set dummy --mode link ${1+"$@"}; shift
-  ;;
-uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-  shift; set dummy --mode uninstall ${1+"$@"}; shift
-  ;;
-esac
-
-
-
-# Option defaults:
-opt_debug=:
-opt_dry_run=false
-opt_config=false
-opt_preserve_dup_deps=false
-opt_features=false
-opt_finish=false
-opt_help=false
-opt_help_all=false
-opt_silent=:
-opt_verbose=:
-opt_silent=false
-opt_verbose=false
-
-
-# Parse options once, thoroughly.  This comes as soon as possible in the
-# script to make things like `--version' happen as quickly as we can.
-{
-  # this just eases exit handling
-  while test $# -gt 0; do
-    opt="$1"
-    shift
-    case $opt in
-      --debug|-x)	opt_debug='set -x'
-			func_echo "enabling shell trace mode"
-			$opt_debug
-			;;
-      --dry-run|--dryrun|-n)
-			opt_dry_run=:
-			;;
-      --config)
-			opt_config=:
-func_config
-			;;
-      --dlopen|-dlopen)
-			optarg="$1"
-			opt_dlopen="${opt_dlopen+$opt_dlopen
-}$optarg"
-			shift
-			;;
-      --preserve-dup-deps)
-			opt_preserve_dup_deps=:
-			;;
-      --features)
-			opt_features=:
-func_features
-			;;
-      --finish)
-			opt_finish=:
-set dummy --mode finish ${1+"$@"}; shift
-			;;
-      --help)
-			opt_help=:
-			;;
-      --help-all)
-			opt_help_all=:
-opt_help=': help-all'
-			;;
-      --mode)
-			test $# = 0 && func_missing_arg $opt && break
-			optarg="$1"
-			opt_mode="$optarg"
-case $optarg in
-  # Valid mode arguments:
-  clean|compile|execute|finish|install|link|relink|uninstall) ;;
-
-  # Catch anything else as an error
-  *) func_error "invalid argument for $opt"
-     exit_cmd=exit
-     break
-     ;;
-esac
-			shift
-			;;
-      --no-silent|--no-quiet)
-			opt_silent=false
-func_append preserve_args " $opt"
-			;;
-      --no-verbose)
-			opt_verbose=false
-func_append preserve_args " $opt"
-			;;
-      --silent|--quiet)
-			opt_silent=:
-func_append preserve_args " $opt"
-        opt_verbose=false
-			;;
-      --verbose|-v)
-			opt_verbose=:
-func_append preserve_args " $opt"
-opt_silent=false
-			;;
-      --tag)
-			test $# = 0 && func_missing_arg $opt && break
-			optarg="$1"
-			opt_tag="$optarg"
-func_append preserve_args " $opt $optarg"
-func_enable_tag "$optarg"
-			shift
-			;;
-
-      -\?|-h)		func_usage				;;
-      --help)		func_help				;;
-      --version)	func_version				;;
-
-      # Separate optargs to long options:
-      --*=*)
-			func_split_long_opt "$opt"
-			set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
-			shift
-			;;
-
-      # Separate non-argument short options:
-      -\?*|-h*|-n*|-v*)
-			func_split_short_opt "$opt"
-			set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
-			shift
-			;;
-
-      --)		break					;;
-      -*)		func_fatal_help "unrecognized option \`$opt'" ;;
-      *)		set dummy "$opt" ${1+"$@"};	shift; break  ;;
-    esac
-  done
-
-  # Validate options:
-
-  # save first non-option argument
-  if test "$#" -gt 0; then
-    nonopt="$opt"
-    shift
-  fi
-
-  # preserve --debug
-  test "$opt_debug" = : || func_append preserve_args " --debug"
-
-  case $host in
-    *cygwin* | *mingw* | *pw32* | *cegcc*)
-      # don't eliminate duplications in $postdeps and $predeps
-      opt_duplicate_compiler_generated_deps=:
-      ;;
-    *)
-      opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
-      ;;
-  esac
-
-  $opt_help || {
-    # Sanity checks first:
-    func_check_version_match
-
-    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-      func_fatal_configuration "not configured to build any kind of library"
-    fi
-
-    # Darwin sucks
-    eval std_shrext=\"$shrext_cmds\"
-
-    # Only execute mode is allowed to have -dlopen flags.
-    if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
-      func_error "unrecognized option \`-dlopen'"
-      $ECHO "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Change the help message to a mode-specific one.
-    generic_help="$help"
-    help="Try \`$progname --help --mode=$opt_mode' for more information."
-  }
-
-
-  # Bail if the options were screwed
-  $exit_cmd $EXIT_FAILURE
-}
-
-
-
-
-## ----------- ##
-##    Main.    ##
-## ----------- ##
-
-# func_lalib_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_lalib_p ()
-{
-    test -f "$1" &&
-      $SED -e 4q "$1" 2>/dev/null \
-        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
-}
-
-# func_lalib_unsafe_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
-# This function implements the same check as func_lalib_p without
-# resorting to external programs.  To this end, it redirects stdin and
-# closes it afterwards, without saving the original file descriptor.
-# As a safety measure, use it only where a negative result would be
-# fatal anyway.  Works if `file' does not exist.
-func_lalib_unsafe_p ()
-{
-    lalib_p=no
-    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
-	for lalib_p_l in 1 2 3 4
-	do
-	    read lalib_p_line
-	    case "$lalib_p_line" in
-		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
-	    esac
-	done
-	exec 0<&5 5<&-
-    fi
-    test "$lalib_p" = yes
-}
-
-# func_ltwrapper_script_p file
-# True iff FILE is a libtool wrapper script
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_script_p ()
-{
-    func_lalib_p "$1"
-}
-
-# func_ltwrapper_executable_p file
-# True iff FILE is a libtool wrapper executable
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_executable_p ()
-{
-    func_ltwrapper_exec_suffix=
-    case $1 in
-    *.exe) ;;
-    *) func_ltwrapper_exec_suffix=.exe ;;
-    esac
-    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
-}
-
-# func_ltwrapper_scriptname file
-# Assumes file is an ltwrapper_executable
-# uses $file to determine the appropriate filename for a
-# temporary ltwrapper_script.
-func_ltwrapper_scriptname ()
-{
-    func_dirname_and_basename "$1" "" "."
-    func_stripname '' '.exe' "$func_basename_result"
-    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
-}
-
-# func_ltwrapper_p file
-# True iff FILE is a libtool wrapper script or wrapper executable
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_p ()
-{
-    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
-}
-
-
-# func_execute_cmds commands fail_cmd
-# Execute tilde-delimited COMMANDS.
-# If FAIL_CMD is given, eval that upon failure.
-# FAIL_CMD may read-access the current command in variable CMD!
-func_execute_cmds ()
-{
-    $opt_debug
-    save_ifs=$IFS; IFS='~'
-    for cmd in $1; do
-      IFS=$save_ifs
-      eval cmd=\"$cmd\"
-      func_show_eval "$cmd" "${2-:}"
-    done
-    IFS=$save_ifs
-}
-
-
-# func_source file
-# Source FILE, adding directory component if necessary.
-# Note that it is not necessary on cygwin/mingw to append a dot to
-# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
-# behavior happens only for exec(3), not for open(2)!  Also, sourcing
-# `FILE.' does not work on cygwin managed mounts.
-func_source ()
-{
-    $opt_debug
-    case $1 in
-    */* | *\\*)	. "$1" ;;
-    *)		. "./$1" ;;
-    esac
-}
-
-
-# func_resolve_sysroot PATH
-# Replace a leading = in PATH with a sysroot.  Store the result into
-# func_resolve_sysroot_result
-func_resolve_sysroot ()
-{
-  func_resolve_sysroot_result=$1
-  case $func_resolve_sysroot_result in
-  =*)
-    func_stripname '=' '' "$func_resolve_sysroot_result"
-    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
-    ;;
-  esac
-}
-
-# func_replace_sysroot PATH
-# If PATH begins with the sysroot, replace it with = and
-# store the result into func_replace_sysroot_result.
-func_replace_sysroot ()
-{
-  case "$lt_sysroot:$1" in
-  ?*:"$lt_sysroot"*)
-    func_stripname "$lt_sysroot" '' "$1"
-    func_replace_sysroot_result="=$func_stripname_result"
-    ;;
-  *)
-    # Including no sysroot.
-    func_replace_sysroot_result=$1
-    ;;
-  esac
-}
-
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag ()
-{
-    $opt_debug
-    if test -n "$available_tags" && test -z "$tagname"; then
-      CC_quoted=
-      for arg in $CC; do
-	func_append_quoted CC_quoted "$arg"
-      done
-      CC_expanded=`func_echo_all $CC`
-      CC_quoted_expanded=`func_echo_all $CC_quoted`
-      case $@ in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
-      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-	    CC_quoted=
-	    for arg in $CC; do
-	      # Double-quote args containing other shell metacharacters.
-	      func_append_quoted CC_quoted "$arg"
-	    done
-	    CC_expanded=`func_echo_all $CC`
-	    CC_quoted_expanded=`func_echo_all $CC_quoted`
-	    case "$@ " in
-	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
-	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  func_echo "unable to infer tagged configuration"
-	  func_fatal_error "specify a tag with \`--tag'"
-#	else
-#	  func_verbose "using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-}
-
-
-
-# func_write_libtool_object output_name pic_name nonpic_name
-# Create a libtool object file (analogous to a ".la" file),
-# but don't create it if we're doing a dry run.
-func_write_libtool_object ()
-{
-    write_libobj=${1}
-    if test "$build_libtool_libs" = yes; then
-      write_lobj=\'${2}\'
-    else
-      write_lobj=none
-    fi
-
-    if test "$build_old_libs" = yes; then
-      write_oldobj=\'${3}\'
-    else
-      write_oldobj=none
-    fi
-
-    $opt_dry_run || {
-      cat >${write_libobj}T </dev/null`
-    if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
-      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
-        $SED -e "$lt_sed_naive_backslashify"`
-    else
-      func_convert_core_file_wine_to_w32_result=
-    fi
-  fi
-}
-# end: func_convert_core_file_wine_to_w32
-
-
-# func_convert_core_path_wine_to_w32 ARG
-# Helper function used by path conversion functions when $build is *nix, and
-# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
-# configured wine environment available, with the winepath program in $build's
-# $PATH. Assumes ARG has no leading or trailing path separator characters.
-#
-# ARG is path to be converted from $build format to win32.
-# Result is available in $func_convert_core_path_wine_to_w32_result.
-# Unconvertible file (directory) names in ARG are skipped; if no directory names
-# are convertible, then the result may be empty.
-func_convert_core_path_wine_to_w32 ()
-{
-  $opt_debug
-  # unfortunately, winepath doesn't convert paths, only file names
-  func_convert_core_path_wine_to_w32_result=""
-  if test -n "$1"; then
-    oldIFS=$IFS
-    IFS=:
-    for func_convert_core_path_wine_to_w32_f in $1; do
-      IFS=$oldIFS
-      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
-      if test -n "$func_convert_core_file_wine_to_w32_result" ; then
-        if test -z "$func_convert_core_path_wine_to_w32_result"; then
-          func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
-        else
-          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
-        fi
-      fi
-    done
-    IFS=$oldIFS
-  fi
-}
-# end: func_convert_core_path_wine_to_w32
-
-
-# func_cygpath ARGS...
-# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
-# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
-# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
-# (2), returns the Cygwin file name or path in func_cygpath_result (input
-# file name or path is assumed to be in w32 format, as previously converted
-# from $build's *nix or MSYS format). In case (3), returns the w32 file name
-# or path in func_cygpath_result (input file name or path is assumed to be in
-# Cygwin format). Returns an empty string on error.
-#
-# ARGS are passed to cygpath, with the last one being the file name or path to
-# be converted.
-#
-# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
-# environment variable; do not put it in $PATH.
-func_cygpath ()
-{
-  $opt_debug
-  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
-    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
-    if test "$?" -ne 0; then
-      # on failure, ensure result is empty
-      func_cygpath_result=
-    fi
-  else
-    func_cygpath_result=
-    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
-  fi
-}
-#end: func_cygpath
-
-
-# func_convert_core_msys_to_w32 ARG
-# Convert file name or path ARG from MSYS format to w32 format.  Return
-# result in func_convert_core_msys_to_w32_result.
-func_convert_core_msys_to_w32 ()
-{
-  $opt_debug
-  # awkward: cmd appends spaces to result
-  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
-    $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
-}
-#end: func_convert_core_msys_to_w32
-
-
-# func_convert_file_check ARG1 ARG2
-# Verify that ARG1 (a file name in $build format) was converted to $host
-# format in ARG2. Otherwise, emit an error message, but continue (resetting
-# func_to_host_file_result to ARG1).
-func_convert_file_check ()
-{
-  $opt_debug
-  if test -z "$2" && test -n "$1" ; then
-    func_error "Could not determine host file name corresponding to"
-    func_error "  \`$1'"
-    func_error "Continuing, but uninstalled executables may not work."
-    # Fallback:
-    func_to_host_file_result="$1"
-  fi
-}
-# end func_convert_file_check
-
-
-# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
-# Verify that FROM_PATH (a path in $build format) was converted to $host
-# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
-# func_to_host_file_result to a simplistic fallback value (see below).
-func_convert_path_check ()
-{
-  $opt_debug
-  if test -z "$4" && test -n "$3"; then
-    func_error "Could not determine the host path corresponding to"
-    func_error "  \`$3'"
-    func_error "Continuing, but uninstalled executables may not work."
-    # Fallback.  This is a deliberately simplistic "conversion" and
-    # should not be "improved".  See libtool.info.
-    if test "x$1" != "x$2"; then
-      lt_replace_pathsep_chars="s|$1|$2|g"
-      func_to_host_path_result=`echo "$3" |
-        $SED -e "$lt_replace_pathsep_chars"`
-    else
-      func_to_host_path_result="$3"
-    fi
-  fi
-}
-# end func_convert_path_check
-
-
-# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
-# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
-# and appending REPL if ORIG matches BACKPAT.
-func_convert_path_front_back_pathsep ()
-{
-  $opt_debug
-  case $4 in
-  $1 ) func_to_host_path_result="$3$func_to_host_path_result"
-    ;;
-  esac
-  case $4 in
-  $2 ) func_append func_to_host_path_result "$3"
-    ;;
-  esac
-}
-# end func_convert_path_front_back_pathsep
-
-
-##################################################
-# $build to $host FILE NAME CONVERSION FUNCTIONS #
-##################################################
-# invoked via `$to_host_file_cmd ARG'
-#
-# In each case, ARG is the path to be converted from $build to $host format.
-# Result will be available in $func_to_host_file_result.
-
-
-# func_to_host_file ARG
-# Converts the file name ARG from $build format to $host format. Return result
-# in func_to_host_file_result.
-func_to_host_file ()
-{
-  $opt_debug
-  $to_host_file_cmd "$1"
-}
-# end func_to_host_file
-
-
-# func_to_tool_file ARG LAZY
-# converts the file name ARG from $build format to toolchain format. Return
-# result in func_to_tool_file_result.  If the conversion in use is listed
-# in (the comma separated) LAZY, no conversion takes place.
-func_to_tool_file ()
-{
-  $opt_debug
-  case ,$2, in
-    *,"$to_tool_file_cmd",*)
-      func_to_tool_file_result=$1
-      ;;
-    *)
-      $to_tool_file_cmd "$1"
-      func_to_tool_file_result=$func_to_host_file_result
-      ;;
-  esac
-}
-# end func_to_tool_file
-
-
-# func_convert_file_noop ARG
-# Copy ARG to func_to_host_file_result.
-func_convert_file_noop ()
-{
-  func_to_host_file_result="$1"
-}
-# end func_convert_file_noop
-
-
-# func_convert_file_msys_to_w32 ARG
-# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
-# conversion to w32 is not available inside the cwrapper.  Returns result in
-# func_to_host_file_result.
-func_convert_file_msys_to_w32 ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    func_convert_core_msys_to_w32 "$1"
-    func_to_host_file_result="$func_convert_core_msys_to_w32_result"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_msys_to_w32
-
-
-# func_convert_file_cygwin_to_w32 ARG
-# Convert file name ARG from Cygwin to w32 format.  Returns result in
-# func_to_host_file_result.
-func_convert_file_cygwin_to_w32 ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
-    # LT_CYGPATH in this case.
-    func_to_host_file_result=`cygpath -m "$1"`
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_cygwin_to_w32
-
-
-# func_convert_file_nix_to_w32 ARG
-# Convert file name ARG from *nix to w32 format.  Requires a wine environment
-# and a working winepath. Returns result in func_to_host_file_result.
-func_convert_file_nix_to_w32 ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    func_convert_core_file_wine_to_w32 "$1"
-    func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_nix_to_w32
-
-
-# func_convert_file_msys_to_cygwin ARG
-# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
-# Returns result in func_to_host_file_result.
-func_convert_file_msys_to_cygwin ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    func_convert_core_msys_to_w32 "$1"
-    func_cygpath -u "$func_convert_core_msys_to_w32_result"
-    func_to_host_file_result="$func_cygpath_result"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_msys_to_cygwin
-
-
-# func_convert_file_nix_to_cygwin ARG
-# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
-# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
-# in func_to_host_file_result.
-func_convert_file_nix_to_cygwin ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
-    func_convert_core_file_wine_to_w32 "$1"
-    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
-    func_to_host_file_result="$func_cygpath_result"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_nix_to_cygwin
-
-
-#############################################
-# $build to $host PATH CONVERSION FUNCTIONS #
-#############################################
-# invoked via `$to_host_path_cmd ARG'
-#
-# In each case, ARG is the path to be converted from $build to $host format.
-# The result will be available in $func_to_host_path_result.
-#
-# Path separators are also converted from $build format to $host format.  If
-# ARG begins or ends with a path separator character, it is preserved (but
-# converted to $host format) on output.
-#
-# All path conversion functions are named using the following convention:
-#   file name conversion function    : func_convert_file_X_to_Y ()
-#   path conversion function         : func_convert_path_X_to_Y ()
-# where, for any given $build/$host combination the 'X_to_Y' value is the
-# same.  If conversion functions are added for new $build/$host combinations,
-# the two new functions must follow this pattern, or func_init_to_host_path_cmd
-# will break.
-
-
-# func_init_to_host_path_cmd
-# Ensures that function "pointer" variable $to_host_path_cmd is set to the
-# appropriate value, based on the value of $to_host_file_cmd.
-to_host_path_cmd=
-func_init_to_host_path_cmd ()
-{
-  $opt_debug
-  if test -z "$to_host_path_cmd"; then
-    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
-    to_host_path_cmd="func_convert_path_${func_stripname_result}"
-  fi
-}
-
-
-# func_to_host_path ARG
-# Converts the path ARG from $build format to $host format. Return result
-# in func_to_host_path_result.
-func_to_host_path ()
-{
-  $opt_debug
-  func_init_to_host_path_cmd
-  $to_host_path_cmd "$1"
-}
-# end func_to_host_path
-
-
-# func_convert_path_noop ARG
-# Copy ARG to func_to_host_path_result.
-func_convert_path_noop ()
-{
-  func_to_host_path_result="$1"
-}
-# end func_convert_path_noop
-
-
-# func_convert_path_msys_to_w32 ARG
-# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
-# conversion to w32 is not available inside the cwrapper.  Returns result in
-# func_to_host_path_result.
-func_convert_path_msys_to_w32 ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # Remove leading and trailing path separator characters from ARG.  MSYS
-    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
-    # and winepath ignores them completely.
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-    func_to_host_path_result="$func_convert_core_msys_to_w32_result"
-    func_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_msys_to_w32
-
-
-# func_convert_path_cygwin_to_w32 ARG
-# Convert path ARG from Cygwin to w32 format.  Returns result in
-# func_to_host_file_result.
-func_convert_path_cygwin_to_w32 ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # See func_convert_path_msys_to_w32:
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
-    func_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_cygwin_to_w32
-
-
-# func_convert_path_nix_to_w32 ARG
-# Convert path ARG from *nix to w32 format.  Requires a wine environment and
-# a working winepath.  Returns result in func_to_host_file_result.
-func_convert_path_nix_to_w32 ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # See func_convert_path_msys_to_w32:
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-    func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
-    func_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_nix_to_w32
-
-
-# func_convert_path_msys_to_cygwin ARG
-# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
-# Returns result in func_to_host_file_result.
-func_convert_path_msys_to_cygwin ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # See func_convert_path_msys_to_w32:
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
-    func_to_host_path_result="$func_cygpath_result"
-    func_convert_path_check : : \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-  fi
-}
-# end func_convert_path_msys_to_cygwin
-
-
-# func_convert_path_nix_to_cygwin ARG
-# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
-# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
-# func_to_host_file_result.
-func_convert_path_nix_to_cygwin ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # Remove leading and trailing path separator characters from
-    # ARG. msys behavior is inconsistent here, cygpath turns them
-    # into '.;' and ';.', and winepath ignores them completely.
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
-    func_to_host_path_result="$func_cygpath_result"
-    func_convert_path_check : : \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-  fi
-}
-# end func_convert_path_nix_to_cygwin
-
-
-# func_mode_compile arg...
-func_mode_compile ()
-{
-    $opt_debug
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-    suppress_opt=yes
-    suppress_output=
-    arg_mode=normal
-    libobj=
-    later=
-    pie_flag=
-
-    for arg
-    do
-      case $arg_mode in
-      arg  )
-	# do not "continue".  Instead, add this to base_compile
-	lastarg="$arg"
-	arg_mode=normal
-	;;
-
-      target )
-	libobj="$arg"
-	arg_mode=normal
-	continue
-	;;
-
-      normal )
-	# Accept any command-line options.
-	case $arg in
-	-o)
-	  test -n "$libobj" && \
-	    func_fatal_error "you cannot specify \`-o' more than once"
-	  arg_mode=target
-	  continue
-	  ;;
-
-	-pie | -fpie | -fPIE)
-          func_append pie_flag " $arg"
-	  continue
-	  ;;
-
-	-shared | -static | -prefer-pic | -prefer-non-pic)
-	  func_append later " $arg"
-	  continue
-	  ;;
-
-	-no-suppress)
-	  suppress_opt=no
-	  continue
-	  ;;
-
-	-Xcompiler)
-	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
-	  continue      #  The current "srcfile" will either be retained or
-	  ;;            #  replaced later.  I would guess that would be a bug.
-
-	-Wc,*)
-	  func_stripname '-Wc,' '' "$arg"
-	  args=$func_stripname_result
-	  lastarg=
-	  save_ifs="$IFS"; IFS=','
-	  for arg in $args; do
-	    IFS="$save_ifs"
-	    func_append_quoted lastarg "$arg"
-	  done
-	  IFS="$save_ifs"
-	  func_stripname ' ' '' "$lastarg"
-	  lastarg=$func_stripname_result
-
-	  # Add the arguments to base_compile.
-	  func_append base_compile " $lastarg"
-	  continue
-	  ;;
-
-	*)
-	  # Accept the current argument as the source file.
-	  # The previous "srcfile" becomes the current argument.
-	  #
-	  lastarg="$srcfile"
-	  srcfile="$arg"
-	  ;;
-	esac  #  case $arg
-	;;
-      esac    #  case $arg_mode
-
-      # Aesthetically quote the previous argument.
-      func_append_quoted base_compile "$lastarg"
-    done # for arg
-
-    case $arg_mode in
-    arg)
-      func_fatal_error "you must specify an argument for -Xcompile"
-      ;;
-    target)
-      func_fatal_error "you must specify a target with \`-o'"
-      ;;
-    *)
-      # Get the name of the library object.
-      test -z "$libobj" && {
-	func_basename "$srcfile"
-	libobj="$func_basename_result"
-      }
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    case $libobj in
-    *.[cCFSifmso] | \
-    *.ada | *.adb | *.ads | *.asm | \
-    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
-      func_xform "$libobj"
-      libobj=$func_xform_result
-      ;;
-    esac
-
-    case $libobj in
-    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
-    *)
-      func_fatal_error "cannot determine name of library object from \`$libobj'"
-      ;;
-    esac
-
-    func_infer_tag $base_compile
-
-    for arg in $later; do
-      case $arg in
-      -shared)
-	test "$build_libtool_libs" != yes && \
-	  func_fatal_configuration "can not build a shared library"
-	build_old_libs=no
-	continue
-	;;
-
-      -static)
-	build_libtool_libs=no
-	build_old_libs=yes
-	continue
-	;;
-
-      -prefer-pic)
-	pic_mode=yes
-	continue
-	;;
-
-      -prefer-non-pic)
-	pic_mode=no
-	continue
-	;;
-      esac
-    done
-
-    func_quote_for_eval "$libobj"
-    test "X$libobj" != "X$func_quote_for_eval_result" \
-      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
-      && func_warning "libobj name \`$libobj' may not contain shell special characters."
-    func_dirname_and_basename "$obj" "/" ""
-    objname="$func_basename_result"
-    xdir="$func_dirname_result"
-    lobj=${xdir}$objdir/$objname
-
-    test -z "$base_compile" && \
-      func_fatal_help "you must specify a compilation command"
-
-    # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
-      removelist="$obj $lobj $libobj ${libobj}T"
-    else
-      removelist="$lobj $libobj ${libobj}T"
-    fi
-
-    # On Cygwin there's no "real" PIC flag so we must build both object types
-    case $host_os in
-    cygwin* | mingw* | pw32* | os2* | cegcc*)
-      pic_mode=default
-      ;;
-    esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-      # non-PIC code in shared libraries is not supported
-      pic_mode=default
-    fi
-
-    # Calculate the filename of the output object if compiler does
-    # not support -o with -c
-    if test "$compiler_c_o" = no; then
-      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
-      lockfile="$output_obj.lock"
-    else
-      output_obj=
-      need_locks=no
-      lockfile=
-    fi
-
-    # Lock this critical section if it is needed
-    # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
-      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
-	func_echo "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    elif test "$need_locks" = warn; then
-      if test -f "$lockfile"; then
-	$ECHO "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-      func_append removelist " $output_obj"
-      $ECHO "$srcfile" > "$lockfile"
-    fi
-
-    $opt_dry_run || $RM $removelist
-    func_append removelist " $lockfile"
-    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
-
-    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
-    srcfile=$func_to_tool_file_result
-    func_quote_for_eval "$srcfile"
-    qsrcfile=$func_quote_for_eval_result
-
-    # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
-      # Without this assignment, base_compile gets emptied.
-      fbsd_hideous_sh_bug=$base_compile
-
-      if test "$pic_mode" != no; then
-	command="$base_compile $qsrcfile $pic_flag"
-      else
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
-      fi
-
-      func_mkdir_p "$xdir$objdir"
-
-      if test -z "$output_obj"; then
-	# Place PIC objects in $objdir
-	func_append command " -o $lobj"
-      fi
-
-      func_show_eval_locale "$command"	\
-          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$ECHO "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed, then go on to compile the next one
-      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-	func_show_eval '$MV "$output_obj" "$lobj"' \
-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-      fi
-
-      # Allow error messages only from the first compilation.
-      if test "$suppress_opt" = yes; then
-	suppress_output=' >/dev/null 2>&1'
-      fi
-    fi
-
-    # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
-	# Don't build PIC code
-	command="$base_compile $qsrcfile$pie_flag"
-      else
-	command="$base_compile $qsrcfile $pic_flag"
-      fi
-      if test "$compiler_c_o" = yes; then
-	func_append command " -o $obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      func_append command "$suppress_output"
-      func_show_eval_locale "$command" \
-        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$ECHO "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed
-      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-	func_show_eval '$MV "$output_obj" "$obj"' \
-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-      fi
-    fi
-
-    $opt_dry_run || {
-      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
-
-      # Unlock the critical section if it was locked
-      if test "$need_locks" != no; then
-	removelist=$lockfile
-        $RM "$lockfile"
-      fi
-    }
-
-    exit $EXIT_SUCCESS
-}
-
-$opt_help || {
-  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
-}
-
-func_mode_help ()
-{
-    # We need to display help for each of the modes.
-    case $opt_mode in
-      "")
-        # Generic help is extracted from the usage comments
-        # at the start of this file.
-        func_help
-        ;;
-
-      clean)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-        ;;
-
-      compile)
-      $ECHO \
-"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -no-suppress      do not suppress compiler output for multiple passes
-  -prefer-pic       try to build PIC objects only
-  -prefer-non-pic   try to build non-PIC objects only
-  -shared           do not build a \`.o' file suitable for static linking
-  -static           only build a \`.o' file suitable for static linking
-  -Wc,FLAG          pass FLAG directly to the compiler
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
-        ;;
-
-      execute)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-        ;;
-
-      finish)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
-        ;;
-
-      install)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
-
-The following components of INSTALL-COMMAND are treated specially:
-
-  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-        ;;
-
-      link)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -bindir BINDIR    specify path to binaries directory (for systems where
-                    libraries must be found in the PATH setting at runtime)
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-                    try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-                    try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
-  -precious-files-regex REGEX
-                    don't remove output files matching REGEX
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -shared           only do dynamic linking of libtool libraries
-  -shrext SUFFIX    override the standard shared library file extension
-  -static           do not do any dynamic linking of uninstalled libtool libraries
-  -static-libtool-libs
-                    do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-                    specify library version info [each variable defaults to 0]
-  -weak LIBNAME     declare that the target provides the LIBNAME interface
-  -Wc,FLAG
-  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
-  -Wl,FLAG
-  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
-  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-        ;;
-
-      uninstall)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-        ;;
-
-      *)
-        func_fatal_help "invalid operation mode \`$opt_mode'"
-        ;;
-    esac
-
-    echo
-    $ECHO "Try \`$progname --help' for more information about other modes."
-}
-
-# Now that we've collected a possible --mode arg, show help if necessary
-if $opt_help; then
-  if test "$opt_help" = :; then
-    func_mode_help
-  else
-    {
-      func_help noexit
-      for opt_mode in compile link execute install finish uninstall clean; do
-	func_mode_help
-      done
-    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
-    {
-      func_help noexit
-      for opt_mode in compile link execute install finish uninstall clean; do
-	echo
-	func_mode_help
-      done
-    } |
-    sed '1d
-      /^When reporting/,/^Report/{
-	H
-	d
-      }
-      $x
-      /information about other modes/d
-      /more detailed .*MODE/d
-      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
-  fi
-  exit $?
-fi
-
-
-# func_mode_execute arg...
-func_mode_execute ()
-{
-    $opt_debug
-    # The first argument is the command name.
-    cmd="$nonopt"
-    test -z "$cmd" && \
-      func_fatal_help "you must specify a COMMAND"
-
-    # Handle -dlopen flags immediately.
-    for file in $opt_dlopen; do
-      test -f "$file" \
-	|| func_fatal_help "\`$file' is not a file"
-
-      dir=
-      case $file in
-      *.la)
-	func_resolve_sysroot "$file"
-	file=$func_resolve_sysroot_result
-
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "\`$lib' is not a valid libtool archive"
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-	func_source "$file"
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && \
-	    func_warning "\`$file' was not linked with \`-export-dynamic'"
-	  continue
-	fi
-
-	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  func_append dir "/$objdir"
-	else
-	  if test ! -f "$dir/$dlname"; then
-	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
-	  fi
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
-	;;
-
-      *)
-	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
-	continue
-	;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -* | *.la | *.lo ) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	if func_ltwrapper_script_p "$file"; then
-	  func_source "$file"
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	elif func_ltwrapper_executable_p "$file"; then
-	  func_ltwrapper_scriptname "$file"
-	  func_source "$func_ltwrapper_scriptname_result"
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	fi
-	;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      func_append_quoted args "$file"
-    done
-
-    if test "X$opt_dry_run" = Xfalse; then
-      if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
-      fi
-
-      # Restore saved environment variables
-      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-      do
-	eval "if test \"\${save_$lt_var+set}\" = set; then
-                $lt_var=\$save_$lt_var; export $lt_var
-	      else
-		$lt_unset $lt_var
-	      fi"
-      done
-
-      # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-	echo "export $shlibpath_var"
-      fi
-      $ECHO "$cmd$args"
-      exit $EXIT_SUCCESS
-    fi
-}
-
-test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
-
-
-# func_mode_finish arg...
-func_mode_finish ()
-{
-    $opt_debug
-    libs=
-    libdirs=
-    admincmds=
-
-    for opt in "$nonopt" ${1+"$@"}
-    do
-      if test -d "$opt"; then
-	func_append libdirs " $opt"
-
-      elif test -f "$opt"; then
-	if func_lalib_unsafe_p "$opt"; then
-	  func_append libs " $opt"
-	else
-	  func_warning "\`$opt' is not a valid libtool archive"
-	fi
-
-      else
-	func_fatal_error "invalid argument \`$opt'"
-      fi
-    done
-
-    if test -n "$libs"; then
-      if test -n "$lt_sysroot"; then
-        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
-        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
-      else
-        sysroot_cmd=
-      fi
-
-      # Remove sysroot references
-      if $opt_dry_run; then
-        for lib in $libs; do
-          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
-        done
-      else
-        tmpdir=`func_mktempdir`
-        for lib in $libs; do
-	  sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
-	    > $tmpdir/tmp-la
-	  mv -f $tmpdir/tmp-la $lib
-	done
-        ${RM}r "$tmpdir"
-      fi
-    fi
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
-'"$cmd"'"'
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $opt_dry_run || eval "$cmds" || func_append admincmds "
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    $opt_silent && exit $EXIT_SUCCESS
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      echo "----------------------------------------------------------------------"
-      echo "Libraries have been installed in:"
-      for libdir in $libdirs; do
-	$ECHO "   $libdir"
-      done
-      echo
-      echo "If you ever happen to want to link against installed libraries"
-      echo "in a given directory, LIBDIR, you must either use libtool, and"
-      echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-      echo "flag during linking and do at least one of the following:"
-      if test -n "$shlibpath_var"; then
-	echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-	echo "     during execution"
-      fi
-      if test -n "$runpath_var"; then
-	echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-	echo "     during linking"
-      fi
-      if test -n "$hardcode_libdir_flag_spec"; then
-	libdir=LIBDIR
-	eval flag=\"$hardcode_libdir_flag_spec\"
-
-	$ECHO "   - use the \`$flag' linker flag"
-      fi
-      if test -n "$admincmds"; then
-	$ECHO "   - have your system administrator run these commands:$admincmds"
-      fi
-      if test -f /etc/ld.so.conf; then
-	echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-      fi
-      echo
-
-      echo "See any operating system documentation about shared libraries for"
-      case $host in
-	solaris2.[6789]|solaris2.1[0-9])
-	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-	  echo "pages."
-	  ;;
-	*)
-	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
-	  ;;
-      esac
-      echo "----------------------------------------------------------------------"
-    fi
-    exit $EXIT_SUCCESS
-}
-
-test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
-
-
-# func_mode_install arg...
-func_mode_install ()
-{
-    $opt_debug
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-       # Allow the use of GNU shtool's install command.
-       case $nonopt in *shtool*) :;; *) false;; esac; then
-      # Aesthetically quote it.
-      func_quote_for_eval "$nonopt"
-      install_prog="$func_quote_for_eval_result "
-      arg=$1
-      shift
-    else
-      install_prog=
-      arg=$nonopt
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    func_quote_for_eval "$arg"
-    func_append install_prog "$func_quote_for_eval_result"
-    install_shared_prog=$install_prog
-    case " $install_prog " in
-      *[\\\ /]cp\ *) install_cp=: ;;
-      *) install_cp=false ;;
-    esac
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    no_mode=:
-    for arg
-    do
-      arg2=
-      if test -n "$dest"; then
-	func_append files " $dest"
-	dest=$arg
-	continue
-      fi
-
-      case $arg in
-      -d) isdir=yes ;;
-      -f)
-	if $install_cp; then :; else
-	  prev=$arg
-	fi
-	;;
-      -g | -m | -o)
-	prev=$arg
-	;;
-      -s)
-	stripme=" -s"
-	continue
-	;;
-      -*)
-	;;
-      *)
-	# If the previous option needed an argument, then skip it.
-	if test -n "$prev"; then
-	  if test "x$prev" = x-m && test -n "$install_override_mode"; then
-	    arg2=$install_override_mode
-	    no_mode=false
-	  fi
-	  prev=
-	else
-	  dest=$arg
-	  continue
-	fi
-	;;
-      esac
-
-      # Aesthetically quote the argument.
-      func_quote_for_eval "$arg"
-      func_append install_prog " $func_quote_for_eval_result"
-      if test -n "$arg2"; then
-	func_quote_for_eval "$arg2"
-      fi
-      func_append install_shared_prog " $func_quote_for_eval_result"
-    done
-
-    test -z "$install_prog" && \
-      func_fatal_help "you must specify an install program"
-
-    test -n "$prev" && \
-      func_fatal_help "the \`$prev' option requires an argument"
-
-    if test -n "$install_override_mode" && $no_mode; then
-      if $install_cp; then :; else
-	func_quote_for_eval "$install_override_mode"
-	func_append install_shared_prog " -m $func_quote_for_eval_result"
-      fi
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	func_fatal_help "no file or destination specified"
-      else
-	func_fatal_help "you must specify a destination"
-      fi
-    fi
-
-    # Strip any trailing slash from the destination.
-    func_stripname '' '/' "$dest"
-    dest=$func_stripname_result
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      func_dirname_and_basename "$dest" "" "."
-      destdir="$func_dirname_result"
-      destname="$func_basename_result"
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files; shift
-      test "$#" -gt 1 && \
-	func_fatal_help "\`$dest' is not a directory"
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	  func_fatal_help "\`$destdir' must be an absolute directory name"
-	  ;;
-	esac
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-	# Do the static libraries later.
-	func_append staticlibs " $file"
-	;;
-
-      *.la)
-	func_resolve_sysroot "$file"
-	file=$func_resolve_sysroot_result
-
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "\`$file' is not a valid libtool archive"
-
-	library_names=
-	old_library=
-	relink_command=
-	func_source "$file"
-
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	  case "$current_libdirs " in
-	  *" $libdir "*) ;;
-	  *) func_append current_libdirs " $libdir" ;;
-	  esac
-	else
-	  # Note the libdir as a future libdir.
-	  case "$future_libdirs " in
-	  *" $libdir "*) ;;
-	  *) func_append future_libdirs " $libdir" ;;
-	  esac
-	fi
-
-	func_dirname "$file" "/" ""
-	dir="$func_dirname_result"
-	func_append dir "$objdir"
-
-	if test -n "$relink_command"; then
-	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
-
-	  # Don't allow the user to place us outside of our expected
-	  # location b/c this prevents finding dependent libraries that
-	  # are installed to the same prefix.
-	  # At present, this check doesn't affect windows .dll's that
-	  # are installed into $libdir/../bin (currently, that works fine)
-	  # but it's something to keep an eye on.
-	  test "$inst_prefix_dir" = "$destdir" && \
-	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
-
-	  if test -n "$inst_prefix_dir"; then
-	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-	  else
-	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
-	  fi
-
-	  func_warning "relinking \`$file'"
-	  func_show_eval "$relink_command" \
-	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
-	fi
-
-	# See the names of the shared library.
-	set dummy $library_names; shift
-	if test -n "$1"; then
-	  realname="$1"
-	  shift
-
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
-
-	  # Install the shared library and build the symlinks.
-	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
-	      'exit $?'
-	  tstripme="$stripme"
-	  case $host_os in
-	  cygwin* | mingw* | pw32* | cegcc*)
-	    case $realname in
-	    *.dll.a)
-	      tstripme=""
-	      ;;
-	    esac
-	    ;;
-	  esac
-	  if test -n "$tstripme" && test -n "$striplib"; then
-	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
-	  fi
-
-	  if test "$#" -gt 0; then
-	    # Delete the old symlinks, and create new ones.
-	    # Try `ln -sf' first, because the `ln' binary might depend on
-	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
-	    # so we also need to try rm && ln -s.
-	    for linkname
-	    do
-	      test "$linkname" != "$realname" \
-		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
-	    done
-	  fi
-
-	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
-	  func_execute_cmds "$postinstall_cmds" 'exit $?'
-	fi
-
-	# Install the pseudo-library for information purposes.
-	func_basename "$file"
-	name="$func_basename_result"
-	instname="$dir/$name"i
-	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  func_basename "$file"
-	  destfile="$func_basename_result"
-	  destfile="$destdir/$destfile"
-	fi
-
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	  func_lo2o "$destfile"
-	  staticdest=$func_lo2o_result
-	  ;;
-	*.$objext)
-	  staticdest="$destfile"
-	  destfile=
-	  ;;
-	*)
-	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
-	  ;;
-	esac
-
-	# Install the libtool object if requested.
-	test -n "$destfile" && \
-	  func_show_eval "$install_prog $file $destfile" 'exit $?'
-
-	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
-	  # Deduce the name of the old-style object file.
-	  func_lo2o "$file"
-	  staticobj=$func_lo2o_result
-	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
-	fi
-	exit $EXIT_SUCCESS
-	;;
-
-      *)
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  func_basename "$file"
-	  destfile="$func_basename_result"
-	  destfile="$destdir/$destfile"
-	fi
-
-	# If the file is missing, and there is a .exe on the end, strip it
-	# because it is most likely a libtool script we actually want to
-	# install
-	stripped_ext=""
-	case $file in
-	  *.exe)
-	    if test ! -f "$file"; then
-	      func_stripname '' '.exe' "$file"
-	      file=$func_stripname_result
-	      stripped_ext=".exe"
-	    fi
-	    ;;
-	esac
-
-	# Do a test to see if this is really a libtool program.
-	case $host in
-	*cygwin* | *mingw*)
-	    if func_ltwrapper_executable_p "$file"; then
-	      func_ltwrapper_scriptname "$file"
-	      wrapper=$func_ltwrapper_scriptname_result
-	    else
-	      func_stripname '' '.exe' "$file"
-	      wrapper=$func_stripname_result
-	    fi
-	    ;;
-	*)
-	    wrapper=$file
-	    ;;
-	esac
-	if func_ltwrapper_script_p "$wrapper"; then
-	  notinst_deplibs=
-	  relink_command=
-
-	  func_source "$wrapper"
-
-	  # Check the variables that should have been set.
-	  test -z "$generated_by_libtool_version" && \
-	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
-
-	  finalize=yes
-	  for lib in $notinst_deplibs; do
-	    # Check to see that each library is installed.
-	    libdir=
-	    if test -f "$lib"; then
-	      func_source "$lib"
-	    fi
-	    libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      func_warning "\`$lib' has not been installed in \`$libdir'"
-	      finalize=no
-	    fi
-	  done
-
-	  relink_command=
-	  func_source "$wrapper"
-
-	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
-	    $opt_dry_run || {
-	      if test "$finalize" = yes; then
-	        tmpdir=`func_mktempdir`
-		func_basename "$file$stripped_ext"
-		file="$func_basename_result"
-	        outputname="$tmpdir/$file"
-	        # Replace the output file specification.
-	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
-
-	        $opt_silent || {
-	          func_quote_for_expand "$relink_command"
-		  eval "func_echo $func_quote_for_expand_result"
-	        }
-	        if eval "$relink_command"; then :
-	          else
-		  func_error "error: relink \`$file' with the above command before installing it"
-		  $opt_dry_run || ${RM}r "$tmpdir"
-		  continue
-	        fi
-	        file="$outputname"
-	      else
-	        func_warning "cannot relink \`$file'"
-	      fi
-	    }
-	  else
-	    # Install the binary that we compiled earlier.
-	    file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
-	  fi
-	fi
-
-	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyway
-	case $install_prog,$host in
-	*/usr/bin/install*,*cygwin*)
-	  case $file:$destfile in
-	  *.exe:*.exe)
-	    # this is ok
-	    ;;
-	  *.exe:*)
-	    destfile=$destfile.exe
-	    ;;
-	  *:*.exe)
-	    func_stripname '' '.exe' "$destfile"
-	    destfile=$func_stripname_result
-	    ;;
-	  esac
-	  ;;
-	esac
-	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
-	$opt_dry_run || if test -n "$outputname"; then
-	  ${RM}r "$tmpdir"
-	fi
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      func_basename "$file"
-      name="$func_basename_result"
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-
-      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
-
-      if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
-      fi
-
-      # Do each command in the postinstall commands.
-      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
-    done
-
-    test -n "$future_libdirs" && \
-      func_warning "remember to run \`$progname --finish$future_libdirs'"
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      $opt_dry_run && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-    else
-      exit $EXIT_SUCCESS
-    fi
-}
-
-test "$opt_mode" = install && func_mode_install ${1+"$@"}
-
-
-# func_generate_dlsyms outputname originator pic_p
-# Extract symbols from dlprefiles and create ${outputname}S.o with
-# a dlpreopen symbol table.
-func_generate_dlsyms ()
-{
-    $opt_debug
-    my_outputname="$1"
-    my_originator="$2"
-    my_pic_p="${3-no}"
-    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
-    my_dlsyms=
-
-    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-      if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	my_dlsyms="${my_outputname}S.c"
-      else
-	func_error "not configured to extract global symbols from dlpreopened files"
-      fi
-    fi
-
-    if test -n "$my_dlsyms"; then
-      case $my_dlsyms in
-      "") ;;
-      *.c)
-	# Discover the nlist of each of the dlfiles.
-	nlist="$output_objdir/${my_outputname}.nm"
-
-	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
-
-	# Parse the name list into a source file.
-	func_verbose "creating $output_objdir/$my_dlsyms"
-
-	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
-/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
-/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
-#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
-#endif
-
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data.  */
-# define LT_DLSYM_CONST
-#else
-# define LT_DLSYM_CONST const
-#endif
-
-/* External symbol declarations for the compiler. */\
-"
-
-	if test "$dlself" = yes; then
-	  func_verbose "generating symbol list for \`$output'"
-
-	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
-
-	  # Add our own program objects to the symbol list.
-	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
-	  for progfile in $progfiles; do
-	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
-	    func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
-	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
-	  done
-
-	  if test -n "$exclude_expsyms"; then
-	    $opt_dry_run || {
-	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	    }
-	  fi
-
-	  if test -n "$export_symbols_regex"; then
-	    $opt_dry_run || {
-	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	    }
-	  fi
-
-	  # Prepare the list of exported symbols
-	  if test -z "$export_symbols"; then
-	    export_symbols="$output_objdir/$outputname.exp"
-	    $opt_dry_run || {
-	      $RM $export_symbols
-	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-	      case $host in
-	      *cygwin* | *mingw* | *cegcc* )
-                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
-	        ;;
-	      esac
-	    }
-	  else
-	    $opt_dry_run || {
-	      eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	      case $host in
-	        *cygwin* | *mingw* | *cegcc* )
-	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
-	          ;;
-	      esac
-	    }
-	  fi
-	fi
-
-	for dlprefile in $dlprefiles; do
-	  func_verbose "extracting global C symbols from \`$dlprefile'"
-	  func_basename "$dlprefile"
-	  name="$func_basename_result"
-          case $host in
-	    *cygwin* | *mingw* | *cegcc* )
-	      # if an import library, we need to obtain dlname
-	      if func_win32_import_lib_p "$dlprefile"; then
-	        func_tr_sh "$dlprefile"
-	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
-	        dlprefile_dlbasename=""
-	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
-	          # Use subshell, to avoid clobbering current variable values
-	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
-	          if test -n "$dlprefile_dlname" ; then
-	            func_basename "$dlprefile_dlname"
-	            dlprefile_dlbasename="$func_basename_result"
-	          else
-	            # no lafile. user explicitly requested -dlpreopen .
-	            $sharedlib_from_linklib_cmd "$dlprefile"
-	            dlprefile_dlbasename=$sharedlib_from_linklib_result
-	          fi
-	        fi
-	        $opt_dry_run || {
-	          if test -n "$dlprefile_dlbasename" ; then
-	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
-	          else
-	            func_warning "Could not compute DLL name from $name"
-	            eval '$ECHO ": $name " >> "$nlist"'
-	          fi
-	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
-	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
-	        }
-	      else # not an import lib
-	        $opt_dry_run || {
-	          eval '$ECHO ": $name " >> "$nlist"'
-	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	        }
-	      fi
-	    ;;
-	    *)
-	      $opt_dry_run || {
-	        eval '$ECHO ": $name " >> "$nlist"'
-	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	      }
-	    ;;
-          esac
-	done
-
-	$opt_dry_run || {
-	  # Make sure we have at least an empty file.
-	  test -f "$nlist" || : > "$nlist"
-
-	  if test -n "$exclude_expsyms"; then
-	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-	    $MV "$nlist"T "$nlist"
-	  fi
-
-	  # Try sorting and uniquifying the output.
-	  if $GREP -v "^: " < "$nlist" |
-	      if sort -k 3 /dev/null 2>&1; then
-		sort -k 3
-	      else
-		sort +2
-	      fi |
-	      uniq > "$nlist"S; then
-	    :
-	  else
-	    $GREP -v "^: " < "$nlist" > "$nlist"S
-	  fi
-
-	  if test -f "$nlist"S; then
-	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
-	  else
-	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
-	  fi
-
-	  echo >> "$output_objdir/$my_dlsyms" "\
-
-/* The mapping between symbol names and symbols.  */
-typedef struct {
-  const char *name;
-  void *address;
-} lt_dlsymlist;
-extern LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[];
-LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[] =
-{\
-  { \"$my_originator\", (void *) 0 },"
-
-	  case $need_lib_prefix in
-	  no)
-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
-	    ;;
-	  *)
-	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
-	    ;;
-	  esac
-	  echo >> "$output_objdir/$my_dlsyms" "\
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_${my_prefix}_LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	} # !$opt_dry_run
-
-	pic_flag_for_symtable=
-	case "$compile_command " in
-	*" -static "*) ;;
-	*)
-	  case $host in
-	  # compiling the symbol table file with pic_flag works around
-	  # a FreeBSD bug that causes programs to crash when -lm is
-	  # linked before any other PIC object.  But we must not use
-	  # pic_flag when linking with -static.  The problem exists in
-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
-	  *-*-hpux*)
-	    pic_flag_for_symtable=" $pic_flag"  ;;
-	  *)
-	    if test "X$my_pic_p" != Xno; then
-	      pic_flag_for_symtable=" $pic_flag"
-	    fi
-	    ;;
-	  esac
-	  ;;
-	esac
-	symtab_cflags=
-	for arg in $LTCFLAGS; do
-	  case $arg in
-	  -pie | -fpie | -fPIE) ;;
-	  *) func_append symtab_cflags " $arg" ;;
-	  esac
-	done
-
-	# Now compile the dynamic symbol file.
-	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
-
-	# Clean up the generated files.
-	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
-
-	# Transform the symbol file into the correct name.
-	symfileobj="$output_objdir/${my_outputname}S.$objext"
-	case $host in
-	*cygwin* | *mingw* | *cegcc* )
-	  if test -f "$output_objdir/$my_outputname.def"; then
-	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	  else
-	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	  fi
-	  ;;
-	*)
-	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	  ;;
-	esac
-	;;
-      *)
-	func_fatal_error "unknown suffix for \`$my_dlsyms'"
-	;;
-      esac
-    else
-      # We keep going just in case the user didn't refer to
-      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-      # really was required.
-
-      # Nullify the symbol file.
-      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
-      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
-    fi
-}
-
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-# Despite the name, also deal with 64 bit binaries.
-func_win32_libid ()
-{
-  $opt_debug
-  win32_libid_type="unknown"
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
-       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
-      func_to_tool_file "$1" func_convert_file_msys_to_w32
-      win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
-	$SED -n -e '
-	    1,100{
-		/ I /{
-		    s,.*,import,
-		    p
-		    q
-		}
-	    }'`
-      case $win32_nmres in
-      import*)  win32_libid_type="x86 archive import";;
-      *)        win32_libid_type="x86 archive static";;
-      esac
-    fi
-    ;;
-  *DLL*)
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
-    esac
-    ;;
-  esac
-  $ECHO "$win32_libid_type"
-}
-
-# func_cygming_dll_for_implib ARG
-#
-# Platform-specific function to extract the
-# name of the DLL associated with the specified
-# import library ARG.
-# Invoked by eval'ing the libtool variable
-#    $sharedlib_from_linklib_cmd
-# Result is available in the variable
-#    $sharedlib_from_linklib_result
-func_cygming_dll_for_implib ()
-{
-  $opt_debug
-  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
-}
-
-# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
-#
-# The is the core of a fallback implementation of a
-# platform-specific function to extract the name of the
-# DLL associated with the specified import library LIBNAME.
-#
-# SECTION_NAME is either .idata$6 or .idata$7, depending
-# on the platform and compiler that created the implib.
-#
-# Echos the name of the DLL associated with the
-# specified import library.
-func_cygming_dll_for_implib_fallback_core ()
-{
-  $opt_debug
-  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
-  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
-    $SED '/^Contents of section '"$match_literal"':/{
-      # Place marker at beginning of archive member dllname section
-      s/.*/====MARK====/
-      p
-      d
-    }
-    # These lines can sometimes be longer than 43 characters, but
-    # are always uninteresting
-    /:[	 ]*file format pe[i]\{,1\}-/d
-    /^In archive [^:]*:/d
-    # Ensure marker is printed
-    /^====MARK====/p
-    # Remove all lines with less than 43 characters
-    /^.\{43\}/!d
-    # From remaining lines, remove first 43 characters
-    s/^.\{43\}//' |
-    $SED -n '
-      # Join marker and all lines until next marker into a single line
-      /^====MARK====/ b para
-      H
-      $ b para
-      b
-      :para
-      x
-      s/\n//g
-      # Remove the marker
-      s/^====MARK====//
-      # Remove trailing dots and whitespace
-      s/[\. \t]*$//
-      # Print
-      /./p' |
-    # we now have a list, one entry per line, of the stringified
-    # contents of the appropriate section of all members of the
-    # archive which possess that section. Heuristic: eliminate
-    # all those which have a first or second character that is
-    # a '.' (that is, objdump's representation of an unprintable
-    # character.) This should work for all archives with less than
-    # 0x302f exports -- but will fail for DLLs whose name actually
-    # begins with a literal '.' or a single character followed by
-    # a '.'.
-    #
-    # Of those that remain, print the first one.
-    $SED -e '/^\./d;/^.\./d;q'
-}
-
-# func_cygming_gnu_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is a GNU/binutils-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_gnu_implib_p ()
-{
-  $opt_debug
-  func_to_tool_file "$1" func_convert_file_msys_to_w32
-  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
-  test -n "$func_cygming_gnu_implib_tmp"
-}
-
-# func_cygming_ms_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is an MS-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_ms_implib_p ()
-{
-  $opt_debug
-  func_to_tool_file "$1" func_convert_file_msys_to_w32
-  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
-  test -n "$func_cygming_ms_implib_tmp"
-}
-
-# func_cygming_dll_for_implib_fallback ARG
-# Platform-specific function to extract the
-# name of the DLL associated with the specified
-# import library ARG.
-#
-# This fallback implementation is for use when $DLLTOOL
-# does not support the --identify-strict option.
-# Invoked by eval'ing the libtool variable
-#    $sharedlib_from_linklib_cmd
-# Result is available in the variable
-#    $sharedlib_from_linklib_result
-func_cygming_dll_for_implib_fallback ()
-{
-  $opt_debug
-  if func_cygming_gnu_implib_p "$1" ; then
-    # binutils import library
-    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
-  elif func_cygming_ms_implib_p "$1" ; then
-    # ms-generated import library
-    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
-  else
-    # unknown
-    sharedlib_from_linklib_result=""
-  fi
-}
-
-
-# func_extract_an_archive dir oldlib
-func_extract_an_archive ()
-{
-    $opt_debug
-    f_ex_an_ar_dir="$1"; shift
-    f_ex_an_ar_oldlib="$1"
-    if test "$lock_old_archive_extraction" = yes; then
-      lockfile=$f_ex_an_ar_oldlib.lock
-      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
-	func_echo "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    fi
-    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
-		   'stat=$?; rm -f "$lockfile"; exit $stat'
-    if test "$lock_old_archive_extraction" = yes; then
-      $opt_dry_run || rm -f "$lockfile"
-    fi
-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-     :
-    else
-      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
-    fi
-}
-
-
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
-{
-    $opt_debug
-    my_gentop="$1"; shift
-    my_oldlibs=${1+"$@"}
-    my_oldobjs=""
-    my_xlib=""
-    my_xabs=""
-    my_xdir=""
-
-    for my_xlib in $my_oldlibs; do
-      # Extract the objects.
-      case $my_xlib in
-	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-	*) my_xabs=`pwd`"/$my_xlib" ;;
-      esac
-      func_basename "$my_xlib"
-      my_xlib="$func_basename_result"
-      my_xlib_u=$my_xlib
-      while :; do
-        case " $extracted_archives " in
-	*" $my_xlib_u "*)
-	  func_arith $extracted_serial + 1
-	  extracted_serial=$func_arith_result
-	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
-	*) break ;;
-	esac
-      done
-      extracted_archives="$extracted_archives $my_xlib_u"
-      my_xdir="$my_gentop/$my_xlib_u"
-
-      func_mkdir_p "$my_xdir"
-
-      case $host in
-      *-darwin*)
-	func_verbose "Extracting $my_xabs"
-	# Do not bother doing anything if just a dry run
-	$opt_dry_run || {
-	  darwin_orig_dir=`pwd`
-	  cd $my_xdir || exit $?
-	  darwin_archive=$my_xabs
-	  darwin_curdir=`pwd`
-	  darwin_base_archive=`basename "$darwin_archive"`
-	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
-	  if test -n "$darwin_arches"; then
-	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
-	    darwin_arch=
-	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
-	    for darwin_arch in  $darwin_arches ; do
-	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-	      cd "$darwin_curdir"
-	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-	    done # $darwin_arches
-            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
-	    darwin_file=
-	    darwin_files=
-	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
-	      $LIPO -create -output "$darwin_file" $darwin_files
-	    done # $darwin_filelist
-	    $RM -rf unfat-$$
-	    cd "$darwin_orig_dir"
-	  else
-	    cd $darwin_orig_dir
-	    func_extract_an_archive "$my_xdir" "$my_xabs"
-	  fi # $darwin_arches
-	} # !$opt_dry_run
-	;;
-      *)
-        func_extract_an_archive "$my_xdir" "$my_xabs"
-	;;
-      esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
-    done
-
-    func_extract_archives_result="$my_oldobjs"
-}
-
-
-# func_emit_wrapper [arg=no]
-#
-# Emit a libtool wrapper script on stdout.
-# Don't directly open a file because we may want to
-# incorporate the script contents within a cygwin/mingw
-# wrapper executable.  Must ONLY be called from within
-# func_mode_link because it depends on a number of variables
-# set therein.
-#
-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-# variable will take.  If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
-# the $objdir directory.  This is a cygwin/mingw-specific
-# behavior.
-func_emit_wrapper ()
-{
-	func_emit_wrapper_arg1=${1-no}
-
-	$ECHO "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='$sed_quote_subst'
-
-# Be Bourne compatible
-if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variables:
-  generated_by_libtool_version='$macro_version'
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$ECHO are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    file=\"\$0\""
-
-    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
-    $ECHO "\
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-    ECHO=\"$qECHO\"
-  fi
-
-# Very basic option parsing. These options are (a) specific to
-# the libtool wrapper, (b) are identical between the wrapper
-# /script/ and the wrapper /executable/ which is used only on
-# windows platforms, and (c) all begin with the string "--lt-"
-# (application programs are unlikely to have options which match
-# this pattern).
-#
-# There are only two supported options: --lt-debug and
-# --lt-dump-script. There is, deliberately, no --lt-help.
-#
-# The first argument to this parsing function should be the
-# script's $0 value, followed by "$@".
-lt_option_debug=
-func_parse_lt_options ()
-{
-  lt_script_arg0=\$0
-  shift
-  for lt_opt
-  do
-    case \"\$lt_opt\" in
-    --lt-debug) lt_option_debug=1 ;;
-    --lt-dump-script)
-        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
-        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
-        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
-        cat \"\$lt_dump_D/\$lt_dump_F\"
-        exit 0
-      ;;
-    --lt-*)
-        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
-        exit 1
-      ;;
-    esac
-  done
-
-  # Print the debug banner immediately:
-  if test -n \"\$lt_option_debug\"; then
-    echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
-  fi
-}
-
-# Used when --lt-debug. Prints its arguments to stdout
-# (redirection is the responsibility of the caller)
-func_lt_dump_args ()
-{
-  lt_dump_args_N=1;
-  for lt_arg
-  do
-    \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
-    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
-  done
-}
-
-# Core function for launching the target application
-func_exec_program_core ()
-{
-"
-  case $host in
-  # Backslashes separate directories on plain windows
-  *-*-mingw | *-*-os2* | *-cegcc*)
-    $ECHO "\
-      if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
-        func_lt_dump_args \${1+\"\$@\"} 1>&2
-      fi
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
-    ;;
-
-  *)
-    $ECHO "\
-      if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
-        func_lt_dump_args \${1+\"\$@\"} 1>&2
-      fi
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
-    ;;
-  esac
-  $ECHO "\
-      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
-      exit 1
-}
-
-# A function to encapsulate launching the target application
-# Strips options in the --lt-* namespace from \$@ and
-# launches target application with the remaining arguments.
-func_exec_program ()
-{
-  for lt_wr_arg
-  do
-    case \$lt_wr_arg in
-    --lt-*) ;;
-    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-    esac
-    shift
-  done
-  func_exec_program_core \${1+\"\$@\"}
-}
-
-  # Parse options
-  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
-  done
-
-  # Usually 'no', except on cygwin/mingw when embedded into
-  # the cwrapper.
-  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
-  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
-    # special case for '.'
-    if test \"\$thisdir\" = \".\"; then
-      thisdir=\`pwd\`
-    fi
-    # remove .libs from thisdir
-    case \"\$thisdir\" in
-    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
-    $objdir )   thisdir=. ;;
-    esac
-  fi
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-	if test "$fast_install" = yes; then
-	  $ECHO "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
-
-  if test ! -f \"\$progdir/\$program\" ||
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
-    file=\"\$\$-\$program\"
-
-    if test ! -d \"\$progdir\"; then
-      $MKDIR \"\$progdir\"
-    else
-      $RM \"\$progdir/\$file\"
-    fi"
-
-	  $ECHO "\
-
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-	$ECHO \"\$relink_command_output\" >&2
-	$RM \"\$progdir/\$file\"
-	exit 1
-      fi
-    fi
-
-    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $RM \"\$progdir/\$program\";
-      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $RM \"\$progdir/\$file\"
-  fi"
-	else
-	  $ECHO "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	$ECHO "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# fixup the dll searchpath if we need to.
-	#
-	# Fix the DLL searchpath if we need to.  Do this before prepending
-	# to shlibpath, because on Windows, both are PATH and uninstalled
-	# libraries must come first.
-	if test -n "$dllsearchpath"; then
-	  $ECHO "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
-	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	  $ECHO "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-	fi
-
-	$ECHO "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-      func_exec_program \${1+\"\$@\"}
-    fi
-  else
-    # The program doesn't exist.
-    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
-    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit 1
-  fi
-fi\
-"
-}
-
-
-# func_emit_cwrapperexe_src
-# emit the source code for a wrapper executable on stdout
-# Must ONLY be called from within func_mode_link because
-# it depends on a number of variable set therein.
-func_emit_cwrapperexe_src ()
-{
-	cat <
-#include 
-#ifdef _MSC_VER
-# include 
-# include 
-# include 
-#else
-# include 
-# include 
-# ifdef __CYGWIN__
-#  include 
-# endif
-#endif
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-/* declarations of non-ANSI functions */
-#if defined(__MINGW32__)
-# ifdef __STRICT_ANSI__
-int _putenv (const char *);
-# endif
-#elif defined(__CYGWIN__)
-# ifdef __STRICT_ANSI__
-char *realpath (const char *, char *);
-int putenv (char *);
-int setenv (const char *, const char *, int);
-# endif
-/* #elif defined (other platforms) ... */
-#endif
-
-/* portability defines, excluding path handling macros */
-#if defined(_MSC_VER)
-# define setmode _setmode
-# define stat    _stat
-# define chmod   _chmod
-# define getcwd  _getcwd
-# define putenv  _putenv
-# define S_IXUSR _S_IEXEC
-# ifndef _INTPTR_T_DEFINED
-#  define _INTPTR_T_DEFINED
-#  define intptr_t int
-# endif
-#elif defined(__MINGW32__)
-# define setmode _setmode
-# define stat    _stat
-# define chmod   _chmod
-# define getcwd  _getcwd
-# define putenv  _putenv
-#elif defined(__CYGWIN__)
-# define HAVE_SETENV
-# define FOPEN_WB "wb"
-/* #elif defined (other platforms) ... */
-#endif
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef S_IXOTH
-# define S_IXOTH 0
-#endif
-#ifndef S_IXGRP
-# define S_IXGRP 0
-#endif
-
-/* path handling portability macros */
-#ifndef DIR_SEPARATOR
-# define DIR_SEPARATOR '/'
-# define PATH_SEPARATOR ':'
-#endif
-
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
-# define HAVE_DOS_BASED_FILE_SYSTEM
-# define FOPEN_WB "wb"
-# ifndef DIR_SEPARATOR_2
-#  define DIR_SEPARATOR_2 '\\'
-# endif
-# ifndef PATH_SEPARATOR_2
-#  define PATH_SEPARATOR_2 ';'
-# endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#ifndef PATH_SEPARATOR_2
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
-#else /* PATH_SEPARATOR_2 */
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
-#endif /* PATH_SEPARATOR_2 */
-
-#ifndef FOPEN_WB
-# define FOPEN_WB "w"
-#endif
-#ifndef _O_BINARY
-# define _O_BINARY 0
-#endif
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
-
-#if defined(LT_DEBUGWRAPPER)
-static int lt_debug = 1;
-#else
-static int lt_debug = 0;
-#endif
-
-const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
-
-void *xmalloc (size_t num);
-char *xstrdup (const char *string);
-const char *base_name (const char *name);
-char *find_executable (const char *wrapper);
-char *chase_symlinks (const char *pathspec);
-int make_executable (const char *path);
-int check_executable (const char *path);
-char *strendzap (char *str, const char *pat);
-void lt_debugprintf (const char *file, int line, const char *fmt, ...);
-void lt_fatal (const char *file, int line, const char *message, ...);
-static const char *nonnull (const char *s);
-static const char *nonempty (const char *s);
-void lt_setenv (const char *name, const char *value);
-char *lt_extend_str (const char *orig_value, const char *add, int to_end);
-void lt_update_exe_path (const char *name, const char *value);
-void lt_update_lib_path (const char *name, const char *value);
-char **prepare_spawn (char **argv);
-void lt_dump_script (FILE *f);
-EOF
-
-	    cat <= 0)
-      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
-    return 1;
-  else
-    return 0;
-}
-
-int
-make_executable (const char *path)
-{
-  int rval = 0;
-  struct stat st;
-
-  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
-                  nonempty (path));
-  if ((!path) || (!*path))
-    return 0;
-
-  if (stat (path, &st) >= 0)
-    {
-      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
-    }
-  return rval;
-}
-
-/* Searches for the full path of the wrapper.  Returns
-   newly allocated full path name if found, NULL otherwise
-   Does not chase symlinks, even on platforms that support them.
-*/
-char *
-find_executable (const char *wrapper)
-{
-  int has_slash = 0;
-  const char *p;
-  const char *p_next;
-  /* static buffer for getcwd */
-  char tmp[LT_PATHMAX + 1];
-  int tmp_len;
-  char *concat_name;
-
-  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
-                  nonempty (wrapper));
-
-  if ((wrapper == NULL) || (*wrapper == '\0'))
-    return NULL;
-
-  /* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
-    {
-      concat_name = xstrdup (wrapper);
-      if (check_executable (concat_name))
-	return concat_name;
-      XFREE (concat_name);
-    }
-  else
-    {
-#endif
-      if (IS_DIR_SEPARATOR (wrapper[0]))
-	{
-	  concat_name = xstrdup (wrapper);
-	  if (check_executable (concat_name))
-	    return concat_name;
-	  XFREE (concat_name);
-	}
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-    }
-#endif
-
-  for (p = wrapper; *p; p++)
-    if (*p == '/')
-      {
-	has_slash = 1;
-	break;
-      }
-  if (!has_slash)
-    {
-      /* no slashes; search PATH */
-      const char *path = getenv ("PATH");
-      if (path != NULL)
-	{
-	  for (p = path; *p; p = p_next)
-	    {
-	      const char *q;
-	      size_t p_len;
-	      for (q = p; *q; q++)
-		if (IS_PATH_SEPARATOR (*q))
-		  break;
-	      p_len = q - p;
-	      p_next = (*q == '\0' ? q : q + 1);
-	      if (p_len == 0)
-		{
-		  /* empty path: current directory */
-		  if (getcwd (tmp, LT_PATHMAX) == NULL)
-		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-                              nonnull (strerror (errno)));
-		  tmp_len = strlen (tmp);
-		  concat_name =
-		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-		  memcpy (concat_name, tmp, tmp_len);
-		  concat_name[tmp_len] = '/';
-		  strcpy (concat_name + tmp_len + 1, wrapper);
-		}
-	      else
-		{
-		  concat_name =
-		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
-		  memcpy (concat_name, p, p_len);
-		  concat_name[p_len] = '/';
-		  strcpy (concat_name + p_len + 1, wrapper);
-		}
-	      if (check_executable (concat_name))
-		return concat_name;
-	      XFREE (concat_name);
-	    }
-	}
-      /* not found in PATH; assume curdir */
-    }
-  /* Relative path | not found in path: prepend cwd */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-              nonnull (strerror (errno)));
-  tmp_len = strlen (tmp);
-  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-  memcpy (concat_name, tmp, tmp_len);
-  concat_name[tmp_len] = '/';
-  strcpy (concat_name + tmp_len + 1, wrapper);
-
-  if (check_executable (concat_name))
-    return concat_name;
-  XFREE (concat_name);
-  return NULL;
-}
-
-char *
-chase_symlinks (const char *pathspec)
-{
-#ifndef S_ISLNK
-  return xstrdup (pathspec);
-#else
-  char buf[LT_PATHMAX];
-  struct stat s;
-  char *tmp_pathspec = xstrdup (pathspec);
-  char *p;
-  int has_symlinks = 0;
-  while (strlen (tmp_pathspec) && !has_symlinks)
-    {
-      lt_debugprintf (__FILE__, __LINE__,
-		      "checking path component for symlinks: %s\n",
-		      tmp_pathspec);
-      if (lstat (tmp_pathspec, &s) == 0)
-	{
-	  if (S_ISLNK (s.st_mode) != 0)
-	    {
-	      has_symlinks = 1;
-	      break;
-	    }
-
-	  /* search backwards for last DIR_SEPARATOR */
-	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
-	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-	    p--;
-	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-	    {
-	      /* no more DIR_SEPARATORS left */
-	      break;
-	    }
-	  *p = '\0';
-	}
-      else
-	{
-	  lt_fatal (__FILE__, __LINE__,
-		    "error accessing file \"%s\": %s",
-		    tmp_pathspec, nonnull (strerror (errno)));
-	}
-    }
-  XFREE (tmp_pathspec);
-
-  if (!has_symlinks)
-    {
-      return xstrdup (pathspec);
-    }
-
-  tmp_pathspec = realpath (pathspec, buf);
-  if (tmp_pathspec == 0)
-    {
-      lt_fatal (__FILE__, __LINE__,
-		"could not follow symlinks for %s", pathspec);
-    }
-  return xstrdup (tmp_pathspec);
-#endif
-}
-
-char *
-strendzap (char *str, const char *pat)
-{
-  size_t len, patlen;
-
-  assert (str != NULL);
-  assert (pat != NULL);
-
-  len = strlen (str);
-  patlen = strlen (pat);
-
-  if (patlen <= len)
-    {
-      str += len - patlen;
-      if (strcmp (str, pat) == 0)
-	*str = '\0';
-    }
-  return str;
-}
-
-void
-lt_debugprintf (const char *file, int line, const char *fmt, ...)
-{
-  va_list args;
-  if (lt_debug)
-    {
-      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
-      va_start (args, fmt);
-      (void) vfprintf (stderr, fmt, args);
-      va_end (args);
-    }
-}
-
-static void
-lt_error_core (int exit_status, const char *file,
-	       int line, const char *mode,
-	       const char *message, va_list ap)
-{
-  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
-
-  if (exit_status >= 0)
-    exit (exit_status);
-}
-
-void
-lt_fatal (const char *file, int line, const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
-  va_end (ap);
-}
-
-static const char *
-nonnull (const char *s)
-{
-  return s ? s : "(null)";
-}
-
-static const char *
-nonempty (const char *s)
-{
-  return (s && !*s) ? "(empty)" : nonnull (s);
-}
-
-void
-lt_setenv (const char *name, const char *value)
-{
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_setenv) setting '%s' to '%s'\n",
-                  nonnull (name), nonnull (value));
-  {
-#ifdef HAVE_SETENV
-    /* always make a copy, for consistency with !HAVE_SETENV */
-    char *str = xstrdup (value);
-    setenv (name, str, 1);
-#else
-    int len = strlen (name) + 1 + strlen (value) + 1;
-    char *str = XMALLOC (char, len);
-    sprintf (str, "%s=%s", name, value);
-    if (putenv (str) != EXIT_SUCCESS)
-      {
-        XFREE (str);
-      }
-#endif
-  }
-}
-
-char *
-lt_extend_str (const char *orig_value, const char *add, int to_end)
-{
-  char *new_value;
-  if (orig_value && *orig_value)
-    {
-      int orig_value_len = strlen (orig_value);
-      int add_len = strlen (add);
-      new_value = XMALLOC (char, add_len + orig_value_len + 1);
-      if (to_end)
-        {
-          strcpy (new_value, orig_value);
-          strcpy (new_value + orig_value_len, add);
-        }
-      else
-        {
-          strcpy (new_value, add);
-          strcpy (new_value + add_len, orig_value);
-        }
-    }
-  else
-    {
-      new_value = xstrdup (add);
-    }
-  return new_value;
-}
-
-void
-lt_update_exe_path (const char *name, const char *value)
-{
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
-                  nonnull (name), nonnull (value));
-
-  if (name && *name && value && *value)
-    {
-      char *new_value = lt_extend_str (getenv (name), value, 0);
-      /* some systems can't cope with a ':'-terminated path #' */
-      int len = strlen (new_value);
-      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
-        {
-          new_value[len-1] = '\0';
-        }
-      lt_setenv (name, new_value);
-      XFREE (new_value);
-    }
-}
-
-void
-lt_update_lib_path (const char *name, const char *value)
-{
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
-                  nonnull (name), nonnull (value));
-
-  if (name && *name && value && *value)
-    {
-      char *new_value = lt_extend_str (getenv (name), value, 0);
-      lt_setenv (name, new_value);
-      XFREE (new_value);
-    }
-}
-
-EOF
-	    case $host_os in
-	      mingw*)
-		cat <<"EOF"
-
-/* Prepares an argument vector before calling spawn().
-   Note that spawn() does not by itself call the command interpreter
-     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
-      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-         GetVersionEx(&v);
-         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
-      }) ? "cmd.exe" : "command.com").
-   Instead it simply concatenates the arguments, separated by ' ', and calls
-   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
-   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
-   special way:
-   - Space and tab are interpreted as delimiters. They are not treated as
-     delimiters if they are surrounded by double quotes: "...".
-   - Unescaped double quotes are removed from the input. Their only effect is
-     that within double quotes, space and tab are treated like normal
-     characters.
-   - Backslashes not followed by double quotes are not special.
-   - But 2*n+1 backslashes followed by a double quote become
-     n backslashes followed by a double quote (n >= 0):
-       \" -> "
-       \\\" -> \"
-       \\\\\" -> \\"
- */
-#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
-#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
-char **
-prepare_spawn (char **argv)
-{
-  size_t argc;
-  char **new_argv;
-  size_t i;
-
-  /* Count number of arguments.  */
-  for (argc = 0; argv[argc] != NULL; argc++)
-    ;
-
-  /* Allocate new argument vector.  */
-  new_argv = XMALLOC (char *, argc + 1);
-
-  /* Put quoted arguments into the new argument vector.  */
-  for (i = 0; i < argc; i++)
-    {
-      const char *string = argv[i];
-
-      if (string[0] == '\0')
-	new_argv[i] = xstrdup ("\"\"");
-      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
-	{
-	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
-	  size_t length;
-	  unsigned int backslashes;
-	  const char *s;
-	  char *quoted_string;
-	  char *p;
-
-	  length = 0;
-	  backslashes = 0;
-	  if (quote_around)
-	    length++;
-	  for (s = string; *s != '\0'; s++)
-	    {
-	      char c = *s;
-	      if (c == '"')
-		length += backslashes + 1;
-	      length++;
-	      if (c == '\\')
-		backslashes++;
-	      else
-		backslashes = 0;
-	    }
-	  if (quote_around)
-	    length += backslashes + 1;
-
-	  quoted_string = XMALLOC (char, length + 1);
-
-	  p = quoted_string;
-	  backslashes = 0;
-	  if (quote_around)
-	    *p++ = '"';
-	  for (s = string; *s != '\0'; s++)
-	    {
-	      char c = *s;
-	      if (c == '"')
-		{
-		  unsigned int j;
-		  for (j = backslashes + 1; j > 0; j--)
-		    *p++ = '\\';
-		}
-	      *p++ = c;
-	      if (c == '\\')
-		backslashes++;
-	      else
-		backslashes = 0;
-	    }
-	  if (quote_around)
-	    {
-	      unsigned int j;
-	      for (j = backslashes; j > 0; j--)
-		*p++ = '\\';
-	      *p++ = '"';
-	    }
-	  *p = '\0';
-
-	  new_argv[i] = quoted_string;
-	}
-      else
-	new_argv[i] = (char *) string;
-    }
-  new_argv[argc] = NULL;
-
-  return new_argv;
-}
-EOF
-		;;
-	    esac
-
-            cat <<"EOF"
-void lt_dump_script (FILE* f)
-{
-EOF
-	    func_emit_wrapper yes |
-              $SED -e 's/\([\\"]\)/\\\1/g' \
-	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
-
-            cat <<"EOF"
-}
-EOF
-}
-# end: func_emit_cwrapperexe_src
-
-# func_win32_import_lib_p ARG
-# True if ARG is an import lib, as indicated by $file_magic_cmd
-func_win32_import_lib_p ()
-{
-    $opt_debug
-    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
-    *import*) : ;;
-    *) false ;;
-    esac
-}
-
-# func_mode_link arg...
-func_mode_link ()
-{
-    $opt_debug
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-      # It is impossible to link a dll without this setting, and
-      # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
-      # flag for every libtool invocation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args=$nonopt
-    base_compile="$nonopt $@"
-    compile_command=$nonopt
-    finalize_command=$nonopt
-
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-    new_inherited_linker_flags=
-
-    avoid_version=no
-    bindir=
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    non_pic_objects=
-    precious_files_regex=
-    prefer_static_libs=no
-    preload=no
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
-    weak_libs=
-    single_module="${wl}-single_module"
-    func_infer_tag $base_compile
-
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -shared)
-	test "$build_libtool_libs" != yes && \
-	  func_fatal_configuration "can not build a shared library"
-	build_old_libs=no
-	break
-	;;
-      -all-static | -static | -static-libtool-libs)
-	case $arg in
-	-all-static)
-	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-	    func_warning "complete static linking is impossible in this configuration"
-	  fi
-	  if test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-	-static)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=built
-	  ;;
-	-static-libtool-libs)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-	esac
-	build_libtool_libs=no
-	build_old_libs=yes
-	break
-	;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
-    # Go through the arguments, transforming them on the way.
-    while test "$#" -gt 0; do
-      arg="$1"
-      shift
-      func_quote_for_eval "$arg"
-      qarg=$func_quote_for_eval_unquoted_result
-      func_append libtool_args " $func_quote_for_eval_result"
-
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-	case $prev in
-	output)
-	  func_append compile_command " @OUTPUT@"
-	  func_append finalize_command " @OUTPUT@"
-	  ;;
-	esac
-
-	case $prev in
-	bindir)
-	  bindir="$arg"
-	  prev=
-	  continue
-	  ;;
-	dlfiles|dlprefiles)
-	  if test "$preload" = no; then
-	    # Add the symbol object into the linking commands.
-	    func_append compile_command " @SYMFILE@"
-	    func_append finalize_command " @SYMFILE@"
-	    preload=yes
-	  fi
-	  case $arg in
-	  *.la | *.lo) ;;  # We handle these cases below.
-	  force)
-	    if test "$dlself" = no; then
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  self)
-	    if test "$prev" = dlprefiles; then
-	      dlself=yes
-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-	      dlself=yes
-	    else
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  *)
-	    if test "$prev" = dlfiles; then
-	      func_append dlfiles " $arg"
-	    else
-	      func_append dlprefiles " $arg"
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  esac
-	  ;;
-	expsyms)
-	  export_symbols="$arg"
-	  test -f "$arg" \
-	    || func_fatal_error "symbol file \`$arg' does not exist"
-	  prev=
-	  continue
-	  ;;
-	expsyms_regex)
-	  export_symbols_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	framework)
-	  case $host in
-	    *-*-darwin*)
-	      case "$deplibs " in
-		*" $qarg.ltframework "*) ;;
-		*) func_append deplibs " $qarg.ltframework" # this is fixed later
-		   ;;
-	      esac
-	      ;;
-	  esac
-	  prev=
-	  continue
-	  ;;
-	inst_prefix)
-	  inst_prefix_dir="$arg"
-	  prev=
-	  continue
-	  ;;
-	objectlist)
-	  if test -f "$arg"; then
-	    save_arg=$arg
-	    moreargs=
-	    for fil in `cat "$save_arg"`
-	    do
-#	      func_append moreargs " $fil"
-	      arg=$fil
-	      # A libtool-controlled object.
-
-	      # Check to see that this really is a libtool object.
-	      if func_lalib_unsafe_p "$arg"; then
-		pic_object=
-		non_pic_object=
-
-		# Read the .lo file
-		func_source "$arg"
-
-		if test -z "$pic_object" ||
-		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none &&
-		   test "$non_pic_object" = none; then
-		  func_fatal_error "cannot find name of object for \`$arg'"
-		fi
-
-		# Extract subdirectory from the argument.
-		func_dirname "$arg" "/" ""
-		xdir="$func_dirname_result"
-
-		if test "$pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  pic_object="$xdir$pic_object"
-
-		  if test "$prev" = dlfiles; then
-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      func_append dlfiles " $pic_object"
-		      prev=
-		      continue
-		    else
-		      # If libtool objects are unsupported, then we need to preload.
-		      prev=dlprefiles
-		    fi
-		  fi
-
-		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test "$prev" = dlprefiles; then
-		    # Preload the old-style object.
-		    func_append dlprefiles " $pic_object"
-		    prev=
-		  fi
-
-		  # A PIC object.
-		  func_append libobjs " $pic_object"
-		  arg="$pic_object"
-		fi
-
-		# Non-PIC object.
-		if test "$non_pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  non_pic_object="$xdir$non_pic_object"
-
-		  # A standard non-PIC object
-		  func_append non_pic_objects " $non_pic_object"
-		  if test -z "$pic_object" || test "$pic_object" = none ; then
-		    arg="$non_pic_object"
-		  fi
-		else
-		  # If the PIC object exists, use it instead.
-		  # $xdir was prepended to $pic_object above.
-		  non_pic_object="$pic_object"
-		  func_append non_pic_objects " $non_pic_object"
-		fi
-	      else
-		# Only an error if not doing a dry-run.
-		if $opt_dry_run; then
-		  # Extract subdirectory from the argument.
-		  func_dirname "$arg" "/" ""
-		  xdir="$func_dirname_result"
-
-		  func_lo2o "$arg"
-		  pic_object=$xdir$objdir/$func_lo2o_result
-		  non_pic_object=$xdir$func_lo2o_result
-		  func_append libobjs " $pic_object"
-		  func_append non_pic_objects " $non_pic_object"
-	        else
-		  func_fatal_error "\`$arg' is not a valid libtool object"
-		fi
-	      fi
-	    done
-	  else
-	    func_fatal_error "link input file \`$arg' does not exist"
-	  fi
-	  arg=$save_arg
-	  prev=
-	  continue
-	  ;;
-	precious_regex)
-	  precious_files_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	release)
-	  release="-$arg"
-	  prev=
-	  continue
-	  ;;
-	rpath | xrpath)
-	  # We need an absolute path.
-	  case $arg in
-	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-	  *)
-	    func_fatal_error "only absolute run-paths are allowed"
-	    ;;
-	  esac
-	  if test "$prev" = rpath; then
-	    case "$rpath " in
-	    *" $arg "*) ;;
-	    *) func_append rpath " $arg" ;;
-	    esac
-	  else
-	    case "$xrpath " in
-	    *" $arg "*) ;;
-	    *) func_append xrpath " $arg" ;;
-	    esac
-	  fi
-	  prev=
-	  continue
-	  ;;
-	shrext)
-	  shrext_cmds="$arg"
-	  prev=
-	  continue
-	  ;;
-	weak)
-	  func_append weak_libs " $arg"
-	  prev=
-	  continue
-	  ;;
-	xcclinker)
-	  func_append linker_flags " $qarg"
-	  func_append compiler_flags " $qarg"
-	  prev=
-	  func_append compile_command " $qarg"
-	  func_append finalize_command " $qarg"
-	  continue
-	  ;;
-	xcompiler)
-	  func_append compiler_flags " $qarg"
-	  prev=
-	  func_append compile_command " $qarg"
-	  func_append finalize_command " $qarg"
-	  continue
-	  ;;
-	xlinker)
-	  func_append linker_flags " $qarg"
-	  func_append compiler_flags " $wl$qarg"
-	  prev=
-	  func_append compile_command " $wl$qarg"
-	  func_append finalize_command " $wl$qarg"
-	  continue
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi # test -n "$prev"
-
-      prevarg="$arg"
-
-      case $arg in
-      -all-static)
-	if test -n "$link_static_flag"; then
-	  # See comment for -static flag below, for more details.
-	  func_append compile_command " $link_static_flag"
-	  func_append finalize_command " $link_static_flag"
-	fi
-	continue
-	;;
-
-      -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
-	;;
-
-      -avoid-version)
-	avoid_version=yes
-	continue
-	;;
-
-      -bindir)
-	prev=bindir
-	continue
-	;;
-
-      -dlopen)
-	prev=dlfiles
-	continue
-	;;
-
-      -dlpreopen)
-	prev=dlprefiles
-	continue
-	;;
-
-      -export-dynamic)
-	export_dynamic=yes
-	continue
-	;;
-
-      -export-symbols | -export-symbols-regex)
-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  func_fatal_error "more than one -exported-symbols argument is not allowed"
-	fi
-	if test "X$arg" = "X-export-symbols"; then
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	continue
-	;;
-
-      -framework)
-	prev=framework
-	continue
-	;;
-
-      -inst-prefix-dir)
-	prev=inst_prefix
-	continue
-	;;
-
-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-      # so, if we see these flags be careful not to treat them like -L
-      -L[A-Z][A-Z]*:*)
-	case $with_gcc/$host in
-	no/*-*-irix* | /*-*-irix*)
-	  func_append compile_command " $arg"
-	  func_append finalize_command " $arg"
-	  ;;
-	esac
-	continue
-	;;
-
-      -L*)
-	func_stripname "-L" '' "$arg"
-	if test -z "$func_stripname_result"; then
-	  if test "$#" -gt 0; then
-	    func_fatal_error "require no space between \`-L' and \`$1'"
-	  else
-	    func_fatal_error "need path for \`-L' option"
-	  fi
-	fi
-	func_resolve_sysroot "$func_stripname_result"
-	dir=$func_resolve_sysroot_result
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  absdir=`cd "$dir" && pwd`
-	  test -z "$absdir" && \
-	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
-	  dir="$absdir"
-	  ;;
-	esac
-	case "$deplibs " in
-	*" -L$dir "* | *" $arg "*)
-	  # Will only happen for absolute or sysroot arguments
-	  ;;
-	*)
-	  # Preserve sysroot, but never include relative directories
-	  case $dir in
-	    [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
-	    *) func_append deplibs " -L$dir" ;;
-	  esac
-	  func_append lib_search_path " $dir"
-	  ;;
-	esac
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$dir:"*) ;;
-	  ::) dllsearchpath=$dir;;
-	  *) func_append dllsearchpath ":$dir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  ::) dllsearchpath=$testbindir;;
-	  *) func_append dllsearchpath ":$testbindir";;
-	  esac
-	  ;;
-	esac
-	continue
-	;;
-
-      -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
-	    # These systems don't actually have a C or math library (as such)
-	    continue
-	    ;;
-	  *-*-os2*)
-	    # These systems don't actually have a C library (as such)
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C and math libraries are in the System framework
-	    func_append deplibs " System.ltframework"
-	    continue
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  esac
-	elif test "X$arg" = "X-lc_r"; then
-	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	   # Do not include libc_r directly, use -pthread flag.
-	   continue
-	   ;;
-	 esac
-	fi
-	func_append deplibs " $arg"
-	continue
-	;;
-
-      -module)
-	module=yes
-	continue
-	;;
-
-      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-      # classes, name mangling, and exception handling.
-      # Darwin uses the -arch flag to determine output architecture.
-      -model|-arch|-isysroot|--sysroot)
-	func_append compiler_flags " $arg"
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-	prev=xcompiler
-	continue
-	;;
-
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-	func_append compiler_flags " $arg"
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-	case "$new_inherited_linker_flags " in
-	    *" $arg "*) ;;
-	    * ) func_append new_inherited_linker_flags " $arg" ;;
-	esac
-	continue
-	;;
-
-      -multi_module)
-	single_module="${wl}-multi_module"
-	continue
-	;;
-
-      -no-fast-install)
-	fast_install=no
-	continue
-	;;
-
-      -no-install)
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
-	  # The PATH hackery in wrapper scripts is required on Windows
-	  # and Darwin in order for the loader to find any dlls it needs.
-	  func_warning "\`-no-install' is ignored for $host"
-	  func_warning "assuming \`-no-fast-install' instead"
-	  fast_install=no
-	  ;;
-	*) no_install=yes ;;
-	esac
-	continue
-	;;
-
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
-      -objectlist)
-	prev=objectlist
-	continue
-	;;
-
-      -o) prev=output ;;
-
-      -precious-files-regex)
-	prev=precious_regex
-	continue
-	;;
-
-      -release)
-	prev=release
-	continue
-	;;
-
-      -rpath)
-	prev=rpath
-	continue
-	;;
-
-      -R)
-	prev=xrpath
-	continue
-	;;
-
-      -R*)
-	func_stripname '-R' '' "$arg"
-	dir=$func_stripname_result
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	=*)
-	  func_stripname '=' '' "$dir"
-	  dir=$lt_sysroot$func_stripname_result
-	  ;;
-	*)
-	  func_fatal_error "only absolute run-paths are allowed"
-	  ;;
-	esac
-	case "$xrpath " in
-	*" $dir "*) ;;
-	*) func_append xrpath " $dir" ;;
-	esac
-	continue
-	;;
-
-      -shared)
-	# The effects of -shared are defined in a previous loop.
-	continue
-	;;
-
-      -shrext)
-	prev=shrext
-	continue
-	;;
-
-      -static | -static-libtool-libs)
-	# The effects of -static are defined in a previous loop.
-	# We used to do the same as -all-static on platforms that
-	# didn't have a PIC flag, but the assumption that the effects
-	# would be equivalent was wrong.  It would break on at least
-	# Digital Unix and AIX.
-	continue
-	;;
-
-      -thread-safe)
-	thread_safe=yes
-	continue
-	;;
-
-      -version-info)
-	prev=vinfo
-	continue
-	;;
-
-      -version-number)
-	prev=vinfo
-	vinfo_number=yes
-	continue
-	;;
-
-      -weak)
-        prev=weak
-	continue
-	;;
-
-      -Wc,*)
-	func_stripname '-Wc,' '' "$arg"
-	args=$func_stripname_result
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-          func_quote_for_eval "$flag"
-	  func_append arg " $func_quote_for_eval_result"
-	  func_append compiler_flags " $func_quote_for_eval_result"
-	done
-	IFS="$save_ifs"
-	func_stripname ' ' '' "$arg"
-	arg=$func_stripname_result
-	;;
-
-      -Wl,*)
-	func_stripname '-Wl,' '' "$arg"
-	args=$func_stripname_result
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-          func_quote_for_eval "$flag"
-	  func_append arg " $wl$func_quote_for_eval_result"
-	  func_append compiler_flags " $wl$func_quote_for_eval_result"
-	  func_append linker_flags " $func_quote_for_eval_result"
-	done
-	IFS="$save_ifs"
-	func_stripname ' ' '' "$arg"
-	arg=$func_stripname_result
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Xlinker)
-	prev=xlinker
-	continue
-	;;
-
-      -XCClinker)
-	prev=xcclinker
-	continue
-	;;
-
-      # -msg_* for osf cc
-      -msg_*)
-	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
-
-      # Flags to be passed through unchanged, with rationale:
-      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
-      # -r[0-9][0-9]*        specify processor for the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
-      # +DA*, +DD*           enable 64-bit mode for the HP compiler
-      # -q*                  compiler args for the IBM compiler
-      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
-      # -F/path              path to uninstalled frameworks, gcc on darwin
-      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
-      # @file                GCC response files
-      # -tp=*                Portland pgcc target processor selection
-      # --sysroot=*          for sysroot support
-      # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
-        func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-        func_append compile_command " $arg"
-        func_append finalize_command " $arg"
-        func_append compiler_flags " $arg"
-        continue
-        ;;
-
-      # Some other compiler flag.
-      -* | +*)
-        func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
-
-      *.$objext)
-	# A standard object.
-	func_append objs " $arg"
-	;;
-
-      *.lo)
-	# A libtool-controlled object.
-
-	# Check to see that this really is a libtool object.
-	if func_lalib_unsafe_p "$arg"; then
-	  pic_object=
-	  non_pic_object=
-
-	  # Read the .lo file
-	  func_source "$arg"
-
-	  if test -z "$pic_object" ||
-	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none &&
-	     test "$non_pic_object" = none; then
-	    func_fatal_error "cannot find name of object for \`$arg'"
-	  fi
-
-	  # Extract subdirectory from the argument.
-	  func_dirname "$arg" "/" ""
-	  xdir="$func_dirname_result"
-
-	  if test "$pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    pic_object="$xdir$pic_object"
-
-	    if test "$prev" = dlfiles; then
-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		func_append dlfiles " $pic_object"
-		prev=
-		continue
-	      else
-		# If libtool objects are unsupported, then we need to preload.
-		prev=dlprefiles
-	      fi
-	    fi
-
-	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test "$prev" = dlprefiles; then
-	      # Preload the old-style object.
-	      func_append dlprefiles " $pic_object"
-	      prev=
-	    fi
-
-	    # A PIC object.
-	    func_append libobjs " $pic_object"
-	    arg="$pic_object"
-	  fi
-
-	  # Non-PIC object.
-	  if test "$non_pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    non_pic_object="$xdir$non_pic_object"
-
-	    # A standard non-PIC object
-	    func_append non_pic_objects " $non_pic_object"
-	    if test -z "$pic_object" || test "$pic_object" = none ; then
-	      arg="$non_pic_object"
-	    fi
-	  else
-	    # If the PIC object exists, use it instead.
-	    # $xdir was prepended to $pic_object above.
-	    non_pic_object="$pic_object"
-	    func_append non_pic_objects " $non_pic_object"
-	  fi
-	else
-	  # Only an error if not doing a dry-run.
-	  if $opt_dry_run; then
-	    # Extract subdirectory from the argument.
-	    func_dirname "$arg" "/" ""
-	    xdir="$func_dirname_result"
-
-	    func_lo2o "$arg"
-	    pic_object=$xdir$objdir/$func_lo2o_result
-	    non_pic_object=$xdir$func_lo2o_result
-	    func_append libobjs " $pic_object"
-	    func_append non_pic_objects " $non_pic_object"
-	  else
-	    func_fatal_error "\`$arg' is not a valid libtool object"
-	  fi
-	fi
-	;;
-
-      *.$libext)
-	# An archive.
-	func_append deplibs " $arg"
-	func_append old_deplibs " $arg"
-	continue
-	;;
-
-      *.la)
-	# A libtool-controlled library.
-
-	func_resolve_sysroot "$arg"
-	if test "$prev" = dlfiles; then
-	  # This library was specified with -dlopen.
-	  func_append dlfiles " $func_resolve_sysroot_result"
-	  prev=
-	elif test "$prev" = dlprefiles; then
-	  # The library was specified with -dlpreopen.
-	  func_append dlprefiles " $func_resolve_sysroot_result"
-	  prev=
-	else
-	  func_append deplibs " $func_resolve_sysroot_result"
-	fi
-	continue
-	;;
-
-      # Some other compiler argument.
-      *)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
-      esac # arg
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-      fi
-    done # argument parsing loop
-
-    test -n "$prev" && \
-      func_fatal_help "the \`$prevarg' option requires an argument"
-
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      func_append compile_command " $arg"
-      func_append finalize_command " $arg"
-    fi
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    func_basename "$output"
-    outputname="$func_basename_result"
-    libobjs_save="$libobjs"
-
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
-    else
-      shlib_search_path=
-    fi
-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
-    func_dirname "$output" "/" ""
-    output_objdir="$func_dirname_result$objdir"
-    func_to_tool_file "$output_objdir/"
-    tool_output_objdir=$func_to_tool_file_result
-    # Create the object directory.
-    func_mkdir_p "$output_objdir"
-
-    # Determine the type of output
-    case $output in
-    "")
-      func_fatal_help "you must specify an output file"
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
-
-    specialdeplibs=
-
-    libs=
-    # Find all interdependent deplibs by searching for libraries
-    # that are linked more than once (e.g. -la -lb -la)
-    for deplib in $deplibs; do
-      if $opt_preserve_dup_deps ; then
-	case "$libs " in
-	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
-	esac
-      fi
-      func_append libs " $deplib"
-    done
-
-    if test "$linkmode" = lib; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-
-      # Compute libraries that are listed more than once in $predeps
-      # $postdeps and mark them as special (i.e., whose duplicates are
-      # not to be eliminated).
-      pre_post_deps=
-      if $opt_duplicate_compiler_generated_deps; then
-	for pre_post_dep in $predeps $postdeps; do
-	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
-	  esac
-	  func_append pre_post_deps " $pre_post_dep"
-	done
-      fi
-      pre_post_deps=
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    notinst_path= # paths that contain not-installed libtool libraries
-
-    case $linkmode in
-    lib)
-	passes="conv dlpreopen link"
-	for file in $dlfiles $dlprefiles; do
-	  case $file in
-	  *.la) ;;
-	  *)
-	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
-	    ;;
-	  esac
-	done
-	;;
-    prog)
-	compile_deplibs=
-	finalize_deplibs=
-	alldeplibs=no
-	newdlfiles=
-	newdlprefiles=
-	passes="conv scan dlopen dlpreopen link"
-	;;
-    *)  passes="conv"
-	;;
-    esac
-
-    for pass in $passes; do
-      # The preopen pass in lib mode reverses $deplibs; put it back here
-      # so that -L comes before libs that need it for instance...
-      if test "$linkmode,$pass" = "lib,link"; then
-	## FIXME: Find the place where the list is rebuilt in the wrong
-	##        order, and fix it there properly
-        tmp_deplibs=
-	for deplib in $deplibs; do
-	  tmp_deplibs="$deplib $tmp_deplibs"
-	done
-	deplibs="$tmp_deplibs"
-      fi
-
-      if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
-	deplibs=
-      fi
-      if test "$linkmode" = prog; then
-	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-	esac
-      fi
-      if test "$linkmode,$pass" = "lib,dlpreopen"; then
-	# Collect and forward deplibs of preopened libtool libs
-	for lib in $dlprefiles; do
-	  # Ignore non-libtool-libs
-	  dependency_libs=
-	  func_resolve_sysroot "$lib"
-	  case $lib in
-	  *.la)	func_source "$func_resolve_sysroot_result" ;;
-	  esac
-
-	  # Collect preopened libtool deplibs, except any this library
-	  # has declared as weak libs
-	  for deplib in $dependency_libs; do
-	    func_basename "$deplib"
-            deplib_base=$func_basename_result
-	    case " $weak_libs " in
-	    *" $deplib_base "*) ;;
-	    *) func_append deplibs " $deplib" ;;
-	    esac
-	  done
-	done
-	libs="$dlprefiles"
-      fi
-      if test "$pass" = dlopen; then
-	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
-	deplibs=
-      fi
-
-      for deplib in $libs; do
-	lib=
-	found=no
-	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    func_append compiler_flags " $deplib"
-	    if test "$linkmode" = lib ; then
-		case "$new_inherited_linker_flags " in
-		    *" $deplib "*) ;;
-		    * ) func_append new_inherited_linker_flags " $deplib" ;;
-		esac
-	    fi
-	  fi
-	  continue
-	  ;;
-	-l*)
-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    func_warning "\`-l' is ignored for archives/objects"
-	    continue
-	  fi
-	  func_stripname '-l' '' "$deplib"
-	  name=$func_stripname_result
-	  if test "$linkmode" = lib; then
-	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
-	  else
-	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
-	  fi
-	  for searchdir in $searchdirs; do
-	    for search_ext in .la $std_shrext .so .a; do
-	      # Search the libtool library
-	      lib="$searchdir/lib${name}${search_ext}"
-	      if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		  found=yes
-		else
-		  found=no
-		fi
-		break 2
-	      fi
-	    done
-	  done
-	  if test "$found" != yes; then
-	    # deplib doesn't seem to be a libtool library
-	    if test "$linkmode,$pass" = "prog,link"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  else # deplib is a libtool library
-	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-	    # We need to do some special things here, and not later.
-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	      case " $predeps $postdeps " in
-	      *" $deplib "*)
-		if func_lalib_p "$lib"; then
-		  library_names=
-		  old_library=
-		  func_source "$lib"
-		  for l in $old_library $library_names; do
-		    ll="$l"
-		  done
-		  if test "X$ll" = "X$old_library" ; then # only static version available
-		    found=no
-		    func_dirname "$lib" "" "."
-		    ladir="$func_dirname_result"
-		    lib=$ladir/$old_library
-		    if test "$linkmode,$pass" = "prog,link"; then
-		      compile_deplibs="$deplib $compile_deplibs"
-		      finalize_deplibs="$deplib $finalize_deplibs"
-		    else
-		      deplibs="$deplib $deplibs"
-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-		    fi
-		    continue
-		  fi
-		fi
-		;;
-	      *) ;;
-	      esac
-	    fi
-	  fi
-	  ;; # -l
-	*.ltframework)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    deplibs="$deplib $deplibs"
-	    if test "$linkmode" = lib ; then
-		case "$new_inherited_linker_flags " in
-		    *" $deplib "*) ;;
-		    * ) func_append new_inherited_linker_flags " $deplib" ;;
-		esac
-	    fi
-	  fi
-	  continue
-	  ;;
-	-L*)
-	  case $linkmode in
-	  lib)
-	    deplibs="$deplib $deplibs"
-	    test "$pass" = conv && continue
-	    newdependency_libs="$deplib $newdependency_libs"
-	    func_stripname '-L' '' "$deplib"
-	    func_resolve_sysroot "$func_stripname_result"
-	    func_append newlib_search_path " $func_resolve_sysroot_result"
-	    ;;
-	  prog)
-	    if test "$pass" = conv; then
-	      deplibs="$deplib $deplibs"
-	      continue
-	    fi
-	    if test "$pass" = scan; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    func_stripname '-L' '' "$deplib"
-	    func_resolve_sysroot "$func_stripname_result"
-	    func_append newlib_search_path " $func_resolve_sysroot_result"
-	    ;;
-	  *)
-	    func_warning "\`-L' is ignored for archives/objects"
-	    ;;
-	  esac # linkmode
-	  continue
-	  ;; # -L
-	-R*)
-	  if test "$pass" = link; then
-	    func_stripname '-R' '' "$deplib"
-	    func_resolve_sysroot "$func_stripname_result"
-	    dir=$func_resolve_sysroot_result
-	    # Make sure the xrpath contains only unique directories.
-	    case "$xrpath " in
-	    *" $dir "*) ;;
-	    *) func_append xrpath " $dir" ;;
-	    esac
-	  fi
-	  deplibs="$deplib $deplibs"
-	  continue
-	  ;;
-	*.la)
-	  func_resolve_sysroot "$deplib"
-	  lib=$func_resolve_sysroot_result
-	  ;;
-	*.$libext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  case $linkmode in
-	  lib)
-	    # Linking convenience modules into shared libraries is allowed,
-	    # but linking other static libraries is non-portable.
-	    case " $dlpreconveniencelibs " in
-	    *" $deplib "*) ;;
-	    *)
-	      valid_a_lib=no
-	      case $deplibs_check_method in
-		match_pattern*)
-		  set dummy $deplibs_check_method; shift
-		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
-		    | $EGREP "$match_pattern_regex" > /dev/null; then
-		    valid_a_lib=yes
-		  fi
-		;;
-		pass_all)
-		  valid_a_lib=yes
-		;;
-	      esac
-	      if test "$valid_a_lib" != yes; then
-		echo
-		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because the file extensions .$libext of this argument makes me believe"
-		echo "*** that it is just a static archive that I should not use here."
-	      else
-		echo
-		$ECHO "*** Warning: Linking the shared library $output against the"
-		$ECHO "*** static library $deplib is not portable!"
-		deplibs="$deplib $deplibs"
-	      fi
-	      ;;
-	    esac
-	    continue
-	    ;;
-	  prog)
-	    if test "$pass" != link; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    continue
-	    ;;
-	  esac # linkmode
-	  ;; # *.$libext
-	*.lo | *.$objext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	  elif test "$linkmode" = prog; then
-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	      # If there is no dlopen support or we're linking statically,
-	      # we need to preload.
-	      func_append newdlprefiles " $deplib"
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      func_append newdlfiles " $deplib"
-	    fi
-	  fi
-	  continue
-	  ;;
-	%DEPLIBS%)
-	  alldeplibs=yes
-	  continue
-	  ;;
-	esac # case $deplib
-
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
-	fi
-
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$lib" \
-	  || func_fatal_error "\`$lib' is not a valid libtool archive"
-
-	func_dirname "$lib" "" "."
-	ladir="$func_dirname_result"
-
-	dlname=
-	dlopen=
-	dlpreopen=
-	libdir=
-	library_names=
-	old_library=
-	inherited_linker_flags=
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variables installed, or shouldnotlink
-	installed=yes
-	shouldnotlink=no
-	avoidtemprpath=
-
-
-	# Read the .la file
-	func_source "$lib"
-
-	# Convert "-framework foo" to "foo.ltframework"
-	if test -n "$inherited_linker_flags"; then
-	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
-	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
-	    case " $new_inherited_linker_flags " in
-	      *" $tmp_inherited_linker_flag "*) ;;
-	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
-	    esac
-	  done
-	fi
-	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	if test "$linkmode,$pass" = "lib,link" ||
-	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	  test -n "$dlopen" && func_append dlfiles " $dlopen"
-	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
-	fi
-
-	if test "$pass" = conv; then
-	  # Only check for convenience libraries
-	  deplibs="$lib $deplibs"
-	  if test -z "$libdir"; then
-	    if test -z "$old_library"; then
-	      func_fatal_error "cannot find name of link library for \`$lib'"
-	    fi
-	    # It is a libtool convenience library, so add in its objects.
-	    func_append convenience " $ladir/$objdir/$old_library"
-	    func_append old_convenience " $ladir/$objdir/$old_library"
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    func_fatal_error "\`$lib' is not a convenience library"
-	  fi
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    deplibs="$deplib $deplibs"
-	    if $opt_preserve_dup_deps ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
-	      esac
-	    fi
-	    func_append tmp_libs " $deplib"
-	  done
-	  continue
-	fi # $pass = conv
-
-
-	# Get the name of the library we link against.
-	linklib=
-	if test -n "$old_library" &&
-	   { test "$prefer_static_libs" = yes ||
-	     test "$prefer_static_libs,$installed" = "built,no"; }; then
-	  linklib=$old_library
-	else
-	  for l in $old_library $library_names; do
-	    linklib="$l"
-	  done
-	fi
-	if test -z "$linklib"; then
-	  func_fatal_error "cannot find name of link library for \`$lib'"
-	fi
-
-	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	  if test -z "$libdir"; then
-	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
-	  fi
-	  if test -z "$dlname" ||
-	     test "$dlopen_support" != yes ||
-	     test "$build_libtool_libs" = no; then
-	    # If there is no dlname, no dlopen support or we're linking
-	    # statically, we need to preload.  We also need to preload any
-	    # dependent libraries so libltdl's deplib preloader doesn't
-	    # bomb out in the load deplibs phase.
-	    func_append dlprefiles " $lib $dependency_libs"
-	  else
-	    func_append newdlfiles " $lib"
-	  fi
-	  continue
-	fi # $pass = dlopen
-
-	# We need an absolute path.
-	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-	*)
-	  abs_ladir=`cd "$ladir" && pwd`
-	  if test -z "$abs_ladir"; then
-	    func_warning "cannot determine absolute directory name of \`$ladir'"
-	    func_warning "passing it literally to the linker, although it might fail"
-	    abs_ladir="$ladir"
-	  fi
-	  ;;
-	esac
-	func_basename "$lib"
-	laname="$func_basename_result"
-
-	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
-	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    func_warning "library \`$lib' was moved."
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    libdir="$abs_ladir"
-	  else
-	    dir="$lt_sysroot$libdir"
-	    absdir="$lt_sysroot$libdir"
-	  fi
-	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
-	else
-	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    # Remove this search path later
-	    func_append notinst_path " $abs_ladir"
-	  else
-	    dir="$ladir/$objdir"
-	    absdir="$abs_ladir/$objdir"
-	    # Remove this search path later
-	    func_append notinst_path " $abs_ladir"
-	  fi
-	fi # $installed = yes
-	func_stripname 'lib' '.la' "$laname"
-	name=$func_stripname_result
-
-	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir" && test "$linkmode" = prog; then
-	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
-	  fi
-	  case "$host" in
-	    # special handling for platforms with PE-DLLs.
-	    *cygwin* | *mingw* | *cegcc* )
-	      # Linker will automatically link against shared library if both
-	      # static and shared are present.  Therefore, ensure we extract
-	      # symbols from the import library if a shared library is present
-	      # (otherwise, the dlopen module name will be incorrect).  We do
-	      # this by putting the import library name into $newdlprefiles.
-	      # We recover the dlopen module name by 'saving' the la file
-	      # name in a special purpose variable, and (later) extracting the
-	      # dlname from the la file.
-	      if test -n "$dlname"; then
-	        func_tr_sh "$dir/$linklib"
-	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
-	        func_append newdlprefiles " $dir/$linklib"
-	      else
-	        func_append newdlprefiles " $dir/$old_library"
-	        # Keep a list of preopened convenience libraries to check
-	        # that they are being used correctly in the link pass.
-	        test -z "$libdir" && \
-	          func_append dlpreconveniencelibs " $dir/$old_library"
-	      fi
-	    ;;
-	    * )
-	      # Prefer using a static library (so that no silly _DYNAMIC symbols
-	      # are required to link).
-	      if test -n "$old_library"; then
-	        func_append newdlprefiles " $dir/$old_library"
-	        # Keep a list of preopened convenience libraries to check
-	        # that they are being used correctly in the link pass.
-	        test -z "$libdir" && \
-	          func_append dlpreconveniencelibs " $dir/$old_library"
-	      # Otherwise, use the dlname, so that lt_dlopen finds it.
-	      elif test -n "$dlname"; then
-	        func_append newdlprefiles " $dir/$dlname"
-	      else
-	        func_append newdlprefiles " $dir/$linklib"
-	      fi
-	    ;;
-	  esac
-	fi # $pass = dlpreopen
-
-	if test -z "$libdir"; then
-	  # Link the convenience library
-	  if test "$linkmode" = lib; then
-	    deplibs="$dir/$old_library $deplibs"
-	  elif test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$dir/$old_library $compile_deplibs"
-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-	  else
-	    deplibs="$lib $deplibs" # used for prog,scan pass
-	  fi
-	  continue
-	fi
-
-
-	if test "$linkmode" = prog && test "$pass" != link; then
-	  func_append newlib_search_path " $ladir"
-	  deplibs="$lib $deplibs"
-
-	  linkalldeplibs=no
-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	     test "$build_libtool_libs" = no; then
-	    linkalldeplibs=yes
-	  fi
-
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    case $deplib in
-	    -L*) func_stripname '-L' '' "$deplib"
-	         func_resolve_sysroot "$func_stripname_result"
-	         func_append newlib_search_path " $func_resolve_sysroot_result"
-		 ;;
-	    esac
-	    # Need to link against all dependency_libs?
-	    if test "$linkalldeplibs" = yes; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      # Need to hardcode shared library paths
-	      # or/and link against static libraries
-	      newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    if $opt_preserve_dup_deps ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
-	      esac
-	    fi
-	    func_append tmp_libs " $deplib"
-	  done # for deplib
-	  continue
-	fi # $linkmode = prog...
-
-	if test "$linkmode,$pass" = "prog,link"; then
-	  if test -n "$library_names" &&
-	     { { test "$prefer_static_libs" = no ||
-	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
-	       test -z "$old_library"; }; then
-	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
-	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath:" in
-	      *"$absdir:"*) ;;
-	      *) func_append temp_rpath "$absdir:" ;;
-	      esac
-	    fi
-
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) func_append compile_rpath " $absdir" ;;
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) func_append finalize_rpath " $libdir" ;;
-	      esac
-	      ;;
-	    esac
-	  fi # $linkmode,$pass = prog,link...
-
-	  if test "$alldeplibs" = yes &&
-	     { test "$deplibs_check_method" = pass_all ||
-	       { test "$build_libtool_libs" = yes &&
-		 test -n "$library_names"; }; }; then
-	    # We only need to search for static libraries
-	    continue
-	  fi
-	fi
-
-	link_static=no # Whether the deplib will be linked statically
-	use_static_libs=$prefer_static_libs
-	if test "$use_static_libs" = built && test "$installed" = yes; then
-	  use_static_libs=no
-	fi
-	if test -n "$library_names" &&
-	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
-	  case $host in
-	  *cygwin* | *mingw* | *cegcc*)
-	      # No point in relinking DLLs because paths are not encoded
-	      func_append notinst_deplibs " $lib"
-	      need_relink=no
-	    ;;
-	  *)
-	    if test "$installed" = no; then
-	      func_append notinst_deplibs " $lib"
-	      need_relink=yes
-	    fi
-	    ;;
-	  esac
-	  # This is a shared library
-
-	  # Warn about portability, can't link against -module's on some
-	  # systems (darwin).  Don't bleat about dlopened modules though!
-	  dlopenmodule=""
-	  for dlpremoduletest in $dlprefiles; do
-	    if test "X$dlpremoduletest" = "X$lib"; then
-	      dlopenmodule="$dlpremoduletest"
-	      break
-	    fi
-	  done
-	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
-	    echo
-	    if test "$linkmode" = prog; then
-	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
-	    else
-	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
-	    fi
-	    $ECHO "*** $linklib is not portable!"
-	  fi
-	  if test "$linkmode" = lib &&
-	     test "$hardcode_into_libs" = yes; then
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) func_append compile_rpath " $absdir" ;;
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) func_append finalize_rpath " $libdir" ;;
-	      esac
-	      ;;
-	    esac
-	  fi
-
-	  if test -n "$old_archive_from_expsyms_cmds"; then
-	    # figure out the soname
-	    set dummy $library_names
-	    shift
-	    realname="$1"
-	    shift
-	    libname=`eval "\\$ECHO \"$libname_spec\""`
-	    # use dlname if we got it. it's perfectly good, no?
-	    if test -n "$dlname"; then
-	      soname="$dlname"
-	    elif test -n "$soname_spec"; then
-	      # bleh windows
-	      case $host in
-	      *cygwin* | mingw* | *cegcc*)
-	        func_arith $current - $age
-		major=$func_arith_result
-		versuffix="-$major"
-		;;
-	      esac
-	      eval soname=\"$soname_spec\"
-	    else
-	      soname="$realname"
-	    fi
-
-	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot="$soname"
-	    func_basename "$soroot"
-	    soname="$func_basename_result"
-	    func_stripname 'lib' '.dll' "$soname"
-	    newlib=libimp-$func_stripname_result.a
-
-	    # If the library has no export list, then create one now
-	    if test -f "$output_objdir/$soname-def"; then :
-	    else
-	      func_verbose "extracting exported symbol list from \`$soname'"
-	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
-	    fi
-
-	    # Create $newlib
-	    if test -f "$output_objdir/$newlib"; then :; else
-	      func_verbose "generating import library for \`$soname'"
-	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
-	    fi
-	    # make sure the library variables are pointing to the new library
-	    dir=$output_objdir
-	    linklib=$newlib
-	  fi # test -n "$old_archive_from_expsyms_cmds"
-
-	  if test "$linkmode" = prog || test "$opt_mode" != relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    lib_linked=yes
-	    case $hardcode_action in
-	    immediate | unsupported)
-	      if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
-		case $host in
-		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
-		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
-		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
-		    *-*-unixware7*) add_dir="-L$dir" ;;
-		  *-*-darwin* )
-		    # if the lib is a (non-dlopened) module then we can not
-		    # link against it, someone is ignoring the earlier warnings
-		    if /usr/bin/file -L $add 2> /dev/null |
-			 $GREP ": [^:]* bundle" >/dev/null ; then
-		      if test "X$dlopenmodule" != "X$lib"; then
-			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
-			if test -z "$old_library" ; then
-			  echo
-			  echo "*** And there doesn't seem to be a static archive available"
-			  echo "*** The link will probably fail, sorry"
-			else
-			  add="$dir/$old_library"
-			fi
-		      elif test -n "$old_library"; then
-			add="$dir/$old_library"
-		      fi
-		    fi
-		esac
-	      elif test "$hardcode_minus_L" = no; then
-		case $host in
-		*-*-sunos*) add_shlibpath="$dir" ;;
-		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    relink)
-	      if test "$hardcode_direct" = yes &&
-	         test "$hardcode_direct_absolute" = no; then
-		add="$dir/$linklib"
-	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
-		# Try looking first in the location we're being installed to.
-		if test -n "$inst_prefix_dir"; then
-		  case $libdir in
-		    [\\/]*)
-		      func_append add_dir " -L$inst_prefix_dir$libdir"
-		      ;;
-		  esac
-		fi
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    *) lib_linked=no ;;
-	    esac
-
-	    if test "$lib_linked" != yes; then
-	      func_fatal_configuration "unsupported hardcode properties"
-	    fi
-
-	    if test -n "$add_shlibpath"; then
-	      case :$compile_shlibpath: in
-	      *":$add_shlibpath:"*) ;;
-	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
-	      esac
-	    fi
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes &&
-		 test "$hardcode_minus_L" != yes &&
-		 test "$hardcode_shlibpath_var" = yes; then
-		case :$finalize_shlibpath: in
-		*":$libdir:"*) ;;
-		*) func_append finalize_shlibpath "$libdir:" ;;
-		esac
-	      fi
-	    fi
-	  fi
-
-	  if test "$linkmode" = prog || test "$opt_mode" = relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes &&
-	       test "$hardcode_direct_absolute" = no; then
-	      add="$libdir/$linklib"
-	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
-	      add="-l$name"
-	    elif test "$hardcode_shlibpath_var" = yes; then
-	      case :$finalize_shlibpath: in
-	      *":$libdir:"*) ;;
-	      *) func_append finalize_shlibpath "$libdir:" ;;
-	      esac
-	      add="-l$name"
-	    elif test "$hardcode_automatic" = yes; then
-	      if test -n "$inst_prefix_dir" &&
-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-		add="$inst_prefix_dir$libdir/$linklib"
-	      else
-		add="$libdir/$linklib"
-	      fi
-	    else
-	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
-	      # Try looking first in the location we're being installed to.
-	      if test -n "$inst_prefix_dir"; then
-		case $libdir in
-		  [\\/]*)
-		    func_append add_dir " -L$inst_prefix_dir$libdir"
-		    ;;
-		esac
-	      fi
-	      add="-l$name"
-	    fi
-
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	    fi
-	  fi
-	elif test "$linkmode" = prog; then
-	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-	  # is not unsupported.  This is valid on all known static and
-	  # shared platforms.
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
-	    compile_deplibs="$dir/$linklib $compile_deplibs"
-	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-	  else
-	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-	  fi
-	elif test "$build_libtool_libs" = yes; then
-	  # Not a shared library
-	  if test "$deplibs_check_method" != pass_all; then
-	    # We're trying link a shared library against a static one
-	    # but the system doesn't support it.
-
-	    # Just print a warning and add the library to dependency_libs so
-	    # that the program can be linked against the static library.
-	    echo
-	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
-	    echo "*** I have the capability to make that library automatically link in when"
-	    echo "*** you link to this library.  But I can only do this if you have a"
-	    echo "*** shared version of the library, which you do not appear to have."
-	    if test "$module" = yes; then
-	      echo "*** But as you try to build a module library, libtool will still create "
-	      echo "*** a static module, that should work as long as the dlopening application"
-	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-	      if test -z "$global_symbol_pipe"; then
-		echo
-		echo "*** However, this would only work if libtool was able to extract symbol"
-		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		echo "*** not find such a program.  So, this module is probably useless."
-		echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	      fi
-	      if test "$build_old_libs" = no; then
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  else
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi # link shared/static library?
-
-	if test "$linkmode" = lib; then
-	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes ||
-	       test "$build_old_libs" = yes ||
-	       test "$link_static" = yes; }; then
-	    # Extract -R from dependency_libs
-	    temp_deplibs=
-	    for libdir in $dependency_libs; do
-	      case $libdir in
-	      -R*) func_stripname '-R' '' "$libdir"
-	           temp_xrpath=$func_stripname_result
-		   case " $xrpath " in
-		   *" $temp_xrpath "*) ;;
-		   *) func_append xrpath " $temp_xrpath";;
-		   esac;;
-	      *) func_append temp_deplibs " $libdir";;
-	      esac
-	    done
-	    dependency_libs="$temp_deplibs"
-	  fi
-
-	  func_append newlib_search_path " $absdir"
-	  # Link against this library
-	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-	  # ... and its dependency_libs
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    newdependency_libs="$deplib $newdependency_libs"
-	    case $deplib in
-              -L*) func_stripname '-L' '' "$deplib"
-                   func_resolve_sysroot "$func_stripname_result";;
-              *) func_resolve_sysroot "$deplib" ;;
-            esac
-	    if $opt_preserve_dup_deps ; then
-	      case "$tmp_libs " in
-	      *" $func_resolve_sysroot_result "*)
-                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
-	      esac
-	    fi
-	    func_append tmp_libs " $func_resolve_sysroot_result"
-	  done
-
-	  if test "$link_all_deplibs" != no; then
-	    # Add the search paths of all dependency libraries
-	    for deplib in $dependency_libs; do
-	      path=
-	      case $deplib in
-	      -L*) path="$deplib" ;;
-	      *.la)
-	        func_resolve_sysroot "$deplib"
-	        deplib=$func_resolve_sysroot_result
-	        func_dirname "$deplib" "" "."
-		dir=$func_dirname_result
-		# We need an absolute path.
-		case $dir in
-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-		*)
-		  absdir=`cd "$dir" && pwd`
-		  if test -z "$absdir"; then
-		    func_warning "cannot determine absolute directory name of \`$dir'"
-		    absdir="$dir"
-		  fi
-		  ;;
-		esac
-		if $GREP "^installed=no" $deplib > /dev/null; then
-		case $host in
-		*-*-darwin*)
-		  depdepl=
-		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-		  if test -n "$deplibrary_names" ; then
-		    for tmp in $deplibrary_names ; do
-		      depdepl=$tmp
-		    done
-		    if test -f "$absdir/$objdir/$depdepl" ; then
-		      depdepl="$absdir/$objdir/$depdepl"
-		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
-                      if test -z "$darwin_install_name"; then
-                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
-                      fi
-		      func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
-		      func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
-		      path=
-		    fi
-		  fi
-		  ;;
-		*)
-		  path="-L$absdir/$objdir"
-		  ;;
-		esac
-		else
-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		  test -z "$libdir" && \
-		    func_fatal_error "\`$deplib' is not a valid libtool archive"
-		  test "$absdir" != "$libdir" && \
-		    func_warning "\`$deplib' seems to be moved"
-
-		  path="-L$absdir"
-		fi
-		;;
-	      esac
-	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$path $deplibs" ;;
-	      esac
-	    done
-	  fi # link_all_deplibs != no
-	fi # linkmode = lib
-      done # for deplib in $libs
-      if test "$pass" = link; then
-	if test "$linkmode" = "prog"; then
-	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
-	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
-	else
-	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	fi
-      fi
-      dependency_libs="$newdependency_libs"
-      if test "$pass" = dlpreopen; then
-	# Link the dlpreopened libraries before other libraries
-	for deplib in $save_deplibs; do
-	  deplibs="$deplib $deplibs"
-	done
-      fi
-      if test "$pass" != dlopen; then
-	if test "$pass" != conv; then
-	  # Make sure lib_search_path contains only unique directories.
-	  lib_search_path=
-	  for dir in $newlib_search_path; do
-	    case "$lib_search_path " in
-	    *" $dir "*) ;;
-	    *) func_append lib_search_path " $dir" ;;
-	    esac
-	  done
-	  newlib_search_path=
-	fi
-
-	if test "$linkmode,$pass" != "prog,link"; then
-	  vars="deplibs"
-	else
-	  vars="compile_deplibs finalize_deplibs"
-	fi
-	for var in $vars dependency_libs; do
-	  # Add libraries to $var in reverse order
-	  eval tmp_libs=\"\$$var\"
-	  new_libs=
-	  for deplib in $tmp_libs; do
-	    # FIXME: Pedantically, this is the right thing to do, so
-	    #        that some nasty dependency loop isn't accidentally
-	    #        broken:
-	    #new_libs="$deplib $new_libs"
-	    # Pragmatically, this seems to cause very few problems in
-	    # practice:
-	    case $deplib in
-	    -L*) new_libs="$deplib $new_libs" ;;
-	    -R*) ;;
-	    *)
-	      # And here is the reason: when a library appears more
-	      # than once as an explicit dependence of a library, or
-	      # is implicitly linked in more than once by the
-	      # compiler, it is considered special, and multiple
-	      # occurrences thereof are not removed.  Compare this
-	      # with having the same library being listed as a
-	      # dependency of multiple other libraries: in this case,
-	      # we know (pedantically, we assume) the library does not
-	      # need to be listed more than once, so we keep only the
-	      # last copy.  This is not always right, but it is rare
-	      # enough that we require users that really mean to play
-	      # such unportable linking tricks to link the library
-	      # using -Wl,-lname, so that libtool does not consider it
-	      # for duplicate removal.
-	      case " $specialdeplibs " in
-	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-	      *)
-		case " $new_libs " in
-		*" $deplib "*) ;;
-		*) new_libs="$deplib $new_libs" ;;
-		esac
-		;;
-	      esac
-	      ;;
-	    esac
-	  done
-	  tmp_libs=
-	  for deplib in $new_libs; do
-	    case $deplib in
-	    -L*)
-	      case " $tmp_libs " in
-	      *" $deplib "*) ;;
-	      *) func_append tmp_libs " $deplib" ;;
-	      esac
-	      ;;
-	    *) func_append tmp_libs " $deplib" ;;
-	    esac
-	  done
-	  eval $var=\"$tmp_libs\"
-	done # for var
-      fi
-      # Last step: remove runtime libs from dependency_libs
-      # (they stay in deplibs)
-      tmp_libs=
-      for i in $dependency_libs ; do
-	case " $predeps $postdeps $compiler_lib_search_path " in
-	*" $i "*)
-	  i=""
-	  ;;
-	esac
-	if test -n "$i" ; then
-	  func_append tmp_libs " $i"
-	fi
-      done
-      dependency_libs=$tmp_libs
-    done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
-    fi
-    if test "$linkmode" = prog || test "$linkmode" = lib; then
-      dlprefiles="$newdlprefiles"
-    fi
-
-    case $linkmode in
-    oldlib)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for archives"
-      fi
-
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for archives" ;;
-      esac
-
-      test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for archives"
-
-      test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for archives"
-
-      test -n "$vinfo" && \
-	func_warning "\`-version-info/-version-number' is ignored for archives"
-
-      test -n "$release" && \
-	func_warning "\`-release' is ignored for archives"
-
-      test -n "$export_symbols$export_symbols_regex" && \
-	func_warning "\`-export-symbols' is ignored for archives"
-
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs="$output"
-      func_append objs "$old_deplibs"
-      ;;
-
-    lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
-      case $outputname in
-      lib*)
-	func_stripname 'lib' '.la' "$outputname"
-	name=$func_stripname_result
-	eval shared_ext=\"$shrext_cmds\"
-	eval libname=\"$libname_spec\"
-	;;
-      *)
-	test "$module" = no && \
-	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
-
-	if test "$need_lib_prefix" != no; then
-	  # Add the "lib" prefix for modules if required
-	  func_stripname '' '.la' "$outputname"
-	  name=$func_stripname_result
-	  eval shared_ext=\"$shrext_cmds\"
-	  eval libname=\"$libname_spec\"
-	else
-	  func_stripname '' '.la' "$outputname"
-	  libname=$func_stripname_result
-	fi
-	;;
-      esac
-
-      if test -n "$objs"; then
-	if test "$deplibs_check_method" != pass_all; then
-	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
-	else
-	  echo
-	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
-	  $ECHO "*** objects $objs is not portable!"
-	  func_append libobjs " $objs"
-	fi
-      fi
-
-      test "$dlself" != no && \
-	func_warning "\`-dlopen self' is ignored for libtool libraries"
-
-      set dummy $rpath
-      shift
-      test "$#" -gt 1 && \
-	func_warning "ignoring multiple \`-rpath's for a libtool library"
-
-      install_libdir="$1"
-
-      oldlibs=
-      if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
-	  # Building a libtool convenience library.
-	  # Some compilers have problems with a `.al' extension so
-	  # convenience libraries should have the same extension an
-	  # archive normally would.
-	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-	  build_libtool_libs=convenience
-	  build_old_libs=yes
-	fi
-
-	test -n "$vinfo" && \
-	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
-
-	test -n "$release" && \
-	  func_warning "\`-release' is ignored for convenience libraries"
-      else
-
-	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
-	set dummy $vinfo 0 0 0
-	shift
-	IFS="$save_ifs"
-
-	test -n "$7" && \
-	  func_fatal_help "too many parameters to \`-version-info'"
-
-	# convert absolute version numbers to libtool ages
-	# this retains compatibility with .la files and attempts
-	# to make the code below a bit more comprehensible
-
-	case $vinfo_number in
-	yes)
-	  number_major="$1"
-	  number_minor="$2"
-	  number_revision="$3"
-	  #
-	  # There are really only two kinds -- those that
-	  # use the current revision as the major version
-	  # and those that subtract age and use age as
-	  # a minor version.  But, then there is irix
-	  # which has an extra 1 added just for fun
-	  #
-	  case $version_type in
-	  darwin|linux|osf|windows|none)
-	    func_arith $number_major + $number_minor
-	    current=$func_arith_result
-	    age="$number_minor"
-	    revision="$number_revision"
-	    ;;
-	  freebsd-aout|freebsd-elf|qnx|sunos)
-	    current="$number_major"
-	    revision="$number_minor"
-	    age="0"
-	    ;;
-	  irix|nonstopux)
-	    func_arith $number_major + $number_minor
-	    current=$func_arith_result
-	    age="$number_minor"
-	    revision="$number_minor"
-	    lt_irix_increment=no
-	    ;;
-	  esac
-	  ;;
-	no)
-	  current="$1"
-	  revision="$2"
-	  age="$3"
-	  ;;
-	esac
-
-	# Check that each of the things are valid numbers.
-	case $current in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "CURRENT \`$current' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	case $revision in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "REVISION \`$revision' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	case $age in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "AGE \`$age' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	if test "$age" -gt "$current"; then
-	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	fi
-
-	# Calculate the version variables.
-	major=
-	versuffix=
-	verstring=
-	case $version_type in
-	none) ;;
-
-	darwin)
-	  # Like Linux, but with the current version available in
-	  # verstring for coding it into the library header
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix="$major.$age.$revision"
-	  # Darwin ld doesn't like 0 for these options...
-	  func_arith $current + 1
-	  minor_current=$func_arith_result
-	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-	  ;;
-
-	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
-	  ;;
-
-	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current"
-	  ;;
-
-	irix | nonstopux)
-	  if test "X$lt_irix_increment" = "Xno"; then
-	    func_arith $current - $age
-	  else
-	    func_arith $current - $age + 1
-	  fi
-	  major=$func_arith_result
-
-	  case $version_type in
-	    nonstopux) verstring_prefix=nonstopux ;;
-	    *)         verstring_prefix=sgi ;;
-	  esac
-	  verstring="$verstring_prefix$major.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$revision
-	  while test "$loop" -ne 0; do
-	    func_arith $revision - $loop
-	    iface=$func_arith_result
-	    func_arith $loop - 1
-	    loop=$func_arith_result
-	    verstring="$verstring_prefix$major.$iface:$verstring"
-	  done
-
-	  # Before this point, $major must not contain `.'.
-	  major=.$major
-	  versuffix="$major.$revision"
-	  ;;
-
-	linux)
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix="$major.$age.$revision"
-	  ;;
-
-	osf)
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix=".$current.$age.$revision"
-	  verstring="$current.$age.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$age
-	  while test "$loop" -ne 0; do
-	    func_arith $current - $loop
-	    iface=$func_arith_result
-	    func_arith $loop - 1
-	    loop=$func_arith_result
-	    verstring="$verstring:${iface}.0"
-	  done
-
-	  # Make executables depend on our current version.
-	  func_append verstring ":${current}.0"
-	  ;;
-
-	qnx)
-	  major=".$current"
-	  versuffix=".$current"
-	  ;;
-
-	sunos)
-	  major=".$current"
-	  versuffix=".$current.$revision"
-	  ;;
-
-	windows)
-	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 filesystems.
-	  func_arith $current - $age
-	  major=$func_arith_result
-	  versuffix="-$major"
-	  ;;
-
-	*)
-	  func_fatal_configuration "unknown library version type \`$version_type'"
-	  ;;
-	esac
-
-	# Clear the version info if we defaulted, and they specified a release.
-	if test -z "$vinfo" && test -n "$release"; then
-	  major=
-	  case $version_type in
-	  darwin)
-	    # we can't check for "0.0" in archive_cmds due to quoting
-	    # problems, so we reset it completely
-	    verstring=
-	    ;;
-	  *)
-	    verstring="0.0"
-	    ;;
-	  esac
-	  if test "$need_version" = no; then
-	    versuffix=
-	  else
-	    versuffix=".0.0"
-	  fi
-	fi
-
-	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
-	  major=
-	  versuffix=
-	  verstring=""
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    func_warning "undefined symbols not allowed in $host shared libraries"
-	    build_libtool_libs=no
-	    build_old_libs=yes
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
-	fi
-
-      fi
-
-      func_generate_dlsyms "$libname" "$libname" "yes"
-      func_append libobjs " $symfileobj"
-      test "X$libobjs" = "X " && libobjs=
-
-      if test "$opt_mode" != relink; then
-	# Remove our outputs, but don't remove object files since they
-	# may have been created when compiling PIC objects.
-	removelist=
-	tempremovelist=`$ECHO "$output_objdir/*"`
-	for p in $tempremovelist; do
-	  case $p in
-	    *.$objext | *.gcno)
-	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       if test "X$precious_files_regex" != "X"; then
-		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-		 then
-		   continue
-		 fi
-	       fi
-	       func_append removelist " $p"
-	       ;;
-	    *) ;;
-	  esac
-	done
-	test -n "$removelist" && \
-	  func_show_eval "${RM}r \$removelist"
-      fi
-
-      # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	func_append oldlibs " $output_objdir/$libname.$libext"
-
-	# Transform .lo files to .o files.
-	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
-      fi
-
-      # Eliminate all temporary directories.
-      #for path in $notinst_path; do
-      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
-      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
-      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
-      #done
-
-      if test -n "$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	temp_xrpath=
-	for libdir in $xrpath; do
-	  func_replace_sysroot "$libdir"
-	  func_append temp_xrpath " -R$func_replace_sysroot_result"
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append finalize_rpath " $libdir" ;;
-	  esac
-	done
-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-	  dependency_libs="$temp_xrpath $dependency_libs"
-	fi
-      fi
-
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
-      dlfiles=
-      for lib in $old_dlfiles; do
-	case " $dlprefiles $dlfiles " in
-	*" $lib "*) ;;
-	*) func_append dlfiles " $lib" ;;
-	esac
-      done
-
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-	case "$dlprefiles " in
-	*" $lib "*) ;;
-	*) func_append dlprefiles " $lib" ;;
-	esac
-      done
-
-      if test "$build_libtool_libs" = yes; then
-	if test -n "$rpath"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
-	    # these systems don't actually have a c library (as such)!
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C library is in the System framework
-	    func_append deplibs " System.ltframework"
-	    ;;
-	  *-*-netbsd*)
-	    # Don't link with libc until the a.out ld.so is fixed.
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    ;;
-	  *)
-	    # Add libc to deplibs on all other systems if necessary.
-	    if test "$build_libtool_need_lc" = "yes"; then
-	      func_append deplibs " -lc"
-	    fi
-	    ;;
-	  esac
-	fi
-
-	# Transform deplibs into only deplibs that can be linked in shared.
-	name_save=$name
-	libname_save=$libname
-	release_save=$release
-	versuffix_save=$versuffix
-	major_save=$major
-	# I'm not sure if I'm treating the release correctly.  I think
-	# release should show up in the -l (ie -lgmp5) so we don't want to
-	# add it in twice.  Is that correct?
-	release=""
-	versuffix=""
-	major=""
-	newdeplibs=
-	droppeddeps=no
-	case $deplibs_check_method in
-	pass_all)
-	  # Don't check for shared/static.  Everything works.
-	  # This might be a little naive.  We might want to check
-	  # whether the library exists or not.  But this is on
-	  # osf3 & osf4 and I'm not really sure... Just
-	  # implementing what was already the behavior.
-	  newdeplibs=$deplibs
-	  ;;
-	test_compile)
-	  # This code stresses the "libraries are programs" paradigm to its
-	  # limits. Maybe even breaks it.  We compile a program, linking it
-	  # against the deplibs as a proxy for the library.  Then we can check
-	  # whether they linked in statically or dynamically with ldd.
-	  $opt_dry_run || $RM conftest.c
-	  cat > conftest.c </dev/null`
-		    $nocaseglob
-		  else
-		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
-		  fi
-		  for potent_lib in $potential_libs; do
-		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null |
-			 $GREP " -> " >/dev/null; then
-			continue
-		      fi
-		      # The statement above tries to avoid entering an
-		      # endless loop below, in case of cyclic links.
-		      # We might still enter an endless loop, since a link
-		      # loop can be closed while we follow links,
-		      # but so what?
-		      potlib="$potent_lib"
-		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
-			esac
-		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
-			 $SED -e 10q |
-			 $EGREP "$file_magic_regex" > /dev/null; then
-			func_append newdeplibs " $a_deplib"
-			a_deplib=""
-			break 2
-		      fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		echo
-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
-		else
-		  $ECHO "*** with $libname and none of the candidates passed a file format test"
-		  $ECHO "*** using a file magic. Last file checked: $potlib"
-		fi
-	      fi
-	      ;;
-	    *)
-	      # Add a -L argument.
-	      func_append newdeplibs " $a_deplib"
-	      ;;
-	    esac
-	  done # Gone through all deplibs.
-	  ;;
-	match_pattern*)
-	  set dummy $deplibs_check_method; shift
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    case $a_deplib in
-	    -l*)
-	      func_stripname -l '' "$a_deplib"
-	      name=$func_stripname_result
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  func_append newdeplibs " $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval "\\$ECHO \"$libname_spec\""`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
-		       $EGREP "$match_pattern_regex" > /dev/null; then
-		      func_append newdeplibs " $a_deplib"
-		      a_deplib=""
-		      break 2
-		    fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		echo
-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
-		else
-		  $ECHO "*** with $libname and none of the candidates passed a file format test"
-		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
-		fi
-	      fi
-	      ;;
-	    *)
-	      # Add a -L argument.
-	      func_append newdeplibs " $a_deplib"
-	      ;;
-	    esac
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  newdeplibs=""
-	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
-	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	    for i in $predeps $postdeps ; do
-	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
-	    done
-	  fi
-	  case $tmp_deplibs in
-	  *[!\	\ ]*)
-	    echo
-	    if test "X$deplibs_check_method" = "Xnone"; then
-	      echo "*** Warning: inter-library dependencies are not supported in this platform."
-	    else
-	      echo "*** Warning: inter-library dependencies are not known to be supported."
-	    fi
-	    echo "*** All declared inter-library dependencies are being dropped."
-	    droppeddeps=yes
-	    ;;
-	  esac
-	  ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
-
-	case $host in
-	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library with the System framework
-	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
-	  ;;
-	esac
-
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
-	    echo
-	    echo "*** Warning: libtool could not satisfy all declared inter-library"
-	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
-	    echo "*** a static module, that should work as long as the dlopening"
-	    echo "*** application is linked with the -dlopen flag."
-	    if test -z "$global_symbol_pipe"; then
-	      echo
-	      echo "*** However, this would only work if libtool was able to extract symbol"
-	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      echo "*** not find such a program.  So, this module is probably useless."
-	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
-	      build_libtool_libs=module
-	      build_old_libs=yes
-	    else
-	      build_libtool_libs=no
-	    fi
-	  else
-	    echo "*** The inter-library dependencies that have been dropped here will be"
-	    echo "*** automatically added whenever a program is linked with this library"
-	    echo "*** or is declared to -dlopen it."
-
-	    if test "$allow_undefined" = no; then
-	      echo
-	      echo "*** Since this library must not contain undefined symbols,"
-	      echo "*** because either the platform does not support them or"
-	      echo "*** it was explicitly requested with -no-undefined,"
-	      echo "*** libtool will only create a static version of it."
-	      if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  fi
-	fi
-	# Done checking deplibs!
-	deplibs=$newdeplibs
-      fi
-      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
-      case $host in
-	*-*-darwin*)
-	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  ;;
-      esac
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $deplibs " in
-	  *" -L$path/$objdir "*)
-	    func_append new_libs " -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) func_append new_libs " $deplib" ;;
-	  esac
-	  ;;
-	*) func_append new_libs " $deplib" ;;
-	esac
-      done
-      deplibs="$new_libs"
-
-      # All the library-specific variables (install_libdir is set above).
-      library_names=
-      old_library=
-      dlname=
-
-      # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-	if test "$hardcode_into_libs" = yes; then
-	  # Hardcode the library paths
-	  hardcode_libdirs=
-	  dep_rpath=
-	  rpath="$finalize_rpath"
-	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
-	  for libdir in $rpath; do
-	    if test -n "$hardcode_libdir_flag_spec"; then
-	      if test -n "$hardcode_libdir_separator"; then
-		func_replace_sysroot "$libdir"
-		libdir=$func_replace_sysroot_result
-		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs="$libdir"
-		else
-		  # Just accumulate the unique libdirs.
-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		    ;;
-		  *)
-		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-		    ;;
-		  esac
-		fi
-	      else
-		eval flag=\"$hardcode_libdir_flag_spec\"
-		func_append dep_rpath " $flag"
-	      fi
-	    elif test -n "$runpath_var"; then
-	      case "$perm_rpath " in
-	      *" $libdir "*) ;;
-	      *) func_apped perm_rpath " $libdir" ;;
-	      esac
-	    fi
-	  done
-	  # Substitute the hardcoded libdirs into the rpath.
-	  if test -n "$hardcode_libdir_separator" &&
-	     test -n "$hardcode_libdirs"; then
-	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
-	  fi
-	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-	    # We should set the runpath_var.
-	    rpath=
-	    for dir in $perm_rpath; do
-	      func_append rpath "$dir:"
-	    done
-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-	  fi
-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-	fi
-
-	shlibpath="$finalize_shlibpath"
-	test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-	if test -n "$shlibpath"; then
-	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-	fi
-
-	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext_cmds\"
-	eval library_names=\"$library_names_spec\"
-	set dummy $library_names
-	shift
-	realname="$1"
-	shift
-
-	if test -n "$soname_spec"; then
-	  eval soname=\"$soname_spec\"
-	else
-	  soname="$realname"
-	fi
-	if test -z "$dlname"; then
-	  dlname=$soname
-	fi
-
-	lib="$output_objdir/$realname"
-	linknames=
-	for link
-	do
-	  func_append linknames " $link"
-	done
-
-	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
-	test "X$libobjs" = "X " && libobjs=
-
-	delfiles=
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
-	  export_symbols="$output_objdir/$libname.uexp"
-	  func_append delfiles " $export_symbols"
-	fi
-
-	orig_export_symbols=
-	case $host_os in
-	cygwin* | mingw* | cegcc*)
-	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
-	    # exporting using user supplied symfile
-	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
-	      # and it's NOT already a .def file. Must figure out
-	      # which of the given symbols are data symbols and tag
-	      # them as such. So, trigger use of export_symbols_cmds.
-	      # export_symbols gets reassigned inside the "prepare
-	      # the list of exported symbols" if statement, so the
-	      # include_expsyms logic still works.
-	      orig_export_symbols="$export_symbols"
-	      export_symbols=
-	      always_export_symbols=yes
-	    fi
-	  fi
-	  ;;
-	esac
-
-	# Prepare the list of exported symbols
-	if test -z "$export_symbols"; then
-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    func_verbose "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $opt_dry_run || $RM $export_symbols
-	    cmds=$export_symbols_cmds
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd1 in $cmds; do
-	      IFS="$save_ifs"
-	      # Take the normal branch if the nm_file_list_spec branch
-	      # doesn't work or if tool conversion is not needed.
-	      case $nm_file_list_spec~$to_tool_file_cmd in
-		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
-		  try_normal_branch=yes
-		  eval cmd=\"$cmd1\"
-		  func_len " $cmd"
-		  len=$func_len_result
-		  ;;
-		*)
-		  try_normal_branch=no
-		  ;;
-	      esac
-	      if test "$try_normal_branch" = yes \
-		 && { test "$len" -lt "$max_cmd_len" \
-		      || test "$max_cmd_len" -le -1; }
-	      then
-		func_show_eval "$cmd" 'exit $?'
-		skipped_export=false
-	      elif test -n "$nm_file_list_spec"; then
-		func_basename "$output"
-		output_la=$func_basename_result
-		save_libobjs=$libobjs
-		save_output=$output
-		output=${output_objdir}/${output_la}.nm
-		func_to_tool_file "$output"
-		libobjs=$nm_file_list_spec$func_to_tool_file_result
-		func_append delfiles " $output"
-		func_verbose "creating $NM input file list: $output"
-		for obj in $save_libobjs; do
-		  func_to_tool_file "$obj"
-		  $ECHO "$func_to_tool_file_result"
-		done > "$output"
-		eval cmd=\"$cmd1\"
-		func_show_eval "$cmd" 'exit $?'
-		output=$save_output
-		libobjs=$save_libobjs
-		skipped_export=false
-	      else
-		# The command line is too long to execute in one step.
-		func_verbose "using reloadable object file for export list..."
-		skipped_export=:
-		# Break out early, otherwise skipped_export may be
-		# set to false by a later but shorter cmd.
-		break
-	      fi
-	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
-	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-	fi
-
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  tmp_export_symbols="$export_symbols"
-	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
-	fi
-
-	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
-	  # The given exports_symbols file has to be filtered, so filter it.
-	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
-	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	  # 's' commands which not all seds can handle. GNU sed should be fine
-	  # though. Also, the filter scales superlinearly with the number of
-	  # global variables. join(1) would be nice here, but unfortunately
-	  # isn't a blessed tool.
-	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
-	  export_symbols=$output_objdir/$libname.def
-	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-	fi
-
-	tmp_deplibs=
-	for test_deplib in $deplibs; do
-	  case " $convenience " in
-	  *" $test_deplib "*) ;;
-	  *)
-	    func_append tmp_deplibs " $test_deplib"
-	    ;;
-	  esac
-	done
-	deplibs="$tmp_deplibs"
-
-	if test -n "$convenience"; then
-	  if test -n "$whole_archive_flag_spec" &&
-	    test "$compiler_needs_object" = yes &&
-	    test -z "$libobjs"; then
-	    # extract the archives, so we have objects to list.
-	    # TODO: could optimize this to just extract one archive.
-	    whole_archive_flag_spec=
-	  fi
-	  if test -n "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	    test "X$libobjs" = "X " && libobjs=
-	  else
-	    gentop="$output_objdir/${outputname}x"
-	    func_append generated " $gentop"
-
-	    func_extract_archives $gentop $convenience
-	    func_append libobjs " $func_extract_archives_result"
-	    test "X$libobjs" = "X " && libobjs=
-	  fi
-	fi
-
-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-	  eval flag=\"$thread_safe_flag_spec\"
-	  func_append linker_flags " $flag"
-	fi
-
-	# Make a backup of the uninstalled library when relinking
-	if test "$opt_mode" = relink; then
-	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
-	fi
-
-	# Do each of the archive commands.
-	if test "$module" = yes && test -n "$module_cmds" ; then
-	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	    eval test_cmds=\"$module_expsym_cmds\"
-	    cmds=$module_expsym_cmds
-	  else
-	    eval test_cmds=\"$module_cmds\"
-	    cmds=$module_cmds
-	  fi
-	else
-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    eval test_cmds=\"$archive_expsym_cmds\"
-	    cmds=$archive_expsym_cmds
-	  else
-	    eval test_cmds=\"$archive_cmds\"
-	    cmds=$archive_cmds
-	  fi
-	fi
-
-	if test "X$skipped_export" != "X:" &&
-	   func_len " $test_cmds" &&
-	   len=$func_len_result &&
-	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
-	else
-	  # The command line is too long to link in one step, link piecewise
-	  # or, if using GNU ld and skipped_export is not :, use a linker
-	  # script.
-
-	  # Save the value of $output and $libobjs because we want to
-	  # use them later.  If we have whole_archive_flag_spec, we
-	  # want to use save_libobjs as it was before
-	  # whole_archive_flag_spec was expanded, because we can't
-	  # assume the linker understands whole_archive_flag_spec.
-	  # This may have to be revisited, in case too many
-	  # convenience libraries get linked in and end up exceeding
-	  # the spec.
-	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	  fi
-	  save_output=$output
-	  func_basename "$output"
-	  output_la=$func_basename_result
-
-	  # Clear the reloadable object creation command queue and
-	  # initialize k to one.
-	  test_cmds=
-	  concat_cmds=
-	  objlist=
-	  last_robj=
-	  k=1
-
-	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
-	    output=${output_objdir}/${output_la}.lnkscript
-	    func_verbose "creating GNU ld script: $output"
-	    echo 'INPUT (' > $output
-	    for obj in $save_libobjs
-	    do
-	      func_to_tool_file "$obj"
-	      $ECHO "$func_to_tool_file_result" >> $output
-	    done
-	    echo ')' >> $output
-	    func_append delfiles " $output"
-	    func_to_tool_file "$output"
-	    output=$func_to_tool_file_result
-	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
-	    output=${output_objdir}/${output_la}.lnk
-	    func_verbose "creating linker input file list: $output"
-	    : > $output
-	    set x $save_libobjs
-	    shift
-	    firstobj=
-	    if test "$compiler_needs_object" = yes; then
-	      firstobj="$1 "
-	      shift
-	    fi
-	    for obj
-	    do
-	      func_to_tool_file "$obj"
-	      $ECHO "$func_to_tool_file_result" >> $output
-	    done
-	    func_append delfiles " $output"
-	    func_to_tool_file "$output"
-	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
-	  else
-	    if test -n "$save_libobjs"; then
-	      func_verbose "creating reloadable object files..."
-	      output=$output_objdir/$output_la-${k}.$objext
-	      eval test_cmds=\"$reload_cmds\"
-	      func_len " $test_cmds"
-	      len0=$func_len_result
-	      len=$len0
-
-	      # Loop over the list of objects to be linked.
-	      for obj in $save_libobjs
-	      do
-		func_len " $obj"
-		func_arith $len + $func_len_result
-		len=$func_arith_result
-		if test "X$objlist" = X ||
-		   test "$len" -lt "$max_cmd_len"; then
-		  func_append objlist " $obj"
-		else
-		  # The command $test_cmds is almost too long, add a
-		  # command to the queue.
-		  if test "$k" -eq 1 ; then
-		    # The first file doesn't have a previous command to add.
-		    reload_objs=$objlist
-		    eval concat_cmds=\"$reload_cmds\"
-		  else
-		    # All subsequent reloadable object files will link in
-		    # the last one created.
-		    reload_objs="$objlist $last_robj"
-		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
-		  fi
-		  last_robj=$output_objdir/$output_la-${k}.$objext
-		  func_arith $k + 1
-		  k=$func_arith_result
-		  output=$output_objdir/$output_la-${k}.$objext
-		  objlist=" $obj"
-		  func_len " $last_robj"
-		  func_arith $len0 + $func_len_result
-		  len=$func_arith_result
-		fi
-	      done
-	      # Handle the remaining objects by creating one last
-	      # reloadable object file.  All subsequent reloadable object
-	      # files will link in the last one created.
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      reload_objs="$objlist $last_robj"
-	      eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
-	      if test -n "$last_robj"; then
-	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
-	      fi
-	      func_append delfiles " $output"
-
-	    else
-	      output=
-	    fi
-
-	    if ${skipped_export-false}; then
-	      func_verbose "generating symbol list for \`$libname.la'"
-	      export_symbols="$output_objdir/$libname.exp"
-	      $opt_dry_run || $RM $export_symbols
-	      libobjs=$output
-	      # Append the command to create the export file.
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
-	      if test -n "$last_robj"; then
-		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
-	      fi
-	    fi
-
-	    test -n "$save_libobjs" &&
-	      func_verbose "creating a temporary reloadable object file: $output"
-
-	    # Loop through the commands generated above and execute them.
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $concat_cmds; do
-	      IFS="$save_ifs"
-	      $opt_silent || {
-		  func_quote_for_expand "$cmd"
-		  eval "func_echo $func_quote_for_expand_result"
-	      }
-	      $opt_dry_run || eval "$cmd" || {
-		lt_exit=$?
-
-		# Restore the uninstalled library and exit
-		if test "$opt_mode" = relink; then
-		  ( cd "$output_objdir" && \
-		    $RM "${realname}T" && \
-		    $MV "${realname}U" "$realname" )
-		fi
-
-		exit $lt_exit
-	      }
-	    done
-	    IFS="$save_ifs"
-
-	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
-	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-
-          if ${skipped_export-false}; then
-	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	      tmp_export_symbols="$export_symbols"
-	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
-	    fi
-
-	    if test -n "$orig_export_symbols"; then
-	      # The given exports_symbols file has to be filtered, so filter it.
-	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
-	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	      # 's' commands which not all seds can handle. GNU sed should be fine
-	      # though. Also, the filter scales superlinearly with the number of
-	      # global variables. join(1) would be nice here, but unfortunately
-	      # isn't a blessed tool.
-	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
-	      export_symbols=$output_objdir/$libname.def
-	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-	    fi
-	  fi
-
-	  libobjs=$output
-	  # Restore the value of output.
-	  output=$save_output
-
-	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	    test "X$libobjs" = "X " && libobjs=
-	  fi
-	  # Expand the library linking commands again to reset the
-	  # value of $libobjs for piecewise linking.
-
-	  # Do each of the archive commands.
-	  if test "$module" = yes && test -n "$module_cmds" ; then
-	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	      cmds=$module_expsym_cmds
-	    else
-	      cmds=$module_cmds
-	    fi
-	  else
-	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	      cmds=$archive_expsym_cmds
-	    else
-	      cmds=$archive_cmds
-	    fi
-	  fi
-	fi
-
-	if test -n "$delfiles"; then
-	  # Append the command to remove temporary files to $cmds.
-	  eval cmds=\"\$cmds~\$RM $delfiles\"
-	fi
-
-	# Add any objects from preloaded convenience libraries
-	if test -n "$dlprefiles"; then
-	  gentop="$output_objdir/${outputname}x"
-	  func_append generated " $gentop"
-
-	  func_extract_archives $gentop $dlprefiles
-	  func_append libobjs " $func_extract_archives_result"
-	  test "X$libobjs" = "X " && libobjs=
-	fi
-
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $opt_silent || {
-	    func_quote_for_expand "$cmd"
-	    eval "func_echo $func_quote_for_expand_result"
-	  }
-	  $opt_dry_run || eval "$cmd" || {
-	    lt_exit=$?
-
-	    # Restore the uninstalled library and exit
-	    if test "$opt_mode" = relink; then
-	      ( cd "$output_objdir" && \
-	        $RM "${realname}T" && \
-		$MV "${realname}U" "$realname" )
-	    fi
-
-	    exit $lt_exit
-	  }
-	done
-	IFS="$save_ifs"
-
-	# Restore the uninstalled library and exit
-	if test "$opt_mode" = relink; then
-	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
-
-	  if test -n "$convenience"; then
-	    if test -z "$whole_archive_flag_spec"; then
-	      func_show_eval '${RM}r "$gentop"'
-	    fi
-	  fi
-
-	  exit $EXIT_SUCCESS
-	fi
-
-	# Create links to the real library.
-	for linkname in $linknames; do
-	  if test "$realname" != "$linkname"; then
-	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
-	  fi
-	done
-
-	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
-	  # On all known operating systems, these are identical.
-	  dlname="$soname"
-	fi
-      fi
-      ;;
-
-    obj)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for objects"
-      fi
-
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for objects" ;;
-      esac
-
-      test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for objects"
-
-      test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for objects"
-
-      test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for objects"
-
-      test -n "$release" && \
-	func_warning "\`-release' is ignored for objects"
-
-      case $output in
-      *.lo)
-	test -n "$objs$old_deplibs" && \
-	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"
-
-	libobj=$output
-	func_lo2o "$libobj"
-	obj=$func_lo2o_result
-	;;
-      *)
-	libobj=
-	obj="$output"
-	;;
-      esac
-
-      # Delete the old objects.
-      $opt_dry_run || $RM $obj $libobj
-
-      # Objects from convenience libraries.  This assumes
-      # single-version convenience libraries.  Whenever we create
-      # different ones for PIC/non-PIC, this we'll have to duplicate
-      # the extraction.
-      reload_conv_objs=
-      gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec and hope we can get by with
-      # turning comma into space..
-      wl=
-
-      if test -n "$convenience"; then
-	if test -n "$whole_archive_flag_spec"; then
-	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
-	else
-	  gentop="$output_objdir/${obj}x"
-	  func_append generated " $gentop"
-
-	  func_extract_archives $gentop $convenience
-	  reload_conv_objs="$reload_objs $func_extract_archives_result"
-	fi
-      fi
-
-      # If we're not building shared, we need to use non_pic_objs
-      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
-
-      # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-
-      output="$obj"
-      func_execute_cmds "$reload_cmds" 'exit $?'
-
-      # Exit if we aren't doing a library object file.
-      if test -z "$libobj"; then
-	if test -n "$gentop"; then
-	  func_show_eval '${RM}r "$gentop"'
-	fi
-
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$build_libtool_libs" != yes; then
-	if test -n "$gentop"; then
-	  func_show_eval '${RM}r "$gentop"'
-	fi
-
-	# Create an invalid libtool object if no PIC, so that we don't
-	# accidentally link it into a program.
-	# $show "echo timestamp > $libobj"
-	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
-	exit $EXIT_SUCCESS
-      fi
-
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
-	# Only do commands if we really have different PIC objects.
-	reload_objs="$libobjs $reload_conv_objs"
-	output="$libobj"
-	func_execute_cmds "$reload_cmds" 'exit $?'
-      fi
-
-      if test -n "$gentop"; then
-	func_show_eval '${RM}r "$gentop"'
-      fi
-
-      exit $EXIT_SUCCESS
-      ;;
-
-    prog)
-      case $host in
-	*cygwin*) func_stripname '' '.exe' "$output"
-	          output=$func_stripname_result.exe;;
-      esac
-      test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for programs"
-
-      test -n "$release" && \
-	func_warning "\`-release' is ignored for programs"
-
-      test "$preload" = yes \
-        && test "$dlopen_support" = unknown \
-	&& test "$dlopen_self" = unknown \
-	&& test "$dlopen_self_static" = unknown && \
-	  func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
-
-      case $host in
-      *-*-rhapsody* | *-*-darwin1.[012])
-	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
-	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
-	;;
-      esac
-
-      case $host in
-      *-*-darwin*)
-	# Don't allow lazy linking, it breaks C++ global constructors
-	# But is supposedly fixed on 10.4 or later (yay!).
-	if test "$tagname" = CXX ; then
-	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
-	    10.[0123])
-	      func_append compile_command " ${wl}-bind_at_load"
-	      func_append finalize_command " ${wl}-bind_at_load"
-	    ;;
-	  esac
-	fi
-	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
-	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	;;
-      esac
-
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $compile_deplibs " in
-	  *" -L$path/$objdir "*)
-	    func_append new_libs " -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $compile_deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) func_append new_libs " $deplib" ;;
-	  esac
-	  ;;
-	*) func_append new_libs " $deplib" ;;
-	esac
-      done
-      compile_deplibs="$new_libs"
-
-
-      func_append compile_command " $compile_deplibs"
-      func_append finalize_command " $finalize_deplibs"
-
-      if test -n "$rpath$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	for libdir in $rpath $xrpath; do
-	  # This is the magic to use -rpath.
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append finalize_rpath " $libdir" ;;
-	  esac
-	done
-      fi
-
-      # Now hardcode the library paths
-      rpath=
-      hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    func_append rpath " $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append perm_rpath " $libdir" ;;
-	  esac
-	fi
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$libdir:"*) ;;
-	  ::) dllsearchpath=$libdir;;
-	  *) func_append dllsearchpath ":$libdir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  ::) dllsearchpath=$testbindir;;
-	  *) func_append dllsearchpath ":$testbindir";;
-	  esac
-	  ;;
-	esac
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      compile_rpath="$rpath"
-
-      rpath=
-      hardcode_libdirs=
-      for libdir in $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    func_append rpath " $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$finalize_perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append finalize_perm_rpath " $libdir" ;;
-	  esac
-	fi
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      finalize_rpath="$rpath"
-
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-	# Transform all the library objects into standard objects.
-	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
-	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
-      fi
-
-      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
-
-      # template prelinking step
-      if test -n "$prelink_cmds"; then
-	func_execute_cmds "$prelink_cmds" 'exit $?'
-      fi
-
-      wrappers_required=yes
-      case $host in
-      *cegcc* | *mingw32ce*)
-        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
-        wrappers_required=no
-        ;;
-      *cygwin* | *mingw* )
-        if test "$build_libtool_libs" != yes; then
-          wrappers_required=no
-        fi
-        ;;
-      *)
-        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-          wrappers_required=no
-        fi
-        ;;
-      esac
-      if test "$wrappers_required" = no; then
-	# Replace the output file specification.
-	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
-	link_command="$compile_command$compile_rpath"
-
-	# We have no uninstalled library dependencies, so finalize right now.
-	exit_status=0
-	func_show_eval "$link_command" 'exit_status=$?'
-
-	if test -n "$postlink_cmds"; then
-	  func_to_tool_file "$output"
-	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-	  func_execute_cmds "$postlink_cmds" 'exit $?'
-	fi
-
-	# Delete the generated files.
-	if test -f "$output_objdir/${outputname}S.${objext}"; then
-	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
-	fi
-
-	exit $exit_status
-      fi
-
-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-      fi
-      if test -n "$finalize_shlibpath"; then
-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
-
-      compile_var=
-      finalize_var=
-      if test -n "$runpath_var"; then
-	if test -n "$perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $perm_rpath; do
-	    func_append rpath "$dir:"
-	  done
-	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-	if test -n "$finalize_perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $finalize_perm_rpath; do
-	    func_append rpath "$dir:"
-	  done
-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-      fi
-
-      if test "$no_install" = yes; then
-	# We don't need to create a wrapper script.
-	link_command="$compile_var$compile_command$compile_rpath"
-	# Replace the output file specification.
-	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
-	# Delete the old output file.
-	$opt_dry_run || $RM $output
-	# Link the executable and exit
-	func_show_eval "$link_command" 'exit $?'
-
-	if test -n "$postlink_cmds"; then
-	  func_to_tool_file "$output"
-	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-	  func_execute_cmds "$postlink_cmds" 'exit $?'
-	fi
-
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$hardcode_action" = relink; then
-	# Fast installation is not supported
-	link_command="$compile_var$compile_command$compile_rpath"
-	relink_command="$finalize_var$finalize_command$finalize_rpath"
-
-	func_warning "this platform does not like uninstalled shared libraries"
-	func_warning "\`$output' will be relinked during installation"
-      else
-	if test "$fast_install" != no; then
-	  link_command="$finalize_var$compile_command$finalize_rpath"
-	  if test "$fast_install" = yes; then
-	    relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
-	  else
-	    # fast_install is set to needless
-	    relink_command=
-	  fi
-	else
-	  link_command="$compile_var$compile_command$compile_rpath"
-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-	fi
-      fi
-
-      # Replace the output file specification.
-      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-
-      # Delete the old output files.
-      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
-
-      func_show_eval "$link_command" 'exit $?'
-
-      if test -n "$postlink_cmds"; then
-	func_to_tool_file "$output_objdir/$outputname"
-	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-	func_execute_cmds "$postlink_cmds" 'exit $?'
-      fi
-
-      # Now create the wrapper script.
-      func_verbose "creating $output"
-
-      # Quote the relink command for shipping.
-      if test -n "$relink_command"; then
-	# Preserve any variables that may affect compiler behavior
-	for var in $variables_saved_for_relink; do
-	  if eval test -z \"\${$var+set}\"; then
-	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-	  elif eval var_value=\$$var; test -z "$var_value"; then
-	    relink_command="$var=; export $var; $relink_command"
-	  else
-	    func_quote_for_eval "$var_value"
-	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-	  fi
-	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-      fi
-
-      # Only actually do things if not in dry run mode.
-      $opt_dry_run || {
-	# win32 will think the script is a binary if it has
-	# a .exe suffix, so we strip it off here.
-	case $output in
-	  *.exe) func_stripname '' '.exe' "$output"
-	         output=$func_stripname_result ;;
-	esac
-	# test for cygwin because mv fails w/o .exe extensions
-	case $host in
-	  *cygwin*)
-	    exeext=.exe
-	    func_stripname '' '.exe' "$outputname"
-	    outputname=$func_stripname_result ;;
-	  *) exeext= ;;
-	esac
-	case $host in
-	  *cygwin* | *mingw* )
-	    func_dirname_and_basename "$output" "" "."
-	    output_name=$func_basename_result
-	    output_path=$func_dirname_result
-	    cwrappersource="$output_path/$objdir/lt-$output_name.c"
-	    cwrapper="$output_path/$output_name.exe"
-	    $RM $cwrappersource $cwrapper
-	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-
-	    func_emit_cwrapperexe_src > $cwrappersource
-
-	    # The wrapper executable is built using the $host compiler,
-	    # because it contains $host paths and files. If cross-
-	    # compiling, it, like the target executable, must be
-	    # executed on the $host or under an emulation environment.
-	    $opt_dry_run || {
-	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
-	      $STRIP $cwrapper
-	    }
-
-	    # Now, create the wrapper script for func_source use:
-	    func_ltwrapper_scriptname $cwrapper
-	    $RM $func_ltwrapper_scriptname_result
-	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
-	    $opt_dry_run || {
-	      # note: this script will not be executed, so do not chmod.
-	      if test "x$build" = "x$host" ; then
-		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
-	      else
-		func_emit_wrapper no > $func_ltwrapper_scriptname_result
-	      fi
-	    }
-	  ;;
-	  * )
-	    $RM $output
-	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
-
-	    func_emit_wrapper no > $output
-	    chmod +x $output
-	  ;;
-	esac
-      }
-      exit $EXIT_SUCCESS
-      ;;
-    esac
-
-    # See if we need to build an old-fashioned archive.
-    for oldlib in $oldlibs; do
-
-      if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save $symfileobj"
-	addlibs="$convenience"
-	build_libtool_libs=no
-      else
-	if test "$build_libtool_libs" = module; then
-	  oldobjs="$libobjs_save"
-	  build_libtool_libs=no
-	else
-	  oldobjs="$old_deplibs $non_pic_objects"
-	  if test "$preload" = yes && test -f "$symfileobj"; then
-	    func_append oldobjs " $symfileobj"
-	  fi
-	fi
-	addlibs="$old_convenience"
-      fi
-
-      if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
-	func_append generated " $gentop"
-
-	func_extract_archives $gentop $addlibs
-	func_append oldobjs " $func_extract_archives_result"
-      fi
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-	cmds=$old_archive_from_new_cmds
-      else
-
-	# Add any objects from preloaded convenience libraries
-	if test -n "$dlprefiles"; then
-	  gentop="$output_objdir/${outputname}x"
-	  func_append generated " $gentop"
-
-	  func_extract_archives $gentop $dlprefiles
-	  func_append oldobjs " $func_extract_archives_result"
-	fi
-
-	# POSIX demands no paths to be encoded in archives.  We have
-	# to avoid creating archives with duplicate basenames if we
-	# might have to extract them afterwards, e.g., when creating a
-	# static archive out of a convenience library, or when linking
-	# the entirety of a libtool archive into another (currently
-	# not supported by libtool).
-	if (for obj in $oldobjs
-	    do
-	      func_basename "$obj"
-	      $ECHO "$func_basename_result"
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	  :
-	else
-	  echo "copying selected object files to avoid basename conflicts..."
-	  gentop="$output_objdir/${outputname}x"
-	  func_append generated " $gentop"
-	  func_mkdir_p "$gentop"
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  counter=1
-	  for obj in $save_oldobjs
-	  do
-	    func_basename "$obj"
-	    objbase="$func_basename_result"
-	    case " $oldobjs " in
-	    " ") oldobjs=$obj ;;
-	    *[\ /]"$objbase "*)
-	      while :; do
-		# Make sure we don't pick an alternate name that also
-		# overlaps.
-		newobj=lt$counter-$objbase
-		func_arith $counter + 1
-		counter=$func_arith_result
-		case " $oldobjs " in
-		*[\ /]"$newobj "*) ;;
-		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
-		esac
-	      done
-	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      func_append oldobjs " $gentop/$newobj"
-	      ;;
-	    *) func_append oldobjs " $obj" ;;
-	    esac
-	  done
-	fi
-	eval cmds=\"$old_archive_cmds\"
-
-	func_len " $cmds"
-	len=$func_len_result
-	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  cmds=$old_archive_cmds
-	elif test -n "$archiver_list_spec"; then
-	  func_verbose "using command file archive linking..."
-	  for obj in $oldobjs
-	  do
-	    func_to_tool_file "$obj"
-	    $ECHO "$func_to_tool_file_result"
-	  done > $output_objdir/$libname.libcmd
-	  func_to_tool_file "$output_objdir/$libname.libcmd"
-	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
-	  cmds=$old_archive_cmds
-	else
-	  # the command line is too long to link in one step, link in parts
-	  func_verbose "using piecewise archive linking..."
-	  save_RANLIB=$RANLIB
-	  RANLIB=:
-	  objlist=
-	  concat_cmds=
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  # Is there a better way of finding the last object in the list?
-	  for obj in $save_oldobjs
-	  do
-	    last_oldobj=$obj
-	  done
-	  eval test_cmds=\"$old_archive_cmds\"
-	  func_len " $test_cmds"
-	  len0=$func_len_result
-	  len=$len0
-	  for obj in $save_oldobjs
-	  do
-	    func_len " $obj"
-	    func_arith $len + $func_len_result
-	    len=$func_arith_result
-	    func_append objlist " $obj"
-	    if test "$len" -lt "$max_cmd_len"; then
-	      :
-	    else
-	      # the above command should be used before it gets too long
-	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj" ; then
-		RANLIB=$save_RANLIB
-	      fi
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-	      objlist=
-	      len=$len0
-	    fi
-	  done
-	  RANLIB=$save_RANLIB
-	  oldobjs=$objlist
-	  if test "X$oldobjs" = "X" ; then
-	    eval cmds=\"\$concat_cmds\"
-	  else
-	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-	  fi
-	fi
-      fi
-      func_execute_cmds "$cmds" 'exit $?'
-    done
-
-    test -n "$generated" && \
-      func_show_eval "${RM}r$generated"
-
-    # Now create the libtool archive.
-    case $output in
-    *.la)
-      old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
-      func_verbose "creating $output"
-
-      # Preserve any variables that may affect compiler behavior
-      for var in $variables_saved_for_relink; do
-	if eval test -z \"\${$var+set}\"; then
-	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-	elif eval var_value=\$$var; test -z "$var_value"; then
-	  relink_command="$var=; export $var; $relink_command"
-	else
-	  func_quote_for_eval "$var_value"
-	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-	fi
-      done
-      # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-      if test "$hardcode_automatic" = yes ; then
-	relink_command=
-      fi
-
-      # Only create the output if not a dry run.
-      $opt_dry_run || {
-	for installed in no yes; do
-	  if test "$installed" = yes; then
-	    if test -z "$install_libdir"; then
-	      break
-	    fi
-	    output="$output_objdir/$outputname"i
-	    # Replace all uninstalled libtool libraries with the installed ones
-	    newdependency_libs=
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      *.la)
-		func_basename "$deplib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		test -z "$libdir" && \
-		  func_fatal_error "\`$deplib' is not a valid libtool archive"
-		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
-		;;
-	      -L*)
-		func_stripname -L '' "$deplib"
-		func_replace_sysroot "$func_stripname_result"
-		func_append newdependency_libs " -L$func_replace_sysroot_result"
-		;;
-	      -R*)
-		func_stripname -R '' "$deplib"
-		func_replace_sysroot "$func_stripname_result"
-		func_append newdependency_libs " -R$func_replace_sysroot_result"
-		;;
-	      *) func_append newdependency_libs " $deplib" ;;
-	      esac
-	    done
-	    dependency_libs="$newdependency_libs"
-	    newdlfiles=
-
-	    for lib in $dlfiles; do
-	      case $lib in
-	      *.la)
-	        func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-		test -z "$libdir" && \
-		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
-		;;
-	      *) func_append newdlfiles " $lib" ;;
-	      esac
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-	      *.la)
-		# Only pass preopened files to the pseudo-archive (for
-		# eventual linking with the app. that links it) if we
-		# didn't already link the preopened objects directly into
-		# the library:
-		func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-		test -z "$libdir" && \
-		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
-		;;
-	      esac
-	    done
-	    dlprefiles="$newdlprefiles"
-	  else
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      func_append newdlfiles " $abs"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      func_append newdlprefiles " $abs"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  fi
-	  $RM $output
-	  # place dlname in correct position for cygwin
-	  # In fact, it would be nice if we could use this code for all target
-	  # systems that can't hard-code library paths into their executables
-	  # and that have no shared library path variable independent of PATH,
-	  # but it turns out we can't easily determine that from inspecting
-	  # libtool variables, so we have to hard-code the OSs to which it
-	  # applies here; at the moment, that means platforms that use the PE
-	  # object format with DLL files.  See the long comment at the top of
-	  # tests/bindir.at for full details.
-	  tdlname=$dlname
-	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
-	      # If a -bindir argument was supplied, place the dll there.
-	      if test "x$bindir" != x ;
-	      then
-		func_relative_path "$install_libdir" "$bindir"
-		tdlname=$func_relative_path_result$dlname
-	      else
-		# Otherwise fall back on heuristic.
-		tdlname=../bin/$dlname
-	      fi
-	      ;;
-	  esac
-	  $ECHO > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags='$new_inherited_linker_flags'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-
-# Names of additional weak libraries provided by this library
-weak_library_names='$weak_libs'
-
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
-
-# Is this an already installed library?
-installed=$installed
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes; then
-	    $ECHO >> $output "\
-relink_command=\"$relink_command\""
-	  fi
-	done
-      }
-
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
-      ;;
-    esac
-    exit $EXIT_SUCCESS
-}
-
-{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
-    func_mode_link ${1+"$@"}
-
-
-# func_mode_uninstall arg...
-func_mode_uninstall ()
-{
-    $opt_debug
-    RM="$nonopt"
-    files=
-    rmforce=
-    exit_status=0
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    for arg
-    do
-      case $arg in
-      -f) func_append RM " $arg"; rmforce=yes ;;
-      -*) func_append RM " $arg" ;;
-      *) func_append files " $arg" ;;
-      esac
-    done
-
-    test -z "$RM" && \
-      func_fatal_help "you must specify an RM program"
-
-    rmdirs=
-
-    for file in $files; do
-      func_dirname "$file" "" "."
-      dir="$func_dirname_result"
-      if test "X$dir" = X.; then
-	odir="$objdir"
-      else
-	odir="$dir/$objdir"
-      fi
-      func_basename "$file"
-      name="$func_basename_result"
-      test "$opt_mode" = uninstall && odir="$dir"
-
-      # Remember odir for removal later, being careful to avoid duplicates
-      if test "$opt_mode" = clean; then
-	case " $rmdirs " in
-	  *" $odir "*) ;;
-	  *) func_append rmdirs " $odir" ;;
-	esac
-      fi
-
-      # Don't error if the file doesn't exist and rm -f was used.
-      if { test -L "$file"; } >/dev/null 2>&1 ||
-	 { test -h "$file"; } >/dev/null 2>&1 ||
-	 test -f "$file"; then
-	:
-      elif test -d "$file"; then
-	exit_status=1
-	continue
-      elif test "$rmforce" = yes; then
-	continue
-      fi
-
-      rmfiles="$file"
-
-      case $name in
-      *.la)
-	# Possibly a libtool archive, so verify it.
-	if func_lalib_p "$file"; then
-	  func_source $dir/$name
-
-	  # Delete the libtool libraries and symlinks.
-	  for n in $library_names; do
-	    func_append rmfiles " $odir/$n"
-	  done
-	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
-
-	  case "$opt_mode" in
-	  clean)
-	    case " $library_names " in
-	    *" $dlname "*) ;;
-	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
-	    esac
-	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
-	    ;;
-	  uninstall)
-	    if test -n "$library_names"; then
-	      # Do each command in the postuninstall commands.
-	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
-	    fi
-
-	    if test -n "$old_library"; then
-	      # Do each command in the old_postuninstall commands.
-	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
-	    fi
-	    # FIXME: should reinstall the best remaining shared library.
-	    ;;
-	  esac
-	fi
-	;;
-
-      *.lo)
-	# Possibly a libtool object, so verify it.
-	if func_lalib_p "$file"; then
-
-	  # Read the .lo file
-	  func_source $dir/$name
-
-	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" &&
-	     test "$pic_object" != none; then
-	    func_append rmfiles " $dir/$pic_object"
-	  fi
-
-	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" &&
-	     test "$non_pic_object" != none; then
-	    func_append rmfiles " $dir/$non_pic_object"
-	  fi
-	fi
-	;;
-
-      *)
-	if test "$opt_mode" = clean ; then
-	  noexename=$name
-	  case $file in
-	  *.exe)
-	    func_stripname '' '.exe' "$file"
-	    file=$func_stripname_result
-	    func_stripname '' '.exe' "$name"
-	    noexename=$func_stripname_result
-	    # $file with .exe has already been added to rmfiles,
-	    # add $file without .exe
-	    func_append rmfiles " $file"
-	    ;;
-	  esac
-	  # Do a test to see if this is a libtool program.
-	  if func_ltwrapper_p "$file"; then
-	    if func_ltwrapper_executable_p "$file"; then
-	      func_ltwrapper_scriptname "$file"
-	      relink_command=
-	      func_source $func_ltwrapper_scriptname_result
-	      func_append rmfiles " $func_ltwrapper_scriptname_result"
-	    else
-	      relink_command=
-	      func_source $dir/$noexename
-	    fi
-
-	    # note $name still contains .exe if it was in $file originally
-	    # as does the version of $file that was added into $rmfiles
-	    func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
-	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      func_append rmfiles " $odir/lt-$name"
-	    fi
-	    if test "X$noexename" != "X$name" ; then
-	      func_append rmfiles " $odir/lt-${noexename}.c"
-	    fi
-	  fi
-	fi
-	;;
-      esac
-      func_show_eval "$RM $rmfiles" 'exit_status=1'
-    done
-
-    # Try to remove the ${objdir}s in the directories where we deleted files
-    for dir in $rmdirs; do
-      if test -d "$dir"; then
-	func_show_eval "rmdir $dir >/dev/null 2>&1"
-      fi
-    done
-
-    exit $exit_status
-}
-
-{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
-    func_mode_uninstall ${1+"$@"}
-
-test -z "$opt_mode" && {
-  help="$generic_help"
-  func_fatal_help "you must specify a MODE"
-}
-
-test -z "$exec_cmd" && \
-  func_fatal_help "invalid operation mode \`$opt_mode'"
-
-if test -n "$exec_cmd"; then
-  eval exec "$exec_cmd"
-  exit $EXIT_FAILURE
-fi
-
-exit $exit_status
-
-
-# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries.  Given conflicting
-# choices, we go for a static library, that is the most portable,
-# since we can't tell whether shared libraries were disabled because
-# the user asked for that or because the platform doesn't support
-# them.  This is particularly important on AIX, because we don't
-# support having both static and shared libraries enabled at the same
-# time on that platform, so we default to a shared-only configuration.
-# If a disable-shared tag is given, we'll fallback to a static-only
-# configuration.  But we'll never go from static-only to shared-only.
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
-# ### END LIBTOOL TAG CONFIG: disable-shared
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
-# ### END LIBTOOL TAG CONFIG: disable-static
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:
-# vi:sw=2
-
diff --git a/m4/gtk-doc.m4 b/m4/gtk-doc.m4
index 0ada1519..ac2eccb4 100644
--- a/m4/gtk-doc.m4
+++ b/m4/gtk-doc.m4
@@ -37,7 +37,7 @@ AC_DEFUN([GTK_DOC_CHECK],
     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,,)
+      PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0,,[:])
     fi
   fi
 
@@ -58,6 +58,10 @@ AC_DEFUN([GTK_DOC_CHECK],
     enable_gtk_doc_pdf=no
   fi
 
+  if test -z "$AM_DEFAULT_VERBOSITY"; then
+    AM_DEFAULT_VERBOSITY=1
+  fi
+  AC_SUBST([AM_DEFAULT_VERBOSITY])
 
   AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
   AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
diff --git a/man/Makefile.am b/man/Makefile.am
index d3512076..763d4301 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,18 +1,20 @@
 man_MANS =
 CLEANFILES =
 
-if ENABLE_DOC
+if ENABLE_GTK_DOC
 
 XSLTPROC = xsltproc --xinclude --nonet
 
 nm-settings.5: nm-settings.xml
 	$(XSLTPROC) $(top_srcdir)/tools/manpages-docbook.xsl $(builddir)/nm-settings.xml
-CLEANFILES += nm-settings.5
 
 nm-settings.xml: $(top_builddir)/tools/generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la
 	rm -f $(builddir)/$@
 	$(top_builddir)/tools/generate-settings-spec refentry $(builddir)/$@
-CLEANFILES += nm-settings.xml
+
+endif
+
+CLEANFILES += nm-settings.5 nm-settings.xml
 
 man_MANS +=				\
 	NetworkManager.8		\
@@ -20,7 +22,13 @@ man_MANS +=				\
 	nm-system-settings.conf.5	\
 	nm-tool.1			\
 	nm-online.1			\
-	nmcli.1				\
-	nm-settings.5
+	nmcli.1
 
+if ENABLE_GTK_DOC
+man_MANS += nm-settings.5
+else
+if INSTALL_PREGEN_MANPAGES
+man_MANS += nm-settings.5
 endif
+endif
+
diff --git a/man/Makefile.in b/man/Makefile.in
index 3dacf44b..23f4ef2c 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,23 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -50,22 +77,14 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@ENABLE_DOC_TRUE@am__append_1 = nm-settings.5 nm-settings.xml
-@ENABLE_DOC_TRUE@am__append_2 = \
-@ENABLE_DOC_TRUE@	NetworkManager.8		\
-@ENABLE_DOC_TRUE@	NetworkManager.conf.5		\
-@ENABLE_DOC_TRUE@	nm-system-settings.conf.5	\
-@ENABLE_DOC_TRUE@	nm-tool.1			\
-@ENABLE_DOC_TRUE@	nm-online.1			\
-@ENABLE_DOC_TRUE@	nmcli.1				\
-@ENABLE_DOC_TRUE@	nm-settings.5
-
+@ENABLE_GTK_DOC_TRUE@am__append_1 = nm-settings.5
+@ENABLE_GTK_DOC_FALSE@@INSTALL_PREGEN_MANPAGES_TRUE@am__append_2 = nm-settings.5
 subdir = man
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(srcdir)/NetworkManager.8.in \
-	$(srcdir)/NetworkManager.conf.5.in $(srcdir)/nm-online.1.in \
+	$(srcdir)/NetworkManager.conf.5.in \
 	$(srcdir)/nm-system-settings.conf.5.in $(srcdir)/nm-tool.1.in \
-	$(srcdir)/nmcli.1.in
+	$(srcdir)/nm-online.1.in $(srcdir)/nmcli.1.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
 	$(top_srcdir)/m4/gettext.m4 \
@@ -86,12 +105,18 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = NetworkManager.8 NetworkManager.conf.5 \
 	nm-system-settings.conf.5 nm-tool.1 nm-online.1 nmcli.1
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -133,6 +158,7 @@ man5dir = $(mandir)/man5
 man8dir = $(mandir)/man8
 NROFF = nroff
 MANS = $(man_MANS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -275,7 +301,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGCONFIG_PATH = @PKGCONFIG_PATH@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@@ -290,6 +315,8 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@
+SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@
 SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
 SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
 SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
@@ -371,9 +398,11 @@ with_dhclient = @with_dhclient@
 with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
-man_MANS = $(am__append_2)
-CLEANFILES = $(am__append_1)
-@ENABLE_DOC_TRUE@XSLTPROC = xsltproc --xinclude --nonet
+man_MANS = NetworkManager.8 NetworkManager.conf.5 \
+	nm-system-settings.conf.5 nm-tool.1 nm-online.1 nmcli.1 \
+	$(am__append_1) $(am__append_2)
+CLEANFILES = nm-settings.5 nm-settings.xml
+@ENABLE_GTK_DOC_TRUE@XSLTPROC = xsltproc --xinclude --nonet
 all: all-am
 
 .SUFFIXES:
@@ -554,27 +583,14 @@ uninstall-man8:
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
 	dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -713,25 +729,26 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-man1 \
-	install-man5 install-man8 install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-man1 install-man5 install-man8 install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-man uninstall-man1 uninstall-man5 uninstall-man8
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-man uninstall-man1 uninstall-man5 \
+	uninstall-man8
 
 
-@ENABLE_DOC_TRUE@nm-settings.5: nm-settings.xml
-@ENABLE_DOC_TRUE@	$(XSLTPROC) $(top_srcdir)/tools/manpages-docbook.xsl $(builddir)/nm-settings.xml
+@ENABLE_GTK_DOC_TRUE@nm-settings.5: nm-settings.xml
+@ENABLE_GTK_DOC_TRUE@	$(XSLTPROC) $(top_srcdir)/tools/manpages-docbook.xsl $(builddir)/nm-settings.xml
 
-@ENABLE_DOC_TRUE@nm-settings.xml: $(top_builddir)/tools/generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la
-@ENABLE_DOC_TRUE@	rm -f $(builddir)/$@
-@ENABLE_DOC_TRUE@	$(top_builddir)/tools/generate-settings-spec refentry $(builddir)/$@
+@ENABLE_GTK_DOC_TRUE@nm-settings.xml: $(top_builddir)/tools/generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la
+@ENABLE_GTK_DOC_TRUE@	rm -f $(builddir)/$@
+@ENABLE_GTK_DOC_TRUE@	$(top_builddir)/tools/generate-settings-spec refentry $(builddir)/$@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/man/nm-online.1.in b/man/nm-online.1.in
index 4859ba90..3acb4de4 100644
--- a/man/nm-online.1.in
+++ b/man/nm-online.1.in
@@ -21,7 +21,7 @@
 .\"
 .\" Copyright (C) 2010 Red Hat, Inc.
 .\"
-.TH NM-ONLINE "1" "6 August 2010"
+.TH NM-ONLINE "1" "11 July 2013"
 
 .SH NAME
 nm-online \- ask NetworkManager whether the network is connected
@@ -38,9 +38,9 @@ exit, the returned status code should be checked (see the return codes bellow).
 
 .SH OPTIONS
 .TP
-.B \-t, \-\-timeout
-Time to wait for a connection, in seconds.  If not specified, the default is 30
-seconds.
+.B \-t, \-\-timeout 
+Time to wait for a connection, in seconds.  If the option is not provided,
+the default timeout is 30 seconds.
 .TP
 .B \-x, \-\-exit
 Exit immediately if NetworkManager is not running or connecting.
diff --git a/man/nmcli.1.in b/man/nmcli.1.in
index d7a7a9fd..ee48aba6 100644
--- a/man/nmcli.1.in
+++ b/man/nmcli.1.in
@@ -24,7 +24,7 @@
 .TH NMCLI "1" "17 January 2013"
 
 .SH NAME
-nmcli \(en command\(hyline tool for controlling NetworkManager
+nmcli \- command\(hyline tool for controlling NetworkManager
 .SH SYNOPSIS
 .ad l
 .B nmcli
diff --git a/missing b/missing
deleted file mode 100755
index 28055d2a..00000000
--- a/missing
+++ /dev/null
@@ -1,376 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2009-04-28.21; # UTC
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard , 1996.
-
-# 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, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see .
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
-
-Send bug reports to ."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# normalize program name to check for.
-program=`echo "$1" | sed '
-  s/^gnu-//; t
-  s/^gnu//; t
-  s/^g//; t'`
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).  This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
-  lex*|yacc*)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  tar*)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te*)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison*|yacc*)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f y.tab.h; then
-	echo >y.tab.h
-    fi
-    if test ! -f y.tab.c; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex*|flex*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f lex.yy.c; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit $?
-    fi
-    ;;
-
-  makeinfo*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '
-	/^@setfilename/{
-	  s/.* \([^ ]*\) *$/\1/
-	  p
-	  q
-	}' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
-
-  tar*)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case $firstarg in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case $firstarg in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9f261d0b..f8b4b091 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -14,6 +14,7 @@ libnm-util/crypto_nss.c
 libnm-util/nm-utils.c
 policy/org.freedesktop.NetworkManager.policy.in.in
 src/main.c
+src/bluez-manager/nm-bluez-device.c
 src/dhcp-manager/nm-dhcp-dhclient.c
 src/dhcp-manager/nm-dhcp-dhclient-utils.c
 src/dhcp-manager/nm-dhcp-manager.c
diff --git a/po/gl.po b/po/gl.po
index f9a9e31d..5131f2b9 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1964,7 +1964,7 @@ msgstr "LOOSE_BINDING, "
 #, c-format
 #| msgid "disabled"
 msgid "%d (disabled)"
-msgstr "0 (desactivado)"
+msgstr "%d (desactivado)"
 
 #: ../cli/src/settings.c:692
 #, c-format
diff --git a/po/hr.po b/po/hr.po
index 1d0b4676..4e245654 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -882,7 +882,7 @@ msgstr "Greška: 'dev status': %s"
 #: ../cli/src/devices.c:1006
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
-msgstr "Greška: 'dev status': s; dozvoljena polja: %s"
+msgstr "Greška: 'dev status': %s; dozvoljena polja: %s"
 
 #: ../cli/src/devices.c:1029
 msgid "Status of devices"
diff --git a/po/ja.po b/po/ja.po
index 37f0e829..a57bfe5e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2,969 +2,1806 @@
 # Japanese translation for NetworkManager
 # Copyright (C) 2005 Dan Williams 
 # This file is distributed under the same license as the NetworkManager package.
-#
 # Satoru SATOH , 2005-2007.
 # Kiyoto Hashida , 2010.
+# Noriko Mizumoto , 2013.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: ja\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-06 14:31+0530\n"
-"PO-Revision-Date: 2010-05-07 16:04+0900\n"
-"Last-Translator: Kiyoto Hashida \n"
-"Language-Team: Japanese \n"
+"Project-Id-Version: NetworkManager\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-09-23 12:01+0900\n"
+"PO-Revision-Date: 2013-09-17 10:09+0000\n"
+"Last-Translator: Noriko Mizumoto \n"
+"Language-Team: Japanese \n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: Plural-Forms: nplurals=1; plural=0;\n\n"
-"\n"
-"\n"
-"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: Plural-Forms: nplurals=1; plural=0;\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
-msgid "NAME"
-msgstr "名前"
+#: ../cli/src/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52
+#: ../cli/src/common.c:63 ../cli/src/connections.c:133
+#: ../cli/src/connections.c:167
+msgid "GROUP"
+msgstr "グループ"
 
 #. 0
-#: ../cli/src/connections.c:60 ../cli/src/connections.c:75
-msgid "UUID"
-msgstr "UUID"
+#: ../cli/src/common.c:33 ../cli/src/common.c:53
+msgid "ADDRESS"
+msgstr "アドレス"
 
 #. 1
-#: ../cli/src/connections.c:61
-msgid "DEVICES"
-msgstr "デバイス"
+#: ../cli/src/common.c:34 ../cli/src/common.c:54
+msgid "ROUTE"
+msgstr "ルート"
 
 #. 2
-#: ../cli/src/connections.c:62 ../cli/src/connections.c:77
-msgid "SCOPE"
-msgstr "範囲"
+#: ../cli/src/common.c:35 ../cli/src/common.c:55
+msgid "DNS"
+msgstr "DNS"
 
 #. 3
-#: ../cli/src/connections.c:63
-msgid "DEFAULT"
-msgstr "デフォルト"
+#: ../cli/src/common.c:36 ../cli/src/common.c:56
+msgid "DOMAIN"
+msgstr "ドメイン"
 
 #. 4
-#: ../cli/src/connections.c:64
-msgid "DBUS-SERVICE"
-msgstr "DBUS-サービス"
+#: ../cli/src/common.c:37
+msgid "WINS"
+msgstr "WINS"
 
-#. 5
-#: ../cli/src/connections.c:65
-msgid "SPEC-OBJECT"
-msgstr "スペックオブジェクト"
+#. 0
+#: ../cli/src/common.c:45 ../cli/src/common.c:64
+msgid "OPTION"
+msgstr "オプション"
 
-#. 6
-#: ../cli/src/connections.c:66
-msgid "VPN"
-msgstr "VPN"
+#: ../cli/src/common.c:366
+msgid "unmanaged"
+msgstr "管理無し"
+
+#: ../cli/src/common.c:368
+msgid "unavailable"
+msgstr "利用不可"
+
+#: ../cli/src/common.c:370 ../cli/src/network-manager.c:120
+msgid "disconnected"
+msgstr "切断済み"
+
+#: ../cli/src/common.c:372
+msgid "connecting (prepare)"
+msgstr "接続中（準備）"
+
+#: ../cli/src/common.c:374
+msgid "connecting (configuring)"
+msgstr "接続中（設定中）"
+
+#: ../cli/src/common.c:376
+msgid "connecting (need authentication)"
+msgstr "接続中（認証が必要）"
+
+#: ../cli/src/common.c:378
+msgid "connecting (getting IP configuration)"
+msgstr "接続中（IP 設定を取得中）"
+
+#: ../cli/src/common.c:380
+msgid "connecting (checking IP connectivity)"
+msgstr "接続中（IP の接続性チェック）"
+
+#: ../cli/src/common.c:382
+msgid "connecting (starting secondary connections)"
+msgstr "接続中（セカンダリ接続を開始）"
+
+#: ../cli/src/common.c:384 ../cli/src/network-manager.c:116
+msgid "connected"
+msgstr "接続済み"
+
+#: ../cli/src/common.c:386 ../cli/src/connections.c:466
+msgid "deactivating"
+msgstr "停止中"
+
+#: ../cli/src/common.c:388
+msgid "connection failed"
+msgstr "接続に失敗"
+
+#: ../cli/src/common.c:390 ../cli/src/connections.c:471
+#: ../cli/src/connections.c:494 ../cli/src/connections.c:1189
+#: ../cli/src/devices.c:664 ../cli/src/network-manager.c:123
+#: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:188
+#: ../cli/src/network-manager.c:197 ../cli/src/network-manager.c:257
+#: ../cli/src/network-manager.c:273 ../cli/src/network-manager.c:431
+#: ../cli/src/network-manager.c:486 ../cli/src/network-manager.c:524
+#: ../cli/src/network-manager.c:563 ../cli/src/settings.c:661
+#: ../cli/src/settings.c:689 ../cli/src/settings.c:751 ../cli/src/utils.c:533
+#: ../src/main.c:435 ../src/main.c:454
+msgid "unknown"
+msgstr "不明"
+
+#: ../cli/src/common.c:399
+msgid "No reason given"
+msgstr "原因不明"
+
+#: ../cli/src/common.c:402
+msgid "Unknown error"
+msgstr "不明なエラー"
+
+#: ../cli/src/common.c:405
+msgid "Device is now managed"
+msgstr "デバイスが管理下に置かれました"
+
+#: ../cli/src/common.c:408
+msgid "Device is now unmanaged"
+msgstr "デバイスが管理下から外れました"
+
+#: ../cli/src/common.c:411
+msgid "The device could not be readied for configuration"
+msgstr "デバイスの設定準備ができませんでした"
+
+#: ../cli/src/common.c:414
+msgid "IP configuration could not be reserved (no available address, timeout, etc.)"
+msgstr "IP 設定を確保できませんでした (利用可能なアドレスがない、タイムアウトなど)"
+
+#: ../cli/src/common.c:417
+msgid "The IP configuration is no longer valid"
+msgstr "この IP 設定は無効になりました"
+
+#: ../cli/src/common.c:420
+msgid "Secrets were required, but not provided"
+msgstr "秘密が必要でしたが入力されませんでした"
+
+#: ../cli/src/common.c:423
+msgid "802.1X supplicant disconnected"
+msgstr "802.1X サプリカントが切断されました"
+
+#: ../cli/src/common.c:426
+msgid "802.1X supplicant configuration failed"
+msgstr "802.1X サプリカントの設定に失敗しました"
+
+#: ../cli/src/common.c:429
+msgid "802.1X supplicant failed"
+msgstr "802.1X サプリカントが失敗しました"
+
+#: ../cli/src/common.c:432
+msgid "802.1X supplicant took too long to authenticate"
+msgstr "802.1X サプリカントの認証に時間がかかり過ぎました"
+
+#: ../cli/src/common.c:435
+msgid "PPP service failed to start"
+msgstr "PPP サービスの開始に失敗しました"
+
+#: ../cli/src/common.c:438
+msgid "PPP service disconnected"
+msgstr "PPP サービスの接続が切断されました"
+
+#: ../cli/src/common.c:441
+msgid "PPP failed"
+msgstr "PPP の失敗"
+
+#: ../cli/src/common.c:444
+msgid "DHCP client failed to start"
+msgstr "DHCP クライアントの開始に失敗しました"
+
+#: ../cli/src/common.c:447
+msgid "DHCP client error"
+msgstr "DHCP クライアントエラー"
+
+#: ../cli/src/common.c:450
+msgid "DHCP client failed"
+msgstr "DHCP クライアントの失敗"
+
+#: ../cli/src/common.c:453
+msgid "Shared connection service failed to start"
+msgstr "共有接続サービスの開始に失敗しました"
+
+#: ../cli/src/common.c:456
+msgid "Shared connection service failed"
+msgstr "共有接続サービスの失敗"
+
+#: ../cli/src/common.c:459
+msgid "AutoIP service failed to start"
+msgstr "AutoIP サービスの開始に失敗しました"
+
+#: ../cli/src/common.c:462
+msgid "AutoIP service error"
+msgstr "AutoIP サービスエラー"
+
+#: ../cli/src/common.c:465
+msgid "AutoIP service failed"
+msgstr "AutoIP サービスの失敗"
+
+#: ../cli/src/common.c:468
+msgid "The line is busy"
+msgstr "回線が使用中です"
+
+#: ../cli/src/common.c:471
+msgid "No dial tone"
+msgstr "ダイアル音がありません"
+
+#: ../cli/src/common.c:474
+msgid "No carrier could be established"
+msgstr "確立できるキャリアがありませんでした"
+
+#: ../cli/src/common.c:477
+msgid "The dialing request timed out"
+msgstr "ダイアル要求がタイムアウトしました"
+
+#: ../cli/src/common.c:480
+msgid "The dialing attempt failed"
+msgstr "ダイアルの試行に失敗しました"
+
+#: ../cli/src/common.c:483
+msgid "Modem initialization failed"
+msgstr "モデムの初期化に失敗しました"
+
+#: ../cli/src/common.c:486
+msgid "Failed to select the specified APN"
+msgstr "指定された APN の選択に失敗しました"
+
+#: ../cli/src/common.c:489
+msgid "Not searching for networks"
+msgstr ""
+
+#: ../cli/src/common.c:492
+msgid "Network registration denied"
+msgstr "ネットワークの登録が拒否されました"
+
+#: ../cli/src/common.c:495
+msgid "Network registration timed out"
+msgstr "ネットワークの登録がタイムアウトしました"
+
+#: ../cli/src/common.c:498
+msgid "Failed to register with the requested network"
+msgstr "要求されたネットワークへの登録に失敗しました"
+
+#: ../cli/src/common.c:501
+msgid "PIN check failed"
+msgstr "PIN 確認に失敗しました"
+
+#: ../cli/src/common.c:504
+msgid "Necessary firmware for the device may be missing"
+msgstr "このデバイスに必要なファームウェアがない可能性があります"
+
+#: ../cli/src/common.c:507
+msgid "The device was removed"
+msgstr "このデバイスは削除されました"
+
+#: ../cli/src/common.c:510
+msgid "NetworkManager went to sleep"
+msgstr "NetworkManager がスリープ状態に入りました"
+
+#: ../cli/src/common.c:513
+msgid "The device's active connection disappeared"
+msgstr "このデバイスのアクティブな接続が消滅しました"
+
+#: ../cli/src/common.c:516
+msgid "Device disconnected by user or client"
+msgstr "ユーザーまたはクライアントによりデバイスが切断されました"
+
+#: ../cli/src/common.c:519
+msgid "Carrier/link changed"
+msgstr "キャリア／リンクが変更されました"
+
+#: ../cli/src/common.c:522
+msgid "The device's existing connection was assumed"
+msgstr ""
+
+#: ../cli/src/common.c:525
+msgid "The supplicant is now available"
+msgstr "サプリカントが使用できるようになりました"
+
+#: ../cli/src/common.c:528
+msgid "The modem could not be found"
+msgstr "モデムが見つかりませんでした"
+
+#: ../cli/src/common.c:531
+msgid "The Bluetooth connection failed or timed out"
+msgstr "Bluetooth 接続が失敗またはタイムアウトしました"
+
+#: ../cli/src/common.c:534
+msgid "GSM Modem's SIM card not inserted"
+msgstr "GSM モデムの SIM カードが挿入されていません"
+
+#: ../cli/src/common.c:537
+msgid "GSM Modem's SIM PIN required"
+msgstr "GSM モデムの SIM PIN が必要です"
+
+#: ../cli/src/common.c:540
+msgid "GSM Modem's SIM PUK required"
+msgstr "GSM モデムの SIM PUK が必要です"
+
+#: ../cli/src/common.c:543
+msgid "GSM Modem's SIM wrong"
+msgstr "GSM モデムの SIM が間違っています"
+
+#: ../cli/src/common.c:546
+msgid "InfiniBand device does not support connected mode"
+msgstr "InfiniBand デバイスでは接続モードに対応していません"
+
+#: ../cli/src/common.c:549
+msgid "A dependency of the connection failed"
+msgstr "接続依存性の失敗"
+
+#: ../cli/src/common.c:552
+msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
+msgstr "ADSL ブリッジ経由の RFC 2684 Ethernet に問題が発生しました"
+
+#: ../cli/src/common.c:555
+msgid "ModemManager is unavailable"
+msgstr "ModemManager は使用できません"
+
+#: ../cli/src/common.c:558
+msgid "The Wi-Fi network could not be found"
+msgstr "Wi-Fi ネットワークが見つかりませんでした"
+
+#: ../cli/src/common.c:561
+msgid "A secondary connection of the base connection failed"
+msgstr "ベース接続のセカンダリ接続に失敗しました"
+
+#: ../cli/src/common.c:564 ../cli/src/devices.c:310 ../cli/src/devices.c:328
+#: ../cli/src/devices.c:450 ../cli/src/devices.c:494
+msgid "Unknown"
+msgstr "不明"
+
+#. 0
+#. used only for 'GENERAL' group listing
+#: ../cli/src/connections.c:60 ../cli/src/connections.c:134
+#: ../cli/src/devices.c:109 ../cli/src/devices.c:134 ../cli/src/devices.c:144
+#: ../cli/src/devices.c:154 ../cli/src/devices.c:164 ../cli/src/devices.c:180
+#: ../cli/src/devices.c:194 ../cli/src/devices.c:216 ../cli/src/devices.c:232
+#: ../cli/src/devices.c:241
+msgid "NAME"
+msgstr "名前"
+
+#. 0
+#. 1
+#: ../cli/src/connections.c:61 ../cli/src/connections.c:135
+msgid "UUID"
+msgstr "UUID"
 
 #. 1
 #. 0
 #. 1
-#: ../cli/src/connections.c:76 ../cli/src/devices.c:61 ../cli/src/devices.c:87
+#. 2
+#: ../cli/src/connections.c:62 ../cli/src/connections.c:168
+#: ../cli/src/devices.c:72 ../cli/src/devices.c:111 ../cli/src/devices.c:219
 msgid "TYPE"
 msgstr "タイプ"
 
-#. 3
-#: ../cli/src/connections.c:78
+#. 2
+#: ../cli/src/connections.c:63
 msgid "TIMESTAMP"
 msgstr "タイムスタンプ"
 
-#. 4
-#: ../cli/src/connections.c:79
+#. 3
+#: ../cli/src/connections.c:64
 msgid "TIMESTAMP-REAL"
 msgstr "タイムスタンプ-リアル"
 
-#. 5
-#: ../cli/src/connections.c:80
+#. 4
+#. 13
+#: ../cli/src/connections.c:65 ../cli/src/devices.c:123
 msgid "AUTOCONNECT"
 msgstr "自動接続"
 
-#. 6
-#: ../cli/src/connections.c:81
+#. 5
+#: ../cli/src/connections.c:66
 msgid "READONLY"
 msgstr "読み込み専用"
 
-#: ../cli/src/connections.c:157
-#, c-format
+#. 6
+#. 8
+#. 2
+#. 11
+#. 5
+#: ../cli/src/connections.c:67 ../cli/src/connections.c:142
+#: ../cli/src/devices.c:74 ../cli/src/devices.c:206 ../cli/src/devices.c:222
+msgid "DBUS-PATH"
+msgstr "DBUS パス"
+
+#. 2
+#: ../cli/src/connections.c:136
+msgid "DEVICES"
+msgstr "デバイス"
+
+#. 3
+#. 1
+#. 8
+#. 1
+#: ../cli/src/connections.c:137 ../cli/src/devices.c:73
+#: ../cli/src/devices.c:118 ../cli/src/network-manager.c:39
+msgid "STATE"
+msgstr "状態"
+
+#. 4
+#: ../cli/src/connections.c:138
+msgid "DEFAULT"
+msgstr "デフォルト"
+
+#. 5
+#: ../cli/src/connections.c:139
+msgid "DEFAULT6"
+msgstr "デフォルト6"
+
+#. 6
+#: ../cli/src/connections.c:140
+msgid "SPEC-OBJECT"
+msgstr "スペックオブジェクト"
+
+#. 7
+#. 1
+#: ../cli/src/connections.c:141 ../cli/src/connections.c:155
+msgid "VPN"
+msgstr "VPN"
+
+#. 9
+#: ../cli/src/connections.c:143
+msgid "CON-PATH"
+msgstr "CON パス"
+
+#. 10
+#: ../cli/src/connections.c:144
+msgid "ZONE"
+msgstr "ゾーン"
+
+#. 11
+#: ../cli/src/connections.c:145
+msgid "MASTER-PATH"
+msgstr "マスターパス"
+
+#: ../cli/src/connections.c:153 ../cli/src/devices.c:83
+msgid "GENERAL"
+msgstr "全般"
+
+#. 0
+#: ../cli/src/connections.c:154
+msgid "IP"
+msgstr "IP"
+
+#. 1
+#: ../cli/src/connections.c:169
+msgid "USERNAME"
+msgstr "ユーザー名"
+
+#. 2
+#: ../cli/src/connections.c:170
+msgid "GATEWAY"
+msgstr "ゲートウェイ"
+
+#. 3
+#: ../cli/src/connections.c:171
+msgid "BANNER"
+msgstr "バナー"
+
+#. 4
+#: ../cli/src/connections.c:172
+msgid "VPN-STATE"
+msgstr "VPN の状態"
+
+#. 5
+#: ../cli/src/connections.c:173
+msgid "CFG"
+msgstr "CFG"
+
+#: ../cli/src/connections.c:195
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: nmcli con { COMMAND | help }\n"
+#| "  COMMAND := { list | status | up | down }\n"
+#| "\n"
+#| "  list [id  | uuid  | system | user]\n"
+#| "  status\n"
+#| "  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout ]\n"
+#| "  down id  | uuid \n"
 msgid ""
-"Usage: nmcli con { COMMAND | help }\n"
-"  COMMAND := { list | status | up | down }\n"
+"Usage: nmcli connection { COMMAND | help }\n"
+"  COMMAND := { list | status | up | down | delete }\n"
 "\n"
-"  list [id  | uuid  | system | user]\n"
-"  status\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
-"]\n"
+"  list [id  | uuid ]\n"
+"  status [id  | uuid  | path ]\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"
+"\n"
 msgstr ""
 "使用法: nmcli con { COMMAND | help }\n"
 "  COMMAND := { list | status | up | down }\n"
 "\n"
 "  list [id  | uuid  | system | user]\n"
 "  status\n"
-"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout "
-"]\n"
+"  up id  | uuid  [iface ] [ap ] [--nowait] [--timeout ]\n"
 "  down id  | uuid \n"
 
-#: ../cli/src/connections.c:197 ../cli/src/connections.c:536
-#, c-format
+#: ../cli/src/connections.c:256 ../cli/src/connections.c:442
+#, fuzzy, c-format
+#| msgid "Error: 'stp': %s."
 msgid "Error: 'con list': %s"
-msgstr "エラー:'con list': %s"
+msgstr "エラー:'stp': %s。"
 
-#: ../cli/src/connections.c:199 ../cli/src/connections.c:538
-#, c-format
+#: ../cli/src/connections.c:258 ../cli/src/connections.c:444
+#, fuzzy, c-format
+#| msgid "Error: 'nm status': %s; allowed fields: %s"
 msgid "Error: 'con list': %s; allowed fields: %s"
-msgstr "エラー:'con list': %s ; 許可されるフィールド: %s"
+msgstr "エラー: 'nm status': %s; 許可されるフィールド: %s"
 
-#: ../cli/src/connections.c:207
+#: ../cli/src/connections.c:266
 msgid "Connection details"
 msgstr "接続の詳細"
 
-#: ../cli/src/connections.c:381 ../cli/src/connections.c:601
-msgid "system"
-msgstr "システム"
-
-#: ../cli/src/connections.c:381 ../cli/src/connections.c:601
-msgid "user"
-msgstr "ユーザー"
-
-#: ../cli/src/connections.c:383
+#: ../cli/src/connections.c:317
 msgid "never"
 msgstr "しない"
 
 #. "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:318 ../cli/src/connections.c:319
+#: ../cli/src/connections.c:552 ../cli/src/connections.c:553
+#: ../cli/src/connections.c:555 ../cli/src/devices.c:458
+#: ../cli/src/devices.c:511 ../cli/src/devices.c:629 ../cli/src/devices.c:630
+#: ../cli/src/devices.c:631 ../cli/src/devices.c:663 ../cli/src/devices.c:690
+#: ../cli/src/devices.c:691 ../cli/src/devices.c:692 ../cli/src/devices.c:693
+#: ../cli/src/devices.c:694 ../cli/src/devices.c:695 ../cli/src/devices.c:696
+#: ../cli/src/network-manager.c:267 ../cli/src/settings.c:866
+#: ../cli/src/settings.c:941 ../cli/src/settings.c:1076
+#: ../cli/src/settings.c:1166 ../cli/src/settings.c:1376
+#: ../cli/src/settings.c:1377 ../cli/src/settings.c:1379
+#: ../cli/src/settings.c:1381 ../cli/src/settings.c:1382
+#: ../cli/src/settings.c:1513 ../cli/src/settings.c:1514
+#: ../cli/src/settings.c:1515 ../cli/src/settings.c:1516
+#: ../cli/src/settings.c:1594 ../cli/src/settings.c:1595
+#: ../cli/src/settings.c:1596 ../cli/src/settings.c:1597
+#: ../cli/src/settings.c:1598 ../cli/src/settings.c:1599
+#: ../cli/src/settings.c:1600 ../cli/src/settings.c:1601
+#: ../cli/src/settings.c:1602 ../cli/src/settings.c:1603
+#: ../cli/src/settings.c:1604 ../cli/src/settings.c:1605
+#: ../cli/src/settings.c:1606 ../cli/src/settings.c:1688
+#: ../cli/src/settings.c:2044 ../cli/src/settings.c:2081
 msgid "yes"
 msgstr "はい"
 
-#: ../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:318 ../cli/src/connections.c:319
+#: ../cli/src/connections.c:552 ../cli/src/connections.c:553
+#: ../cli/src/connections.c:555 ../cli/src/devices.c:458
+#: ../cli/src/devices.c:511 ../cli/src/devices.c:629 ../cli/src/devices.c:630
+#: ../cli/src/devices.c:631 ../cli/src/devices.c:663 ../cli/src/devices.c:690
+#: ../cli/src/devices.c:691 ../cli/src/devices.c:692 ../cli/src/devices.c:693
+#: ../cli/src/devices.c:694 ../cli/src/devices.c:695 ../cli/src/devices.c:696
+#: ../cli/src/network-manager.c:269 ../cli/src/settings.c:866
+#: ../cli/src/settings.c:868 ../cli/src/settings.c:941
+#: ../cli/src/settings.c:1076 ../cli/src/settings.c:1166
+#: ../cli/src/settings.c:1376 ../cli/src/settings.c:1377
+#: ../cli/src/settings.c:1379 ../cli/src/settings.c:1381
+#: ../cli/src/settings.c:1382 ../cli/src/settings.c:1513
+#: ../cli/src/settings.c:1514 ../cli/src/settings.c:1515
+#: ../cli/src/settings.c:1516 ../cli/src/settings.c:1594
+#: ../cli/src/settings.c:1595 ../cli/src/settings.c:1596
+#: ../cli/src/settings.c:1597 ../cli/src/settings.c:1598
+#: ../cli/src/settings.c:1599 ../cli/src/settings.c:1600
+#: ../cli/src/settings.c:1601 ../cli/src/settings.c:1602
+#: ../cli/src/settings.c:1603 ../cli/src/settings.c:1604
+#: ../cli/src/settings.c:1605 ../cli/src/settings.c:1606
+#: ../cli/src/settings.c:1688 ../cli/src/settings.c:2044
+#: ../cli/src/settings.c:2081
 msgid "no"
 msgstr "いいえ"
 
-#: ../cli/src/connections.c:457 ../cli/src/connections.c:500
-msgid "System connections"
-msgstr "システム接続"
-
-#: ../cli/src/connections.c:462 ../cli/src/connections.c:513
-msgid "User connections"
-msgstr "ユーザー接続"
+#: ../cli/src/connections.c:393
+#, fuzzy
+#| msgid "Connection details"
+msgid "Connection list"
+msgstr "接続の詳細"
 
-#: ../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:406 ../cli/src/connections.c:948
+#: ../cli/src/connections.c:1486 ../cli/src/connections.c:1501
+#: ../cli/src/connections.c:1510 ../cli/src/connections.c:1520
+#: ../cli/src/connections.c:1532 ../cli/src/connections.c:1641
+#: ../cli/src/connections.c:1743 ../cli/src/devices.c:1192
+#: ../cli/src/devices.c:1202 ../cli/src/devices.c:1320
+#: ../cli/src/devices.c:1328 ../cli/src/devices.c:1692
+#: ../cli/src/devices.c:1699 ../cli/src/devices.c:1713
+#: ../cli/src/devices.c:1720 ../cli/src/devices.c:1737
+#: ../cli/src/devices.c:1748 ../cli/src/devices.c:1969
+#: ../cli/src/devices.c:1976
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "エラー: %s 引数がありません。"
 
-#: ../cli/src/connections.c:487
+#: ../cli/src/connections.c:419
 #, c-format
 msgid "Error: %s - no such connection."
 msgstr "エラー: %s - そのような接続はありません。"
 
-#: ../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:425 ../cli/src/connections.c:1545
+#: ../cli/src/connections.c:1658 ../cli/src/connections.c:1750
+#: ../cli/src/devices.c:976 ../cli/src/devices.c:1056
+#: ../cli/src/devices.c:1216 ../cli/src/devices.c:1334
+#: ../cli/src/devices.c:1761 ../cli/src/devices.c:1982
 #, c-format
 msgid "Unknown parameter: %s\n"
-msgstr "不明なパラメータ: %s\n"
+msgstr "不明なパラメーター: %s\n"
 
-#: ../cli/src/connections.c:528
+#: ../cli/src/connections.c:434
 #, c-format
 msgid "Error: no valid parameter specified."
 msgstr "エラー: 有効なパラメータが指定されていません。"
 
-#: ../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:449 ../cli/src/connections.c:1846
+#: ../cli/src/devices.c:2193 ../cli/src/network-manager.c:599
 #, c-format
 msgid "Error: %s."
-msgstr "エラー: %s"
-
-#: ../cli/src/connections.c:649
-#, c-format
-msgid "Error: 'con status': %s"
-msgstr "エラー: 'con status': %s"
-
-#: ../cli/src/connections.c:651
-#, c-format
-msgid "Error: 'con status': %s; allowed fields: %s"
-msgstr "エラー: 'con status': %s ; 許可されるフィールド: %s"
-
-#: ../cli/src/connections.c:658
-msgid "Active connections"
-msgstr "アクティブな接続"
-
-#: ../cli/src/connections.c:1026
-#, c-format
-msgid "no active connection on device '%s'"
-msgstr "デバイス '%s'上にアクティブな接続がありません"
-
-#: ../cli/src/connections.c:1034
-#, c-format
-msgid "no active connection or device"
-msgstr "アクティブな接続、又はデバイスがありません"
-
-#: ../cli/src/connections.c:1084
-#, c-format
-msgid "device '%s' not compatible with connection '%s'"
-msgstr "デバイス '%s' は接続 '%s' と互換性がありません"
-
-#: ../cli/src/connections.c:1086
-#, c-format
-msgid "no device found for connection '%s'"
-msgstr "接続 '%s'用のデバイスが見付かりません"
+msgstr "エラー: %s."
 
-#: ../cli/src/connections.c:1097
+#: ../cli/src/connections.c:462
 msgid "activating"
 msgstr "アクティベート中"
 
-#: ../cli/src/connections.c:1099
+#: ../cli/src/connections.c:464
 msgid "activated"
 msgstr "アクティベート済み"
 
-#: ../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
-msgid "unknown"
-msgstr "不明"
+#: ../cli/src/connections.c:468
+msgid "deactivated"
+msgstr "停止しました"
 
-#: ../cli/src/connections.c:1111
+#: ../cli/src/connections.c:480
 msgid "VPN connecting (prepare)"
 msgstr "VPN 接続（準備）"
 
-#: ../cli/src/connections.c:1113
+#: ../cli/src/connections.c:482
 msgid "VPN connecting (need authentication)"
 msgstr "VPN 接続（認証が必要）"
 
-#: ../cli/src/connections.c:1115
+#: ../cli/src/connections.c:484
 msgid "VPN connecting"
 msgstr "VPN 接続"
 
-#: ../cli/src/connections.c:1117
+#: ../cli/src/connections.c:486
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN 接続（IP 設定を取得）"
 
-#: ../cli/src/connections.c:1119
+#: ../cli/src/connections.c:488
 msgid "VPN connected"
 msgstr "VPN 接続済み"
 
-#: ../cli/src/connections.c:1121
+#: ../cli/src/connections.c:490
 msgid "VPN connection failed"
 msgstr "VPN 接続失敗"
 
-#: ../cli/src/connections.c:1123
+#: ../cli/src/connections.c:492
 msgid "VPN disconnected"
 msgstr "VPN 切断済み"
 
-#: ../cli/src/connections.c:1134
+#: ../cli/src/connections.c:548 ../cli/src/connections.c:558
+msgid "N/A"
+msgstr "なし"
+
+#: ../cli/src/connections.c:752 ../cli/src/connections.c:976
+#, fuzzy, c-format
+#| msgid "Error: 'device status': %s"
+msgid "Error: 'con status': %s"
+msgstr "エラー: 'device status': %s"
+
+#: ../cli/src/connections.c:754 ../cli/src/connections.c:978
+#, fuzzy, c-format
+#| msgid "Error: 'nm status': %s; allowed fields: %s"
+msgid "Error: 'con status': %s; allowed fields: %s"
+msgstr "エラー: 'nm status': %s; 許可されるフィールド: %s"
+
+#: ../cli/src/connections.c:762
+msgid "Active connection details"
+msgstr "アクティブな接続の詳細"
+
+#: ../cli/src/connections.c:898 ../cli/src/connections.c:1560
+#: ../cli/src/connections.c:1673 ../cli/src/connections.c:1764
+#: ../cli/src/devices.c:1003 ../cli/src/devices.c:1065
+#: ../cli/src/devices.c:1231 ../cli/src/devices.c:1364
+#: ../cli/src/devices.c:1783 ../cli/src/devices.c:2011
+#: ../cli/src/network-manager.c:311
+#, fuzzy, c-format
+#| msgid "Error: NetworkManager is not running."
+msgid "Error: Can't find out if NetworkManager is running: %s."
+msgstr "エラー: NetworkManager が起動していません。"
+
+#: ../cli/src/connections.c:902 ../cli/src/connections.c:1564
+#: ../cli/src/connections.c:1677 ../cli/src/connections.c:1768
+#: ../cli/src/devices.c:1007 ../cli/src/devices.c:1069
+#: ../cli/src/devices.c:1235 ../cli/src/devices.c:1368
+#: ../cli/src/devices.c:1787 ../cli/src/devices.c:2015
+#: ../cli/src/network-manager.c:315
+#, c-format
+msgid "Error: NetworkManager is not running."
+msgstr "エラー: NetworkManager が起動していません。"
+
+#: ../cli/src/connections.c:934
+#, fuzzy
+#| msgid "Active connection details"
+msgid "Active connections"
+msgstr "アクティブな接続の詳細"
+
+#: ../cli/src/connections.c:959
+#, c-format
+msgid "Error: '%s' is not an active connection."
+msgstr "エラー: '%s' はアクティブな接続ではありません。"
+
+#: ../cli/src/connections.c:964
+#, fuzzy, c-format
+#| msgid "Unknown parameter: %s\n"
+msgid "Error: unknown parameter: %s"
+msgstr "不明なパラメーター: %s\n"
+
+#: ../cli/src/connections.c:1071
+#, c-format
+msgid "no active connection on device '%s'"
+msgstr "デバイス '%s' 上にアクティブな接続はありません"
+
+#: ../cli/src/connections.c:1079
+msgid "no active connection or device"
+msgstr "アクティブな接続またはデバイスがありません"
+
+#: ../cli/src/connections.c:1150
+#, c-format
+msgid "device '%s' not compatible with connection '%s'"
+msgstr "デバイス '%s' は接続 '%s' と互換性がありません"
+
+#: ../cli/src/connections.c:1153
+#, c-format
+msgid "no device found for connection '%s'"
+msgstr "接続 '%s'用のデバイスが見つかりません"
+
+#: ../cli/src/connections.c:1165
 msgid "unknown reason"
 msgstr "不明な理由"
 
-#: ../cli/src/connections.c:1136
+#: ../cli/src/connections.c:1167
 msgid "none"
 msgstr "なし"
 
-#: ../cli/src/connections.c:1138
+#: ../cli/src/connections.c:1169
 msgid "the user was disconnected"
 msgstr "ユーザーの接続が切断されました。"
 
-#: ../cli/src/connections.c:1140
+#: ../cli/src/connections.c:1171
 msgid "the base network connection was interrupted"
 msgstr "基本ネットワーク接続が妨害されました。"
 
-#: ../cli/src/connections.c:1142
+#: ../cli/src/connections.c:1173
 msgid "the VPN service stopped unexpectedly"
 msgstr "VPN サービスが予期しない停止をしました"
 
-#: ../cli/src/connections.c:1144
+#: ../cli/src/connections.c:1175
 msgid "the VPN service returned invalid configuration"
 msgstr "VPN サービスは無効な設定を返しました"
 
-#: ../cli/src/connections.c:1146
+#: ../cli/src/connections.c:1177
 msgid "the connection attempt timed out"
 msgstr "接続試行は時間切れです"
 
-#: ../cli/src/connections.c:1148
+#: ../cli/src/connections.c:1179
 msgid "the VPN service did not start in time"
 msgstr "VPN サービスは時間内に開始していません"
 
-#: ../cli/src/connections.c:1150
+#: ../cli/src/connections.c:1181
 msgid "the VPN service failed to start"
 msgstr "VPN サービスの開始は失敗しました"
 
-#: ../cli/src/connections.c:1152
+#: ../cli/src/connections.c:1183
 msgid "no valid VPN secrets"
 msgstr "有効な VPN シークレットはありません"
 
-#: ../cli/src/connections.c:1154
+#: ../cli/src/connections.c:1185
 msgid "invalid VPN secrets"
 msgstr "無効な VPN シークレット"
 
-#: ../cli/src/connections.c:1156
+#: ../cli/src/connections.c:1187
 msgid "the connection was removed"
 msgstr "接続は削除されました"
 
-#: ../cli/src/connections.c:1170
-#, c-format
-msgid "state: %s\n"
-msgstr "状態: %s\n"
-
-#: ../cli/src/connections.c:1173 ../cli/src/connections.c:1199
+#: ../cli/src/connections.c:1204 ../cli/src/connections.c:1409
 #, c-format
-msgid "Connection activated\n"
-msgstr "接続はアクティベート済み\n"
+msgid "Connection successfully activated (D-Bus active path: %s)\n"
+msgstr "接続が正常にアクティベートされました (D-Bus アクティブパス: %s)\n"
 
-#: ../cli/src/connections.c:1176
+#. Active connection failed and dissapeared, quit.
+#: ../cli/src/connections.c:1209 ../cli/src/connections.c:1310
 #, c-format
 msgid "Error: Connection activation failed."
-msgstr "エラー: 接続のアクティベーションに失敗"
+msgstr "エラー: 接続のアクティベートに失敗しました。"
 
-#: ../cli/src/connections.c:1195
+#: ../cli/src/connections.c:1234
 #, c-format
-msgid "state: %s (%d)\n"
-msgstr "状態: %s (%d)\n"
+msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
+msgstr "VPN 接続が正常にアクティベートされました (D-Bus アクティブパス: %s)\n"
 
-#: ../cli/src/connections.c:1205
+#: ../cli/src/connections.c:1242
 #, c-format
 msgid "Error: Connection activation failed: %s."
-msgstr "エラー: 接続のアクティベーションに失敗: %s."
+msgstr "エラー: 接続のアクティベートに失敗しました: %s。"
 
-#: ../cli/src/connections.c:1222 ../cli/src/devices.c:811
+#: ../cli/src/connections.c:1339 ../cli/src/devices.c:1125
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "エラー: 制限時間の %d 秒が経過"
 
-#: ../cli/src/connections.c:1265
+#: ../cli/src/connections.c:1400
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "エラー: 接続のアクティベーションに失敗: %s"
 
-#: ../cli/src/connections.c:1279
+#: ../cli/src/connections.c:1494 ../cli/src/connections.c:1649
+#: ../cli/src/connections.c:1777
 #, c-format
-msgid "Error: Obtaining active connection for '%s' failed."
-msgstr "エラー: '%s'用のアクティブ接続の取得に失敗"
+msgid "Error: Unknown connection: %s."
+msgstr "エラー: 不明な接続: %s。"
 
-#: ../cli/src/connections.c:1288
-#, c-format
-msgid "Active connection state: %s\n"
-msgstr "アクティブ接続の状態: %s\n"
-
-#: ../cli/src/connections.c:1289
-#, c-format
-msgid "Active connection path: %s\n"
-msgstr "アクティブ接続のパス: %s\n"
-
-#: ../cli/src/connections.c:1343 ../cli/src/connections.c:1461
-#, c-format
-msgid "Error: Unknown connection: %s."
-msgstr "エラー: 不明な接続: %s"
-
-#: ../cli/src/connections.c:1378 ../cli/src/devices.c:882
-#, c-format
+#: ../cli/src/connections.c:1540 ../cli/src/devices.c:1210
+#: ../cli/src/devices.c:1756
+#, fuzzy, c-format
+#| msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgid "Error: timeout value '%s' is not valid."
-msgstr "エラー: 制限時間値の '%s' は有効でありません"
+msgstr "エラー: bssid の引数値 '%s' は有効な BSSID ではありません。"
 
-#: ../cli/src/connections.c:1391 ../cli/src/connections.c:1478
+#: ../cli/src/connections.c:1553 ../cli/src/connections.c:1666
+#: ../cli/src/connections.c:1757
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr "エラー: id か又は uuid の指定が必要です"
 
-#: ../cli/src/connections.c:1411
+#: ../cli/src/connections.c:1586
 #, c-format
 msgid "Error: No suitable device found: %s."
-msgstr "エラー: 適切なデバイスが見付かりません: %s"
+msgstr "エラー: 適切なデバイスが見つかりません: %s"
 
-#: ../cli/src/connections.c:1413
+#: ../cli/src/connections.c:1588
 #, c-format
 msgid "Error: No suitable device found."
-msgstr "エラー: 適切なデバイスが見付かりません"
+msgstr "エラー: 適切なデバイスが見つかりません"
 
-#: ../cli/src/connections.c:1505
+#: ../cli/src/connections.c:1702
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr "警告: 接続はアクティブでありません\n"
 
-#: ../cli/src/connections.c:1561
+#: ../cli/src/connections.c:1716
 #, c-format
+msgid "Error: Connection deletion failed: %s"
+msgstr "エラー: 接続の削除に失敗しました: %s"
+
+#: ../cli/src/connections.c:1837
+#, fuzzy, c-format
+#| msgid "Error: 'radio' command '%s' is not valid."
 msgid "Error: 'con' command '%s' is not valid."
-msgstr "エラー: 'con' コマンド '%s' は有効ではありません"
+msgstr "エラー: 'radio' のコマンド '%s' は有効なコマンドではありません。"
 
-#: ../cli/src/connections.c:1597
+#: ../cli/src/connections.c:1905
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr "エラー: D-Bus に接続できませんでした"
 
-#: ../cli/src/connections.c:1604
+#: ../cli/src/connections.c:1913
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr "エラー: システム設定を取得できませんでした"
 
-#: ../cli/src/connections.c:1612
-#, c-format
-msgid "Error: Could not get user settings."
-msgstr "エラー: ユーザー設定を取得できませんでした"
-
-#: ../cli/src/connections.c:1622
+#: ../cli/src/connections.c:1923
 #, c-format
-msgid "Error: Can't obtain connections: settings services are not running."
-msgstr "エラー: 接続を取得できません: 設定サービスが稼働していません"
+msgid "Error: Can't obtain connections: settings service is not running."
+msgstr "エラー: 接続を取得できません: 設定サービスが稼働していません。"
 
 #. 0
 #. 9
-#: ../cli/src/devices.c:60 ../cli/src/devices.c:86 ../cli/src/devices.c:162
+#. 3
+#: ../cli/src/devices.c:71 ../cli/src/devices.c:110 ../cli/src/devices.c:204
+#: ../cli/src/devices.c:220
 msgid "DEVICE"
 msgstr "デバイス"
 
-#. 1
-#. 4
-#. 0
-#: ../cli/src/devices.c:62 ../cli/src/devices.c:90
-#: ../cli/src/network-manager.c:36
-msgid "STATE"
-msgstr "状態"
-
-#: ../cli/src/devices.c:71
-msgid "GENERAL"
-msgstr "全般"
-
 #. 0
-#: ../cli/src/devices.c:72
+#: ../cli/src/devices.c:84
 msgid "CAPABILITIES"
 msgstr "能力"
 
 #. 1
-#: ../cli/src/devices.c:73
+#: ../cli/src/devices.c:85
 msgid "WIFI-PROPERTIES"
 msgstr "WIFI-プロパティ"
 
 #. 2
-#: ../cli/src/devices.c:74
+#. 5
+#: ../cli/src/devices.c:86 ../cli/src/devices.c:170
 msgid "AP"
 msgstr "AP"
 
 #. 3
-#: ../cli/src/devices.c:75
+#: ../cli/src/devices.c:87
 msgid "WIRED-PROPERTIES"
 msgstr "有線接続-プロパティ"
 
 #. 4
-#: ../cli/src/devices.c:76
-msgid "IP4-SETTINGS"
-msgstr "IP4-セッティング"
+#: ../cli/src/devices.c:88
+msgid "WIMAX-PROPERTIES"
+msgstr "WIMAX-プロパティ"
 
 #. 5
-#: ../cli/src/devices.c:77
-msgid "IP4-DNS"
-msgstr "IP4-DNS"
+#. 0
+#: ../cli/src/devices.c:89 ../cli/src/devices.c:217
+msgid "NSP"
+msgstr "NSP"
+
+#. 6
+#: ../cli/src/devices.c:90
+msgid "IP4"
+msgstr "IP4"
+
+#. 7
+#: ../cli/src/devices.c:91
+msgid "DHCP4"
+msgstr "DHCP4"
+
+#. 8
+#: ../cli/src/devices.c:92
+msgid "IP6"
+msgstr "IP6"
+
+#. 9
+#: ../cli/src/devices.c:93
+msgid "DHCP6"
+msgstr "DHCP6"
+
+#. 10
+#: ../cli/src/devices.c:94
+msgid "BOND"
+msgstr "ボンド"
+
+#. 11
+#: ../cli/src/devices.c:95
+msgid "VLAN"
+msgstr "VLAN"
+
+#. 12
+#: ../cli/src/devices.c:96
+msgid "CONNECTIONS"
+msgstr "接続"
 
 #. 2
-#: ../cli/src/devices.c:88
+#: ../cli/src/devices.c:112
+msgid "VENDOR"
+msgstr "ベンダー"
+
+#. 3
+#: ../cli/src/devices.c:113
+msgid "PRODUCT"
+msgstr "製品"
+
+#. 4
+#: ../cli/src/devices.c:114
 msgid "DRIVER"
 msgstr "ドライバー"
 
-#. 3
-#: ../cli/src/devices.c:89
+#. 5
+#: ../cli/src/devices.c:115
+msgid "DRIVER-VERSION"
+msgstr "ドライバーバージョン"
+
+#. 6
+#: ../cli/src/devices.c:116
+msgid "FIRMWARE-VERSION"
+msgstr "ファームウェアバージョン"
+
+#. 7
+#: ../cli/src/devices.c:117
 msgid "HWADDR"
 msgstr "HWADDR"
 
+#. 9
+#: ../cli/src/devices.c:119
+msgid "REASON"
+msgstr "原因"
+
+#. 10
+#: ../cli/src/devices.c:120
+msgid "UDI"
+msgstr "UDI"
+
+#. 11
+#: ../cli/src/devices.c:121
+msgid "IP-IFACE"
+msgstr "IP-IFACE"
+
+#. 12
+#: ../cli/src/devices.c:122
+msgid "NM-MANAGED"
+msgstr "NM 管理"
+
+#. 14
+#: ../cli/src/devices.c:124
+msgid "FIRMWARE-MISSING"
+msgstr "ファームウェア不足"
+
+#. 15
+#: ../cli/src/devices.c:125
+msgid "CONNECTION"
+msgstr "接続"
+
+#. 0
+#: ../cli/src/devices.c:135
+msgid "AVAILABLE-CONNECTION-PATHS"
+msgstr "使用可能な接続パス"
+
+#. 1
+#: ../cli/src/devices.c:136
+msgid "AVAILABLE-CONNECTIONS"
+msgstr "使用可能な接続"
+
 #. 0
-#: ../cli/src/devices.c:99
+#: ../cli/src/devices.c:145
 msgid "CARRIER-DETECT"
 msgstr "キャリア検出"
 
 #. 1
-#: ../cli/src/devices.c:100
+#: ../cli/src/devices.c:146
 msgid "SPEED"
 msgstr "速度"
 
 #. 0
-#: ../cli/src/devices.c:109
+#: ../cli/src/devices.c:155
 msgid "CARRIER"
 msgstr "キャリア"
 
 #. 0
-#: ../cli/src/devices.c:119
+#: ../cli/src/devices.c:165
 msgid "WEP"
 msgstr "WEP"
 
 #. 1
-#: ../cli/src/devices.c:120
+#: ../cli/src/devices.c:166
 msgid "WPA"
 msgstr "WPA"
 
 #. 2
-#: ../cli/src/devices.c:121
+#: ../cli/src/devices.c:167
 msgid "WPA2"
 msgstr "WPA2"
 
 #. 3
-#: ../cli/src/devices.c:122
+#: ../cli/src/devices.c:168
 msgid "TKIP"
 msgstr "TKIP"
 
 #. 4
-#: ../cli/src/devices.c:123
+#: ../cli/src/devices.c:169
 msgid "CCMP"
 msgstr "CCMP"
 
+#. 6
+#: ../cli/src/devices.c:171
+msgid "ADHOC"
+msgstr "アドホック"
+
 #. 0
-#: ../cli/src/devices.c:132
-msgid "ADDRESS"
-msgstr "アドレス"
+#: ../cli/src/devices.c:181
+msgid "CTR-FREQ"
+msgstr "中心周波数"
 
 #. 1
-#: ../cli/src/devices.c:133
-msgid "PREFIX"
-msgstr "接頭辞"
+#: ../cli/src/devices.c:182
+msgid "RSSI"
+msgstr "RSSI"
 
 #. 2
-#: ../cli/src/devices.c:134
-msgid "GATEWAY"
-msgstr "ゲートウェイ"
+#: ../cli/src/devices.c:183
+msgid "CINR"
+msgstr "CINR"
 
-#. 0
-#: ../cli/src/devices.c:143
-msgid "DNS"
-msgstr "DNS"
+#. 3
+#: ../cli/src/devices.c:184
+msgid "TX-POW"
+msgstr "TX-POW"
+
+#. 4
+#: ../cli/src/devices.c:185
+msgid "BSID"
+msgstr "BSID"
 
 #. 0
-#: ../cli/src/devices.c:153
+#: ../cli/src/devices.c:195
 msgid "SSID"
 msgstr "SSID"
 
 #. 1
-#: ../cli/src/devices.c:154
+#: ../cli/src/devices.c:196
 msgid "BSSID"
 msgstr "BSSID"
 
 #. 2
-#: ../cli/src/devices.c:155
+#: ../cli/src/devices.c:197
 msgid "MODE"
 msgstr "モード"
 
 #. 3
-#: ../cli/src/devices.c:156
+#: ../cli/src/devices.c:198
 msgid "FREQ"
 msgstr "周波数"
 
 #. 4
-#: ../cli/src/devices.c:157
+#: ../cli/src/devices.c:199
 msgid "RATE"
 msgstr "レート"
 
 #. 5
-#: ../cli/src/devices.c:158
+#. 1
+#: ../cli/src/devices.c:200 ../cli/src/devices.c:218
 msgid "SIGNAL"
 msgstr "信号"
 
 #. 6
-#: ../cli/src/devices.c:159
+#: ../cli/src/devices.c:201
 msgid "SECURITY"
 msgstr "セキュリティ"
 
 #. 7
-#: ../cli/src/devices.c:160
+#: ../cli/src/devices.c:202
 msgid "WPA-FLAGS"
 msgstr "WPA-フラグ"
 
 #. 8
-#: ../cli/src/devices.c:161
+#: ../cli/src/devices.c:203
 msgid "RSN-FLAGS"
 msgstr "RSN-フラグ"
 
 #. 10
-#: ../cli/src/devices.c:163
+#. 4
+#: ../cli/src/devices.c:205 ../cli/src/devices.c:221
 msgid "ACTIVE"
 msgstr "アクティブ"
 
-#: ../cli/src/devices.c:186
-#, c-format
+#. 0
+#: ../cli/src/devices.c:233
+msgid "SLAVES"
+msgstr "スレーブ"
+
+#. 0
+#: ../cli/src/devices.c:242
+msgid "ID"
+msgstr "ID"
+
+#: ../cli/src/devices.c:258
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: nmcli device { COMMAND | help }\n"
+#| "\n"
+#| "  COMMAND := { status | show | disconnect | wifi | wimax }\n"
+#| "\n"
+#| "  COMMAND := { status | show | disconnect | wifi }\n"
+#| "\n"
+#| "  status\n"
+#| "\n"
+#| "  show []\n"
+#| "\n"
+#| "  disconnect \n"
+#| "\n"
+#| "  wifi [list [ifname ] [bssid ]]\n"
+#| "\n"
+#| "  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] [ifname ] [bssid ] [name ]\n"
+#| "\n"
+#| "               [private yes|no]\n"
+#| "\n"
+#| "  wifi rescan [[ifname] ]\n"
+#| "\n"
+#| "  wimax [list [ifname ] [nsp ]]\n"
+#| "\n"
 msgid ""
-"Usage: nmcli dev { COMMAND | help }\n"
+"Usage: nmcli device { 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"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] [iface ] [bssid ] [name ]\n"
+"               [--private] [--nowait] [--timeout ]\n"
+"  wimax [list [iface ] [nsp ]]\n"
 "\n"
 msgstr ""
-"使用法: nmcli dev { COMMAND | help }\n"
+"使い方: nmcli device { コマンド | help }\n"
 "\n"
-"  COMMAND := { status | list | disconnect | wifi }\n"
+"  コマンド := { status | show | disconnect | wifi | wimax }\n"
+"\n"
+"  コマンド := { status | show | disconnect | wifi }\n"
 "\n"
 "  status\n"
-"  list [iface ]\n"
-"  disconnect iface  [--nowait] [--timeout ]\n"
-"  wifi [list [iface ] [hwaddr ]]\n"
+"\n"
+"  show []\n"
+"\n"
+"  disconnect \n"
+"\n"
+"  wifi [list [ifname ] [bssid ]]\n"
+"\n"
+"  wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] [ifname ] [bssid ] [name ]\n"
+"\n"
+"               [private yes|no]\n"
+"\n"
+"  wifi rescan [[ifname] ]\n"
+"\n"
+"  wimax [list [ifname ] [nsp ]]\n"
 "\n"
 
-#: ../cli/src/devices.c:206
-msgid "unmanaged"
-msgstr "管理無し"
-
-#: ../cli/src/devices.c:208
-msgid "unavailable"
-msgstr "利用不可"
-
-#: ../cli/src/devices.c:210 ../cli/src/network-manager.c:89
-msgid "disconnected"
-msgstr "切断済み"
-
-#: ../cli/src/devices.c:212
-msgid "connecting (prepare)"
-msgstr "接続中（準備）"
-
-#: ../cli/src/devices.c:214
-msgid "connecting (configuring)"
-msgstr "接続中（設定中）"
-
-#: ../cli/src/devices.c:216
-msgid "connecting (need authentication)"
-msgstr "接続中（認証が必要）"
-
-#: ../cli/src/devices.c:218
-msgid "connecting (getting IP configuration)"
-msgstr "接続中（IP 設定を取得中）"
-
-#: ../cli/src/devices.c:220 ../cli/src/network-manager.c:87
-msgid "connected"
-msgstr "接続済み"
-
-#: ../cli/src/devices.c:222
-msgid "connection failed"
-msgstr "接続に失敗"
-
-#: ../cli/src/devices.c:245 ../cli/src/devices.c:380
-msgid "Unknown"
-msgstr "不明"
-
-#: ../cli/src/devices.c:277
+#: ../cli/src/devices.c:361
 msgid "(none)"
 msgstr "（なし）"
 
-#: ../cli/src/devices.c:302
-#, c-format
-msgid "%s: error converting IP4 address 0x%X"
-msgstr "%s: IP4 アドレス 0x%X を変換中にエラー発生"
-
-#: ../cli/src/devices.c:349
+#: ../cli/src/devices.c:417
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../cli/src/devices.c:350
+#: ../cli/src/devices.c:418
 #, c-format
 msgid "%u MB/s"
 msgstr "%u MB/s"
 
-#: ../cli/src/devices.c:359
+#: ../cli/src/devices.c:427
 msgid "Encrypted: "
 msgstr "暗号化:"
 
-#: ../cli/src/devices.c:364
+#: ../cli/src/devices.c:432
 msgid "WEP "
 msgstr "WEP "
 
-#: ../cli/src/devices.c:366
+#: ../cli/src/devices.c:434
 msgid "WPA "
 msgstr "WPA "
 
-#: ../cli/src/devices.c:368
+#: ../cli/src/devices.c:436
 msgid "WPA2 "
 msgstr "WPA2 "
 
-#: ../cli/src/devices.c:371
+#: ../cli/src/devices.c:439
 msgid "Enterprise "
 msgstr "Enterprise "
 
-#: ../cli/src/devices.c:380
+#: ../cli/src/devices.c:448
 msgid "Ad-Hoc"
 msgstr "アドホック"
 
-#: ../cli/src/devices.c:380
+#: ../cli/src/devices.c:449
 msgid "Infrastructure"
 msgstr "インフラストラクチャ"
 
-#: ../cli/src/devices.c:442
-#, c-format
+#: ../cli/src/devices.c:485
+msgid "Home"
+msgstr "ホーム"
+
+#: ../cli/src/devices.c:488
+msgid "Partner"
+msgstr "パートナー"
+
+#: ../cli/src/devices.c:491
+msgid "Roaming"
+msgstr "ローミング"
+
+#: ../cli/src/devices.c:563
+#, fuzzy, c-format
+#| msgid "Error: 'device status': %s"
 msgid "Error: 'dev list': %s"
-msgstr "エラー: 'dev list': %s"
+msgstr "エラー: 'device status': %s"
 
-#: ../cli/src/devices.c:444
-#, c-format
+#: ../cli/src/devices.c:565
+#, fuzzy, c-format
+#| msgid "Error: 'device status': %s; allowed fields: %s"
 msgid "Error: 'dev list': %s; allowed fields: %s"
-msgstr "エラー: 'dev list': %s; 許可されるフィールド: %s"
+msgstr "エラー: 'device status': %s; 許可フィールド: %s"
 
-#: ../cli/src/devices.c:453
+#: ../cli/src/devices.c:574
 msgid "Device details"
 msgstr "デバイスの詳細"
 
-#: ../cli/src/devices.c:483 ../cli/src/devices.c:827
+#: ../cli/src/devices.c:621 ../cli/src/devices.c:624 ../cli/src/devices.c:1151
+#: ../cli/src/utils.c:479
 msgid "(unknown)"
 msgstr "(不明)"
 
-#: ../cli/src/devices.c:484
-msgid "unknown)"
-msgstr "不明)"
+#: ../cli/src/devices.c:633
+msgid "not connected"
+msgstr "未接続"
 
-#: ../cli/src/devices.c:510
+#: ../cli/src/devices.c:660
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:736
 msgid "on"
 msgstr "オン"
 
-#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:736
 msgid "off"
 msgstr "オフ"
 
-#: ../cli/src/devices.c:710
-#, c-format
+#: ../cli/src/devices.c:993
+#, fuzzy, c-format
+#| msgid "Error: 'device status': %s"
 msgid "Error: 'dev status': %s"
-msgstr "エラー: 'dev status': %s"
+msgstr "エラー: 'device status': %s"
 
-#: ../cli/src/devices.c:712
-#, c-format
+#: ../cli/src/devices.c:995
+#, fuzzy, c-format
+#| msgid "Error: 'device status': %s; allowed fields: %s"
 msgid "Error: 'dev status': %s; allowed fields: %s"
-msgstr "エラー: 'dev status': %s; 許可されるフィールド: %s"
+msgstr "エラー: 'device status': %s; 許可フィールド: %s"
 
-#: ../cli/src/devices.c:719
+#: ../cli/src/devices.c:1018
 msgid "Status of devices"
-msgstr "デバイスのステータス"
+msgstr "デバイスの状態"
 
-#: ../cli/src/devices.c:747
-#, c-format
+#: ../cli/src/devices.c:1049
+#, fuzzy, c-format
+#| msgid "Error: %s argument is missing."
 msgid "Error: '%s' argument is missing."
-msgstr "エラー: '%s' 引数がありません。"
+msgstr "エラー: %s 引数がありません。"
 
-#: ../cli/src/devices.c:776 ../cli/src/devices.c:915 ../cli/src/devices.c:1035
+#: ../cli/src/devices.c:1090 ../cli/src/devices.c:1255
+#: ../cli/src/devices.c:1396 ../cli/src/devices.c:2043
 #, c-format
 msgid "Error: Device '%s' not found."
-msgstr "エラー: デバイス'%s' が見付かりません"
+msgstr "エラー: デバイス'%s' が見つかりません"
 
-#: ../cli/src/devices.c:799
+#: ../cli/src/devices.c:1113
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
 msgstr "成功: デバイス '%s' は正常に切断されました。"
 
-#: ../cli/src/devices.c:824
+#: ../cli/src/devices.c:1148
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
 msgstr "エラー: デバイス '%s' (%s) の切断に失敗しました: %s"
 
-#: ../cli/src/devices.c:832
+#: ../cli/src/devices.c:1161
 #, c-format
-msgid "Device state: %d (%s)\n"
-msgstr "デバイスの状態: %d (%s)\n"
+msgid "Device '%s' has been disconnected.\n"
+msgstr "デバイス '%s' は切断されています。\n"
 
-#: ../cli/src/devices.c:896
-#, c-format
+#: ../cli/src/devices.c:1224
+#, fuzzy, c-format
+#| msgid "Error: id or uuid has to be specified."
 msgid "Error: iface has to be specified."
-msgstr "エラー: iface を指定する必要があります。"
+msgstr "エラー: id か又は uuid の指定が必要です"
 
-#: ../cli/src/devices.c:1011
-#, c-format
+#: ../cli/src/devices.c:1354
+#, fuzzy, c-format
+#| msgid "Error: 'device wifi': %s"
 msgid "Error: 'dev wifi': %s"
 msgstr "エラー: 'dev wifi': %s"
 
-#: ../cli/src/devices.c:1013
-#, c-format
+#: ../cli/src/devices.c:1356
+#, fuzzy, c-format
+#| msgid "Error: 'device wifi': %s; allowed fields: %s"
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
-msgstr "エラー: 'dev wifi': %s; 許可されるフィールド: %s"
+msgstr "エラー: 'dev wifi': %s; 許可フィールド: %s"
 
-#: ../cli/src/devices.c:1020
+#: ../cli/src/devices.c:1379
+#, fuzzy
+#| msgid "Wi-Fi scan list"
 msgid "WiFi scan list"
-msgstr "WiFi スキャン一覧"
+msgstr "Wi-Fi スキャン一覧"
 
-#: ../cli/src/devices.c:1055 ../cli/src/devices.c:1109
+#: ../cli/src/devices.c:1416 ../cli/src/devices.c:1470
 #, c-format
-msgid "Error: Access point with hwaddr '%s' not found."
-msgstr "エラー: hwaddr '%s' のアクセスポイントが見付かりません"
+msgid "Error: Access point with bssid '%s' not found."
+msgstr "エラー: bssid '%s' のアクセスポイントが見つかりません。"
 
-#: ../cli/src/devices.c:1072
-#, c-format
+#: ../cli/src/devices.c:1433
+#, fuzzy, c-format
+#| msgid "Error: Device '%s' is not a Wi-Fi device."
 msgid "Error: Device '%s' is not a WiFi device."
-msgstr "エラー: デバイス '%s' は WiFi デバイスではありません。"
+msgstr "エラー: デバイス '%s' は Wi-Fi デバイスではありません。"
+
+#: ../cli/src/devices.c:1501 ../cli/src/devices.c:1547
+#, c-format
+msgid "Connection with UUID '%s' created and activated on device '%s'\n"
+msgstr "UUID '%s' の接続が '%s' デバイス上に作成されアクティベートされました。\n"
+
+#: ../cli/src/devices.c:1506
+#, c-format
+msgid "Error: Connection activation failed: (%d) %s."
+msgstr "エラー: 接続のアクティベートに失敗しました: (%d) %s。"
+
+#: ../cli/src/devices.c:1531
+#, c-format
+msgid "Error: Failed to add/activate new connection: (%d) %s"
+msgstr "エラー: 新規接続の追加、アクティベートに失敗しました: (%d) %s"
+
+#: ../cli/src/devices.c:1539
+#, c-format
+msgid "Error: Failed to add/activate new connection: Unknown error"
+msgstr "エラー: 新規接続の追加、アクティベートに失敗しました: 不明なエラー"
+
+#: ../cli/src/devices.c:1683
+#, c-format
+msgid "Error: SSID or BSSID are missing."
+msgstr "エラー: SSID または BSSID がありません。"
+
+#: ../cli/src/devices.c:1706
+#, c-format
+msgid "Error: bssid argument value '%s' is not a valid BSSID."
+msgstr "エラー: bssid の引数値 '%s' は有効な BSSID ではありません。"
+
+#: ../cli/src/devices.c:1730
+#, c-format
+msgid "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
+msgstr "エラー: wep-key-type の引数値 '%s' は無効です。'key' または 'phrase' を使用してください。"
 
-#: ../cli/src/devices.c:1136
+#: ../cli/src/devices.c:1770
 #, c-format
+msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
+msgstr "エラー: (%s) が接続先となる BSSID は bssid 引数 (%s) により異なります。"
+
+#: ../cli/src/devices.c:1776
+#, c-format
+msgid "Error: Parameter '%s' is neither SSID nor BSSID."
+msgstr "エラー: パラメーター '%s' は SSID、BSSID のいずれでもありません。"
+
+#: ../cli/src/devices.c:1805
+#, c-format
+msgid "Error: Device '%s' is not a Wi-Fi device."
+msgstr "エラー: デバイス '%s' は Wi-Fi デバイスではありません。"
+
+#: ../cli/src/devices.c:1807
+#, c-format
+msgid "Error: No Wi-Fi device found."
+msgstr "エラー: Wi-Fi デバイスが見つかりませんでした。"
+
+#: ../cli/src/devices.c:1825
+#, c-format
+msgid "Error: No network with SSID '%s' found."
+msgstr "エラー: SSID が '%s' のネットワークが見つかりませんでした。"
+
+#: ../cli/src/devices.c:1827
+#, c-format
+msgid "Error: No access point with BSSID '%s' found."
+msgstr "エラー: BSSID が '%s' のアクセスポイントが見つかりませんでした。"
+
+#: ../cli/src/devices.c:1925
+#, fuzzy, c-format
+#| msgid "Error: 'device wifi' command '%s' is not valid."
 msgid "Error: 'dev wifi' command '%s' is not valid."
-msgstr "エラー: 'dev wifi' コマンド '%s' は無効です。"
+msgstr "エラー: 'dev wifi' のコマンド '%s' は有効なコマンドではありません。"
+
+#: ../cli/src/devices.c:2001
+#, fuzzy, c-format
+#| msgid "Error: 'device wimax': %s"
+msgid "Error: 'dev wimax': %s"
+msgstr "エラー: 'device wimax': %s"
+
+#: ../cli/src/devices.c:2003
+#, fuzzy, c-format
+#| msgid "Error: 'device wimax': %s; allowed fields: %s"
+msgid "Error: 'dev wimax': %s; allowed fields: %s"
+msgstr "エラー: 'device wimax': %s; 許可フィールド: %s"
+
+#: ../cli/src/devices.c:2026
+msgid "WiMAX NSP list"
+msgstr "WiMAX NSP 一覧"
+
+#: ../cli/src/devices.c:2063
+#, c-format
+msgid "Error: NSP with name '%s' not found."
+msgstr "エラー: '%s' と言う名前の NSP が見つかりませんでした。"
 
-#: ../cli/src/devices.c:1183
+#: ../cli/src/devices.c:2074
+#, c-format
+msgid "Error: Device '%s' is not a WiMAX device."
+msgstr "エラー: デバイス '%s' は WiMAX デバイスではありません。"
+
+#: ../cli/src/devices.c:2105
+#, c-format
+msgid "Error: Access point with nsp '%s' not found."
+msgstr "エラー: nsp '%s' のアクセスポイントが見つかりませんでした。"
+
+#: ../cli/src/devices.c:2132
+#, fuzzy, c-format
+#| msgid "Error: 'device wimax' command '%s' is not valid."
+msgid "Error: 'dev wimax' command '%s' is not valid."
+msgstr "エラー: 'dev wimax' のコマンド '%s' は無効です。"
+
+#: ../cli/src/devices.c:2185
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
-msgstr "エラー: 'dev' コマンド '%s' は無効です。"
+msgstr "エラー: 'dev' のコマンド '%s' は有効なコマンドではありません。"
 
-#: ../cli/src/network-manager.c:35
+#: ../cli/src/network-manager.c:37
 msgid "RUNNING"
 msgstr "実行中"
 
-#. 1
-#: ../cli/src/network-manager.c:37
+#. 0
+#: ../cli/src/network-manager.c:38
+msgid "VERSION"
+msgstr "バージョン"
+
+#. 2
+#: ../cli/src/network-manager.c:40
+msgid "NET-ENABLED"
+msgstr ""
+
+#. 3
+#: ../cli/src/network-manager.c:41
 msgid "WIFI-HARDWARE"
 msgstr "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 "WWAN ハードウェア"
 
-#. 4
-#: ../cli/src/network-manager.c:40
+#. 6
+#: ../cli/src/network-manager.c:44
 msgid "WWAN"
 msgstr "WWAN"
 
+#. 7
+#: ../cli/src/network-manager.c:45
+#, fuzzy
+#| msgid "WIFI-HARDWARE"
+msgid "WIMAX-HARDWARE"
+msgstr "WIFI ハードウェア"
+
+#. 8
+#: ../cli/src/network-manager.c:46
+msgid "WIMAX"
+msgstr "WIMAX"
+
 #: ../cli/src/network-manager.c:62
-#, c-format
+msgid "PERMISSION"
+msgstr "パーミッション"
+
+#. 0
+#: ../cli/src/network-manager.c:63
+msgid "VALUE"
+msgstr "値"
+
+#: ../cli/src/network-manager.c:77
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: nmcli radio { COMMAND | help }\n"
+#| "\n"
+#| "  COMMAND := { all | wifi | wwan | wimax }\n"
+#| "\n"
+#| "  all | wifi | wwan | wimax [ on | off ]\n"
+#| "\n"
+#| "  COMMAND := { all | wifi | wwan }\n"
+#| "\n"
+#| "  all | wifi | wwan [ on | off ]\n"
+#| "\n"
 msgid ""
 "Usage: nmcli nm { COMMAND | help }\n"
 "\n"
-"  COMMAND := { status | sleep | wakeup | wifi | wwan }\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan | wimax }\n"
+"\n"
+"  COMMAND := { status | permissions | enable | sleep | wifi | wwan }\n"
 "\n"
 "  status\n"
-"  sleep\n"
-"  wakeup\n"
+"  permissions\n"
+"  enable [true|false]\n"
+"  sleep [true|false]\n"
 "  wifi [on|off]\n"
 "  wwan [on|off]\n"
+"  wimax [on|off]\n"
 "\n"
 msgstr ""
-"使用法: nmcli nm { COMMAND | help }\n"
+"使い方: nmcli radio { コマンド | help }\n"
 "\n"
-"  COMMAND := { status | sleep | wakeup | wifi | wwan }\n"
+"  コマンド := { all | wifi | wwan | wimax }\n"
 "\n"
-"  status\n"
-"  sleep\n"
-"  wakeup\n"
-"  wifi [on|off]\n"
-"  wwan [on|off]\n"
+"  all | wifi | wwan | wimax [ on | off ]\n"
+"\n"
+"  コマンド := { all | wifi | wwan }\n"
+"\n"
+"  all | wifi | wwan [ on | off ]\n"
 "\n"
 
-#: ../cli/src/network-manager.c:83
+#: ../cli/src/network-manager.c:108
 msgid "asleep"
 msgstr "休止中"
 
-#: ../cli/src/network-manager.c:85
+#: ../cli/src/network-manager.c:110
 msgid "connecting"
 msgstr "接続中"
 
-#: ../cli/src/network-manager.c:125
-#, c-format
+#: ../cli/src/network-manager.c:112
+msgid "connected (local only)"
+msgstr "接続完了 (ローカルのみ)"
+
+#: ../cli/src/network-manager.c:114
+msgid "connected (site only)"
+msgstr "接続完了 (サイトのみ)"
+
+#: ../cli/src/network-manager.c:118
+msgid "disconnecting"
+msgstr "切断中"
+
+#: ../cli/src/network-manager.c:158
+#, fuzzy, c-format
+#| msgid "Error: 'device status': %s"
 msgid "Error: 'nm status': %s"
-msgstr "エラー: 'nm status': %s"
+msgstr "エラー: 'device status': %s"
 
-#: ../cli/src/network-manager.c:127
+#: ../cli/src/network-manager.c:160
 #, c-format
 msgid "Error: 'nm status': %s; allowed fields: %s"
 msgstr "エラー: 'nm status': %s; 許可されるフィールド: %s"
 
-#: ../cli/src/network-manager.c:134
-msgid "NetworkManager status"
-msgstr "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
+#. create NMClient
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 msgid "enabled"
 msgstr "有効"
 
-#: ../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:173 ../cli/src/network-manager.c:174
+#: ../cli/src/network-manager.c:175 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:177 ../cli/src/network-manager.c:179
+#: ../cli/src/network-manager.c:180 ../cli/src/network-manager.c:429
+#: ../cli/src/network-manager.c:484 ../cli/src/network-manager.c:522
+#: ../cli/src/network-manager.c:561
 msgid "disabled"
 msgstr "無効"
 
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:193
+msgid "NetworkManager status"
+msgstr "NetworkManager のステータス"
+
+#. Print header
+#: ../cli/src/network-manager.c:196
 msgid "running"
 msgstr "実行中"
 
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:196
 msgid "not running"
 msgstr "実行していません"
 
-#: ../cli/src/network-manager.c:201 ../cli/src/network-manager.c:233
-#, c-format
+#: ../cli/src/network-manager.c:271
+msgid "auth"
+msgstr "認証"
+
+#: ../cli/src/network-manager.c:301
+#, fuzzy, c-format
+#| msgid "Error: 'general permissions': %s"
+msgid "Error: 'nm permissions': %s"
+msgstr "エラー: 'general permissions': %s"
+
+#: ../cli/src/network-manager.c:303
+#, fuzzy, c-format
+#| msgid "Error: 'general permissions': %s; allowed fields: %s"
+msgid "Error: 'nm permissions': %s; allowed fields: %s"
+msgstr "エラー: 'general permissions': %s; 許可フィールド: %s"
+
+#: ../cli/src/network-manager.c:324
+msgid "NetworkManager permissions"
+msgstr "NetworkManager のパーミッション"
+
+#: ../cli/src/network-manager.c:350 ../cli/src/utils.c:459
+#, fuzzy, c-format
+#| msgid "Error: could not connect to D-Bus."
+msgid "Error: Couldn't connect to system bus: %s"
+msgstr "エラー: D-Bus に接続できませんでした"
+
+#: ../cli/src/network-manager.c:361
+#, fuzzy, c-format
+#| msgid "Error: Could not create NMClient object."
+msgid "Error: Couldn't create D-Bus object proxy."
+msgstr "エラー: NMClient オブジェクトを作成できませんでした。"
+
+#: ../cli/src/network-manager.c:367
+#, fuzzy, c-format
+#| msgid "Error: %s: %s."
+msgid "Error in sleep: %s"
+msgstr "エラー: %s: %s。"
+
+#: ../cli/src/network-manager.c:416 ../cli/src/network-manager.c:471
+#: ../cli/src/network-manager.c:509 ../cli/src/network-manager.c:548
+#, fuzzy, c-format
+#| msgid "Error: '--fields' value '%s' is not valid here (allowed fields: %s)"
 msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s"
-msgstr "エラー: '--fields' の値 '%s' はここでは有効ではありません; 許可されるフィールド: %s"
+msgstr "エラー: '--fields' の値 '%s' はここでは無効です; 許可されるフィールド: %s"
 
-#: ../cli/src/network-manager.c:209
-msgid "WiFi enabled"
-msgstr "WiFi は有効です"
+#: ../cli/src/network-manager.c:424
+#, fuzzy
+#| msgid "Networking"
+msgid "Networking enabled"
+msgstr "ネットワーキング"
 
-#: ../cli/src/network-manager.c:220
+#: ../cli/src/network-manager.c:440
+#, fuzzy, c-format
+#| msgid "Error: invalid '%s' argument: '%s' (use on/off)."
+msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."
+msgstr "エラー: 無効な '%s' 引数です: '%s' (on か off を使用してください)。"
+
+#: ../cli/src/network-manager.c:450
 #, c-format
+msgid "Error: Sleeping status is not exported by NetworkManager."
+msgstr ""
+
+#: ../cli/src/network-manager.c:458
+#, fuzzy, c-format
+#| msgid "Error: invalid '%s' argument: '%s' (use on/off)."
+msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'."
+msgstr "エラー: 無効な '%s' 引数です: '%s' (on か off を使用してください)。"
+
+#: ../cli/src/network-manager.c:479
+msgid "WiFi enabled"
+msgstr "Wi-Fi は有効です"
+
+#: ../cli/src/network-manager.c:495
+#, fuzzy, c-format
+#| msgid "Error: invalid extra argument '%s'."
 msgid "Error: invalid 'wifi' parameter: '%s'."
-msgstr "エラー: 無効な'wifi' パラメータ: '%s'"
+msgstr "エラー:  '%s' は無効な追加引数です。"
 
-#: ../cli/src/network-manager.c:241
+#: ../cli/src/network-manager.c:517
 msgid "WWAN enabled"
 msgstr "WWAN は有効です"
 
-#: ../cli/src/network-manager.c:252
-#, c-format
+#: ../cli/src/network-manager.c:533
+#, fuzzy, c-format
+#| msgid "Error: invalid extra argument '%s'."
 msgid "Error: invalid 'wwan' parameter: '%s'."
-msgstr "エラー: 無効な'wwan' パラメータ: '%s'"
-
-#: ../cli/src/network-manager.c:263
-#, c-format
+msgstr "エラー:  '%s' は無効な追加引数です。"
+
+#: ../cli/src/network-manager.c:556
+#, fuzzy
+#| msgid "WiFi enabled"
+msgid "WiMAX enabled"
+msgstr "Wi-Fi は有効です"
+
+#: ../cli/src/network-manager.c:572
+#, fuzzy, c-format
+#| msgid "Error: invalid extra argument '%s'."
+msgid "Error: invalid 'wimax' parameter: '%s'."
+msgstr "エラー:  '%s' は無効な追加引数です。"
+
+#: ../cli/src/network-manager.c:588
+#, fuzzy, c-format
+#| msgid "Error: 'dev' command '%s' is not valid."
 msgid "Error: 'nm' command '%s' is not valid."
-msgstr "エラー: 'nm' コマンド '%s' は無効です。"
-
-#: ../cli/src/nmcli.c:69
-#, c-format
+msgstr "エラー: 'dev' のコマンド '%s' は有効なコマンドではありません。"
+
+#: ../cli/src/nmcli.c:76
+#, fuzzy, c-format
+#| msgid ""
+#| "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
+#| "\n"
+#| "OPTIONS\n"
+#| "  -t[erse]                                   terse output\n"
+#| "  -p[retty]                                  pretty output\n"
+#| "  -m[ode] tabular|multiline                  output mode\n"
+#| "  -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"
+#| "  -a[sk]                                     ask for missing parameters\n"
+#| "  -w[ait]                           set timeout waiting for finishing operations\n"
+#| "  -v[ersion]                                 show program version\n"
+#| "  -h[elp]                                    print this help\n"
+#| "\n"
+#| "OBJECT\n"
+#| "  g[eneral]       NetworkManager's general status and operations\n"
+#| "  n[etworking]    overall networking control\n"
+#| "  r[adio]         NetworkManager radio switches\n"
+#| "  c[onnection]    NetworkManager's connections\n"
+#| "  d[evice]        devices managed by NetworkManager\n"
+#| "\n"
 msgid ""
 "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
 "\n"
@@ -973,588 +1810,894 @@ msgid ""
 "  -p[retty]                                  pretty output\n"
 "  -m[ode] tabular|multiline                  output mode\n"
 "  -f[ields] |all|common   specify fields to output\n"
-"  -e[scape] yes|no                           escape columns separators in "
-"values\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"
 "OBJECT\n"
-"  nm          NetworkManager status\n"
-"  con         NetworkManager connections\n"
-"  dev         devices managed by NetworkManager\n"
+"  nm              NetworkManager's status\n"
+"  c[onnection]    NetworkManager's connections\n"
+"  d[evice]        devices managed by NetworkManager\n"
 "\n"
 msgstr ""
-"使用法: %s [OPTIONS] OBJECT { COMMAND | help }\n"
+"使い方: %s [オプション] オブジェクト { コマンド | help }\n"
 "\n"
-"OPTIONS\n"
-"  -t[erse]                                   terse output\n"
-"  -p[retty]                                  pretty output\n"
-"  -m[ode] tabular|multiline                  output mode\n"
-"  -f[ields] |all|common   specify fields to output\n"
-"  -e[scape] yes|no                           escape columns separators in "
-"values\n"
-"  -v[ersion]                                 show program version\n"
-"  -h[elp]                                    print this help\n"
+"オプション\n"
+"  -t[erse]                                   簡潔な出力\n"
+"  -p[retty]                                  人間が読みやすい出力\n"
+"  -m[ode] tabular|multiline                  出力モード\n"
+"  -f[ields] |all|common   出力フィールドの指定\n"
+"  -e[scape] yes|no                           値内のコラムセパレーターをエスケープ\n"
+"  -n[ocheck]                                 nmcli および NetworkManager のバージョンをチェックしない\n"
+"  -a[sk]                                     足りないパラメーターを問い合わせる\n"
+"  -w[ait]                           動作の完了を待機するタイムアウトを設定\n"
+"  -v[ersion]                                 プログラムバージョン\n"
+"  -h[elp]                                    このヘルプを出力\n"
 "\n"
-"OBJECT\n"
-"  nm          NetworkManager status\n"
-"  con         NetworkManager connections\n"
-"  dev         devices managed by NetworkManager\n"
+"オブジェクト\n"
+"  g[eneral]       NetworkManager の全般的な状態と動作\n"
+"  n[etworking]    全体的なネットワーク制御\n"
+"  r[adio]         NetworkManager ラジオスイッチ\n"
+"  c[onnection]    NetworkManager の接続\n"
+"  d[evice]        NetworkManager で管理しているデバイス\n"
 "\n"
 
-#: ../cli/src/nmcli.c:113
+#: ../cli/src/nmcli.c:124
 #, c-format
 msgid "Error: Object '%s' is unknown, try 'nmcli help'."
-msgstr "エラー: オブジェクト '%s' は不明です。'nmcli help' を試して下さい。"
+msgstr "エラー: オブジェクト '%s' は不明です。'nmcli help' を確認してください。"
 
-#: ../cli/src/nmcli.c:143
+#: ../cli/src/nmcli.c:154
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
-msgstr "エラー: オプション '--terse' は２回目の指定です。"
+msgstr "エラー: オプション '--terse' が二度指定されています。"
 
-#: ../cli/src/nmcli.c:148
+#: ../cli/src/nmcli.c:159
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
-msgstr "エラー: オプション '--terse' は '--pretty' と相互に独占的です。"
+msgstr "エラー: オプション '--terse' は '--pretty' と相互に排他的です。"
 
-#: ../cli/src/nmcli.c:156
+#: ../cli/src/nmcli.c:167
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
-msgstr "エラー: オプション '--pretty' は２回目の指定です。"
+msgstr "エラー: オプション '--pretty' が二度指定されています。"
 
-#: ../cli/src/nmcli.c:161
+#: ../cli/src/nmcli.c:172
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
-msgstr "エラー: オプション '--pretty' は '--terse' と相互に独占的です。"
+msgstr "エラー: オプション '--pretty' は '--terse' と相互に排他的です。"
 
-#: ../cli/src/nmcli.c:171 ../cli/src/nmcli.c:187
+#: ../cli/src/nmcli.c:182 ../cli/src/nmcli.c:198
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "エラー: %s オプション用の引数がありません。"
 
-#: ../cli/src/nmcli.c:180 ../cli/src/nmcli.c:196
+#: ../cli/src/nmcli.c:191 ../cli/src/nmcli.c:207
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "エラー: '%s' は '%s' オプション用の有効な引数ではありません。"
 
-#: ../cli/src/nmcli.c:203
+#: ../cli/src/nmcli.c:214
 #, c-format
 msgid "Error: fields for '%s' options are missing."
 msgstr "エラー: '%s' オプション用のフィールドがありません。"
 
-#: ../cli/src/nmcli.c:209
+#: ../cli/src/nmcli.c:222
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli ツール、バージョン %s\n"
 
-#: ../cli/src/nmcli.c:215
+#: ../cli/src/nmcli.c:228
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
-msgstr "エラー: オプション '%s' は不明です、'nmcli -help' を試して下さい。"
+msgstr "エラー: オプション '%s' は不明です、'nmcli -help' を確認してください。"
 
-#: ../cli/src/nmcli.c:234
+#: ../cli/src/nmcli.c:247
 #, c-format
 msgid "Caught signal %d, shutting down..."
 msgstr "シグナル %d が出ました、シャットダウンします..."
 
-#: ../cli/src/nmcli.c:259
-#, c-format
-msgid "Error: Could not connect to NetworkManager."
-msgstr "エラー: NetworkManager へ接続出来ませんでした。"
+#: ../cli/src/nmcli.c:272
+msgid "Error: Could not create NMClient object."
+msgstr "エラー: NMClient オブジェクトを作成できませんでした。"
 
-#: ../cli/src/nmcli.c:275
+#: ../cli/src/nmcli.c:288
 msgid "Success"
 msgstr "成功"
 
-#: ../cli/src/settings.c:407
+#: ../cli/src/settings.c:595
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr "%d (hex-ascii-key)"
 
-#: ../cli/src/settings.c:409
+#: ../cli/src/settings.c:597
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr "%d (104/128-bit パスフレーズ)"
 
-#: ../cli/src/settings.c:412
+#: ../cli/src/settings.c:600 ../cli/src/settings.c:728
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d (不明)"
 
-#: ../cli/src/settings.c:438
+#: ../cli/src/settings.c:626
 msgid "0 (unknown)"
 msgstr "0 (不明)"
 
-#: ../cli/src/settings.c:444
+#: ../cli/src/settings.c:632
 msgid "any, "
 msgstr "いずれでも、"
 
-#: ../cli/src/settings.c:446
+#: ../cli/src/settings.c:634
 msgid "900 MHz, "
 msgstr "900 MHz, "
 
-#: ../cli/src/settings.c:448
+#: ../cli/src/settings.c:636
 msgid "1800 MHz, "
 msgstr "1800 MHz, "
 
-#: ../cli/src/settings.c:450
+#: ../cli/src/settings.c:638
 msgid "1900 MHz, "
 msgstr "1900 MHz, "
 
-#: ../cli/src/settings.c:452
+#: ../cli/src/settings.c:640
 msgid "850 MHz, "
 msgstr "850 MHz, "
 
-#: ../cli/src/settings.c:454
+#: ../cli/src/settings.c:642
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 2100 MHz, "
 
-#: ../cli/src/settings.c:456
+#: ../cli/src/settings.c:644
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr "WCDMA 3GPP UMTS 1800 MHz, "
 
-#: ../cli/src/settings.c:458
+#: ../cli/src/settings.c:646
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
 
-#: ../cli/src/settings.c:460
+#: ../cli/src/settings.c:648
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr "WCDMA 3GPP UMTS 800 MHz, "
 
-#: ../cli/src/settings.c:462
+#: ../cli/src/settings.c:650
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr "WCDMA 3GPP UMTS 850 MHz, "
 
-#: ../cli/src/settings.c:464
+#: ../cli/src/settings.c:652
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr "WCDMA 3GPP UMTS 900 MHz, "
 
-#: ../cli/src/settings.c:466
+#: ../cli/src/settings.c:654
 msgid "WCDMA 3GPP UMTS 1700 MHz, "
 msgstr "WCDMA 3GPP UMTS 1700 MHz, "
 
-#: ../cli/src/settings.c:546 ../cli/src/settings.c:708
-msgid "auto"
-msgstr "自動"
+#: ../cli/src/settings.c:656
+msgid "WCDMA 3GPP UMTS 1900 MHz, "
+msgstr "WCDMA 3GPP UMTS 1900 MHz, "
 
-#: ../cli/src/settings.c:704 ../cli/src/settings.c:707 ../cli/src/utils.c:172
-msgid "not set"
-msgstr "セットされていません"
+#: ../cli/src/settings.c:658
+msgid "WCDMA 3GPP UMTS 2600 MHz, "
+msgstr "WCDMA 3GPP UMTS 2600 MHz, "
 
-#: ../cli/src/utils.c:124
-#, c-format
-msgid "field '%s' has to be alone"
-msgstr "フィールド '%s' は孤立する必要があります"
+#: ../cli/src/settings.c:676
+msgid "0 (NONE)"
+msgstr "0 (なし)"
 
-#: ../cli/src/utils.c:127
-#, c-format
+#: ../cli/src/settings.c:682
+msgid "REORDER_HEADERS, "
+msgstr "ヘッダーの順序変更、"
+
+#: ../cli/src/settings.c:684
+msgid "GVRP, "
+msgstr "GVRP、"
+
+#: ../cli/src/settings.c:686
+msgid "LOOSE_BINDING, "
+msgstr "結合を緩める、"
+
+#: ../cli/src/settings.c:722
+#, c-format
+msgid "%d (disabled)"
+msgstr "%d (無効)"
+
+#: ../cli/src/settings.c:724
+#, c-format
+msgid "%d (enabled, prefer public IP)"
+msgstr "%d (有効、パブリック IP 優先)"
+
+#: ../cli/src/settings.c:726
+#, c-format
+msgid "%d (enabled, prefer temporary IP)"
+msgstr "%d (有効、テンポラリ IP を優先)"
+
+#: ../cli/src/settings.c:738
+msgid "0 (none)"
+msgstr "0 (なし)"
+
+#: ../cli/src/settings.c:744
+msgid "agent-owned, "
+msgstr "エージェント所有、 "
+
+#: ../cli/src/settings.c:746
+msgid "not saved, "
+msgstr "未保存、 "
+
+#: ../cli/src/settings.c:748
+msgid "not required, "
+msgstr "不必要、 "
+
+#: ../cli/src/settings.c:945 ../cli/src/settings.c:1163
+#: ../cli/src/settings.c:1904
+msgid "auto"
+msgstr "自動"
+
+#: ../cli/src/utils.c:105
+#, c-format
+msgid "Error converting IP4 address '0x%X' to text form"
+msgstr "IP4 アドレス 0x%X をテキスト形式に変換中にエラーが発生しました"
+
+#: ../cli/src/utils.c:133
+#, c-format
+msgid "Error converting IP6 address '%s' to text form"
+msgstr "IP6 アドレス '%s' をテキスト形式に変換中にエラーが発生しました"
+
+#: ../cli/src/utils.c:234
+#, c-format
+msgid "field '%s' has to be alone"
+msgstr "フィールド '%s' は孤立する必要があります"
+
+#: ../cli/src/utils.c:237
+#, c-format
 msgid "invalid field '%s'"
 msgstr "無効なフィールド  '%s'"
 
-#: ../cli/src/utils.c:146
-#, c-format
+#: ../cli/src/utils.c:256
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr "オプション '--terse' には '--fields' の指定が必要です"
 
-#: ../cli/src/utils.c:150
+#: ../cli/src/utils.c:260
 #, c-format
 msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr "オプション'--terse' には特定の '--fields' オプションの値が必要で、 '%s' ではありません"
 
-#: ../libnm-util/crypto.c:120
+#: ../cli/src/utils.c:470
+#, c-format
+msgid "Error: Couldn't create D-Bus object proxy for org.freedesktop.DBus"
+msgstr ""
+
+#: ../cli/src/utils.c:478
+#, fuzzy, c-format
+#| msgid "Error: Connection deletion failed: %s"
+msgid "Error: NameHasOwner request failed: %s"
+msgstr "エラー: 接続の削除に失敗しました: %s"
+
+#: ../cli/src/utils.c:523
+#, c-format
+msgid "Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --nocheck to suppress the warning.\n"
+msgstr "警告: nmcli (%s) と NetworkManager (%s) のバージョンが一致しません。警告を回避する場合は --nocheck を使用します。\n"
+
+#: ../cli/src/utils.c:532
+#, c-format
+msgid "Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force execution using --nocheck, but the results are unpredictable."
+msgstr "エラー: nmcli (%s) と NetworkManager (%s) のバージョンが一致しません。--nocheck を使用すると強制的に実行することはできますが、予測できない結果となります。"
+
+#: ../libnm-util/crypto.c:133
 #, c-format
 msgid "PEM key file had no end tag '%s'."
 msgstr "PEM キーファイルは終了タグ '%s' を持ちません。"
 
-#: ../libnm-util/crypto.c:130
+#: ../libnm-util/crypto.c:146
 #, c-format
 msgid "Doesn't look like a PEM private key file."
 msgstr "PEM プライベートキーファイルではないようです。"
 
-#: ../libnm-util/crypto.c:138
+#: ../libnm-util/crypto.c:154
 #, c-format
 msgid "Not enough memory to store PEM file data."
 msgstr "PEM ファイルデータの保存に十分なメモリーがありません。"
 
-#: ../libnm-util/crypto.c:154
+#: ../libnm-util/crypto.c:170
 #, c-format
 msgid "Malformed PEM file: Proc-Type was not first tag."
 msgstr "不正形式の PEM ファイル: Proc-Type は最初のタグではありません。"
 
-#: ../libnm-util/crypto.c:162
+#: ../libnm-util/crypto.c:178
 #, c-format
 msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
 msgstr "不正形式の PEM ファイル: 不明な Proc-Type タグ '%s' です。"
 
-#: ../libnm-util/crypto.c:172
+#: ../libnm-util/crypto.c:188
 #, c-format
 msgid "Malformed PEM file: DEK-Info was not the second tag."
 msgstr "不正形式の PEM ファイル: DEK-Info は２つ目のタグではありません。"
 
-#: ../libnm-util/crypto.c:183
+#: ../libnm-util/crypto.c:199
 #, c-format
 msgid "Malformed PEM file: no IV found in DEK-Info tag."
-msgstr "不正形式の PEM ファイル: DEK-Info タグ内に IV が見付かりません。"
+msgstr "不正形式の PEM ファイル: DEK-Info タグ内に IV が見つかりません。"
 
-#: ../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 "不正形式の PEM ファイル: DEK-Info タグ内に無効な形式の IV"
 
-#: ../libnm-util/crypto.c:203
+#: ../libnm-util/crypto.c:219
 #, c-format
 msgid "Malformed PEM file: unknown private key cipher '%s'."
 msgstr "不正形式の PEM ファイル: 不明なプライベートキー暗号文 '%s'。"
 
-#: ../libnm-util/crypto.c:222
+#: ../libnm-util/crypto.c:238
 #, c-format
 msgid "Could not decode private key."
 msgstr "プライベートキーを復号できませんでした。"
 
-#: ../libnm-util/crypto.c:267
-#, c-format
-msgid "PEM certificate '%s' had no end tag '%s'."
-msgstr "PEM  証明書 '%s' は終了タグ '%s'持ちません。"
+#: ../libnm-util/crypto.c:290
+msgid "Failed to find expected PKCS#8 start tag."
+msgstr "期待されている PKCS#8 開始タグの検出に失敗しました。"
 
-#: ../libnm-util/crypto.c:277
+#: ../libnm-util/crypto.c:298
 #, c-format
-msgid "Failed to decode certificate."
-msgstr "証明書の復号に失敗しました。"
+msgid "Failed to find expected PKCS#8 end tag '%s'."
+msgstr "期待されている PKCS#8 終了タグ '%s' の検出に失敗しました。"
+
+#: ../libnm-util/crypto.c:318
+#, fuzzy
+#| msgid "Not enough memory to store file data."
+msgid "Not enough memory to store private key data."
+msgstr "ファイルデータの保存に十分なメモリーがありません。"
+
+#: ../libnm-util/crypto.c:323
+msgid "Failed to decode PKCS#8 private key."
+msgstr "PKCS#8 プライベートキーの復号に失敗しました。"
 
-#: ../libnm-util/crypto.c:286
+#: ../libnm-util/crypto.c:345 ../libnm-util/crypto.c:631
 #, c-format
 msgid "Not enough memory to store certificate data."
 msgstr "証明書データの保存に十分なメモリーがありません。"
 
-#: ../libnm-util/crypto.c:294
-#, c-format
-msgid "Not enough memory to store file data."
-msgstr "ファイルデータの保存に十分なメモリーがありません。"
-
-#: ../libnm-util/crypto.c:324
+#: ../libnm-util/crypto.c:371
 #, c-format
 msgid "IV must be an even number of bytes in length."
 msgstr "IV はその長さで偶数のバイト数でなければなりません。"
 
-#: ../libnm-util/crypto.c:333
+#: ../libnm-util/crypto.c:380
 #, c-format
 msgid "Not enough memory to store the IV."
 msgstr "IV の保存に十分なメモリーがありません。"
 
-#: ../libnm-util/crypto.c:344
+#: ../libnm-util/crypto.c:391
 #, c-format
 msgid "IV contains non-hexadecimal digits."
 msgstr "IV は 16進法でない数字を含んでいます。"
 
-#: ../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:429 ../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 "プライベートキー暗号文 '%s' は不明です。"
 
-#: ../libnm-util/crypto.c:391
+#: ../libnm-util/crypto.c:438
 #, c-format
 msgid "Not enough memory to decrypt private key."
 msgstr "プライベートキーの解読に十分なメモリーがありません。"
 
-#: ../libnm-util/crypto.c:511
+#: ../libnm-util/crypto.c:503
+#, c-format
+msgid "Not enough memory to store decrypted private key."
+msgstr "復号したプライベートキーの保存に十分なメモリーがありません。"
+
+#: ../libnm-util/crypto.c:548
 #, c-format
 msgid "Unable to determine private key type."
 msgstr "プライベートキーのタイプを判定できません。"
 
-#: ../libnm-util/crypto.c:530
+#: ../libnm-util/crypto.c:603
 #, c-format
-msgid "Not enough memory to store decrypted private key."
-msgstr "復号したプライベートキーの保存に十分なメモリーがありません。"
+msgid "PEM certificate had no start tag '%s'."
+msgstr "PEM 証明書に終了タグ '%s' がありませんでした。"
 
-#: ../libnm-util/crypto_gnutls.c:49
+#: ../libnm-util/crypto.c:612
+#, c-format
+msgid "PEM certificate had no end tag '%s'."
+msgstr "PEM 証明書に終了タグ '%s' がありませんでした。"
+
+#: ../libnm-util/crypto.c:636
+#, c-format
+msgid "Failed to decode certificate."
+msgstr "証明書の復号に失敗しました。"
+
+#: ../libnm-util/crypto_gnutls.c:50
 msgid "Failed to initialize the crypto engine."
 msgstr "暗号化エンジンの初期化に失敗しました。"
 
-#: ../libnm-util/crypto_gnutls.c:93
+#: ../libnm-util/crypto_gnutls.c:92
 #, c-format
 msgid "Failed to initialize the MD5 engine: %s / %s."
 msgstr "MD5 エンジンの初期化に失敗しました: %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 "IV の長さが無効です (最低 %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 "復号したキーバッファ用に十分なメモリーがありません。"
 
-#: ../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 "復号化暗号文コンテキストの初期化に失敗しました: %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 "復号用のシンメトリックキーの設定に失敗しました: %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 "復号用の IV の設定に失敗しました: %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 "プライベートキーの復号に失敗しました: %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 "プライベートキーの復号に失敗しました: 予想外の不要語句の長さです。"
 
-#: ../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 "プライベートキーの復号に失敗しました。"
 
-#: ../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 "暗号化用のメモリー割り当てが出来ませんでした。"
 
-#: ../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 "暗号化暗号文コンテキストの初期化に失敗しました: %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 "暗号化用のシンメトリックキーの設定に失敗しました: %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 "暗号化用の IV の設定に失敗しました: %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 "データの暗号化に失敗しました: %s / %s。"
 
-#: ../libnm-util/crypto_gnutls.c:362
+#: ../libnm-util/crypto_gnutls.c:361
 #, c-format
 msgid "Error initializing certificate data: %s"
 msgstr "証明書データの初期化にエラー発生: %s"
 
-#: ../libnm-util/crypto_gnutls.c:384
+#: ../libnm-util/crypto_gnutls.c:383
 #, c-format
 msgid "Couldn't decode certificate: %s"
 msgstr "証明書をデコードできませんでした: %s"
 
-#: ../libnm-util/crypto_gnutls.c:408
+#: ../libnm-util/crypto_gnutls.c:407
 #, c-format
 msgid "Couldn't initialize PKCS#12 decoder: %s"
-msgstr "PKCS#12 デコーダを初期化できません: %s"
+msgstr "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 "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 "PKCS#12 ファイルを確証できません: %s"
 
+#: ../libnm-util/crypto_gnutls.c:460
+#, c-format
+msgid "Couldn't initialize PKCS#8 decoder: %s"
+msgstr "PKCS#8 デコーダーを初期化できませんでした: %s"
+
+#: ../libnm-util/crypto_gnutls.c:483
+#, c-format
+msgid "Couldn't decode PKCS#8 file: %s"
+msgstr "PKCS#8 ファイルをデコードできませんでした: %s"
+
 #: ../libnm-util/crypto_nss.c:56
 #, c-format
 msgid "Failed to initialize the crypto engine: %d."
 msgstr "暗号化エンジンの初期化に失敗しました: %d。"
 
-#: ../libnm-util/crypto_nss.c:111
+#: ../libnm-util/crypto_nss.c:107
 #, c-format
 msgid "Failed to initialize the MD5 context: %d."
 msgstr "MD5 コンテキストの初期化に失敗しました: %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 "IV の長さが無効です (最低でも %d は必要)。"
 
-#: ../libnm-util/crypto_nss.c:196
+#: ../libnm-util/crypto_nss.c:192
 #, c-format
 msgid "Failed to initialize the decryption cipher slot."
 msgstr "復号化暗号文スロットの初期化に失敗しました。"
 
-#: ../libnm-util/crypto_nss.c:206
+#: ../libnm-util/crypto_nss.c:202
 #, c-format
 msgid "Failed to set symmetric key for decryption."
 msgstr "復号化用シンメトリックキーの設定に失敗しました。"
 
-#: ../libnm-util/crypto_nss.c:216
+#: ../libnm-util/crypto_nss.c:212
 #, c-format
 msgid "Failed to set IV for decryption."
 msgstr "復号化用 IV の設定に失敗しました。"
 
-#: ../libnm-util/crypto_nss.c:224
+#: ../libnm-util/crypto_nss.c:220
 #, c-format
 msgid "Failed to initialize the decryption context."
 msgstr "復号化コンテキストの初期化に失敗しました。"
 
-#: ../libnm-util/crypto_nss.c:237
+#: ../libnm-util/crypto_nss.c:233
 #, c-format
 msgid "Failed to decrypt the private key: %d."
 msgstr "プライベートキーの復号に失敗しました: %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 "プライベートキーの復号に失敗しました: 復号したデータが大きすぎます。"
 
-#: ../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 "プライベートキー復号化の完了に失敗しました: %d"
 
-#: ../libnm-util/crypto_nss.c:364
+#: ../libnm-util/crypto_nss.c:360
 #, c-format
 msgid "Failed to initialize the encryption cipher slot."
 msgstr "暗号化暗号文スロットの初期化に失敗しました。"
 
-#: ../libnm-util/crypto_nss.c:372
+#: ../libnm-util/crypto_nss.c:368
 #, c-format
 msgid "Failed to set symmetric key for encryption."
 msgstr "暗号化用のシンメトリックキーの設定に失敗しました。"
 
-#: ../libnm-util/crypto_nss.c:380
+#: ../libnm-util/crypto_nss.c:376
 #, c-format
 msgid "Failed to set IV for encryption."
 msgstr "暗号化用の IV の設定に失敗しました。"
 
-#: ../libnm-util/crypto_nss.c:388
+#: ../libnm-util/crypto_nss.c:384
 #, c-format
 msgid "Failed to initialize the encryption context."
 msgstr "暗号化コンテキストの初期化に失敗しました。"
 
-#: ../libnm-util/crypto_nss.c:396
+#: ../libnm-util/crypto_nss.c:392
 #, c-format
 msgid "Failed to encrypt: %d."
 msgstr "暗号化に失敗しました: %d"
 
-#: ../libnm-util/crypto_nss.c:404
+#: ../libnm-util/crypto_nss.c:400
 #, c-format
 msgid "Unexpected amount of data after encrypting."
 msgstr "暗号化の後に予期しないデータの量があります。"
 
-#: ../libnm-util/crypto_nss.c:447
+#: ../libnm-util/crypto_nss.c:443
 #, c-format
 msgid "Couldn't decode certificate: %d"
-msgstr "証明書のデコードが出来ません: %d"
+msgstr "証明書のデコードができません: %d"
 
-#: ../libnm-util/crypto_nss.c:482
+#: ../libnm-util/crypto_nss.c:478
 #, c-format
 msgid "Couldn't convert password to UCS2: %d"
 msgstr "パスワードを 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 "PKCS#12 デコーダを初期化出来ません: %d"
+msgstr "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 "PKCS#12 ファイルをデコード出来ません: %d"
+msgstr "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 "PKCS#12 ファイルを確証出来ません: %d"
+msgstr "PKCS#12 ファイルを確証できません: %d"
 
-#: ../libnm-util/crypto_nss.c:557
+#: ../libnm-util/crypto_nss.c:568
 msgid "Could not generate random data."
 msgstr "ランダムデータを生成できません。"
 
-#: ../libnm-util/nm-utils.c:1925
+#: ../libnm-util/nm-utils.c:2158
 #, c-format
 msgid "Not enough memory to make encryption key."
 msgstr "暗号化キーを作成するのに十分なメモリーがありません。"
 
-#: ../libnm-util/nm-utils.c:2035
+#: ../libnm-util/nm-utils.c:2268
 msgid "Could not allocate memory for PEM file creation."
 msgstr "PEM ファイル作成用にメモリーを割り当て出来ません。"
 
-#: ../libnm-util/nm-utils.c:2047
+#: ../libnm-util/nm-utils.c:2280
 #, c-format
 msgid "Could not allocate memory for writing IV to PEM file."
 msgstr "PEM ファイルへの IV の書き込み用にメモリーを割り当て出来ません。"
 
-#: ../libnm-util/nm-utils.c:2059
+#: ../libnm-util/nm-utils.c:2292
 #, c-format
 msgid "Could not allocate memory for writing encrypted key to PEM file."
 msgstr "PEM ファイルへの暗号化キーの書き込み用にメモリーを割り当て出来ません。"
 
-#: ../libnm-util/nm-utils.c:2078
+#: ../libnm-util/nm-utils.c:2311
 #, c-format
 msgid "Could not allocate memory for PEM file data."
 msgstr "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 "netlink メッセージのプロセス中にエラー発生: %s"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:1
+msgid "Enable or disable system networking"
+msgstr "システムのネットワーキングを有効または無効にする"
 
-#: ../src/nm-netlink-monitor.c:214
-msgid "error occurred while waiting for data on socket"
-msgstr "ソケット上でデータを待っている際にエラーが発生しました"
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:2
+msgid "System policy prevents enabling or disabling system networking"
+msgstr "システムポリシーによりシステムのネットワーキングの有効化または無効化が阻止されます"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:3
+msgid "Put NetworkManager to sleep or wake it up (should only be used by system power management)"
+msgstr "NetworkManager をスリープ状態にする、またはスリープ状態から解除します (使用はシステムの電源管理に限ってください)"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:4
+msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+msgstr "システムポリシーにより NetworkManager のスリープ状態への移行、またはスリープ状態からの解除が阻止されます"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:5
+msgid "Enable or disable WiFi devices"
+msgstr "Wi-Fi デバイスを有効または無効にする"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:6
+msgid "System policy prevents enabling or disabling WiFi devices"
+msgstr "システムポリシーにより Wi-Fi デバイスの有効化または無効化が阻止されます"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:7
+msgid "Enable or disable mobile broadband devices"
+msgstr "モバイルブロードバンドのデバイスを有効または無効にする"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:8
+msgid "System policy prevents enabling or disabling mobile broadband devices"
+msgstr "システムポリシーによりモバイルブロードバンドのデバイスの有効化または無効化が阻止されています"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:9
+msgid "Enable or disable WiMAX mobile broadband devices"
+msgstr "WiMAX モバイルブロードバンドのデバイスを有効または無効にする"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:10
+msgid "System policy prevents enabling or disabling WiMAX mobile broadband devices"
+msgstr "システムポリシーにより WiMAX モバイルブロードバンドのデバイスの有効化または無効化が阻止されます"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:11
+msgid "Allow control of network connections"
+msgstr "ネットワーク接続の制御を許可"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:12
+msgid "System policy prevents control of network connections"
+msgstr "システムポリシーによりネットワーク接続の制御が阻止されます"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:13
+msgid "Connection sharing via a protected WiFi network"
+msgstr "保護された Wi-Fi ネットワーク経由の接続共有"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:14
+msgid "System policy prevents sharing connections via a protected WiFi network"
+msgstr "システムポリシーにより、保護された Wi-Fi ネットワーク経由の接続共有が阻止されます。"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:15
+msgid "Connection sharing via an open WiFi network"
+msgstr "保護されていない Wi-Fi ネットワーク経由の接続共有"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:16
+msgid "System policy prevents sharing connections via an open WiFi network"
+msgstr "システムポリシーにより、保護されていない Wi-Fi ネットワーク経由の接続共有が阻止されます。"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:17
+msgid "Modify personal network connections"
+msgstr "個人のネットワーク接続を編集"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:18
+msgid "System policy prevents modification of personal network settings"
+msgstr "システムポリシーにより個人のネットワーク設定の変更が阻止されます"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:19
+msgid "Modify network connections for all users"
+msgstr "全ユーザーのネットワーク接続を編集"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:20
+msgid "System policy prevents modification of network settings for all users"
+msgstr "システムポリシーにより全ユーザーのネットワーク設定の編集が阻止されます"
 
-#: ../src/nm-netlink-monitor.c:254
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:21
+msgid "Modify persistent system hostname"
+msgstr "永続的なシステムのホスト名を修正"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:22
+msgid "System policy prevents modification of the persistent system hostname"
+msgstr "システムポリシーにより永続的なシステムのホスト名の修正が阻止されます"
+
+#: ../src/main.c:129
 #, c-format
-msgid "unable to connect to netlink for monitoring link status: %s"
-msgstr "リンク状況監視用のネットリンクに接続できません: %s"
+msgid "Failed to set signal mask: %d"
+msgstr "信号マスクの設定に失敗しました: %d"
 
-#: ../src/nm-netlink-monitor.c:265
+#: ../src/main.c:138
 #, c-format
-msgid "unable to enable netlink handle credential passing: %s"
-msgstr "netlink ハンドル信任情報の伝達を有効にできません: %s"
+msgid "Failed to create signal handling thread: %d"
+msgstr "信号処理スレッドの作成に失敗しました: %d"
 
-#: ../src/nm-netlink-monitor.c:291 ../src/nm-netlink-monitor.c:353
+#: ../src/main.c:153
 #, c-format
-msgid "unable to allocate netlink handle for monitoring link status: %s"
-msgstr "リンクステータス監視用のネットリンクハンドルを割り当て出来ません: %s"
+msgid "Opening %s failed: %s\n"
+msgstr "%s のオープンに失敗しました: %s\n"
 
-#: ../src/nm-netlink-monitor.c:376
+#: ../src/main.c:159
 #, c-format
-msgid "unable to allocate netlink link cache for monitoring link status: %s"
-msgstr "リンク状況監視用のネットリンクのリンクキャッシュを割り当てできません: %s"
+msgid "Writing to %s failed: %s\n"
+msgstr "%s への書き込みに失敗しました: %s\n"
 
-#: ../src/nm-netlink-monitor.c:502
+#: ../src/main.c:164
 #, c-format
-msgid "unable to join netlink group: %s"
-msgstr "netlink グループへ参加できません: %s"
+msgid "Closing %s failed: %s\n"
+msgstr "%s のクローズに失敗しました: %s\n"
 
-#: ../src/nm-netlink-monitor.c:629 ../src/nm-netlink-monitor.c:642
+#: ../src/main.c:207
 #, c-format
-msgid "error updating link cache: %s"
-msgstr "リンクキャッシュの更新中にエラー: %s"
+msgid "NetworkManager is already running (pid %ld)\n"
+msgstr "NetworkManager はすでに起動しています (pid %ld)\n"
 
-#: ../src/main.c:502
+#: ../src/main.c:333
+msgid "Print NetworkManager version and exit"
+msgstr "NetworkManager のバージョンを表示して終了する"
+
+#: ../src/main.c:334
+msgid "Don't become a daemon"
+msgstr "デーモンにしない"
+
+#: ../src/main.c:335
+msgid "Make all warnings fatal"
+msgstr "すべての警告を致命的にする"
+
+#: ../src/main.c:336
+msgid "Specify the location of a PID file"
+msgstr "PID ファイルの場所を指定する"
+
+#: ../src/main.c:336
+msgid "filename"
+msgstr "ファイル名"
+
+#: ../src/main.c:337
+msgid "State file location"
+msgstr "状態ファイルの場所"
+
+#: ../src/main.c:337
+msgid "/path/to/state.file"
+msgstr "/path/to/state.file"
+
+#: ../src/main.c:338
+msgid "Config file location"
+msgstr "設定ファイルの場所"
+
+#: ../src/main.c:338
+msgid "/path/to/config.file"
+msgstr "/path/to/config.file"
+
+#: ../src/main.c:339
+msgid "List of plugins separated by ','"
+msgstr "複数のプラグインを「,」で区切った一覧"
+
+#: ../src/main.c:339
+msgid "plugin1,plugin2"
+msgstr "plugin1,plugin2"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:341
+#, fuzzy
+#| msgid "Log level: one of [%s]"
+msgid "Log level: one of [ERR, WARN, INFO, DEBUG]"
+msgstr "ログレベル: [%s] のいずれか"
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:344
+msgid ""
+"Log domains separated by ',': any combination of\n"
+"                                                [NONE,HW,RFKILL,ETHER,WIFI,BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                                 WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                                 AGENTS,SETTINGS,SUSPEND,CORE,DEVICE,OLPC,WIMAX,\n"
+"                                                 INFINIBAND,FIREWALL,ADSL]"
+msgstr ""
+
+#: ../src/main.c:350
+msgid "An http(s) address for checking internet connectivity"
+msgstr "インターネットの接続性を確認するための http(s) アドレス"
+
+#: ../src/main.c:351
+msgid "The interval between connectivity checks (in seconds)"
+msgstr "接続性チェックの間隔 (秒単位)"
+
+#: ../src/main.c:352
+msgid "The expected start of the response"
+msgstr "期待されている応答の開始点"
+
+#: ../src/main.c:352
+msgid "Bingo!"
+msgstr "当たり!"
+
+#: ../src/main.c:370
+#, c-format
+msgid "GModules are not supported on your platform!\n"
+msgstr "GModules はご使用のプラットフォームでは対応していません!\n"
+
+#: ../src/main.c:389
+msgid ""
+"NetworkManager monitors all network connections and automatically\n"
+"chooses the best connection to use.  It also allows the user to\n"
+"specify wireless access points which wireless cards in the computer\n"
+"should associate with."
+msgstr ""
+"NetworkManager によりすべてのネットワーク接続が監視され、\n"
+"使用に最適な接続が自動的に選択されます。また、コンピューター内の\n"
+"ワイヤレスカードを関連付けるべきワイヤレスアクセスポイントの\n"
+"ユーザーによる指定も許可されます。"
+
+#: ../src/main.c:395
 #, c-format
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
-msgstr "無効なオプション。--help を使用して有効なオプションの一覧をご覧下さい。\n"
+msgstr "無効なオプションです。--help を使用して有効なオプションの一覧を確認してください。\n"
+
+#: ../src/main.c:405
+#, c-format
+msgid "You must be root to run NetworkManager!\n"
+msgstr "NetworkManager を実行するには root になる必要があります!\n"
 
-#: ../src/main.c:562
+#: ../src/main.c:433
+#, c-format
+msgid "Failed to read configuration: (%d) %s\n"
+msgstr "設定の読み込みに失敗しました: (%d) %s\n"
+
+#: ../src/main.c:444
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
-msgstr "%s  --help を使用して有効なオプションの一覧をご覧下さい。\n"
+msgstr "%s  --help を使用して有効なオプションの一覧を確認してください。\n"
+
+#: ../src/main.c:451
+#, c-format
+msgid "State file %s parsing failed: (%d) %s\n"
+msgstr "状態ファイル %s の解析に失敗しました: (%d) %s\n"
+
+#: ../src/main.c:468
+#, c-format
+msgid "Could not daemonize: %s [error %u]\n"
+msgstr "デーモン化できませんでした: %s [エラー %u]\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:325
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:139
 msgid "# Created by NetworkManager\n"
 msgstr "# NetworkManager で作成されています\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:341
+#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:146
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -1563,79 +2706,2027 @@ msgstr ""
 "# %s からマージされています\n"
 "\n"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:279
+#: ../src/dhcp-manager/nm-dhcp-manager.c:266
 msgid "no usable DHCP client could be found."
-msgstr "使用できる DHCP クライアントが見付かりませんでした。"
+msgstr "使用できる DHCP クライアントが見つかりませんでした。"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:288
+#: ../src/dhcp-manager/nm-dhcp-manager.c:275
+#, fuzzy
 msgid "'dhclient' could be found."
-msgstr "'dhclient' が見付かりました"
+msgstr "'dhclient' が見つかりました"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:298
+#: ../src/dhcp-manager/nm-dhcp-manager.c:285
+#, fuzzy
 msgid "'dhcpcd' could be found."
-msgstr "'dhcpcd' は見付かりません。"
+msgstr "'dhcpcd' は見つかりません。"
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:306
+#: ../src/dhcp-manager/nm-dhcp-manager.c:293
 #, c-format
 msgid "unsupported DHCP client '%s'"
 msgstr "サポートの無い DHCP クライアント '%s'"
 
-#: ../src/logging/nm-logging.c:146
+#: ../src/dns-manager/nm-dns-manager.c:376
+msgid "NOTE: the libc resolver may not support more than 3 nameservers."
+msgstr "注記: libc リゾルバーは ３つ以上のネームサーバーをサポートできません。"
+
+#: ../src/dns-manager/nm-dns-manager.c:378
+msgid "The nameservers listed below may not be recognized."
+msgstr "以下の一覧にあるネームサーバーは認識されないかも知れません。"
+
+#: ../src/logging/nm-logging.c:143
 #, c-format
 msgid "Unknown log level '%s'"
-msgstr "不明なログインレベル '%s'"
+msgstr "不明なログレベル '%s'"
 
-#: ../src/logging/nm-logging.c:171
+#: ../src/logging/nm-logging.c:189
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr "不明なログドメイン '%s'"
 
-#: ../src/dns-manager/nm-dns-manager.c:343
-msgid "NOTE: the libc resolver may not support more than 3 nameservers."
-msgstr "注記: libc リゾルバは ３つ以上のネームサーバーをサポートできません。"
+#: ../src/modem-manager/nm-modem-cdma.c:271
+#: ../src/modem-manager/nm-modem-broadband.c:533 ../src/nm-device-bt.c:338
+#, c-format
+msgid "CDMA connection %d"
+msgstr "CDMA 接続 %d"
 
-#: ../src/dns-manager/nm-dns-manager.c:345
-msgid "The nameservers listed below may not be recognized."
-msgstr "以下の一覧にあるネームサーバーは認識されないかも知れません。"
+#: ../src/modem-manager/nm-modem-gsm.c:549
+#: ../src/modem-manager/nm-modem-broadband.c:511 ../src/nm-device-bt.c:334
+#, c-format
+msgid "GSM connection %d"
+msgstr "GSM 接続 %d"
+
+#: ../src/nm-device-bond.c:202
+#, c-format
+msgid "Bond connection %d"
+msgstr "ボンド接続 %d"
+
+#: ../src/nm-device-adsl.c:194
+#, c-format
+msgid "ADSL connection %d"
+msgstr "ADSL 接続 %d"
+
+#: ../src/nm-device-bridge.c:201
+#, c-format
+msgid "Bridge connection %d"
+msgstr "ブリッジ接続 %d"
+
+#: ../src/nm-device-bt.c:309
+#, c-format
+msgid "PAN connection %d"
+msgstr "PAN 接続 %d"
+
+#: ../src/nm-device-bt.c:342
+#, c-format
+msgid "DUN connection %d"
+msgstr "DUN 接続 %d"
+
+#: ../src/nm-device-ethernet.c:1320
+#, c-format
+msgid "PPPoE connection %d"
+msgstr "PPPoE 接続 %d"
+
+#: ../src/nm-device-ethernet.c:1320 ../src/settings/nm-settings-utils.c:50
+#, c-format
+msgid "Wired connection %d"
+msgstr "有線接続 %d"
+
+#: ../src/nm-device-infiniband.c:299
+#, c-format
+msgid "InfiniBand connection %d"
+msgstr "InfiniBand 接続 %d"
+
+#: ../src/nm-device-olpc-mesh.c:293
+#, c-format
+msgid "Mesh %d"
+msgstr "Mesh %d"
+
+#: ../src/nm-device-vlan.c:331
+#, c-format
+msgid "VLAN connection %d"
+msgstr "VLAN 接続 %d"
+
+#: ../src/nm-manager.c:813
+#, c-format
+msgid "VPN connection %d"
+msgstr "VPN 接続 %d"
+
+#: ../src/nm-netlink-monitor.c:149 ../src/nm-netlink-monitor.c:273
+#: ../src/nm-netlink-monitor.c:714
+#, c-format
+msgid "error processing netlink message: %s"
+msgstr "netlink メッセージのプロセス中にエラー発生: %s"
+
+#: ../src/nm-netlink-monitor.c:252
+msgid "error occurred while waiting for data on socket"
+msgstr "ソケット上でデータを待っている際にエラーが発生しました"
+
+#: ../src/nm-netlink-monitor.c:297
+#, c-format
+msgid "unable to connect to netlink for monitoring link status: %s"
+msgstr "リンク状況監視用のネットリンクに接続できません: %s"
+
+#: ../src/nm-netlink-monitor.c:308
+#, c-format
+msgid "unable to enable netlink handle credential passing: %s"
+msgstr "netlink ハンドル信任情報の伝達を有効にできません: %s"
+
+#: ../src/nm-netlink-monitor.c:331 ../src/nm-netlink-monitor.c:391
+#, c-format
+msgid "unable to allocate netlink handle for monitoring link status: %s"
+msgstr "リンクステータス監視用のネットリンクハンドルを割り当てできません: %s"
+
+#: ../src/nm-netlink-monitor.c:416
+#, c-format
+msgid "unable to allocate netlink link cache for monitoring link status: %s"
+msgstr "リンク状況監視用のネットリンクのリンクキャッシュを割り当てできません: %s"
+
+#: ../src/nm-netlink-monitor.c:543
+#, c-format
+msgid "unable to join netlink group: %s"
+msgstr "netlink グループへ参加できません: %s"
 
-#: ../src/settings/nm-default-wired-connection.c:157
+#: ../src/nm-netlink-monitor.c:690 ../src/nm-netlink-monitor.c:703
 #, c-format
-msgid "Auto %s"
-msgstr "自動 %s"
+msgid "error updating link cache: %s"
+msgstr "リンクキャッシュの更新中にエラー: %s"
 
-#: ../system-settings/plugins/ifcfg-rh/reader.c:3256
+#: ../src/settings/plugins/ifcfg-rh/reader.c:110
 msgid "System"
 msgstr "システム"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1
-msgid "Connection sharing via a protected WiFi network"
-msgstr "保護された WiFi ネットワーク経由で接続共有"
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3705
+msgid "Bond"
+msgstr "ボンド"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
-msgid "Connection sharing via an open WiFi network"
-msgstr "開放した WiFi ネットワーク経由で接続共有"
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3898
+msgid "Bridge"
+msgstr "ブリッジ"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3
-msgid "Modify persistent system hostname"
-msgstr "永続化システムのホスト名を修正"
+#: ../test/nm-online.c:111
+#, c-format
+msgid "\rConnecting"
+msgstr "\r接続中"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4
-msgid "Modify system connections"
-msgstr "システム接続を修正"
+#: ../test/nm-online.c:142
+msgid "Time to wait for a connection, in seconds (without the option, default value is 30)"
+msgstr "接続を待機する時間を秒単位で指定する (オプションなしの場合、デフォルト値は 30)"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5
-msgid "System policy prevents modification of system settings"
-msgstr "システムポリシーがシステム設定の修正を阻止します。"
+#: ../test/nm-online.c:143
+#, fuzzy
+#| msgid "Exit immediately if NetworkManager is not running"
+msgid "Exit immediately if NetworkManager is not running or connecting"
+msgstr "NetworkManager が起動していない場合は直ちに終了する"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6
-msgid "System policy prevents modification of the persistent system hostname"
-msgstr "システムポリシーが永続化システムのホスト名修正を阻止します。"
+#: ../test/nm-online.c:144
+msgid "Don't print anything"
+msgstr "出力を抑制する"
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7
-msgid "System policy prevents sharing connections via a protected WiFi network"
-msgstr "システムポリシーが保護された WiFi ネットワーク経由の接続共有を阻止します。"
+#: ../test/nm-online.c:162
+msgid "Waits for a successful connection in NetworkManager."
+msgstr ""
 
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8
-msgid "System policy prevents sharing connections via an open WiFi network"
-msgstr "システムポリシーが開放した WiFi ネットワーク経由の接続共有を阻止します。"
+#: ../test/nm-online.c:168 ../test/nm-online.c:177
+msgid "Invalid option.  Please use --help to see a list of valid options."
+msgstr "無効なオプションです。--help を使用して有効なオプションの一覧を確認してください。"
+
+#~ msgid "invalid IPv4 address '%s'"
+#~ msgstr "無効な IPv4 アドレス '%s'"
+
+#~ msgid "invalid prefix '%s'; <1-32> allowed"
+#~ msgstr "無効なプレフィックス '%s'; <1-32> 許可"
+
+#~ msgid "invalid gateway '%s'"
+#~ msgstr "無効なゲートウェイ '%s'"
+
+#~ msgid "invalid IPv6 address '%s'"
+#~ msgstr "無効な IPv6 アドレス '%s'"
+
+#~ msgid "invalid prefix '%s'; <1-128> allowed"
+#~ msgstr "無効なプレフィックス '%s'; <1-128> 許可"
+
+#~ msgid "invalid IPv4 route '%s'"
+#~ msgstr "無効な IPv4 ルート '%s'"
+
+#~ msgid "invalid prefix '%s'; <0-32> allowed"
+#~ msgstr "無効なプレフィックス '%s'; <0-32> 許可"
+
+#~ msgid "invalid next hop address '%s'"
+#~ msgstr "無効なネクストホップアドレス '%s'"
+
+#~ msgid "invalid metric '%s'"
+#~ msgstr "無効なメトリック '%s'"
+
+#~ msgid "invalid IPv6 route '%s'"
+#~ msgstr "無効な IPv6 ルート '%s'"
+
+#~ msgid "invalid prefix '%s'; <0-128> allowed"
+#~ msgstr "無効なプレフィックス '%s'; <0-128> 許可"
+
+#~ msgid "invalid priority map '%s'"
+#~ msgstr "無効な優先度マップ '%s'"
+
+#~ msgid "priority '%s' is not valid (<0-%ld>)"
+#~ msgstr "'%s' は有効な優先度ではありません (<0-%ld>)"
+
+#~ msgid "Setting name? "
+#~ msgstr "設定名は? "
+
+#~ msgid "Property name? "
+#~ msgstr "プロパティ名は? "
+
+#~ msgid "Enter connection type: "
+#~ msgstr "接続タイプを入力してください: "
+
+#~ msgid ""
+#~ "Usage: nmcli connection { COMMAND | help }\n"
+#~ "  COMMAND := { show | up | down | delete }\n"
+#~ "\n"
+#~ "  show configured [[ id | uuid | path ] ]\n"
+#~ "\n"
+#~ "  show active     [[ id | uuid | path | apath ] ]\n"
+#~ "\n"
+#~ "  up [ id | uuid | path ]  [ifname ] [ap ] [nsp ]\n"
+#~ "\n"
+#~ "  up [ id | uuid | path ]  [ifname ] [ap ]\n"
+#~ "\n"
+#~ "  down [ id | uuid | path | apath ] \n"
+#~ "\n"
+#~ "  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS\n"
+#~ "\n"
+#~ "  modify [ id | uuid | path ]  . \n"
+#~ "\n"
+#~ "  edit [ id | uuid | path ]   |  [type ] [con-name ]\n"
+#~ "\n"
+#~ "  delete [ id | uuid | path ] \n"
+#~ "\n"
+#~ "  reload\n"
+#~ "\n"
+#~ "\n"
+#~ msgstr ""
+#~ "使い方: nmcli connection { コマンド | help }\n"
+#~ "  コマンド := { show | up | down | delete }\n"
+#~ "\n"
+#~ "  show configured [[ id | uuid | path ] ]\n"
+#~ "\n"
+#~ "  show active     [[ id | uuid | path | apath ] ]\n"
+#~ "\n"
+#~ "  up [ id | uuid | path ]  [ifname ] [ap ] [nsp ]\n"
+#~ "\n"
+#~ "  up [ id | uuid | path ]  [ifname ] [ap ]\n"
+#~ "\n"
+#~ "  down [ id | uuid | path | apath ] \n"
+#~ "\n"
+#~ "  add 共通オプション タイプ固有オプション IP オプション\n"
+#~ "\n"
+#~ "  modify [ id | uuid | path ]  . \n"
+#~ "\n"
+#~ "  edit [ id | uuid | path ]   |  [type ] [con-name ]\n"
+#~ "\n"
+#~ "  delete [ id | uuid | path ] \n"
+#~ "\n"
+#~ "  reload\n"
+#~ "\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: nmcli connection add { OPTIONS | help }\n"
+#~ "  OPTIONS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS\n"
+#~ "\n"
+#~ "  COMMON_OPTIONS:\n"
+#~ "                  type \n"
+#~ "                  ifname  | \"*\"\n"
+#~ "                  [con-name ]\n"
+#~ "                  [autoconnect yes|no]\n"
+#~ "\n"
+#~ "  TYPE_SPECIFIC_OPTIONS:\n"
+#~ "    ethernet:     [mac ]\n"
+#~ "                  [cloned-mac ]\n"
+#~ "                  [mtu ]\n"
+#~ "\n"
+#~ "    wifi:         ssid \n"
+#~ "                  [mac ]\n"
+#~ "                  [cloned-mac ]\n"
+#~ "                  [mtu ]\n"
+#~ "\n"
+#~ "    wimax:        [mac ]\n"
+#~ "                  [nsp ]\n"
+#~ "\n"
+#~ "    gsm:          apn \n"
+#~ "                  [user ]\n"
+#~ "                  [password ]\n"
+#~ "\n"
+#~ "    cdma:         [user ]\n"
+#~ "                  [password ]\n"
+#~ "\n"
+#~ "    infiniband:   [mac ]\n"
+#~ "                  [mtu ]\n"
+#~ "                  [transport-mode datagram | connected]\n"
+#~ "                  [parent ]\n"
+#~ "                  [p-key ]\n"
+#~ "\n"
+#~ "    bluetooth:    [addr ]\n"
+#~ "                  [bt-type panu|dun-gsm|dun-cdma]\n"
+#~ "\n"
+#~ "    vlan:         dev \n"
+#~ "                  [id ]\n"
+#~ "                  [flags ]\n"
+#~ "                  [ingress ]\n"
+#~ "                  [egress ]\n"
+#~ "                  [mtu ]\n"
+#~ "\n"
+#~ "    bond:         [mode balance-rr (0) | active-backup (1) | balance-xor (2) | broadcast (3) |\n"
+#~ "                        802.3ad    (4) | balance-tlb   (5) | balance-alb (6)]\n"
+#~ "                  [miimon ]\n"
+#~ "                  [downdelay ]\n"
+#~ "                  [updelay ]\n"
+#~ "                  [arp-interval ]\n"
+#~ "                  [arp-ip-target ]\n"
+#~ "\n"
+#~ "    bond-slave:   master \n"
+#~ "\n"
+#~ "    team:         [config ]\n"
+#~ "\n"
+#~ "    team-slave:   master \n"
+#~ "                  [config ]\n"
+#~ "\n"
+#~ "    bridge:       [stp yes|no>]\n"
+#~ "                  [priority ]\n"
+#~ "                  [forward-delay <2-30>]\n"
+#~ "                  [hello-time <1-10>]\n"
+#~ "                  [max-age <6-40>]\n"
+#~ "                  [ageing-time <0-1000000>]\n"
+#~ "\n"
+#~ "    bridge-slave: master ]\n"
+#~ "                  [path-cost <1-65535>]\n"
+#~ "                  [hairpin yes|no]\n"
+#~ "\n"
+#~ "    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan\n"
+#~ "                  [user ]\n"
+#~ "\n"
+#~ "    olpc-mesh:    ssid \n"
+#~ "                  [channel <1-13>]\n"
+#~ "                  [dhcp-anycast ]\n"
+#~ "\n"
+#~ "  IP_OPTIONS:\n"
+#~ "                  [ip4 ] [gw4 ]\n"
+#~ "                  [ip6 ] [gw6 ]\n"
+#~ msgstr ""
+#~ "使い方: nmcli connection add { オプション | help }\n"
+#~ "  オプション := 共通オプション タイプ固有オプション IP オプション\n"
+#~ "\n"
+#~ "  共通オプション:\n"
+#~ "                  type \n"
+#~ "                  ifname  | \"*\"\n"
+#~ "                  [con-name ]\n"
+#~ "                  [autoconnect yes|no]\n"
+#~ "\n"
+#~ "  タイプ固有オプション:\n"
+#~ "    ethernet:     [mac ]\n"
+#~ "                  [cloned-mac ]\n"
+#~ "                  [mtu ]\n"
+#~ "\n"
+#~ "    wifi:         ssid \n"
+#~ "                  [mac ]\n"
+#~ "                  [cloned-mac ]\n"
+#~ "                  [mtu ]\n"
+#~ "\n"
+#~ "    wimax:        [mac ]\n"
+#~ "                  [nsp ]\n"
+#~ "\n"
+#~ "    gsm:          apn \n"
+#~ "                  [user ]\n"
+#~ "                  [password ]\n"
+#~ "\n"
+#~ "    cdma:         [user ]\n"
+#~ "                  [password ]\n"
+#~ "\n"
+#~ "    infiniband:   [mac ]\n"
+#~ "                  [mtu ]\n"
+#~ "                  [transport-mode datagram | connected]\n"
+#~ "                  [parent ]\n"
+#~ "                  [p-key ]\n"
+#~ "\n"
+#~ "    bluetooth:    [addr ]\n"
+#~ "                  [bt-type panu|dun-gsm|dun-cdma]\n"
+#~ "\n"
+#~ "    vlan:         dev \n"
+#~ "                  [id ]\n"
+#~ "                  [flags ]\n"
+#~ "                  [ingress ]\n"
+#~ "                  [egress ]\n"
+#~ "                  [mtu ]\n"
+#~ "\n"
+#~ "    bond:         [mode balance-rr (0) | active-backup (1) | balance-xor (2) | broadcast (3) |\n"
+#~ "                        802.3ad    (4) | balance-tlb   (5) | balance-alb (6)]\n"
+#~ "                  [miimon ]\n"
+#~ "                  [downdelay ]\n"
+#~ "                  [updelay ]\n"
+#~ "                  [arp-interval ]\n"
+#~ "                  [arp-ip-target ]\n"
+#~ "\n"
+#~ "    bond-slave:   master \n"
+#~ "\n"
+#~ "    team:         [config ]\n"
+#~ "\n"
+#~ "    team-slave:   master \n"
+#~ "                  [config ]\n"
+#~ "\n"
+#~ "    bridge:       [stp yes|no>]\n"
+#~ "                  [priority ]\n"
+#~ "                  [forward-delay <2-30>]\n"
+#~ "                  [hello-time <1-10>]\n"
+#~ "                  [max-age <6-40>]\n"
+#~ "                  [ageing-time <0-1000000>]\n"
+#~ "\n"
+#~ "    bridge-slave: master ]\n"
+#~ "                  [path-cost <1-65535>]\n"
+#~ "                  [hairpin yes|no]\n"
+#~ "\n"
+#~ "    vpn:          vpn-type vpnc|openvpn|pptp|openconnect|openswan\n"
+#~ "                  [user ]\n"
+#~ "\n"
+#~ "    olpc-mesh:    ssid \n"
+#~ "                  [channel <1-13>]\n"
+#~ "                  [dhcp-anycast ]\n"
+#~ "\n"
+#~ "  IP オプション:\n"
+#~ "                  [ip4 ] [gw4 ]\n"
+#~ "                  [ip6 ] [gw6 ]\n"
+
+#~ msgid "Error: 'list configured': %s"
+#~ msgstr "エラー: 'list configured': %s"
+
+#~ msgid "Error: 'list configured': %s; allowed fields: %s"
+#~ msgstr "エラー: 'list configured': %s; 許可フィールド: %s"
+
+#~ msgid "List of configured connections"
+#~ msgstr "設定されている接続の一覧"
+
+#~ msgid "Error: 'show configured': %s"
+#~ msgstr "エラー: 'show configured': %s"
+
+#~ msgid "Error: 'show configured': %s; allowed fields: %s"
+#~ msgstr "エラー: 'show configured': %s; 許可フィールド: %s"
+
+#~ msgid "Error: 'list active': %s"
+#~ msgstr "エラー: 'list active': %s"
+
+#~ msgid "Error: 'list active': %s; allowed fields: %s"
+#~ msgstr "エラー: 'list active': %s; 許可フィールド: %s"
+
+#~ msgid "List of active connections"
+#~ msgstr "アクティブな接続の一覧"
+
+#~ msgid "Error: 'show active': %s"
+#~ msgstr "エラー: 'show active': %s"
+
+#~ msgid "Error: 'show active': %s; allowed fields: %s"
+#~ msgstr "エラー: 'show active': %s; 許可フィールド: %s"
+
+#~ msgid "Error: Device '%s' is waiting for slaves before proceeding with activation."
+#~ msgstr "エラー: デバイス '%s' はアクティベートのプロセスを開始する前にスレーブを待機しています"
+
+#~ msgid "Connection (name, UUID, or path): "
+#~ msgstr "接続 (名前、UUID またはパス): "
+
+#~ msgid "Error: No connection specified."
+#~ msgstr "エラー: 接続が指定されていません。"
+
+#~ msgid "preparing"
+#~ msgstr "準備中"
+
+#~ msgid "Error: '%s': '%s' is not a valid %s MAC address."
+#~ msgstr "エラー: ''%s': '%s' は有効な %s MAC アドレスではありません。"
+
+#~ msgid "InfiniBand"
+#~ msgstr "InfiniBand"
+
+#~ msgid "Ethernet"
+#~ msgstr "Ethernet"
+
+#~ msgid "Error: 'mtu': '%s' is not a valid MTU."
+#~ msgstr "エラー: 'mtu': '%s' は有効な MTU ではありません。"
+
+#~ msgid "Error: 'parent': '%s' is not a valid interface name."
+#~ msgstr "エラー: 'parent': '%s' は有効なインターフェース名ではありません。"
+
+#~ msgid "Error: 'p-key': '%s' is not a valid InfiniBand P_KEY."
+#~ msgstr "エラー: 'p-key': '%s' は有効な InfiniBand P_KEY ではありません。"
+
+#~ msgid "Error: 'mode': '%s' is not a valid InfiniBand transport mode [datagram, connected]."
+#~ msgstr "エラー: 'mode': '%s' は有効な InfiniBand 転送モードではありません [datagram, connected]。"
+
+#~ msgid "Error: 'flags': '%s' is not valid; use <0-7>."
+#~ msgstr "エラー: 'flags': '%s' は無効です; <0-7> を使用してください。"
+
+#~ msgid "Error: '%s': '%s' is not valid; %s "
+#~ msgstr "エラー: '%s': '%s' は無効です; %s "
+
+#, fuzzy
+#~| msgid "Error: '%s': '%s' is not valid; use <%d-%d>."
+#~ msgid "Error: '%s': '%s' is not valid; use <%u-%u>."
+#~ msgstr "エラー: '%s': '%s' は無効です; <%d-%d> を使用してください。"
+
+#~ msgid "ethernet"
+#~ msgstr "Ethernet"
+
+#~ msgid "Wi-Fi"
+#~ msgstr "Wi-Fi"
+
+#~ msgid "There are 3 optional arguments for '%s' connection type.\n"
+#~ msgstr "'%s ' 接続タイプには 3 種類のオプション引数があります。\n"
+
+#~ msgid "Do you want to provide them? (yes/no) [yes] "
+#~ msgstr "指定しますか? (yes/no) [yes] "
+
+#~ msgid "MTU [auto]: "
+#~ msgstr "MTU [auto]: "
+
+#~ msgid "MAC [none]: "
+#~ msgstr "MAC [none]: "
+
+#~ msgid "Cloned MAC [none]: "
+#~ msgstr "クローンの MAC [none]: "
+
+#~ msgid "There are 5 optional arguments for 'InfiniBand' connection type.\n"
+#~ msgstr "'InfiniBand' 接続タイプには 5 種類のオプション引数があります。\n"
+
+#~ msgid "Transport mode (datagram or connected) [datagram]: "
+#~ msgstr "転送モード (datagram または connected) [datagram]: "
+
+#~ msgid "Parent interface [none]: "
+#~ msgstr "親インターフェース [none]: "
+
+#~ msgid "P_KEY [none]: "
+#~ msgstr "P_KEY [none]: "
+
+#~ msgid "Error: 'p-key' is mandatory when 'parent' is specified.\n"
+#~ msgstr "エラー: 'parent' を指定する場合、'p-key' は必須です。\n"
+
+#~ msgid "There is 1 optional argument for 'WiMax' connection type.\n"
+#~ msgstr "'WiMax' 接続タイプには 1 種類のオプション引数があります。\n"
+
+#~ msgid "Do you want to provide it? (yes/no) [yes] "
+#~ msgstr "指定しますか? (yes/no) [yes] "
+
+#~ msgid "There are 2 optional arguments for 'mobile broadband' connection type.\n"
+#~ msgstr "'モバイルブロードバンド' 接続タイプには 2 種類のオプション引数があります。\n"
+
+#~ msgid "Username [none]: "
+#~ msgstr "ユーザー名 [none]: "
+
+#~ msgid "Password [none]: "
+#~ msgstr "パスワード [none]: "
+
+#~ msgid "There is 1 optional argument for 'bluetooth' connection type.\n"
+#~ msgstr "'bluetooth' 接続タイプには 1 種類のオプション引数があります。\n"
+
+#~ msgid "Bluetooth type (panu, dun-gsm or dun-cdma) [panu]: "
+#~ msgstr "Bluetooth タイプ (panu、dun-gsm、dun-cdma) [panu]: "
+
+#~ msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n"
+#~ msgstr "エラー: ''bt-type': '%s' は有効な bluetooth タイプではありません。\n"
+
+#~ msgid "There are 4 optional arguments for 'VLAN' connection type.\n"
+#~ msgstr "'VLAN' 接続タイプには 4 種類のオプション引数があります。\n"
+
+#~ msgid "VLAN flags (<0-7>) [none]: "
+#~ msgstr "VLAN フラグ (<0-7>) [none]: "
+
+#~ msgid "Ingress priority maps [none]: "
+#~ msgstr "イングレス優先度マップ [none]: "
+
+#~ msgid "Egress priority maps [none]: "
+#~ msgstr "イーグレス優先度マップ [none]: "
+
+#~ msgid "There are 6 optional arguments for 'bond' connection type.\n"
+#~ msgstr "'ボンド' 接続タイプには 6 種類のオプション引数があります。\n"
+
+#~ msgid "Bonding mode [balance-rr]: "
+#~ msgstr "ボンドモード [balance-rr]: "
+
+#~ msgid "Bonding miimon [100]): "
+#~ msgstr "ボンド miimon [100]): "
+
+#, fuzzy
+#~| msgid "Error: 'miimon': '%s' is not a valid number <0-%d>.\n"
+#~ msgid "Error: 'miimon': '%s' is not a valid number <0-%u>.\n"
+#~ msgstr "エラー: 'miimon': '%s' は有効な数値ではありません <0-%d>。\n"
+
+#~ msgid "Bonding downdelay [0]): "
+#~ msgstr "ボンド downdelay [0]): "
+
+#, fuzzy
+#~| msgid "Error: 'downdelay': '%s' is not a valid number <0-%d>.\n"
+#~ msgid "Error: 'downdelay': '%s' is not a valid number <0-%u>.\n"
+#~ msgstr "エラー: 'downdelay': '%s' は有効な数値ではありません <0-%d>。\n"
+
+#~ msgid "Bonding updelay [0]): "
+#~ msgstr "ボンド  updelay [0]): "
+
+#, fuzzy
+#~| msgid "Error: 'updelay': '%s' is not a valid number <0-%d>.\n"
+#~ msgid "Error: 'updelay': '%s' is not a valid number <0-%u>.\n"
+#~ msgstr "Error: 'updelay': '%s' は有効な数値ではありません <0-%d>。\n"
+
+#~ msgid "Bonding arp-interval [0]): "
+#~ msgstr "ボンド arp-interval [0]): "
+
+#, fuzzy
+#~| msgid "Error: 'arp-interval': '%s' is not a valid number <0-%d>.\n"
+#~ msgid "Error: 'arp-interval': '%s' is not a valid number <0-%u>.\n"
+#~ msgstr "Error: 'arp-interval': '%s' は有効な数値ではありません <0-%d>。\n"
+
+#~ msgid "Bonding arp-ip-target [none]): "
+#~ msgstr "ボンド  arp-ip-target [none]): "
+
+#~ msgid "There are 6 optional arguments for 'bridge' connection type.\n"
+#~ msgstr "'ブリッジ' 接続タイプには 6 種類のオプション引数があります。\n"
+
+#~ msgid "Enable STP (yes/no) [yes]: "
+#~ msgstr "STP の有効化 (yes/no) [yes]: "
+
+#~ msgid "Error: 'stp': '%s'.\n"
+#~ msgstr "エラー:'stp': %s。\n"
+
+#~ msgid "STP priority [128]): "
+#~ msgstr "STP 優先度 [128]): "
+
+#~ msgid "Error: 'priority': '%s' is not a valid number <0-%d>.\n"
+#~ msgstr "エラー: '優先度': '%s' は有効な数値ではありません <0-%d>。\n"
+
+#~ msgid "Forward delay [15]): "
+#~ msgstr "フォワード遅延 [15]): "
+
+#~ msgid "Error: 'forward-delay': '%s' is not a valid number <2-30>.\n"
+#~ msgstr "エラー: 'フォワード遅延': '%s' は有効な数値ではありません <2-30>。\n"
+
+#~ msgid "Hello time [2]): "
+#~ msgstr "Hello タイム [2]): "
+
+#~ msgid "Error: 'hello-time': '%s' is not a valid number <1-10>.\n"
+#~ msgstr "エラー: 'hello タイム': '%s' は有効な数値ではありません <1-10>。\n"
+
+#~ msgid "Max age [20]): "
+#~ msgstr "最大エイジ [20]): "
+
+#~ msgid "Error: 'max-age': '%s' is not a valid number <6-40>.\n"
+#~ msgstr "エラー: '最大エイジ': '%s' は有効な数値ではありません <6-40>。\n"
+
+#~ msgid "MAC address ageing time [300]): "
+#~ msgstr "MAC アドレスエージングタイム [300]): "
+
+#~ msgid "Error: 'ageing-time': '%s' is not a valid number <0-1000000>.\n"
+#~ msgstr "エラー: 'エージングタイム': '%s' は有効な数値ではありません <0-1000000>。\n"
+
+#~ msgid "There are 3 optional arguments for 'bridge-slave' connection type.\n"
+#~ msgstr "'ブリッジスレーブ' 接続タイプには 3 種類のオプション引数があります。\n"
+
+#~ msgid "Bridge port priority [32]): "
+#~ msgstr "ブリッジポート優先度 [32]): "
+
+#~ msgid "Bridge port STP path cost [100]): "
+#~ msgstr "ブリッジポート STP パスコスト [100]): "
+
+#~ msgid "Hairpin (yes/no) [yes]: "
+#~ msgstr "ヘアピン (yes/no) [yes]: "
+
+#~ msgid "Error: 'hairpin': '%s'.\n"
+#~ msgstr "エラー: 'ヘアピン': '%s'。\n"
+
+#~ msgid "There is 1 optional argument for 'VPN' connection type.\n"
+#~ msgstr "'VPN' 接続タイプには 1 種類のオプション引数があります。\n"
+
+#~ msgid "There are 2 optional arguments for 'OLPC Mesh' connection type.\n"
+#~ msgstr "’OLPC メッシュ' 接続タイプには 2 種類のオプション引数があります。\n"
+
+#~ msgid "OLPC Mesh channel [1]): "
+#~ msgstr "OLPC メッシュチャンネル [1]): "
+
+#~ msgid "Error: 'channel': '%s' is not a valid number <1-13>.\n"
+#~ msgstr "エラー: 'channel': '%s' は有効な数値ではありません <1-13>。\n"
+
+#~ msgid "DHCP anycast MAC address [none]: "
+#~ msgstr "DHCP anycast MAC アドレス [none]: "
+
+#~ msgid "Do you want to add IP addresses? (yes/no) [yes] "
+#~ msgstr "IP アドレスを追加しますか? (yes/no) [yes] "
+
+#~ msgid "IPv4 address (IP[/plen] [gateway]) [none]: "
+#~ msgstr "IPv4 アドレス (IP[/plen] [gateway]) [none]: "
+
+#~ msgid "Error: "
+#~ msgstr "エラー: "
+
+#~ msgid "IPv6 address (IP[/plen] [gateway]) [none]: "
+#~ msgstr "IPv6 address (IP[/plen] [gateway]) [none]: "
+
+#~ msgid "Error: 'parent': not valid without 'p-key'."
+#~ msgstr "エラー: '親': 'p-key' がないと使用できません。"
+
+#~ msgid "SSID: "
+#~ msgstr "SSID: "
+
+#~ msgid "Error: 'ssid' is required."
+#~ msgstr "エラー: 'ssid' が必要です。"
+
+#~ msgid "WiMAX NSP name: "
+#~ msgstr "WiMAX NSP 名: "
+
+#~ msgid "Error: 'nsp' is required."
+#~ msgstr "エラー: 'nsp' が必要です。"
+
+#~ msgid "APN: "
+#~ msgstr "APN: "
+
+#~ msgid "Error: 'apn' is required."
+#~ msgstr "エラー: 'apn' が必要です。"
+
+#~ msgid "Bluetooth device address: "
+#~ msgstr "Bluetooth デバイスアドレス: "
+
+#~ msgid "Error: 'addr' is required."
+#~ msgstr "エラー: 'addr' が必要です。"
+
+#~ msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
+#~ msgstr "エラー: 'bt-type': '%s' は無効です; [%s, %s (%s), %s] を使用してください。"
+
+#~ msgid "VLAN parent device or connection UUID: "
+#~ msgstr "VLAN 親デバイスまたは接続 UUID: "
+
+#~ msgid "Error: 'dev' is required."
+#~ msgstr "エラー: 'dev' が必要です。"
+
+#~ msgid "VLAN ID <0-4095>: "
+#~ msgstr "VLAN ID <0-4095>: "
+
+#~ msgid "Error: 'id' is required."
+#~ msgstr "エラー: 'id' が必要です。"
+
+#~ msgid "Error: 'id': '%s' is not valid; use <0-4095>."
+#~ msgstr "エラー: 'id': '%s' は無効です; <0-4095> を使用してください。"
+
+#~ msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC."
+#~ msgstr "エラー: 'dev': '%s' は UUID、インターフェース名、MAC のいずれでもありません。"
+
+#~ msgid "Error: 'mode': %s."
+#~ msgstr "エラー: 'モード': %s。"
+
+#~ msgid "Bond master: "
+#~ msgstr "ボンドマスター: "
+
+#~ msgid "Error: 'master' is required."
+#~ msgstr "エラー: 'マスター' が必要です。"
+
+#~ msgid "Warning: 'type' is currently ignored. We only support ethernet slaves for now.\n"
+#~ msgstr "警告: 現在、'タイプ' は無視されています。対応しているのは Ethernet スレーブのみになります。\n"
+
+#~ msgid "Team master: "
+#~ msgstr "チームマスター: "
+
+#~ msgid "Bridge master: "
+#~ msgstr "ブリッジマスター: "
+
+#~ msgid "Error: 'master': '%s' is not valid UUID nor interface."
+#~ msgstr "エラー: 'マスター': '%s' は有効な UUID でもインターフェースでもありません。"
+
+#~ msgid "Error: 'hairpin': %s."
+#~ msgstr "エラー: 'ヘアピン': %s。"
+
+#~ msgid "VPN type: "
+#~ msgstr "VPN タイプ: "
+
+#~ msgid "Error: 'vpn-type' is required."
+#~ msgstr "エラー: ’vpn タイプ’ が必要です。"
+
+#~ msgid "Error: 'vpn-type': %s."
+#~ msgstr "エラー: 'vpn タイプ': %s。"
+
+#~ msgid "Error: 'channel': '%s' is not valid; use <1-13>."
+#~ msgstr "エラー: 'チャンネル': '%s' は無効です; <1-13> を使用してください。"
+
+#~ msgid "Error: '%s' is a not valid connection type."
+#~ msgstr "エラー: '%s' は無効な接続タイプです。"
+
+#~ msgid "Error: Failed to add '%s' connection: (%d) %s"
+#~ msgstr "エラー: '%s' 接続の追加に失敗しました: (%d) %s"
+
+#~ msgid "Connection '%s' (%s) successfully added.\n"
+#~ msgstr "接続 '%s' (%s) が正常に追加されました。\n"
+
+#~ msgid "Connection type: "
+#~ msgstr "接続タイプ: "
+
+#~ msgid "Error: 'type' argument is required."
+#~ msgstr "エラー: 'タイプ' 引数が必要です。"
+
+#~ msgid "Error: invalid connection type; %s."
+#~ msgstr "エラー: 無効な接続タイプ; %s。"
+
+#~ msgid "Error: 'autoconnect': %s."
+#~ msgstr "エラー: '自動接続': %s。"
+
+#~ msgid "Interface name [*]: "
+#~ msgstr "インターフェース名 [*]: "
+
+#~ msgid "Error: 'ifname': '%s' is not a valid interface nor '*'."
+#~ msgstr "エラー: 'ifname': '%s' は有効なインターフェースでも '*' でもありません。"
+
+#~ msgid "['%s' setting values]\n"
+#~ msgstr "['%s' 設定値]\n"
+
+#~ msgid ""
+#~ "---[ Main menu ]---\n"
+#~ "goto     [ | ]        :: go to a setting or property\n"
+#~ "remove   [.] |  :: remove setting or reset property value\n"
+#~ "set      [. ]  :: set property value\n"
+#~ "describe [.]          :: describe property\n"
+#~ "print    [all]                       :: print the connection\n"
+#~ "verify   [all]                       :: verify the connection\n"
+#~ "save                                 :: save the connection\n"
+#~ "back                                 :: go one level up (back)\n"
+#~ "help/?   []                 :: print this help\n"
+#~ "nmcli            :: nmcli configuration\n"
+#~ "quit                                 :: exit nmcli\n"
+#~ msgstr ""
+#~ "---[ メインメニュー ]---\n"
+#~ "goto     [ | ]        :: 設定またはプロパティへ移動\n"
+#~ "remove   [.] |  :: 設定の削除またはプロパティ値のリセット\n"
+#~ "set      [. ]  :: プロパティ値の設定\n"
+#~ "describe [.]          :: プロパティの詳細表示\n"
+#~ "print    [all]                       :: 接続の表示\n"
+#~ "verify   [all]                       :: 接続の確認\n"
+#~ "save                                 :: 接続の保存\n"
+#~ "back                                 :: 一つ上のレベルに移動 (戻る)\n"
+#~ "help/?   []                 :: このヘルプを表示\n"
+#~ "nmcli            :: nmcli 設定\n"
+#~ "quit                                 :: nmcli の終了\n"
+
+#~ msgid ""
+#~ "goto [.] |   :: enter setting/property for editation\n"
+#~ "\n"
+#~ "This command enters into a setting or property for editing it.\n"
+#~ "\n"
+#~ "Examples: nmcli> goto connection\n"
+#~ "          nmcli connection> goto secondaries\n"
+#~ "          nmcli> goto ipv4.addresses\n"
+#~ msgstr ""
+#~ "goto [.] |   :: 設定／プロパティを入力して変更\n"
+#~ "\n"
+#~ "設定やプロパティの変更モードに入ります。\n"
+#~ "\n"
+#~ "例: nmcli> goto connection\n"
+#~ "          nmcli connection> goto secondaries\n"
+#~ "          nmcli> goto ipv4.addresses\n"
+
+#~ msgid ""
+#~ "remove [.]  :: remove setting or reset property value\n"
+#~ "\n"
+#~ "This command removes an entire setting from the connection, or if a property\n"
+#~ "is given, resets that property to the default value.\n"
+#~ "\n"
+#~ "Examples: nmcli> remove wifi-sec\n"
+#~ "          nmcli> remove eth.mtu\n"
+#~ msgstr ""
+#~ "remove [.]  :: 設定の削除またはプロパティ値のリセット\n"
+#~ "\n"
+#~ "接続から全設定を削除します。または、プロパティを指定している場合には\n"
+#~ "そのプロパティをデフォルト値としてリセットします。\n"
+#~ "\n"
+#~ "例: nmcli> remove wifi-sec\n"
+#~ "          nmcli> remove eth.mtu\n"
+
+#~ msgid ""
+#~ "set [. ]  :: set property value\n"
+#~ "\n"
+#~ "This command sets property value.\n"
+#~ "\n"
+#~ "Example: nmcli> s con.id My connection\n"
+#~ msgstr ""
+#~ "set [. ]  :: プロパティ値の設定\n"
+#~ "\n"
+#~ "プロパティ値を設定します。\n"
+#~ "\n"
+#~ "例: nmcli> s con.id My connection\n"
+
+#~ msgid ""
+#~ "describe [.]  :: describe property\n"
+#~ "\n"
+#~ "Shows property description. You can consult nm-settings(5) manual page to see all NM settings and properties.\n"
+#~ msgstr ""
+#~ "set [. ]  :: プロパティ値の設定\n"
+#~ "\n"
+#~ "プロパティ値を設定します。\n"
+#~ "\n"
+#~ "例: nmcli> s con.id My connection\n"
+
+#~ msgid ""
+#~ "print [all]  :: print setting or connection values\n"
+#~ "\n"
+#~ "Shows current property or the whole connection.\n"
+#~ "\n"
+#~ "Example: nmcli ipv4> print all\n"
+#~ msgstr ""
+#~ "print [all]  :: 設定または接続値の表示\n"
+#~ "\n"
+#~ "現在のプロパティまたは接続全体を表示します。\n"
+#~ "\n"
+#~ "例: nmcli ipv4> print all\n"
+
+#~ msgid ""
+#~ "verify [all]  :: verify setting or connection validity\n"
+#~ "\n"
+#~ "Verifies whether the setting or connection is valid and can be saved later. It indicates invalid values on error.\n"
+#~ "\n"
+#~ "Examples: nmcli> verify\n"
+#~ "          nmcli bond> verify\n"
+#~ msgstr ""
+#~ "verify [all]  :: 設定または接続の有効性の確認\n"
+#~ "\n"
+#~ "設定または接続が有効かどうかを確認し、あとで保存することができます。エラーの場合には無効な値を表示します。\n"
+#~ "\n"
+#~ "例: nmcli> verify\n"
+#~ "          nmcli bond> verify\n"
+
+#~ msgid ""
+#~ "save  :: save the connection\n"
+#~ "\n"
+#~ "Sends the connection to NetworkManager that will save it.\n"
+#~ msgstr ""
+#~ "save  :: 接続の保存\n"
+#~ "\n"
+#~ "接続を保存する NetworkManager にこの接続を送信します。\n"
+
+#~ msgid ""
+#~ "back  :: go to upper menu level\n"
+#~ "\n"
+#~ msgstr ""
+#~ "back  :: 一つ上のメニューレベルに移動\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "help/? []  :: help for the nmcli commands\n"
+#~ "\n"
+#~ msgstr ""
+#~ "help/? []  :: nmcli コマンドのヘルプ\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "nmcli [ ]  :: nmcli configuration\n"
+#~ "\n"
+#~ "Configures nmcli. The following options are available:\n"
+#~ "status-line yes | no        [default: no]\n"
+#~ "save-confirmation yes | no  [default: yes]\n"
+#~ "prompt-color <0-8>          [default: 0]\n"
+#~ "  0 = normal\n"
+#~ "  1 = black\n"
+#~ "  2 = red\n"
+#~ "  3 = green\n"
+#~ "  4 = yellow\n"
+#~ "  5 = blue\n"
+#~ "  6 = magenta\n"
+#~ "  7 = cyan\n"
+#~ "  8 = white\n"
+#~ "\n"
+#~ "Examples: nmcli> nmcli status-line yes\n"
+#~ "          nmcli> nmcli save-confirmation no\n"
+#~ "          nmcli> nmcli prompt-color 3\n"
+#~ msgstr ""
+#~ "nmcli [ ]  :: nmcli 設定\n"
+#~ "\n"
+#~ "nmcli の設定を行ないます。次のオプションが使用可能です。\n"
+#~ "status-line yes | no        [デフォルト: no]\n"
+#~ "save-confirmation yes | no  [デフォルト: yes]\n"
+#~ "prompt-color <0-8>          [デフォルト: 0]\n"
+#~ "  0 = normal\n"
+#~ "  1 = black\n"
+#~ "  2 = red\n"
+#~ "  3 = green\n"
+#~ "  4 = yellow\n"
+#~ "  5 = blue\n"
+#~ "  6 = magenta\n"
+#~ "  7 = cyan\n"
+#~ "  8 = white\n"
+#~ "\n"
+#~ "例: nmcli> nmcli status-line yes\n"
+#~ "          nmcli> nmcli save-confirmation no\n"
+#~ "          nmcli> nmcli prompt-color 3\n"
+
+#~ msgid ""
+#~ "quit  :: exit nmcli\n"
+#~ "\n"
+#~ "This command exits nmcli. When the connection being edited is not saved, the user is asked to confirm the action.\n"
+#~ msgstr ""
+#~ "quit  :: nmcli の終了\n"
+#~ "\n"
+#~ "nmcli を終了します。変更した接続の保存を行なっていない場合、この動作の確認が求められます。\n"
+
+#~ msgid "Unknown command: '%s'\n"
+#~ msgstr "不明なコマンド: '%s'\n"
+
+#~ msgid ""
+#~ "---[ Property menu ]---\n"
+#~ "set      []               :: set new value\n"
+#~ "add      []               :: add new option to the property\n"
+#~ "change                           :: change current value\n"
+#~ "remove   [ |