From 867254ea7c2b193fecf8cd36cc6e5dc53c290d92 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 29 Jun 2012 20:12:44 +0200 Subject: Imported Upstream version 0.9.5.95 --- docs/Makefile.in | 11 +- docs/api/Makefile.in | 11 +- docs/api/html/NetworkManager.devhelp2 | 28 +- docs/api/html/index.html | 32 +- docs/api/html/ix01.html | 2 +- docs/api/html/ref-migrating.html | 58 +- docs/api/html/ref-settings.html | 48 +- docs/api/html/spec.html | 95 ++- docs/api/settings-spec.xml | 6 + docs/api/spec.html | 95 ++- docs/api/version.xml | 2 +- docs/libnm-glib/Makefile.am | 1 + docs/libnm-glib/Makefile.in | 12 +- docs/libnm-glib/html/NMDevice.html | 212 +++++- docs/libnm-glib/html/NMDeviceBond.html | 287 +++++++++ docs/libnm-glib/html/NMDeviceBt.html | 74 +++ docs/libnm-glib/html/NMDeviceEthernet.html | 68 ++ docs/libnm-glib/html/NMDeviceInfiniband.html | 293 +++++++++ docs/libnm-glib/html/NMDeviceModem.html | 62 ++ docs/libnm-glib/html/NMDeviceOlpcMesh.html | 324 ++++++++++ docs/libnm-glib/html/NMDeviceVlan.html | 333 ++++++++++ docs/libnm-glib/html/NMDeviceWifi.html | 82 +++ docs/libnm-glib/html/NMDeviceWimax.html | 72 ++- docs/libnm-glib/html/NMObject.html | 109 ++++ docs/libnm-glib/html/NMRemoteConnection.html | 67 ++ docs/libnm-glib/html/NMSecretAgent.html | 42 +- docs/libnm-glib/html/NMWimaxNsp.html | 4 +- docs/libnm-glib/html/api-index-full.html | 539 ++++++++-------- docs/libnm-glib/html/ch02.html | 14 +- docs/libnm-glib/html/index.html | 14 +- docs/libnm-glib/html/index.sgml | 169 +++++ docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html | 52 +- docs/libnm-glib/html/libnm-glib.devhelp2 | 139 ++++ docs/libnm-glib/html/object-tree.html | 8 +- docs/libnm-glib/libnm-glib-docs.xml | 4 + docs/libnm-glib/libnm-glib-sections.txt | 188 +++--- docs/libnm-glib/tmpl/nm-device-adsl.sgml | 93 +++ docs/libnm-glib/tmpl/nm-device-bond.sgml | 26 + docs/libnm-glib/tmpl/nm-device-bt.sgml | 28 + docs/libnm-glib/tmpl/nm-device-ethernet.sgml | 27 + .../tmpl/nm-device-infiniband-bindings.sgml | 29 - docs/libnm-glib/tmpl/nm-device-infiniband.sgml | 27 + docs/libnm-glib/tmpl/nm-device-modem.sgml | 26 + docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml | 25 + docs/libnm-glib/tmpl/nm-device-vlan.sgml | 27 + docs/libnm-glib/tmpl/nm-device-wifi.sgml | 29 + docs/libnm-glib/tmpl/nm-device-wimax.sgml | 27 + docs/libnm-glib/tmpl/nm-device.sgml | 83 +++ .../tmpl/nm-exported-connection-bindings.sgml | 213 ------- .../tmpl/nm-exported-connection-glue.sgml | 247 ------- docs/libnm-glib/tmpl/nm-object.sgml | 34 + docs/libnm-glib/tmpl/nm-secret-agent-glue.sgml | 240 ------- docs/libnm-glib/tmpl/nm-secret-agent.sgml | 17 + .../tmpl/nm-settings-system-bindings.sgml | 120 ---- docs/libnm-glib/tmpl/nm-vpn-plugin.sgml | 22 +- docs/libnm-util/Makefile.in | 11 +- docs/libnm-util/html/NMConnection.html | 48 +- docs/libnm-util/html/NMSetting.html | 7 +- docs/libnm-util/html/NMSettingBond.html | 547 ++++++++++++++++ docs/libnm-util/html/NMSettingConnection.html | 4 +- docs/libnm-util/html/NMSettingInfiniband.html | 318 +++++++++ docs/libnm-util/html/NMSettingOlpcMesh.html | 4 +- docs/libnm-util/html/NMSettingPPP.html | 288 +++++++-- docs/libnm-util/html/NMSettingPPPOE.html | 34 +- docs/libnm-util/html/NMSettingVlan.html | 708 +++++++++++++++++++++ docs/libnm-util/html/NMSettingWimax.html | 4 +- docs/libnm-util/html/NMSettingWireless.html | 43 ++ .../libnm-util/html/NMSettingWirelessSecurity.html | 8 + docs/libnm-util/html/api-index-full.html | 292 ++++++--- docs/libnm-util/html/ch01.html | 11 +- docs/libnm-util/html/index.html | 9 + docs/libnm-util/html/index.sgml | 118 ++++ docs/libnm-util/html/libnm-util-nm-utils.html | 37 ++ docs/libnm-util/html/libnm-util.devhelp2 | 95 +++ docs/libnm-util/html/object-tree.html | 18 +- docs/libnm-util/libnm-util-docs.sgml | 3 + docs/libnm-util/libnm-util-sections.txt | 44 ++ docs/libnm-util/libnm-util.types | 2 + docs/libnm-util/tmpl/libnm-util-unused.sgml | 260 -------- docs/libnm-util/tmpl/nm-connection.sgml | 9 + docs/libnm-util/tmpl/nm-setting-wireless.sgml | 21 + 81 files changed, 6066 insertions(+), 1774 deletions(-) create mode 100644 docs/libnm-glib/html/NMDeviceBond.html create mode 100644 docs/libnm-glib/html/NMDeviceInfiniband.html create mode 100644 docs/libnm-glib/html/NMDeviceOlpcMesh.html create mode 100644 docs/libnm-glib/html/NMDeviceVlan.html create mode 100644 docs/libnm-glib/tmpl/nm-device-adsl.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-device-infiniband-bindings.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-exported-connection-bindings.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-exported-connection-glue.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-secret-agent-glue.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-settings-system-bindings.sgml create mode 100644 docs/libnm-util/html/NMSettingBond.html create mode 100644 docs/libnm-util/html/NMSettingInfiniband.html create mode 100644 docs/libnm-util/html/NMSettingVlan.html (limited to 'docs') diff --git a/docs/Makefile.in b/docs/Makefile.in index ab5c8c88..558a1a60 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -46,7 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -174,6 +174,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -269,6 +273,9 @@ UDEV_BASE_DIR = @UDEV_BASE_DIR@ USE_NLS = @USE_NLS@ UUID_CFLAGS = @UUID_CFLAGS@ UUID_LIBS = @UUID_LIBS@ +VAPIGEN = @VAPIGEN@ +VAPIGEN_MAKEFILE = @VAPIGEN_MAKEFILE@ +VAPIGEN_VAPIDIR = @VAPIGEN_VAPIDIR@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ @@ -307,6 +314,8 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in index 40f1784f..31eeeb6e 100644 --- a/docs/api/Makefile.in +++ b/docs/api/Makefile.in @@ -55,7 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -178,6 +178,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ @@ -273,6 +277,9 @@ UDEV_BASE_DIR = @UDEV_BASE_DIR@ USE_NLS = @USE_NLS@ UUID_CFLAGS = @UUID_CFLAGS@ UUID_LIBS = @UUID_LIBS@ +VAPIGEN = @VAPIGEN@ +VAPIGEN_MAKEFILE = @VAPIGEN_MAKEFILE@ +VAPIGEN_VAPIDIR = @VAPIGEN_VAPIDIR@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ @@ -311,6 +318,8 @@ htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2 index ba5d51b3..af8fdfaf 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 2c9b8d1b..0fc54781 100644 --- a/docs/api/html/index.html +++ b/docs/api/html/index.html @@ -22,11 +22,11 @@     
  

-

Version 0.9.4.0 +

Version 0.9.5.95

Copyright © 2011 The NetworkManager Authors

-

+

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

D-Bus API Reference
Network Configuration Setting Specification
-
Configuration Settings
+
Configuration Settings
Secret flag types
Migrating from NetworkManager 0.8 to NetworkManager 0.9
-
Architecture and D-Bus API Changes in 0.9
+
Architecture and D-Bus API Changes in 0.9
-
Elimination of the User Settings Service
-
User Secret Agents
-
Settings Service Interface Changes
-
Connection Object Interface Changes
-
Permissions Methods Consolidation
-
AddConnection Returns Object Path of New Connection
-
Support for WiMAX Devices
-
New Device States
-
New Active Connection State
-
Consolidated Modem Devices
-
Secret Property Flags
-
Deprecated Methods Removed
+
Elimination of the User Settings Service
+
User Secret Agents
+
Settings Service Interface Changes
+
Connection Object Interface Changes
+
Permissions Methods Consolidation
+
AddConnection Returns Object Path of New Connection
+
Support for WiMAX Devices
+
New Device States
+
New Active Connection State
+
Consolidated Modem Devices
+
Secret Property Flags
+
Deprecated Methods Removed
Index
diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html index 5affd5c8..d2ae0ae2 100644 --- a/docs/api/html/ix01.html +++ b/docs/api/html/ix01.html @@ -21,7 +21,7 @@

-Index

+Index
diff --git a/docs/api/html/ref-migrating.html b/docs/api/html/ref-migrating.html index 56c6f912..b18b7aa6 100644 --- a/docs/api/html/ref-migrating.html +++ b/docs/api/html/ref-migrating.html @@ -23,20 +23,20 @@

Migrating from NetworkManager 0.8 to NetworkManager 0.9

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

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

-Architecture and D-Bus API Changes in 0.9

+Architecture and D-Bus API Changes in 0.9

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

-Elimination of the User Settings Service

+Elimination of the User Settings Service

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

-User Secret Agents

+User Secret Agents

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

-Settings Service Interface Changes

+Settings Service Interface Changes

With the elimination of the user settings service, the old org.freedesktop.NetworkManagerUserSettings and @@ -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,7 +224,7 @@

-Permissions Methods Consolidation

+Permissions Methods Consolidation

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

-

Table 20. 

+

Table 20. 

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

+

Table 21. 

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

+

Table 22. 

diff --git a/docs/api/html/ref-settings.html b/docs/api/html/ref-settings.html index 7278b958..faff8ce8 100644 --- a/docs/api/html/ref-settings.html +++ b/docs/api/html/ref-settings.html @@ -23,7 +23,7 @@

Network Configuration Setting Specification

-
Configuration Settings
+
Configuration Settings
Secret flag types

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

-Configuration Settings

+Configuration Settings

-

Table 1. 802-1x setting

+

Table 1. 802-1x setting

@@ -246,7 +246,7 @@


-

Table 2. bluetooth setting

+

Table 2. bluetooth setting

@@ -285,7 +285,7 @@


-

Table 3. bond setting

+

Table 3. bond setting

@@ -324,7 +324,7 @@


-

Table 4. cdma setting

+

Table 4. cdma setting

@@ -375,7 +375,7 @@


-

Table 5. connection setting

+

Table 5. connection setting

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


-

Table 6. gsm setting

+

Table 6. gsm setting

@@ -555,7 +555,7 @@


-

Table 7. infiniband setting

+

Table 7. infiniband setting

@@ -600,7 +600,7 @@


-

Table 8. ipv4 setting

+

Table 8. ipv4 setting

@@ -699,7 +699,7 @@


-

Table 9. ipv6 setting

+

Table 9. ipv6 setting

@@ -786,7 +786,7 @@


-

Table 10. 802-11-olpc-mesh setting

+

Table 10. 802-11-olpc-mesh setting

@@ -831,7 +831,7 @@


-

Table 11. ppp setting

+

Table 11. ppp setting

@@ -966,7 +966,7 @@


-

Table 12. pppoe setting

+

Table 12. pppoe setting

@@ -1017,7 +1017,7 @@


-

Table 13. serial setting

+

Table 13. serial setting

@@ -1074,7 +1074,7 @@


-

Table 14. vlan setting

+

Table 14. vlan setting

@@ -1137,7 +1137,7 @@


-

Table 15. vpn setting

+

Table 15. vpn setting

@@ -1188,7 +1188,7 @@


-

Table 16. wimax setting

+

Table 16. wimax setting

@@ -1227,7 +1227,7 @@


-

Table 17. 802-3-ethernet setting

+

Table 17. 802-3-ethernet setting

@@ -1320,7 +1320,7 @@


-

Table 18. 802-11-wireless setting

+

Table 18. 802-11-wireless setting

@@ -1419,13 +1419,19 @@ + + + + + +

 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.

 
 

 

 


 

 

-
Table 19. 802-11-wireless-security setting

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

 
diff --git a/docs/api/html/spec.html b/docs/api/html/spec.html
index a75799e7..80c10325 100644
--- a/docs/api/html/spec.html
+++ b/docs/api/html/spec.html
@@ -1,5 +1,5 @@
 
-NetworkManager D-Bus Interface Specification version 0.9.4.0
NetworkManager D-Bus Interface Specification
Version 0.9.4.0
Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.

+        
NetworkManager D-Bus Interface Specification
Version 0.9.5.95
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
@@ -112,7 +112,7 @@ General Public License for more details.

 
You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

-
Interfaces

+
Interfaces
org.freedesktop.NetworkManager
Methods:
GetDevices (
         
         ) →
@@ -461,6 +461,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.s -
       (read)

         The driver handling the device.
+      
DriverVersion -
+      s -
+      (read)

+        The version of the driver handling the device.
+      
FirmwareVersion -
+      s -
+      (read)

+        The firmware version for the device.
       
Capabilities -
       u -
       (read)
@@ -512,6 +520,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.b -
       (read)

         Whether or not this device is managed by NetworkManager.
+      
Autoconnect -
+      b -
+      (readwrite)

+        If TRUE, indicates the device is allowed to autoconnect.  If FALSE,
+        manual intervention is required before the device will automatically
+        connect to a known network, such as activating a connection using the
+        device, or setting this property to TRUE.
       
FirmwareMissing -
       b -
       (read)

@@ -673,6 +688,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED = 50

           A dependency of the connection failed.
+        
NM_DEVICE_STATE_REASON_BR2684_FAILED = 50

+          Problem with the RFC 2684 Ethernet over ADSL bridge.
         
Sets of flags:
NM_DEVICE_CAP
NM_DEVICE_CAP_NONE = 0x0
Null capability.
NM_DEVICE_CAP_NM_SUPPORTED = 0x1
The device is supported by NetworkManager.
NM_DEVICE_CAP_CARRIER_DETECT = 0x2
The device supports carrier detection.
Structure types:
NM_DEVICE_STATE_REASON_STRUCT - (
         u: state, u: reason
         )
@@ -722,6 +739,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Returns
access_points -
       ao

           List of access point object paths
+        
RequestScan (
+        a{sv}: options
+        ) →
+        nothing

+        Request the device to scan
+      
Parameters
options -
+      a{sv}

+          Options of scan
         
Signals:
PropertiesChanged (
         a{sv}: properties
         )

@@ -990,6 +1015,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
+  
org.freedesktop.NetworkManager.Device.Adsl
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary mapping property names to variant boxed values
+            
Properties:
Carrier -
+      b -
+      (read)

+        Indicates whether the physical carrier is found.
+      

+
   
org.freedesktop.NetworkManager.WiMax.Nsp
Interface has no methods.
Signals:
PropertiesChanged (
         a{sv}: properties
         )
Parameters
properties -
@@ -1384,6 +1422,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED = 0x4

+              Set if the request was initiated by user-requested action via the
+              D-Bus interface, as opposed to automatically initiated by
+              NetworkManager in response to (for example) scan results or
+              carrier changes.
             

 
 
@@ -1488,7 +1531,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

         Disconnect the plugin.
-      
Possible errors
org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress
The request could not be processed because the VPN connection is already being stopped.(generic description)
org.freedesktop.NetworkManager.VPN.Error.AlreadyStopped
The request could not be processed because the VPN connection was already stopped.(generic description)
SetIp4Config (
+      
Possible errors
org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress
The request could not be processed because the VPN connection is already being stopped.(generic description)
org.freedesktop.NetworkManager.VPN.Error.AlreadyStopped
The request could not be processed because the VPN connection was already stopped.(generic description)
SetConfig (
+        a{sv}: config
+        ) →
+        nothing

+        Set generic connection details on the connection.
+      
Parameters
config -
+      a{sv}
+      (String_Variant_Map)
+    

+          Generic configuration details for the connection.
+        
SetIp4Config (
         a{sv}: config
         ) →
         nothing

@@ -1497,7 +1550,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.a{sv}
       (String_Variant_Map)
     

-          Ip4Config details for the conneciton.
+          Ip4Config details for the connection. You must call
+	  SetConfig() before calling this.
+        
SetIp6Config (
+        a{sv}: config
+        ) →
+        nothing

+        Set IPv6 details on the connection.
+      
Parameters
config -
+      a{sv}
+      (String_Variant_Map)
+    

+          Ip6Config details for the connection. You must call
+	  SetConfig() before calling this.
         
SetFailure (
         s: reason
         ) →
@@ -1515,6 +1580,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.NM_VPN_CONNECTION_STATE)
     

           The new state of the plugin.
+        
Config (
+        a{sv}: config
+        )

+        The plugin obtained generic configuration information.
+      
Parameters
config -
+      a{sv}
+      (String_Variant_Map)
+    

+          The configuration information.
         
Ip4Config (
         a{sv}: ip4config
         )

@@ -1524,6 +1598,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.String_Variant_Map)
     

           The IPv4 configuration.
+        
Ip6Config (
+        a{sv}: ip6config
+        )

+        The plugin obtained an IPv6 configuration.
+      
Parameters
ip6config -
+      a{sv}
+      (String_Variant_Map)
+    

+          The IPv6 configuration.
         
LoginBanner (
         s: banner
         )

@@ -1597,7 +1680,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.org.freedesktop.NetworkManager.VPN.Error.BadArgumentsInvalid arguments were passed with the request.  FIXME: too general.
   
org.freedesktop.NetworkManager.VPN.Error.LaunchFailed
A binary providing the service failed to launch.
   
org.freedesktop.NetworkManager.VPN.Error.ConnectionInvalid
The request could not be processed because the VPN connection settings were invalid.
-
Index
Index of interfaces
Index of types

 
 

   

diff --git a/docs/api/spec.html b/docs/api/spec.html
index a75799e7..80c10325 100644
--- a/docs/api/spec.html
+++ b/docs/api/spec.html
@@ -1,5 +1,5 @@
 
-NetworkManager D-Bus Interface Specification version 0.9.4.0
NetworkManager D-Bus Interface Specification
Version 0.9.4.0
Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.

+        
NetworkManager D-Bus Interface Specification
Version 0.9.5.95
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
@@ -112,7 +112,7 @@ General Public License for more details.

 
You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

-
Interfaces

+
Interfaces

   
org.freedesktop.NetworkManager
Methods:
GetDevices (
         
         ) →
@@ -461,6 +461,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.s -
       (read)

         The driver handling the device.
+      
DriverVersion -
+      s -
+      (read)

+        The version of the driver handling the device.
+      
FirmwareVersion -
+      s -
+      (read)

+        The firmware version for the device.
       
Capabilities -
       u -
       (read)
@@ -512,6 +520,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.b -
       (read)

         Whether or not this device is managed by NetworkManager.
+      
Autoconnect -
+      b -
+      (readwrite)

+        If TRUE, indicates the device is allowed to autoconnect.  If FALSE,
+        manual intervention is required before the device will automatically
+        connect to a known network, such as activating a connection using the
+        device, or setting this property to TRUE.
       
FirmwareMissing -
       b -
       (read)

@@ -673,6 +688,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED = 50

           A dependency of the connection failed.
+        
NM_DEVICE_STATE_REASON_BR2684_FAILED = 50

+          Problem with the RFC 2684 Ethernet over ADSL bridge.
         
Sets of flags:
NM_DEVICE_CAP
NM_DEVICE_CAP_NONE = 0x0
Null capability.
NM_DEVICE_CAP_NM_SUPPORTED = 0x1
The device is supported by NetworkManager.
NM_DEVICE_CAP_CARRIER_DETECT = 0x2
The device supports carrier detection.
Structure types:
NM_DEVICE_STATE_REASON_STRUCT - (
         u: state, u: reason
         )
@@ -722,6 +739,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Returns
access_points -
       ao

           List of access point object paths
+        
RequestScan (
+        a{sv}: options
+        ) →
+        nothing

+        Request the device to scan
+      
Parameters
options -
+      a{sv}

+          Options of scan
         
Signals:
PropertiesChanged (
         a{sv}: properties
         )

@@ -990,6 +1015,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
+  
org.freedesktop.NetworkManager.Device.Adsl
Interface has no methods.
Signals:
PropertiesChanged (
+        a{sv}: properties
+        )
Parameters
properties -
+      a{sv}
+      (String_Variant_Map)
+    

+                A dictionary mapping property names to variant boxed values
+            
Properties:
Carrier -
+      b -
+      (read)

+        Indicates whether the physical carrier is found.
+      

+
   
org.freedesktop.NetworkManager.WiMax.Nsp
Interface has no methods.
Signals:
PropertiesChanged (
         a{sv}: properties
         )
Parameters
properties -
@@ -1384,6 +1422,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED = 0x4

+              Set if the request was initiated by user-requested action via the
+              D-Bus interface, as opposed to automatically initiated by
+              NetworkManager in response to (for example) scan results or
+              carrier changes.
             

 
 
@@ -1488,7 +1531,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

         Disconnect the plugin.
-      
Possible errors
org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress
The request could not be processed because the VPN connection is already being stopped.(generic description)
org.freedesktop.NetworkManager.VPN.Error.AlreadyStopped
The request could not be processed because the VPN connection was already stopped.(generic description)
SetIp4Config (
+      
Possible errors
org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress
The request could not be processed because the VPN connection is already being stopped.(generic description)
org.freedesktop.NetworkManager.VPN.Error.AlreadyStopped
The request could not be processed because the VPN connection was already stopped.(generic description)
SetConfig (
+        a{sv}: config
+        ) →
+        nothing

+        Set generic connection details on the connection.
+      
Parameters
config -
+      a{sv}
+      (String_Variant_Map)
+    

+          Generic configuration details for the connection.
+        
SetIp4Config (
         a{sv}: config
         ) →
         nothing

@@ -1497,7 +1550,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.a{sv}
       (String_Variant_Map)
     

-          Ip4Config details for the conneciton.
+          Ip4Config details for the connection. You must call
+	  SetConfig() before calling this.
+        
SetIp6Config (
+        a{sv}: config
+        ) →
+        nothing

+        Set IPv6 details on the connection.
+      
Parameters
config -
+      a{sv}
+      (String_Variant_Map)
+    

+          Ip6Config details for the connection. You must call
+	  SetConfig() before calling this.
         
SetFailure (
         s: reason
         ) →
@@ -1515,6 +1580,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.NM_VPN_CONNECTION_STATE)
     

           The new state of the plugin.
+        
Config (
+        a{sv}: config
+        )

+        The plugin obtained generic configuration information.
+      
Parameters
config -
+      a{sv}
+      (String_Variant_Map)
+    

+          The configuration information.
         
Ip4Config (
         a{sv}: ip4config
         )

@@ -1524,6 +1598,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.String_Variant_Map)
     

           The IPv4 configuration.
+        
Ip6Config (
+        a{sv}: ip6config
+        )

+        The plugin obtained an IPv6 configuration.
+      
Parameters
ip6config -
+      a{sv}
+      (String_Variant_Map)
+    

+          The IPv6 configuration.
         
LoginBanner (
         s: banner
         )

@@ -1597,7 +1680,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.org.freedesktop.NetworkManager.VPN.Error.BadArgumentsInvalid arguments were passed with the request.  FIXME: too general.
   
org.freedesktop.NetworkManager.VPN.Error.LaunchFailed
A binary providing the service failed to launch.
   
org.freedesktop.NetworkManager.VPN.Error.ConnectionInvalid
The request could not be processed because the VPN connection settings were invalid.
-
Index
Index of interfaces
Index of types

 

@@ -107,10 +118,10 @@ const char *        NMDeviceModem
                +----NMDeviceBt
                +----NMDeviceWimax
-               +----NMDeviceOlpcMesh
-               +----NMDeviceInfiniband
-               +----NMDeviceBond
-               +----NMDeviceVlan
+               +----NMDeviceOlpcMesh
+               +----NMDeviceInfiniband
+               +----NMDeviceBond
+               +----NMDeviceVlan
 
 

 

@@ -123,12 +134,15 @@ NMDevice implements
 
Properties

 
   "active-connection"        NMActiveConnection*   : Read
+  "autoconnect"              gboolean              : Read / Write
   "capabilities"             guint                 : Read
   "device-type"              guint                 : Read
   "dhcp4-config"             NMDHCP4Config*        : Read
   "dhcp6-config"             NMDHCP6Config*        : Read
   "driver"                   gchar*                : Read
+  "driver-version"           gchar*                : Read
   "firmware-missing"         gboolean              : Read
+  "firmware-version"         gchar*                : Read
   "interface"                gchar*                : Read
   "ip-interface"             gchar*                : Read
   "ip4-config"               NMIP4Config*          : Read
@@ -207,6 +221,14 @@ NMDevice implements
 

 

 

+
NM_DEVICE_AUTOCONNECT

+
#define NM_DEVICE_AUTOCONNECT "autoconnect"
+

+

+

+

+

+

 
NM_DEVICE_CAPABILITIES

 
#define NM_DEVICE_CAPABILITIES "capabilities"
 

@@ -247,6 +269,14 @@ NMDevice implements
 

 

 

+
NM_DEVICE_DRIVER_VERSION

+
#define NM_DEVICE_DRIVER_VERSION "driver-version"
+

+

+

+

+

+

 
NM_DEVICE_FIRMWARE_MISSING

 
#define NM_DEVICE_FIRMWARE_MISSING "firmware-missing"
 

@@ -255,6 +285,14 @@ NMDevice implements
 

 

 

+
NM_DEVICE_FIRMWARE_VERSION

+
#define NM_DEVICE_FIRMWARE_VERSION "firmware-version"
+

+

+

+

+

+

 
NM_DEVICE_INTERFACE

 
#define NM_DEVICE_INTERFACE "interface"
 

@@ -335,6 +373,52 @@ NMDevice implements
 

 

 

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

+

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

+

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


device :
an NMDevice to validate connection against
connection :
an NMConnection to validate against device
+
error :
return location for a GError, or NULL
+
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);

@@ -466,6 +550,29 @@ not part of an active connection. [
+
nm_device_get_autoconnect ()

+
gboolean            nm_device_get_autoconnect           (NMDevice *device);

+

+Whether the NMDevice can be autoconnected.
+

+

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


device :
a NMDevice
+
Returns :

+TRUE if the device is allowed to be autoconnected

+

+

+

 
nm_device_get_capabilities ()

 
NMDeviceCapabilities nm_device_get_capabilities         (NMDevice *device);

 

@@ -581,6 +688,29 @@ device, and must not be modified.
 

 

 

+
nm_device_get_driver_version ()

+
const char *        nm_device_get_driver_version        (NMDevice *device);

+

+Gets the driver version of the NMDevice.
+

+

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


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

+

+

+

 
nm_device_get_firmware_missing ()

 
gboolean            nm_device_get_firmware_missing      (NMDevice *device);

 

@@ -606,6 +736,29 @@ to be missing.
 

 

 

+
nm_device_get_firmware_version ()

+
const char *        nm_device_get_firmware_version      (NMDevice *device);

+

+Gets the firmware version of the NMDevice.
+

+

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


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

+

+

+

 
nm_device_get_iface ()

 
const char *        nm_device_get_iface                 (NMDevice *device);

 

@@ -869,6 +1022,30 @@ Creates a new 
 

 

+

+

+
nm_device_set_autoconnect ()

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

+

+Enables or disables automatic activation of the NMDevice.
+

+

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


device :
a NMDevice
+
autoconnect :

+TRUE to enable autoconnecting

+

 

 

 
Property Details

@@ -881,6 +1058,15 @@ The 
 

 

+
The "autoconnect" property

+
  "autoconnect"              gboolean              : Read / Write

+

+Whether the device can auto-activate a connection.
+

+
Default value: TRUE

+

+

+

 
The "capabilities" property

 
  "capabilities"             guint                 : Read

 

@@ -924,6 +1110,15 @@ The driver of the device.
 

 

 

+
The "driver-version" property

+
  "driver-version"           gchar*                : Read

+

+The version of the device driver.
+

+
Default value: NULL

+

+

+

 
The "firmware-missing" property

 
  "firmware-missing"         gboolean              : Read

 

@@ -934,6 +1129,15 @@ for its operation.
 

 

 

+
The "firmware-version" property

+
  "firmware-version"         gchar*                : Read

+

+The firmware version of the device.
+

+
Default value: NULL

+

+

+

 
The "interface" property

 
  "interface"                gchar*                : Read

 

diff --git a/docs/libnm-glib/html/NMDeviceBond.html b/docs/libnm-glib/html/NMDeviceBond.html
new file mode 100644
index 00000000..0fb8a415
--- /dev/null
+++ b/docs/libnm-glib/html/NMDeviceBond.html
@@ -0,0 +1,287 @@
+
+
+
+
+NMDeviceBond
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+

+
+
+

+
NMDeviceBond

+
NMDeviceBond

+

+

+
Synopsis

+
                    NMDeviceBond;
+                    NMDeviceBondClass;
+enum                NMDeviceBondError;
+#define             NM_DEVICE_BOND_CARRIER
+#define             NM_DEVICE_BOND_ERROR
+#define             NM_DEVICE_BOND_HW_ADDRESS
+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);
+GObject *           nm_device_bond_new                  (DBusGConnection *connection,
+                                                         const char *path);
+

+

+

+
Object Hierarchy

+
+  GObject
+   +----NMObject
+         +----NMDevice
+               +----NMDeviceBond
+

+

+

+
Implemented Interfaces

+

+NMDeviceBond implements
+ GInitable and  GAsyncInitable.

+

+

+
Properties

+
+  "carrier"                  gboolean              : Read
+  "hw-address"               gchar*                : Read
+

+

+

+
Description

+

+

+

+

+
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 >*/
+	NM_DEVICE_BOND_ERROR_NOT_BOND_CONNECTION,     /*< nick=NotBondConnection >*/
+	NM_DEVICE_BOND_ERROR_INVALID_BOND_CONNECTION, /*< nick=InvalidBondConnection >*/
+	NM_DEVICE_BOND_ERROR_INTERFACE_MISMATCH,      /*< nick=InterfaceMismatch >*/
+} NMDeviceBondError;
+

+

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


NM_DEVICE_BOND_ERROR_UNKNOWN
unknown or unclassified error
+
NM_DEVICE_BOND_ERROR_NOT_BOND_CONNECTION
the connection was not of bond type
+
NM_DEVICE_BOND_ERROR_INVALID_BOND_CONNECTION
the bond connection was invalid
+
NM_DEVICE_BOND_ERROR_INTERFACE_MISMATCH
the interfaces of the connection and the device mismatched
+

+

+

+

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

+
#define NM_DEVICE_BOND_HW_ADDRESS  "hw-address"
+

+

+

+

+

+

+
nm_device_bond_error_quark ()

+
GQuark              nm_device_bond_error_quark          (void);

+

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

+

+Whether the device has carrier.
+

+

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


device :
a NMDeviceBond
+
Returns :

+TRUE if the device has carrier

+

+

+

+
nm_device_bond_get_hw_address ()

+
const char *        nm_device_bond_get_hw_address       (NMDeviceBond *device);

+

+Gets the hardware (MAC) address of the NMDeviceBond
+

+

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


device :
a NMDeviceBond
+
Returns :
the hardware address. This is the internal string used by the
+device, and must not be modified.

+

+

+

+
nm_device_bond_new ()

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

+

+Creates a new NMDeviceBond.
+

+

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


connection :
the DBusGConnection
+
path :
the DBus object path of the device
Returns :
a new device. [transfer full]
+

+

+

+

+
Property Details

+

+
The "carrier" property

+
  "carrier"                  gboolean              : Read

+

+Whether the device has carrier.
+

+
Default value: FALSE

+

+

+

+
The "hw-address" property

+
  "hw-address"               gchar*                : Read

+

+The hardware (MAC) address of the device.
+

+
Default value: NULL

+

+

+

+

+

+          Generated by GTK-Doc V1.18

+
+
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceBt.html b/docs/libnm-glib/html/NMDeviceBt.html
index b41291a5..bc766453 100644
--- a/docs/libnm-glib/html/NMDeviceBt.html
+++ b/docs/libnm-glib/html/NMDeviceBt.html
@@ -45,9 +45,12 @@
 
Synopsis

 
                    NMDeviceBt;
                     NMDeviceBtClass;
+enum                NMDeviceBtError;
 #define             NM_DEVICE_BT_CAPABILITIES
+#define             NM_DEVICE_BT_ERROR
 #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);
@@ -111,6 +114,54 @@ NMDeviceBt implements
 

 

 

+
enum NMDeviceBtError

+
typedef enum {
+	NM_DEVICE_BT_ERROR_UNKNOWN = 0,           /*< nick=UnknownError >*/
+	NM_DEVICE_BT_ERROR_NOT_BT_CONNECTION,     /*< nick=NotBtConnection >*/
+	NM_DEVICE_BT_ERROR_INVALID_BT_CONNECTION, /*< nick=InvalidBtConnection >*/
+	NM_DEVICE_BT_ERROR_INVALID_DEVICE_MAC,    /*< nick=InvalidDeviceMac >*/
+	NM_DEVICE_BT_ERROR_MAC_MISMATCH,          /*< nick=MacMismatch >*/
+	NM_DEVICE_BT_ERROR_MISSING_DEVICE_CAPS,   /*< nick=MissingDeviceCaps >*/
+} NMDeviceBtError;
+

+

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


NM_DEVICE_BT_ERROR_UNKNOWN
unknown or unclassified error
+
NM_DEVICE_BT_ERROR_NOT_BT_CONNECTION
the connection was not of bluetooth type
+
NM_DEVICE_BT_ERROR_INVALID_BT_CONNECTION
the bluetooth connection was invalid
+
NM_DEVICE_BT_ERROR_INVALID_DEVICE_MAC
the device's MAC was invalid
+
NM_DEVICE_BT_ERROR_MAC_MISMATCH
the MACs of the connection and the device mismatched
+
NM_DEVICE_BT_ERROR_MISSING_DEVICE_CAPS
the device missed required capabilities
+

+

+

+

 
NM_DEVICE_BT_CAPABILITIES

 
#define NM_DEVICE_BT_CAPABILITIES "bt-capabilities"
 

@@ -119,6 +170,14 @@ NMDeviceBt implements
 

 

 

+
NM_DEVICE_BT_ERROR

+
#define NM_DEVICE_BT_ERROR nm_device_bt_error_quark ()
+

+

+

+

+

+

 
NM_DEVICE_BT_HW_ADDRESS

 
#define NM_DEVICE_BT_HW_ADDRESS   "hw-address"
 

@@ -135,6 +194,21 @@ NMDeviceBt implements
 

 

 

+
nm_device_bt_error_quark ()

+
GQuark              nm_device_bt_error_quark            (void);

+

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

 

diff --git a/docs/libnm-glib/html/NMDeviceEthernet.html b/docs/libnm-glib/html/NMDeviceEthernet.html
index 786a5842..94d959b6 100644
--- a/docs/libnm-glib/html/NMDeviceEthernet.html
+++ b/docs/libnm-glib/html/NMDeviceEthernet.html
@@ -45,10 +45,13 @@
 
Synopsis

 
                    NMDeviceEthernet;
                     NMDeviceEthernetClass;
+enum                NMDeviceEthernetError;
 #define             NM_DEVICE_ETHERNET_CARRIER
+#define             NM_DEVICE_ETHERNET_ERROR
 #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);
 const char *        nm_device_ethernet_get_hw_address   (NMDeviceEthernet *device);
 const char *        nm_device_ethernet_get_permanent_hw_address
@@ -115,6 +118,48 @@ NMDeviceEthernet implements
 

 

 

+
enum NMDeviceEthernetError

+
typedef enum {
+	NM_DEVICE_ETHERNET_ERROR_UNKNOWN = 0,                 /*< nick=UnknownError >*/
+	NM_DEVICE_ETHERNET_ERROR_NOT_ETHERNET_CONNECTION,     /*< nick=NotEthernetConnection >*/
+	NM_DEVICE_ETHERNET_ERROR_INVALID_ETHERNET_CONNECTION, /*< nick=InvalidEthernetConnection >*/
+	NM_DEVICE_ETHERNET_ERROR_INVALID_DEVICE_MAC,          /*< nick=InvalidDeviceMac >*/
+	NM_DEVICE_ETHERNET_ERROR_MAC_MISMATCH,                /*< nick=MacMismatch >*/
+} NMDeviceEthernetError;
+

+

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


NM_DEVICE_ETHERNET_ERROR_UNKNOWN
unknown or unclassified error
+
NM_DEVICE_ETHERNET_ERROR_NOT_ETHERNET_CONNECTION
the connection was not of ethernet or PPPoE type
+
NM_DEVICE_ETHERNET_ERROR_INVALID_ETHERNET_CONNECTION
the ethernet connection was invalid
+
NM_DEVICE_ETHERNET_ERROR_INVALID_DEVICE_MAC
the device's MAC was invalid
+
NM_DEVICE_ETHERNET_ERROR_MAC_MISMATCH
the MACs of the connection and the device mismatched
+

+

+

+

 
NM_DEVICE_ETHERNET_CARRIER

 
#define NM_DEVICE_ETHERNET_CARRIER     "carrier"
 

@@ -123,6 +168,14 @@ NMDeviceEthernet implements
 

 

 

+
NM_DEVICE_ETHERNET_ERROR

+
#define NM_DEVICE_ETHERNET_ERROR nm_device_ethernet_error_quark ()
+

+

+

+

+

+

 
NM_DEVICE_ETHERNET_HW_ADDRESS

 
#define NM_DEVICE_ETHERNET_HW_ADDRESS  "hw-address"
 

@@ -147,6 +200,21 @@ NMDeviceEthernet implements
 

 

 

+
nm_device_ethernet_error_quark ()

+
GQuark              nm_device_ethernet_error_quark      (void);

+

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

 

diff --git a/docs/libnm-glib/html/NMDeviceInfiniband.html b/docs/libnm-glib/html/NMDeviceInfiniband.html
new file mode 100644
index 00000000..c4253e5d
--- /dev/null
+++ b/docs/libnm-glib/html/NMDeviceInfiniband.html
@@ -0,0 +1,293 @@
+
+
+
+
+NMDeviceInfiniband
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+

+
+
+

+
NMDeviceInfiniband

+
NMDeviceInfiniband

+

+

+
Synopsis

+
                    NMDeviceInfiniband;
+                    NMDeviceInfinibandClass;
+enum                NMDeviceInfinibandError;
+#define             NM_DEVICE_INFINIBAND_CARRIER
+#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);
+GObject *           nm_device_infiniband_new            (DBusGConnection *connection,
+                                                         const char *path);
+

+

+

+
Object Hierarchy

+
+  GObject
+   +----NMObject
+         +----NMDevice
+               +----NMDeviceInfiniband
+

+

+

+
Implemented Interfaces

+

+NMDeviceInfiniband implements
+ GInitable and  GAsyncInitable.

+

+

+
Properties

+
+  "carrier"                  gboolean              : Read
+  "hw-address"               gchar*                : Read
+

+

+

+
Description

+

+

+

+

+
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 >*/
+	NM_DEVICE_INFINIBAND_ERROR_NOT_INFINIBAND_CONNECTION,     /*< nick=NotInfinibandConnection >*/
+	NM_DEVICE_INFINIBAND_ERROR_INVALID_INFINIBAND_CONNECTION, /*< nick=InvalidInfinibandConnection >*/
+	NM_DEVICE_INFINIBAND_ERROR_INVALID_DEVICE_MAC,            /*< nick=InvalidDeviceMac >*/
+	NM_DEVICE_INFINIBAND_ERROR_MAC_MISMATCH,                  /*< nick=MacMismatch >*/
+} NMDeviceInfinibandError;
+

+

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


NM_DEVICE_INFINIBAND_ERROR_UNKNOWN
unknown or unclassified error
+
NM_DEVICE_INFINIBAND_ERROR_NOT_INFINIBAND_CONNECTION
the connection was not of InfiniBand type
+
NM_DEVICE_INFINIBAND_ERROR_INVALID_INFINIBAND_CONNECTION
the InfiniBand connection was invalid
+
NM_DEVICE_INFINIBAND_ERROR_INVALID_DEVICE_MAC
the device's MAC was invalid
+
NM_DEVICE_INFINIBAND_ERROR_MAC_MISMATCH
the MACs of the connection and the device mismatched
+

+

+

+

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

+
#define NM_DEVICE_INFINIBAND_HW_ADDRESS  "hw-address"
+

+

+

+

+

+

+
nm_device_infiniband_error_quark ()

+
GQuark              nm_device_infiniband_error_quark    (void);

+

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

+

+Whether the device has carrier.
+

+

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


device :
a NMDeviceInfiniband
+
Returns :

+TRUE if the device has carrier

+

+

+

+
nm_device_infiniband_get_hw_address ()

+
const char *        nm_device_infiniband_get_hw_address (NMDeviceInfiniband *device);

+

+Gets the hardware (MAC) address of the NMDeviceInfiniband
+

+

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


device :
a NMDeviceInfiniband
+
Returns :
the hardware address. This is the internal string used by the
+device, and must not be modified.

+

+

+

+
nm_device_infiniband_new ()

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

+

+Creates a new NMDeviceInfiniband.
+

+

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


connection :
the DBusGConnection
+
path :
the DBus object path of the device
Returns :
a new device. [transfer full]
+

+

+

+

+
Property Details

+

+
The "carrier" property

+
  "carrier"                  gboolean              : Read

+

+Whether the device has carrier.
+

+
Default value: FALSE

+

+

+

+
The "hw-address" property

+
  "hw-address"               gchar*                : Read

+

+The hardware (MAC) address of the device.
+

+
Default value: NULL

+

+

+

+

+

+          Generated by GTK-Doc V1.18

+
+
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceModem.html b/docs/libnm-glib/html/NMDeviceModem.html
index 751da6e3..6dec6b03 100644
--- a/docs/libnm-glib/html/NMDeviceModem.html
+++ b/docs/libnm-glib/html/NMDeviceModem.html
@@ -45,8 +45,11 @@
 
Synopsis

 
                    NMDeviceModem;
                     NMDeviceModemClass;
+enum                NMDeviceModemError;
 #define             NM_DEVICE_MODEM_CURRENT_CAPABILITIES
+#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);
 NMDeviceModemCapabilities nm_device_modem_get_modem_capabilities
@@ -108,6 +111,42 @@ NMDeviceModem implements
 

 

 

+
enum NMDeviceModemError

+
typedef enum {
+	NM_DEVICE_MODEM_ERROR_UNKNOWN = 0,              /*< nick=UnknownError >*/
+	NM_DEVICE_MODEM_ERROR_NOT_MODEM_CONNECTION,     /*< nick=NotModemConnection >*/
+	NM_DEVICE_MODEM_ERROR_INVALID_MODEM_CONNECTION, /*< nick=InvalidModemConnection >*/
+	NM_DEVICE_MODEM_ERROR_MISSING_DEVICE_CAPS,      /*< nick=MissingDeviceCaps >*/
+} NMDeviceModemError;
+

+

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


NM_DEVICE_MODEM_ERROR_UNKNOWN
unknown or unclassified error
+
NM_DEVICE_MODEM_ERROR_NOT_MODEM_CONNECTION
the connection was not of modem type
+
NM_DEVICE_MODEM_ERROR_INVALID_MODEM_CONNECTION
the modem connection was invalid
+
NM_DEVICE_MODEM_ERROR_MISSING_DEVICE_CAPS
the device missed required capabilities
+

+

+

+

 
NM_DEVICE_MODEM_CURRENT_CAPABILITIES

 
#define NM_DEVICE_MODEM_CURRENT_CAPABILITIES "current-capabilities"
 

@@ -116,6 +155,14 @@ NMDeviceModem implements
 

 

 

+
NM_DEVICE_MODEM_ERROR

+
#define NM_DEVICE_MODEM_ERROR nm_device_modem_error_quark ()
+

+

+

+

+

+

 
NM_DEVICE_MODEM_MODEM_CAPABILITIES

 
#define NM_DEVICE_MODEM_MODEM_CAPABILITIES   "modem-capabilities"
 

@@ -124,6 +171,21 @@ NMDeviceModem implements
 

 

 

+
nm_device_modem_error_quark ()

+
GQuark              nm_device_modem_error_quark         (void);

+

+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 *self);

diff --git a/docs/libnm-glib/html/NMDeviceOlpcMesh.html b/docs/libnm-glib/html/NMDeviceOlpcMesh.html
new file mode 100644
index 00000000..2af9c04b
--- /dev/null
+++ b/docs/libnm-glib/html/NMDeviceOlpcMesh.html
@@ -0,0 +1,324 @@
+
+
+
+
+NMDeviceOlpcMesh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+

+
+
+

+
NMDeviceOlpcMesh

+
NMDeviceOlpcMesh

+

+

+
Synopsis

+
                    NMDeviceOlpcMesh;
+                    NMDeviceOlpcMeshClass;
+enum                NMDeviceOlpcMeshError;
+#define             NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL
+#define             NM_DEVICE_OLPC_MESH_COMPANION
+#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);
+GObject *           nm_device_olpc_mesh_new             (DBusGConnection *connection,
+                                                         const char *path);
+

+

+

+
Object Hierarchy

+
+  GObject
+   +----NMObject
+         +----NMDevice
+               +----NMDeviceOlpcMesh
+

+

+

+
Implemented Interfaces

+

+NMDeviceOlpcMesh implements
+ GInitable and  GAsyncInitable.

+

+

+
Properties

+
+  "active-channel"           guint                 : Read
+  "companion"                NMDeviceWifi*         : Read
+  "hw-address"               gchar*                : Read
+

+

+

+
Description

+

+

+

+

+
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 >*/
+	NM_DEVICE_OLPC_MESH_ERROR_NOT_OLPC_MESH_CONNECTION,     /*< nick=NotOlpcMeshConnection >*/
+	NM_DEVICE_OLPC_MESH_ERROR_INVALID_OLPC_MESH_CONNECTION, /*< nick=InvalidOlpcMeshConnection >*/
+} NMDeviceOlpcMeshError;
+

+

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


NM_DEVICE_OLPC_MESH_ERROR_UNKNOWN
unknown or unclassified error
+
NM_DEVICE_OLPC_MESH_ERROR_NOT_OLPC_MESH_CONNECTION
the connection was not of Olpc Mesh type
+
NM_DEVICE_OLPC_MESH_ERROR_INVALID_OLPC_MESH_CONNECTION
the Olpc Mesh connection was invalid
+

+

+

+

+
NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL

+
#define NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL "active-channel"
+

+

+

+

+

+

+
NM_DEVICE_OLPC_MESH_COMPANION

+
#define NM_DEVICE_OLPC_MESH_COMPANION      "companion"
+

+

+

+

+

+

+
NM_DEVICE_OLPC_MESH_ERROR

+
#define NM_DEVICE_OLPC_MESH_ERROR nm_device_olpc_mesh_error_quark ()
+

+

+

+

+

+

+
NM_DEVICE_OLPC_MESH_HW_ADDRESS

+
#define NM_DEVICE_OLPC_MESH_HW_ADDRESS     "hw-address"
+

+

+

+

+

+

+
nm_device_olpc_mesh_error_quark ()

+
GQuark              nm_device_olpc_mesh_error_quark     (void);

+

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

+

+Returns the active channel of the NMDeviceOlpcMesh device.
+

+

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


device :
a NMDeviceOlpcMesh
+
Returns :
active channel of the device

+

+

+

+
nm_device_olpc_mesh_get_companion ()

+
NMDeviceWifi *      nm_device_olpc_mesh_get_companion   (NMDeviceOlpcMesh *device);

+

+Gets the companion device of the NMDeviceOlpcMesh.
+

+

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


device :
a NMDeviceOlpcMesh
+
Returns :
the companion of the device of NULL. [transfer none]
+

+

+

+

+
nm_device_olpc_mesh_get_hw_address ()

+
const char *        nm_device_olpc_mesh_get_hw_address  (NMDeviceOlpcMesh *device);

+

+Gets the hardware (MAC) address of the NMDeviceOlpcMesh
+

+

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


device :
a NMDeviceOlpcMesh
+
Returns :
the hardware address. This is the internal string used by the
+device, and must not be modified.

+

+

+

+
nm_device_olpc_mesh_new ()

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

+

+Creates a new NMDeviceOlpcMesh.
+

+

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


connection :
the DBusGConnection
+
path :
the DBus object path of the device
Returns :
a new OlpcMesh device. [transfer full]
+

+

+

+

+
Property Details

+

+
The "active-channel" property

+
  "active-channel"           guint                 : Read

+

+The device's active channel.
+

+
Default value: 0

+

+

+

+
The "companion" property

+
  "companion"                NMDeviceWifi*         : Read

+

+The companion device.
+

+

+

+

+
The "hw-address" property

+
  "hw-address"               gchar*                : Read

+

+The hardware (MAC) address of the device.
+

+
Default value: NULL

+

+

+

+

+

+          Generated by GTK-Doc V1.18

+
+
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceVlan.html b/docs/libnm-glib/html/NMDeviceVlan.html
new file mode 100644
index 00000000..4e7f1a70
--- /dev/null
+++ b/docs/libnm-glib/html/NMDeviceVlan.html
@@ -0,0 +1,333 @@
+
+
+
+
+NMDeviceVlan
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+

+
+
+

+
NMDeviceVlan

+
NMDeviceVlan

+

+

+
Synopsis

+
                    NMDeviceVlan;
+                    NMDeviceVlanClass;
+enum                NMDeviceVlanError;
+#define             NM_DEVICE_VLAN_CARRIER
+#define             NM_DEVICE_VLAN_ERROR
+#define             NM_DEVICE_VLAN_HW_ADDRESS
+#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);
+GObject *           nm_device_vlan_new                  (DBusGConnection *connection,
+                                                         const char *path);
+

+

+

+
Object Hierarchy

+
+  GObject
+   +----NMObject
+         +----NMDevice
+               +----NMDeviceVlan
+

+

+

+
Implemented Interfaces

+

+NMDeviceVlan implements
+ GInitable and  GAsyncInitable.

+

+

+
Properties

+
+  "carrier"                  gboolean              : Read
+  "hw-address"               gchar*                : Read
+  "vlan-id"                  guint                 : Read
+

+

+

+
Description

+

+

+

+

+
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 >*/
+	NM_DEVICE_VLAN_ERROR_NOT_VLAN_CONNECTION,     /*< nick=NotVlanConnection >*/
+	NM_DEVICE_VLAN_ERROR_INVALID_VLAN_CONNECTION, /*< nick=InvalidVlanConnection >*/
+	NM_DEVICE_VLAN_ERROR_ID_MISMATCH,             /*< nick=IdMismatch >*/
+	NM_DEVICE_VLAN_ERROR_INTERFACE_MISMATCH,      /*< nick=InterfaceMismatch >*/
+} NMDeviceVlanError;
+

+

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


NM_DEVICE_VLAN_ERROR_UNKNOWN
unknown or unclassified error
+
NM_DEVICE_VLAN_ERROR_NOT_VLAN_CONNECTION
the connection was not of VLAN type
+
NM_DEVICE_VLAN_ERROR_INVALID_VLAN_CONNECTION
the VLAN connection was invalid
+
NM_DEVICE_VLAN_ERROR_ID_MISMATCH
the VLAN identifiers of the connection and the device mismatched
+
NM_DEVICE_VLAN_ERROR_INTERFACE_MISMATCH
the interfaces of the connection and the device mismatched
+

+

+

+

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

+
#define NM_DEVICE_VLAN_HW_ADDRESS  "hw-address"
+

+

+

+

+

+

+
NM_DEVICE_VLAN_VLAN_ID

+
#define NM_DEVICE_VLAN_VLAN_ID     "vlan-id"
+

+

+

+

+

+

+
nm_device_vlan_error_quark ()

+
GQuark              nm_device_vlan_error_quark          (void);

+

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

+

+Whether the device has carrier.
+

+

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


device :
a NMDeviceVlan
+
Returns :

+TRUE if the device has carrier

+

+

+

+
nm_device_vlan_get_hw_address ()

+
const char *        nm_device_vlan_get_hw_address       (NMDeviceVlan *device);

+

+Gets the hardware (MAC) address of the NMDeviceVlan
+

+

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


device :
a NMDeviceVlan
+
Returns :
the hardware address. This is the internal string used by the
+device, and must not be modified.

+

+

+

+
nm_device_vlan_get_vlan_id ()

+
guint               nm_device_vlan_get_vlan_id          (NMDeviceVlan *device);

+

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


device :
a NMDeviceVlan
+
Returns :
the device's VLAN ID

+

+

+

+
nm_device_vlan_new ()

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

+

+Creates a new NMDeviceVlan.
+

+

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


connection :
the DBusGConnection
+
path :
the DBus object path of the device
Returns :
a new device. [transfer full]
+

+

+

+

+
Property Details

+

+
The "carrier" property

+
  "carrier"                  gboolean              : Read

+

+Whether the device has carrier.
+

+
Default value: FALSE

+

+

+

+
The "hw-address" property

+
  "hw-address"               gchar*                : Read

+

+The hardware (MAC) address of the device.
+

+
Default value: NULL

+

+

+

+
The "vlan-id" property

+
  "vlan-id"                  guint                 : Read

+

+The device's VLAN ID.
+

+
Allowed values: <= 4095

+
Default value: 0

+

+

+

+

+

+          Generated by GTK-Doc V1.18

+
+
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceWifi.html b/docs/libnm-glib/html/NMDeviceWifi.html
index f08d0b79..e41712f3 100644
--- a/docs/libnm-glib/html/NMDeviceWifi.html
+++ b/docs/libnm-glib/html/NMDeviceWifi.html
@@ -47,12 +47,15 @@
 
Synopsis

 
                    NMDeviceWifi;
                     NMDeviceWifiClass;
+enum                NMDeviceWifiError;
 #define             NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT
 #define             NM_DEVICE_WIFI_BITRATE
 #define             NM_DEVICE_WIFI_CAPABILITIES
+#define             NM_DEVICE_WIFI_ERROR
 #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,
                                                          const char *path);
@@ -140,6 +143,62 @@ NMDeviceWifi implements
 

 

 

+
enum NMDeviceWifiError

+
typedef enum {
+	NM_DEVICE_WIFI_ERROR_UNKNOWN = 0,             /*< nick=UnknownError >*/
+	NM_DEVICE_WIFI_ERROR_NOT_WIFI_CONNECTION,     /*< nick=NotWifiConnection >*/
+	NM_DEVICE_WIFI_ERROR_INVALID_WIFI_CONNECTION, /*< nick=InvalidWifiConnection >*/
+	NM_DEVICE_WIFI_ERROR_INVALID_DEVICE_MAC,      /*< nick=InvalidDeviceMac >*/
+	NM_DEVICE_WIFI_ERROR_MAC_MISMATCH,            /*< nick=MacMismatch >*/
+	NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_WPA_CAPS, /*< nick=MissingDeviceWpaCaps >*/
+	NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_RSN_CAPS, /*< nick=MissingDeviceRsnCaps >*/
+} NMDeviceWifiError;
+

+

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


NM_DEVICE_WIFI_ERROR_UNKNOWN
unknown or unclassified error
+
NM_DEVICE_WIFI_ERROR_NOT_WIFI_CONNECTION
the connection was not of Wi-Fi type
+
NM_DEVICE_WIFI_ERROR_INVALID_WIFI_CONNECTION
the Wi-Fi connection was invalid
+
NM_DEVICE_WIFI_ERROR_INVALID_DEVICE_MAC
the device's MAC was invalid
+
NM_DEVICE_WIFI_ERROR_MAC_MISMATCH
the MACs of the connection and the device mismatched
+
NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_WPA_CAPS
the device missed WPA capabilities
+required by the connection
+
NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_RSN_CAPS
the device missed RSN capabilities
+required by the connection
+

+

+

+

 
NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT

 
#define NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT "active-access-point"
 

@@ -164,6 +223,14 @@ NMDeviceWifi implements
 

 

 

+
NM_DEVICE_WIFI_ERROR

+
#define NM_DEVICE_WIFI_ERROR nm_device_wifi_error_quark ()
+

+

+

+

+

+

 
NM_DEVICE_WIFI_HW_ADDRESS

 
#define NM_DEVICE_WIFI_HW_ADDRESS          "hw-address"
 

@@ -188,6 +255,21 @@ NMDeviceWifi implements
 

 

 

+
nm_device_wifi_error_quark ()

+
GQuark              nm_device_wifi_error_quark          (void);

+

+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,
diff --git a/docs/libnm-glib/html/NMDeviceWimax.html b/docs/libnm-glib/html/NMDeviceWimax.html
index 6daa921a..598f77b5 100644
--- a/docs/libnm-glib/html/NMDeviceWimax.html
+++ b/docs/libnm-glib/html/NMDeviceWimax.html
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -18,7 +18,7 @@
 Up
 Home
 libnm-glib Reference Manual
-Next
+Next
 
 
 Top
@@ -47,13 +47,16 @@
 
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
+#define             NM_DEVICE_WIMAX_ERROR
 #define             NM_DEVICE_WIMAX_HW_ADDRESS
 #define             NM_DEVICE_WIMAX_RSSI
 #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
@@ -132,6 +135,48 @@ NMDeviceWimax implements
 

 

 

+
enum NMDeviceWimaxError

+
typedef enum {
+	NM_DEVICE_WIMAX_ERROR_UNKNOWN = 0,              /*< nick=UnknownError >*/
+	NM_DEVICE_WIMAX_ERROR_NOT_WIMAX_CONNECTION,     /*< nick=NotWimaxConnection >*/
+	NM_DEVICE_WIMAX_ERROR_INVALID_WIMAX_CONNECTION, /*< nick=InvalidWimaxConnection >*/
+	NM_DEVICE_WIMAX_ERROR_INVALID_DEVICE_MAC,       /*< nick=InvalidDeviceMac >*/
+	NM_DEVICE_WIMAX_ERROR_MAC_MISMATCH,             /*< nick=MacMismatch >*/
+} NMDeviceWimaxError;
+

+

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


NM_DEVICE_WIMAX_ERROR_UNKNOWN
unknown or unclassified error
+
NM_DEVICE_WIMAX_ERROR_NOT_WIMAX_CONNECTION
the connection was not of WiMax type
+
NM_DEVICE_WIMAX_ERROR_INVALID_WIMAX_CONNECTION
the WiMax connection was invalid
+
NM_DEVICE_WIMAX_ERROR_INVALID_DEVICE_MAC
the device's MAC was invalid
+
NM_DEVICE_WIMAX_ERROR_MAC_MISMATCH
the MACs of the connection and the device mismatched
+

+

+

+

 
NM_DEVICE_WIMAX_ACTIVE_NSP

 
#define NM_DEVICE_WIMAX_ACTIVE_NSP       "active-nsp"
 

@@ -164,6 +209,14 @@ NMDeviceWimax implements
 

 

 

+
NM_DEVICE_WIMAX_ERROR

+
#define NM_DEVICE_WIMAX_ERROR nm_device_wimax_error_quark ()
+

+

+

+

+

+

 
NM_DEVICE_WIMAX_HW_ADDRESS

 
#define NM_DEVICE_WIMAX_HW_ADDRESS       "hw-address"
 

@@ -188,6 +241,21 @@ NMDeviceWimax implements
 

 

 

+
nm_device_wimax_error_quark ()

+
GQuark              nm_device_wimax_error_quark         (void);

+

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

 

diff --git a/docs/libnm-glib/html/NMObject.html b/docs/libnm-glib/html/NMObject.html
index 24bb4276..ea763de7 100644
--- a/docs/libnm-glib/html/NMObject.html
+++ b/docs/libnm-glib/html/NMObject.html
@@ -30,6 +30,8 @@
                   Implemented Interfaces
                    | 
                   Properties
+                   | 
+                  Signals
 
 
 

@@ -45,8 +47,11 @@
 
Synopsis

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

@@ -81,6 +86,12 @@ NMObject implements
 
 

 

+
Signals

+
+  "object-creation-failed"                         : Run First
+

+

+

 
Description

 

 

@@ -99,6 +110,15 @@ NMObject implements
 
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);
@@ -113,6 +133,33 @@ NMObject implements
 

 

 

+
enum NMObjectError

+
typedef enum {
+	NM_OBJECT_ERROR_UNKNOWN = 0,
+	NM_OBJECT_ERROR_OBJECT_CREATION_FAILURE,
+} NMObjectError;
+

+

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

+

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


NM_OBJECT_ERROR_UNKNOWN
unknown or unclassified error
+
NM_OBJECT_ERROR_OBJECT_CREATION_FAILURE
an error ocured while creating an NMObject
+

+

+

+

 
NM_OBJECT_DBUS_CONNECTION

 
#define NM_OBJECT_DBUS_CONNECTION "dbus-connection"
 

@@ -129,6 +176,29 @@ NMObject implements
 

 

 

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

+

++
+
+
+
+


Returns :
the error quark used for NMObject errors.

+

+

+

 
nm_object_get_connection ()

 
DBusGConnection *   nm_object_get_connection            (NMObject *object);

 

@@ -189,6 +259,45 @@ device, and must not be modified.
 
Default value: NULL

 

 

+

+
Signal Details

+

+
The "object-creation-failed" signal

+
void                user_function                      (NMObject *master_object,
+                                                        gpointer  error,
+                                                        gpointer  failed_path,
+                                                        gpointer  user_data)          : Run First

+

+Indicates that an error occured while creating an NMObject object
+during property handling of master_object.
+

+

+Note: Be aware that the signal is private for libnm-glib's internal
+      use.
+

+

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


master_object :
the object that received the signal
error :
the error that occured while creating object
failed_path :
object path of the failed object
user_data :
user data set when the signal handler was connected.

+

+

 

 

 

diff --git a/docs/libnm-glib/html/NMRemoteConnection.html b/docs/libnm-glib/html/NMRemoteConnection.html
index 531ab09d..eefc87b4 100644
--- a/docs/libnm-glib/html/NMRemoteConnection.html
+++ b/docs/libnm-glib/html/NMRemoteConnection.html
@@ -145,7 +145,27 @@ NMRemoteConnection implements
                                                          GError *error,
                                                          gpointer user_data);
 

+Called when NetworkManager has committed outstanding changes to a connection
+to backing storage as a result of nm_remote_connection_commit_changes().
 

+

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


connection :
the connection for which updates are to be committed
error :
on failure, a descriptive error
user_data :
user data passed to nm_remote_connection_commit_changes()
+

 

 

 

@@ -154,7 +174,27 @@ NMRemoteConnection implements
                                                          GError *error,
                                                          gpointer user_data);
 

+Called when NetworkManager has deleted a connection as a result of
+nm_remote_connection_delete().
 

+

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


connection :
the connection to be deleted
error :
on failure, a descriptive error
user_data :
user data passed to nm_remote_connection_delete()
+

 

 

 

@@ -164,7 +204,34 @@ NMRemoteConnection implements
                                                          GError *error,
                                                          gpointer user_data);
 

+Called when NetworkManager returns secrets in response to a request for
+secrets via nm_remote_connection_get_secrets().
 

+

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


connection :
the connection for which secrets were requested
secrets :
on success, a hash table of
+hash tables, with each inner hash mapping a setting property to a GValue
+containing that property's value. [element-type utf8 GLib.HashTable]
+
error :
on failure, a descriptive error
user_data :
user data passed to nm_remote_connection_get_secrets()
+

 

 

 

diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html
index f7254c2a..1ad2b84b 100644
--- a/docs/libnm-glib/html/NMSecretAgent.html
+++ b/docs/libnm-glib/html/NMSecretAgent.html
@@ -63,12 +63,14 @@ enum                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,
                                                          NMConnection *connection,
                                                          NMSecretAgentDeleteSecretsFunc callback,
                                                          gpointer user_data);
 GQuark              nm_secret_agent_error_quark         (void);
+gboolean            nm_secret_agent_get_registered      (NMSecretAgent *self);
 void                nm_secret_agent_get_secrets         (NMSecretAgent *self,
                                                          NMConnection *connection,
                                                          const char *setting_name,
@@ -246,7 +248,8 @@ should be called.
 
typedef enum {
 	NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE = 0x0,
 	NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION = 0x1,
-	NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW = 0x2
+	NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW = 0x2,
+	NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED = 0x4
 } NMSecretAgentGetSecretsFlags;
 

 

@@ -277,6 +280,14 @@ existing secrets are invalid or wrong.  This flag implies that interaction
 is allowed.
 
 
+
+
NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED

+set if the request was
+initiated by user-requested action via the D-Bus interface, as opposed to
+automatically initiated by NetworkManager in response to (for example) scan
+results or carrier changes.
+
+
 
 

 

@@ -299,7 +310,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

 

   
@@ -437,6 +448,14 @@ should be called.
 

+
NM_SECRET_AGENT_REGISTERED

+
#define NM_SECRET_AGENT_REGISTERED          "registered"
+

+

+

+

+

+

 
NM_SECRET_AGENT_REGISTRATION_RESULT

 
#define NM_SECRET_AGENT_REGISTRATION_RESULT "registration-result"
 

@@ -492,6 +511,25 @@ VFunc: delete_secrets
 

+
nm_secret_agent_get_registered ()

+
gboolean            nm_secret_agent_get_registered      (NMSecretAgent *self);

+

     
 
 
 
 

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


self :
a NMSecretAgent
+
Returns :
a TRUE if the agent is registered, FALSE if it is not.

+

+

+

 
nm_secret_agent_get_secrets ()

 
void                nm_secret_agent_get_secrets         (NMSecretAgent *self,
                                                          NMConnection *connection,
diff --git a/docs/libnm-glib/html/NMWimaxNsp.html b/docs/libnm-glib/html/NMWimaxNsp.html
index 68a80693..d6782d7f 100644
--- a/docs/libnm-glib/html/NMWimaxNsp.html
+++ b/docs/libnm-glib/html/NMWimaxNsp.html
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -14,7 +14,7 @@
 
 
-
+
diff --git a/docs/libnm-glib/html/api-index-full.html b/docs/libnm-glib/html/api-index-full.html
index e07f804b..13330c48 100644
--- a/docs/libnm-glib/html/api-index-full.html
+++ b/docs/libnm-glib/html/api-index-full.html
@@ -27,8 +27,6 @@
                       | 
                    D
                       | 
-                   G
-                      | 
                    I
                       | 
                    O
@@ -525,299 +523,271 @@
 
D

-DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManagerSettings_Connection, macro in nm-exported-connection-bindings
-

-

-

-DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManagerSettings_Connection_Secrets, macro in nm-exported-connection-bindings
-

-

-

-DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManagerSettings_System, macro in nm-settings-system-bindings
-

-

-

-DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManager_Device_Infiniband, macro in nm-device-infiniband-bindings
-

-

-

-dbus_glib_marshal_nm_exported_connection_BOOLEAN__POINTER_POINTER, function in nm-exported-connection-glue
-

-

-

-dbus_glib_marshal_nm_exported_connection_NONE__BOXED_POINTER, macro in nm-exported-connection-glue
-

-

-

-dbus_glib_marshal_nm_exported_connection_NONE__POINTER, macro in nm-exported-connection-glue
-

-

-

-dbus_glib_marshal_nm_exported_connection_NONE__STRING_BOXED_BOOLEAN_POINTER, macro in nm-exported-connection-glue
+NMDevice, struct in NMDevice
 

-dbus_glib_marshal_nm_exported_connection_VOID__BOXED_POINTER, function in nm-exported-connection-glue
+NMDevice::state-changed, object signal in NMDevice
 

-dbus_glib_marshal_nm_exported_connection_VOID__POINTER, macro in nm-exported-connection-glue
+NMDevice:active-connection, object property in NMDevice
 

-dbus_glib_marshal_nm_exported_connection_VOID__STRING_BOXED_BOOLEAN_POINTER, function in nm-exported-connection-glue
+NMDevice:autoconnect, object property in NMDevice
 

-dbus_glib_marshal_nm_secret_agent_NONE__BOXED_BOXED_POINTER, macro in nm-secret-agent-glue
+NMDevice:capabilities, object property in NMDevice
 

-dbus_glib_marshal_nm_secret_agent_NONE__BOXED_BOXED_STRING_BOXED_UINT_POINTER, macro in nm-secret-agent-glue
+NMDevice:device-type, object property in NMDevice
 

-dbus_glib_marshal_nm_secret_agent_NONE__BOXED_STRING_POINTER, macro in nm-secret-agent-glue
+NMDevice:dhcp4-config, object property in NMDevice
 

-dbus_glib_marshal_nm_secret_agent_VOID__BOXED_BOXED_POINTER, function in nm-secret-agent-glue
+NMDevice:dhcp6-config, object property in NMDevice
 

-dbus_glib_marshal_nm_secret_agent_VOID__BOXED_BOXED_STRING_BOXED_UINT_POINTER, function in nm-secret-agent-glue
+NMDevice:driver, object property in NMDevice
 

-dbus_glib_marshal_nm_secret_agent_VOID__BOXED_STRING_POINTER, function in nm-secret-agent-glue
+NMDevice:driver-version, object property in NMDevice
 

-dbus_glib_nm_exported_connection_object_info, variable in nm-exported-connection-glue
+NMDevice:firmware-missing, object property in NMDevice
 

-dbus_glib_nm_secret_agent_object_info, variable in nm-secret-agent-glue
+NMDevice:firmware-version, object property in NMDevice
 

-dbus_g_proxy_begin_call, function in nm-settings-system-bindings
+NMDevice:interface, object property in NMDevice
 

-NMDevice, struct in NMDevice
+NMDevice:ip-interface, object property in NMDevice
 

-NMDevice::state-changed, object signal in NMDevice
+NMDevice:ip4-config, object property in NMDevice
 

-NMDevice:active-connection, object property in NMDevice
+NMDevice:ip6-config, object property in NMDevice
 

-NMDevice:capabilities, object property in NMDevice
+NMDevice:managed, object property in NMDevice
 

-NMDevice:device-type, object property in NMDevice
+NMDevice:product, object property in NMDevice
 

-NMDevice:dhcp4-config, object property in NMDevice
+NMDevice:state, object property in NMDevice
 

-NMDevice:dhcp6-config, object property in NMDevice
+NMDevice:state-reason, object property in NMDevice
 

-NMDevice:driver, object property in NMDevice
+NMDevice:udi, object property in NMDevice
 

-NMDevice:firmware-missing, object property in NMDevice
+NMDevice:vendor, object property in NMDevice
 

-NMDevice:interface, object property in NMDevice
+NMDeviceAdsl, struct in NMDeviceAdsl
 

-NMDevice:ip-interface, object property in NMDevice
+NMDeviceAdslClass, struct in NMDeviceAdsl
 

-NMDevice:ip4-config, object property in NMDevice
+NMDeviceAdslError, enum in NMDeviceAdsl
 

-NMDevice:ip6-config, object property in NMDevice
+NMDeviceBond, struct in NMDeviceBond
 

-NMDevice:managed, object property in NMDevice
+NMDeviceBond:carrier, object property in NMDeviceBond
 

-NMDevice:product, object property in NMDevice
+NMDeviceBond:hw-address, object property in NMDeviceBond
 

-NMDevice:state, object property in NMDevice
+NMDeviceBondClass, struct in NMDeviceBond
 

-NMDevice:state-reason, object property in NMDevice
+NMDeviceBondError, enum in NMDeviceBond
 

-NMDevice:udi, object property in NMDevice
+NMDeviceBt, struct in NMDeviceBt
 

-NMDevice:vendor, object property in NMDevice
+NMDeviceBt:bt-capabilities, object property in NMDeviceBt
 

-NMDeviceBond, struct in NMDeviceBond
+NMDeviceBt:hw-address, object property in NMDeviceBt
 

-NMDeviceBond:carrier, object property in NMDeviceBond
+NMDeviceBt:name, object property in NMDeviceBt
 

-NMDeviceBond:hw-address, object property in NMDeviceBond
+NMDeviceBtClass, struct in NMDeviceBt
 

-NMDeviceBondClass, struct in NMDeviceBond
+NMDeviceBtError, enum in NMDeviceBt
 

-NMDeviceBt, struct in NMDeviceBt
+NMDeviceClass, struct in NMDevice
 

-NMDeviceBt:bt-capabilities, object property in NMDeviceBt
+NMDeviceDeactivateFn, user_function in NMDevice
 

-NMDeviceBt:hw-address, object property in NMDeviceBt
+NMDeviceEthernet, struct in NMDeviceEthernet
 

-NMDeviceBt:name, object property in NMDeviceBt
+NMDeviceEthernet:carrier, object property in NMDeviceEthernet
 

-NMDeviceBtClass, struct in NMDeviceBt
+NMDeviceEthernet:hw-address, object property in NMDeviceEthernet
 

-NMDeviceClass, struct in NMDevice
+NMDeviceEthernet:perm-hw-address, object property in NMDeviceEthernet
 

-NMDeviceDeactivateFn, user_function in NMDevice
+NMDeviceEthernet:speed, object property in NMDeviceEthernet
 

-NMDeviceEthernet, struct in NMDeviceEthernet
+NMDeviceEthernetClass, struct in NMDeviceEthernet
 

-NMDeviceEthernet:carrier, object property in NMDeviceEthernet
+NMDeviceEthernetError, enum in NMDeviceEthernet
 

-NMDeviceEthernet:hw-address, object property in NMDeviceEthernet
+NMDeviceInfiniband, struct in NMDeviceInfiniband
 

-NMDeviceEthernet:perm-hw-address, object property in NMDeviceEthernet
+NMDeviceInfiniband:carrier, object property in NMDeviceInfiniband
 

-NMDeviceEthernet:speed, object property in NMDeviceEthernet
+NMDeviceInfiniband:hw-address, object property in NMDeviceInfiniband
 

-NMDeviceEthernetClass, struct in NMDeviceEthernet
+NMDeviceInfinibandClass, struct in NMDeviceInfiniband
 

-NMDeviceInfiniband, struct in NMDeviceInfiniband
+NMDeviceInfinibandError, enum in NMDeviceInfiniband
 

-NMDeviceInfiniband:carrier, object property in NMDeviceInfiniband
+NMDeviceModem, struct in NMDeviceModem
 

-NMDeviceInfiniband:hw-address, object property in NMDeviceInfiniband
+NMDeviceModem:current-capabilities, object property in NMDeviceModem
 

-NMDeviceInfinibandClass, struct in NMDeviceInfiniband
+NMDeviceModem:modem-capabilities, object property in NMDeviceModem
 

-NMDeviceModem, struct in NMDeviceModem
+NMDeviceModemClass, struct in NMDeviceModem
 

-NMDeviceModem:current-capabilities, object property in NMDeviceModem
+NMDeviceModemError, enum in NMDeviceModem
 

-NMDeviceModem:modem-capabilities, object property in NMDeviceModem
+NMDeviceOlpcMesh, struct in NMDeviceOlpcMesh
 

-NMDeviceModemClass, struct in NMDeviceModem
+NMDeviceOlpcMesh:active-channel, object property in NMDeviceOlpcMesh
 

-NMDeviceOlpcMesh, struct in NMDeviceOlpcMesh
+NMDeviceOlpcMesh:companion, object property in NMDeviceOlpcMesh
 

-NMDeviceOlpcMesh:active-channel, object property in NMDeviceOlpcMesh
+NMDeviceOlpcMesh:hw-address, object property in NMDeviceOlpcMesh
 

-NMDeviceOlpcMesh:companion, object property in NMDeviceOlpcMesh
+NMDeviceOlpcMeshClass, struct in NMDeviceOlpcMesh
 

-NMDeviceOlpcMesh:hw-address, object property in NMDeviceOlpcMesh
+NMDeviceOlpcMeshError, enum in NMDeviceOlpcMesh
 

-NMDeviceOlpcMeshClass, struct in NMDeviceOlpcMesh
+NMDeviceVlan, struct in NMDeviceVlan
 

-NMDeviceVlan, struct in NMDeviceVlan
+NMDeviceVlan:carrier, object property in NMDeviceVlan
 

-NMDeviceVlan:carrier, object property in NMDeviceVlan
+NMDeviceVlan:hw-address, object property in NMDeviceVlan
 

-NMDeviceVlan:hw-address, object property in NMDeviceVlan
+NMDeviceVlan:vlan-id, object property in NMDeviceVlan
 

-NMDeviceVlan:vlan-id, object property in NMDeviceVlan
+NMDeviceVlanClass, struct in NMDeviceVlan
 

-NMDeviceVlanClass, struct in NMDeviceVlan
+NMDeviceVlanError, enum in NMDeviceVlan
 

@@ -861,6 +831,10 @@ NMDeviceVlanClass, struct in NMDeviceVlan
 

+NMDeviceWifiError, enum in NMDeviceWifi
+

+

+

 NMDeviceWimax, struct in NMDeviceWimax
 

@@ -905,27 +879,63 @@ NMDeviceVlanClass, struct in NMDeviceVlan
 

+NMDeviceWimaxError, enum in NMDeviceWimax
+

+

+

 NM_DEVICE_ACTIVE_CONNECTION, macro in NMDevice
 

-NM_DEVICE_BOND_CARRIER, macro in NMDeviceBond
+NM_DEVICE_ADSL_CARRIER, macro in NMDeviceAdsl
+

+

+

+NM_DEVICE_ADSL_ERROR, macro in NMDeviceAdsl
+

+

+

+nm_device_adsl_error_quark, function in NMDeviceAdsl
+

+

+

+nm_device_adsl_get_carrier, function in NMDeviceAdsl
 

-nm_device_bond_get_carrier, function in NMDeviceBond
+nm_device_adsl_new, function in NMDeviceAdsl
 

-nm_device_bond_get_hw_address, function in NMDeviceBond
+NM_DEVICE_AUTOCONNECT, macro in NMDevice
 

-NM_DEVICE_BOND_HW_ADDRESS, macro in NMDeviceBond
+NM_DEVICE_BOND_CARRIER, macro in NMDeviceBond
 

-nm_device_bond_new, function in NMDeviceBond
+NM_DEVICE_BOND_ERROR, macro in NMDeviceBond
+

+

+

+nm_device_bond_error_quark, function in NMDeviceBond
+

+

+

+nm_device_bond_get_carrier, function in NMDeviceBond
+

+

+

+nm_device_bond_get_hw_address, function in NMDeviceBond
+

+

+

+NM_DEVICE_BOND_HW_ADDRESS, macro in NMDeviceBond
+

+

+

+nm_device_bond_new, function in NMDeviceBond
 

@@ -933,6 +943,14 @@ nm_device_bond_new, function in NMDeviceBond
 

+NM_DEVICE_BT_ERROR, macro in NMDeviceBt
+

+

+

+nm_device_bt_error_quark, function in NMDeviceBt
+

+

+

 nm_device_bt_get_capabilities, function in NMDeviceBt
 

@@ -961,6 +979,10 @@ nm_device_bond_new, function in NMDeviceBond
 

+nm_device_connection_compatible, function in NMDevice
+

+

+

 nm_device_connection_valid, function in NMDevice
 

@@ -985,10 +1007,22 @@ nm_device_bond_new, function in NMDeviceBond
 

+NM_DEVICE_DRIVER_VERSION, macro in NMDevice
+

+

+

 NM_DEVICE_ETHERNET_CARRIER, macro in NMDeviceEthernet
 

+NM_DEVICE_ETHERNET_ERROR, macro in NMDeviceEthernet
+

+

+

+nm_device_ethernet_error_quark, function in NMDeviceEthernet
+

+

+

 nm_device_ethernet_get_carrier, function in NMDeviceEthernet
 

@@ -1029,10 +1063,18 @@ nm_device_bond_new, function in NMDeviceBond
 

+NM_DEVICE_FIRMWARE_VERSION, macro in NMDevice
+

+

+

 nm_device_get_active_connection, function in NMDevice
 

+nm_device_get_autoconnect, function in NMDevice
+

+

+

 nm_device_get_capabilities, function in NMDevice
 

@@ -1053,10 +1095,18 @@ nm_device_bond_new, function in NMDeviceBond
 

+nm_device_get_driver_version, function in NMDevice
+

+

+

 nm_device_get_firmware_missing, function in NMDevice
 

+nm_device_get_firmware_version, function in NMDevice
+

+

+

 nm_device_get_iface, function in NMDevice
 

@@ -1097,23 +1147,31 @@ nm_device_bond_new, function in NMDeviceBond
 

-NM_DEVICE_INFINIBAND_CARRIER, macro in NMDeviceInfiniband
+NM_DEVICE_INFINIBAND_CARRIER, macro in NMDeviceInfiniband
 

-nm_device_infiniband_get_carrier, function in NMDeviceInfiniband
+NM_DEVICE_INFINIBAND_ERROR, macro in NMDeviceInfiniband
 

-nm_device_infiniband_get_hw_address, function in NMDeviceInfiniband
+nm_device_infiniband_error_quark, function in NMDeviceInfiniband
 

-NM_DEVICE_INFINIBAND_HW_ADDRESS, macro in NMDeviceInfiniband
+nm_device_infiniband_get_carrier, function in NMDeviceInfiniband
 

-nm_device_infiniband_new, function in NMDeviceInfiniband
+nm_device_infiniband_get_hw_address, function in NMDeviceInfiniband
+

+

+

+NM_DEVICE_INFINIBAND_HW_ADDRESS, macro in NMDeviceInfiniband
+

+

+

+nm_device_infiniband_new, function in NMDeviceInfiniband
 

@@ -1141,6 +1199,14 @@ nm_device_infiniband_new, function in NMDeviceInfiniband
 

+NM_DEVICE_MODEM_ERROR, macro in NMDeviceModem
+

+

+

+nm_device_modem_error_quark, function in NMDeviceModem
+

+

+

 nm_device_modem_get_current_capabilities, function in NMDeviceModem
 

@@ -1157,31 +1223,39 @@ nm_device_infiniband_new, function in NMDeviceInfiniband
 

-NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL, macro in NMDeviceOlpcMesh
+NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL, macro in NMDeviceOlpcMesh
+

+

+

+NM_DEVICE_OLPC_MESH_COMPANION, macro in NMDeviceOlpcMesh
+

+

+

+NM_DEVICE_OLPC_MESH_ERROR, macro in NMDeviceOlpcMesh
 

-NM_DEVICE_OLPC_MESH_COMPANION, macro in NMDeviceOlpcMesh
+nm_device_olpc_mesh_error_quark, function in NMDeviceOlpcMesh
 

-nm_device_olpc_mesh_get_active_channel, function in NMDeviceOlpcMesh
+nm_device_olpc_mesh_get_active_channel, function in NMDeviceOlpcMesh
 

-nm_device_olpc_mesh_get_companion, function in NMDeviceOlpcMesh
+nm_device_olpc_mesh_get_companion, function in NMDeviceOlpcMesh
 

-nm_device_olpc_mesh_get_hw_address, function in NMDeviceOlpcMesh
+nm_device_olpc_mesh_get_hw_address, function in NMDeviceOlpcMesh
 

-NM_DEVICE_OLPC_MESH_HW_ADDRESS, macro in NMDeviceOlpcMesh
+NM_DEVICE_OLPC_MESH_HW_ADDRESS, macro in NMDeviceOlpcMesh
 

-nm_device_olpc_mesh_new, function in NMDeviceOlpcMesh
+nm_device_olpc_mesh_new, function in NMDeviceOlpcMesh
 

@@ -1189,6 +1263,10 @@ nm_device_olpc_mesh_new, function in NMDeviceOlpcMesh
 

+nm_device_set_autoconnect, function in NMDevice
+

+

+

 NM_DEVICE_STATE, macro in NMDevice
 

@@ -1205,31 +1283,39 @@ nm_device_olpc_mesh_new, function in NMDeviceOlpcMesh
 

-NM_DEVICE_VLAN_CARRIER, macro in NMDeviceVlan
+NM_DEVICE_VLAN_CARRIER, macro in NMDeviceVlan
 

-nm_device_vlan_get_carrier, function in NMDeviceVlan
+NM_DEVICE_VLAN_ERROR, macro in NMDeviceVlan
 

-nm_device_vlan_get_hw_address, function in NMDeviceVlan
+nm_device_vlan_error_quark, function in NMDeviceVlan
 

-nm_device_vlan_get_vlan_id, function in NMDeviceVlan
+nm_device_vlan_get_carrier, function in NMDeviceVlan
 

-NM_DEVICE_VLAN_HW_ADDRESS, macro in NMDeviceVlan
+nm_device_vlan_get_hw_address, function in NMDeviceVlan
 

-nm_device_vlan_new, function in NMDeviceVlan
+nm_device_vlan_get_vlan_id, function in NMDeviceVlan
 

-NM_DEVICE_VLAN_VLAN_ID, macro in NMDeviceVlan
+NM_DEVICE_VLAN_HW_ADDRESS, macro in NMDeviceVlan
+

+

+

+nm_device_vlan_new, function in NMDeviceVlan
+

+

+

+NM_DEVICE_VLAN_VLAN_ID, macro in NMDeviceVlan
 

@@ -1245,6 +1331,14 @@ NM_DEVICE_VLAN_VLAN_ID, macro in NMDeviceVlan
 

+NM_DEVICE_WIFI_ERROR, macro in NMDeviceWifi
+

+

+

+nm_device_wifi_error_quark, function in NMDeviceWifi
+

+

+

 nm_device_wifi_get_access_points, function in NMDeviceWifi
 

@@ -1309,6 +1403,14 @@ NM_DEVICE_VLAN_VLAN_ID, macro in NMDeviceVlan
 

+NM_DEVICE_WIMAX_ERROR, macro in NMDeviceWimax
+

+

+

+nm_device_wimax_error_quark, function in NMDeviceWimax
+

+

+

 nm_device_wimax_get_active_nsp, function in NMDeviceWimax
 

@@ -1416,83 +1518,6 @@ NM_DEVICE_VLAN_VLAN_ID, macro in NMDeviceVlan
 NM_DHCP6_CONFIG_OPTIONS, macro in NMDHCP6Config

-
G

-

-g_marshal_value_peek_boolean, macro in nm-secret-agent-glue
-

-

-

-g_marshal_value_peek_boxed, macro in nm-secret-agent-glue
-

-

-

-g_marshal_value_peek_char, macro in nm-secret-agent-glue
-

-

-

-g_marshal_value_peek_double, macro in nm-secret-agent-glue
-

-

-

-g_marshal_value_peek_enum, macro in nm-secret-agent-glue
-

-

-

-g_marshal_value_peek_flags, macro in nm-secret-agent-glue
-

-

-

-g_marshal_value_peek_float, macro in nm-secret-agent-glue
-

-

-

-g_marshal_value_peek_int, macro in nm-secret-agent-glue
-

-

-

-g_marshal_value_peek_int64, macro in nm-secret-agent-glue
-

-

-

-g_marshal_value_peek_long, macro in nm-secret-agent-glue
-

-

-

-g_marshal_value_peek_object, macro in nm-secret-agent-glue
-

-

-

-g_marshal_value_peek_param, macro in nm-secret-agent-glue
-

-

-

-g_marshal_value_peek_pointer, macro in nm-secret-agent-glue
-

-

-

-g_marshal_value_peek_string, macro in nm-secret-agent-glue
-

-

-

-g_marshal_value_peek_uchar, macro in nm-secret-agent-glue
-

-

-

-g_marshal_value_peek_uint, macro in nm-secret-agent-glue
-

-

-

-g_marshal_value_peek_uint64, macro in nm-secret-agent-glue
-

-

-

-g_marshal_value_peek_ulong, macro in nm-secret-agent-glue
-

-

-

-g_marshal_value_peek_variant, macro in nm-secret-agent-glue
-

-
I

 NMIP4Config, struct in NMIP4Config
@@ -1632,127 +1657,47 @@ g_marshal_value_peek_variant, macro in nm-secret-agent-glue
 

-NMObject:dbus-connection, object property in NMObject
-

-

-

-NMObject:dbus-path, object property in NMObject
-

-

-

-NMObjectClass, struct in NMObject
-

-

-

-NM_OBJECT_DBUS_CONNECTION, macro in NMObject
-

-

-

-NM_OBJECT_DBUS_PATH, macro in NMObject
-

-

-

-nm_object_get_connection, function in NMObject
-

-

-

-nm_object_get_path, function in NMObject
-

-

-

-org_freedesktop_NetworkManagerSettings_Connection_delete, function in nm-exported-connection-bindings
-

-

-

-org_freedesktop_NetworkManagerSettings_Connection_delete_async, function in nm-exported-connection-bindings
-

-

-

-org_freedesktop_NetworkManagerSettings_Connection_delete_async_callback, function in nm-exported-connection-bindings
-

-

-

-org_freedesktop_NetworkManagerSettings_Connection_delete_reply, user_function in nm-exported-connection-bindings
-

-

-

-org_freedesktop_NetworkManagerSettings_Connection_get_settings, function in nm-exported-connection-bindings
-

-

-

-org_freedesktop_NetworkManagerSettings_Connection_get_settings_async, function in nm-exported-connection-bindings
-

-

-

-org_freedesktop_NetworkManagerSettings_Connection_get_settings_async_callback, function in nm-exported-connection-bindings
-

-

-

-org_freedesktop_NetworkManagerSettings_Connection_get_settings_reply, user_function in nm-exported-connection-bindings
-

-

-

-org_freedesktop_NetworkManagerSettings_Connection_Secrets_get_secrets, function in nm-exported-connection-bindings
-

-

-

-org_freedesktop_NetworkManagerSettings_Connection_Secrets_get_secrets_async, function in nm-exported-connection-bindings
-

-

-

-org_freedesktop_NetworkManagerSettings_Connection_Secrets_get_secrets_async_callback, function in nm-exported-connection-bindings
-

-

-

-org_freedesktop_NetworkManagerSettings_Connection_Secrets_get_secrets_reply, user_function in nm-exported-connection-bindings
-

-

-

-org_freedesktop_NetworkManagerSettings_Connection_update, function in nm-exported-connection-bindings
-

-

-

-org_freedesktop_NetworkManagerSettings_Connection_update_async, function in nm-exported-connection-bindings
+NMObject::object-creation-failed, object signal in NMObject
 

-org_freedesktop_NetworkManagerSettings_Connection_update_async_callback, function in nm-exported-connection-bindings
+NMObject:dbus-connection, object property in NMObject
 

-org_freedesktop_NetworkManagerSettings_Connection_update_reply, user_function in nm-exported-connection-bindings
+NMObject:dbus-path, object property in NMObject
 

-org_freedesktop_NetworkManagerSettings_System_get_permissions, function in nm-settings-system-bindings
+NMObjectClass, struct in NMObject
 

-org_freedesktop_NetworkManagerSettings_System_get_permissions_async, function in nm-settings-system-bindings
+NMObjectError, enum in NMObject
 

-org_freedesktop_NetworkManagerSettings_System_get_permissions_async_callback, function in nm-settings-system-bindings
+NM_OBJECT_DBUS_CONNECTION, macro in NMObject
 

-org_freedesktop_NetworkManagerSettings_System_get_permissions_reply, user_function in nm-settings-system-bindings
+NM_OBJECT_DBUS_PATH, macro in NMObject
 

-org_freedesktop_NetworkManagerSettings_System_save_hostname, function in nm-settings-system-bindings
+NM_OBJECT_ERROR, macro in NMObject
 

-org_freedesktop_NetworkManagerSettings_System_save_hostname_async, function in nm-settings-system-bindings
+nm_object_error_quark, function in NMObject
 

-org_freedesktop_NetworkManagerSettings_System_save_hostname_async_callback, function in nm-settings-system-bindings
+nm_object_get_connection, function in NMObject
 

-org_freedesktop_NetworkManagerSettings_System_save_hostname_reply, user_function in nm-settings-system-bindings
+nm_object_get_path, function in NMObject
 
R

@@ -1986,6 +1931,10 @@ org_freedesktop_NetworkManagerSettings_System_save_hostname_reply, user_function
 

+nm_secret_agent_get_registered, function in NMSecretAgent
+

+

+

 nm_secret_agent_get_secrets, function in NMSecretAgent
 

@@ -1998,6 +1947,10 @@ org_freedesktop_NetworkManagerSettings_System_save_hostname_reply, user_function
 

+NM_SECRET_AGENT_REGISTERED, macro in NMSecretAgent
+

+

+

 NM_SECRET_AGENT_REGISTRATION_RESULT, macro in NMSecretAgent
 

@@ -2103,10 +2056,18 @@ org_freedesktop_NetworkManagerSettings_System_save_hostname_reply, user_function
 

+nm_vpn_plugin_set_config, function in NMVPNPlugin
+

+

+

 nm_vpn_plugin_set_ip4_config, function in NMVPNPlugin
 

+nm_vpn_plugin_set_ip6_config, function in NMVPNPlugin
+

+

+

 nm_vpn_plugin_set_login_banner, function in NMVPNPlugin
 

diff --git a/docs/libnm-glib/html/ch02.html b/docs/libnm-glib/html/ch02.html
index 72bb7148..4ae3cc09 100644
--- a/docs/libnm-glib/html/ch02.html
+++ b/docs/libnm-glib/html/ch02.html
@@ -21,7 +21,7 @@
 
 

 

-libnm-glib API Reference

+libnm-glib API Reference

 

 

 NMClient
@@ -48,6 +48,18 @@
 NMDeviceWimax
 

 

+NMDeviceBond
+

+

+NMDeviceInfiniband
+

+

+NMDeviceVlan
+

+

+NMDeviceOlpcMesh
+

+

 NMWimaxNsp
 

 

diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html
index e81d55c8..86ef3641 100644
--- a/docs/libnm-glib/html/index.html
+++ b/docs/libnm-glib/html/index.html
@@ -29,7 +29,7 @@
     

 
Copyright © 2011 The NetworkManager Authors

 

-

+

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

+NMDeviceBond
+

+

+NMDeviceInfiniband
+

+

+NMDeviceVlan
+

+

+NMDeviceOlpcMesh
+

+

 NMWimaxNsp
 

 

diff --git a/docs/libnm-glib/html/index.sgml b/docs/libnm-glib/html/index.sgml
index 5f5404f7..2251b67f 100644
--- a/docs/libnm-glib/html/index.sgml
+++ b/docs/libnm-glib/html/index.sgml
@@ -113,12 +113,15 @@
 
 
 
+
 
 
 
 
 
+
 
+
 
 
 
@@ -129,16 +132,20 @@
 
 
 
+
 
 
 
 
+
 
 
 
 
 
+
 
+
 
 
 
@@ -150,14 +157,18 @@
 
 
 
+
 
 
+
 
 
 
 
 
+
 
+
 
 
 
@@ -179,10 +190,18 @@
 
 
 
+
+
+
+
+
+
 
+
 
 
 
+
 
 
 
@@ -203,12 +222,22 @@
 
 
 
+
+
+
+
+
+
+
+
 
 
 
+
 
 
 
+
 
 
 
@@ -237,8 +266,15 @@
 
 
 
+
+
+
+
+
 
+
 
+
 
 
 
@@ -253,9 +289,18 @@
 
 
 
+
+
+
+
+
+
+
 
+
 
 
+
 
 
 
@@ -274,13 +319,21 @@
 
 
 
+
+
+
+
+
+
 
 
 
 
+
 
 
 
+
 
 
 
@@ -302,6 +355,109 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -452,17 +608,25 @@
 
 
 
+
 
 
 
 
+
+
+
 
 
+
+
 
 
 
 
 
+
+
 
 
 
@@ -547,14 +711,17 @@
 
 
 
+
 
 
 
 
 
+
 
 
 
+
 
 
 
@@ -599,7 +766,9 @@
 
 
 
+
 
+
 
 
 
diff --git a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
index a8f13163..a05a01a4 100644
--- a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
+++ b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
@@ -49,8 +49,12 @@ enum                NMVPNPluginFailure reason);
 DBusGConnection *   nm_vpn_plugin_get_connection        (NMVPNPlugin *plugin);
 NMVPNServiceState   nm_vpn_plugin_get_state             (NMVPNPlugin *plugin);
+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,
@@ -80,40 +84,44 @@ enum                
+
nm_vpn_plugin_set_config ()

+
void                nm_vpn_plugin_set_config            (NMVPNPlugin *plugin,
+                                                         GHashTable *config);

+

+

+

+

+

 
nm_vpn_plugin_set_ip4_config ()

 
void                nm_vpn_plugin_set_ip4_config        (NMVPNPlugin *plugin,
                                                          GHashTable *ip4_config);

@@ -200,6 +216,14 @@ enum                
+
nm_vpn_plugin_set_ip6_config ()

+
void                nm_vpn_plugin_set_ip6_config        (NMVPNPlugin *plugin,
+                                                         GHashTable *ip6_config);

+

+

+

+

+

 
nm_vpn_plugin_set_login_banner ()

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

diff --git a/docs/libnm-glib/html/libnm-glib.devhelp2 b/docs/libnm-glib/html/libnm-glib.devhelp2
index edbb4a26..08ca3a93 100644
--- a/docs/libnm-glib/html/libnm-glib.devhelp2
+++ b/docs/libnm-glib/html/libnm-glib.devhelp2
@@ -12,6 +12,10 @@
       
       
       
+      
+      
+      
+      
       
       
       
@@ -121,12 +125,15 @@
     
     
     
+    
     
     
     
     
     
+    
     
+    
     
     
     
@@ -137,16 +144,20 @@
     
     
     
+    
     
     
     
     
+    
     
     
     
     
     
+    
     
+    
     
     
     
@@ -158,13 +169,17 @@
     
     
     
+    
     
+    
     
     
     
     
     
+    
     
+    
     
     
     
@@ -178,10 +193,13 @@
     
     
     
+    
     
+    
     
     
     
+    
     
     
     
@@ -193,12 +211,15 @@
     
     
     
+    
     
     
     
+    
     
     
     
+    
     
     
     
@@ -218,17 +239,23 @@
     
     
     
+    
     
+    
     
+    
     
     
     
     
     
     
+    
     
+    
     
     
+    
     
     
     
@@ -238,13 +265,16 @@
     
     
     
+    
     
     
     
     
+    
     
     
     
+    
     
     
     
@@ -264,6 +294,60 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -363,12 +447,16 @@
     
     
     
+    
     
     
+    
+    
     
     
     
     
+    
     
     
     
@@ -421,9 +509,11 @@
     
     
     
+    
     
     
     
+    
     
     
     
@@ -452,7 +542,9 @@
     
     
     
+    
     
+    
     
     
     
@@ -477,11 +569,58 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
     
     
     
+    
   
 
diff --git a/docs/libnm-glib/html/object-tree.html b/docs/libnm-glib/html/object-tree.html
index bbc78129..40bce23a 100644
--- a/docs/libnm-glib/html/object-tree.html
+++ b/docs/libnm-glib/html/object-tree.html
@@ -32,10 +32,10 @@
                 NMDeviceModem
                 NMDeviceBt
                 NMDeviceWimax
-                NMDeviceOlpcMesh
-                NMDeviceInfiniband
-                NMDeviceBond
-                NMDeviceVlan
+                NMDeviceOlpcMesh
+                NMDeviceInfiniband
+                NMDeviceBond
+                NMDeviceVlan
             NMWimaxNsp
             NMAccessPoint
             NMIP4Config
diff --git a/docs/libnm-glib/libnm-glib-docs.xml b/docs/libnm-glib/libnm-glib-docs.xml
index 92dad87c..7f855aa0 100644
--- a/docs/libnm-glib/libnm-glib-docs.xml
+++ b/docs/libnm-glib/libnm-glib-docs.xml
@@ -88,6 +88,10 @@
     
     
     
+    
+    
+    
+    
     
     
     
diff --git a/docs/libnm-glib/libnm-glib-sections.txt b/docs/libnm-glib/libnm-glib-sections.txt
index 25ba7b85..1ba78796 100644
--- a/docs/libnm-glib/libnm-glib-sections.txt
+++ b/docs/libnm-glib/libnm-glib-sections.txt
@@ -136,12 +136,15 @@ NMDevice
 NMDeviceClass
 NMDeviceDeactivateFn
 NM_DEVICE_ACTIVE_CONNECTION
+NM_DEVICE_AUTOCONNECT
 NM_DEVICE_CAPABILITIES
 NM_DEVICE_DEVICE_TYPE
 NM_DEVICE_DHCP4_CONFIG
 NM_DEVICE_DHCP6_CONFIG
 NM_DEVICE_DRIVER
+NM_DEVICE_DRIVER_VERSION
 NM_DEVICE_FIRMWARE_MISSING
+NM_DEVICE_FIRMWARE_VERSION
 NM_DEVICE_INTERFACE
 NM_DEVICE_IP4_CONFIG
 NM_DEVICE_IP6_CONFIG
@@ -152,16 +155,20 @@ NM_DEVICE_STATE
 NM_DEVICE_STATE_REASON
 NM_DEVICE_UDI
 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_capabilities
 nm_device_get_device_type
 nm_device_get_dhcp4_config
 nm_device_get_dhcp6_config
 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_ip4_config
 nm_device_get_ip6_config
@@ -173,6 +180,7 @@ nm_device_get_state_reason
 nm_device_get_udi
 nm_device_get_vendor
 nm_device_new
+nm_device_set_autoconnect
 
 NM_DEVICE
 NM_DEVICE_CLASS
@@ -183,13 +191,37 @@ NM_TYPE_DEVICE
 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_new
+
+NM_DEVICE_ADSL
+NM_DEVICE_ADSL_CLASS
+NM_DEVICE_ADSL_GET_CLASS
+NM_IS_DEVICE_ADSL
+NM_IS_DEVICE_ADSL_CLASS
+NM_TYPE_DEVICE_ADSL
+nm_device_adsl_get_type
+

+
 

 nm-device-bond
 NMDeviceBond
 NMDeviceBond
 NMDeviceBondClass
+NMDeviceBondError
 NM_DEVICE_BOND_CARRIER
+NM_DEVICE_BOND_ERROR
 NM_DEVICE_BOND_HW_ADDRESS
+nm_device_bond_error_quark
 nm_device_bond_get_carrier
 nm_device_bond_get_hw_address
 nm_device_bond_new
@@ -208,9 +240,12 @@ nm_device_bond_get_type
 NMDeviceBt
 NMDeviceBt
 NMDeviceBtClass
+NMDeviceBtError
 NM_DEVICE_BT_CAPABILITIES
+NM_DEVICE_BT_ERROR
 NM_DEVICE_BT_HW_ADDRESS
 NM_DEVICE_BT_NAME
+nm_device_bt_error_quark
 nm_device_bt_get_capabilities
 nm_device_bt_get_hw_address
 nm_device_bt_get_name
@@ -230,10 +265,13 @@ nm_device_bt_get_type
 NMDeviceEthernet
 NMDeviceEthernet
 NMDeviceEthernetClass
+NMDeviceEthernetError
 NM_DEVICE_ETHERNET_CARRIER
+NM_DEVICE_ETHERNET_ERROR
 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_get_hw_address
 nm_device_ethernet_get_permanent_hw_address
@@ -254,8 +292,11 @@ nm_device_ethernet_get_type
 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_new
@@ -269,18 +310,16 @@ NM_TYPE_DEVICE_INFINIBAND
 nm_device_infiniband_get_type
 

 
-

-nm-device-infiniband-bindings
-DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManager_Device_Infiniband
-

-
 

 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_get_modem_capabilities
 
@@ -298,9 +337,12 @@ nm_device_modem_get_type
 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
@@ -320,9 +362,12 @@ nm_device_olpc_mesh_get_type
 NMDeviceVlan
 NMDeviceVlan
 NMDeviceVlanClass
+NMDeviceVlanError
 NM_DEVICE_VLAN_CARRIER
+NM_DEVICE_VLAN_ERROR
 NM_DEVICE_VLAN_HW_ADDRESS
 NM_DEVICE_VLAN_VLAN_ID
+nm_device_vlan_error_quark
 nm_device_vlan_get_carrier
 nm_device_vlan_get_hw_address
 nm_device_vlan_get_vlan_id
@@ -342,12 +387,15 @@ nm_device_vlan_get_type
 NMDeviceWifi
 NMDeviceWifi
 NMDeviceWifiClass
+NMDeviceWifiError
 NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT
 NM_DEVICE_WIFI_BITRATE
 NM_DEVICE_WIFI_CAPABILITIES
+NM_DEVICE_WIFI_ERROR
 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
@@ -372,13 +420,16 @@ nm_device_wifi_get_type
 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_HW_ADDRESS
 NM_DEVICE_WIMAX_RSSI
 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
@@ -435,71 +486,39 @@ NM_TYPE_DHCP6_CONFIG
 nm_dhcp6_config_get_type
 

 
-

-nm-exported-connection-bindings
-DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManagerSettings_Connection
-DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManagerSettings_Connection_Secrets
-dbus_g_proxy_begin_call
-org_freedesktop_NetworkManagerSettings_Connection_Secrets_get_secrets
-org_freedesktop_NetworkManagerSettings_Connection_Secrets_get_secrets_async
-org_freedesktop_NetworkManagerSettings_Connection_Secrets_get_secrets_async_callback
-org_freedesktop_NetworkManagerSettings_Connection_Secrets_get_secrets_reply
-org_freedesktop_NetworkManagerSettings_Connection_delete
-org_freedesktop_NetworkManagerSettings_Connection_delete_async
-org_freedesktop_NetworkManagerSettings_Connection_delete_async_callback
-org_freedesktop_NetworkManagerSettings_Connection_delete_reply
-org_freedesktop_NetworkManagerSettings_Connection_get_settings
-org_freedesktop_NetworkManagerSettings_Connection_get_settings_async
-org_freedesktop_NetworkManagerSettings_Connection_get_settings_async_callback
-org_freedesktop_NetworkManagerSettings_Connection_get_settings_reply
-org_freedesktop_NetworkManagerSettings_Connection_update
-org_freedesktop_NetworkManagerSettings_Connection_update_async
-org_freedesktop_NetworkManagerSettings_Connection_update_async_callback
-org_freedesktop_NetworkManagerSettings_Connection_update_reply
-

-
-

-nm-exported-connection-glue
-dbus_glib_marshal_nm_exported_connection_BOOLEAN__POINTER_POINTER
-dbus_glib_marshal_nm_exported_connection_NONE__BOXED_POINTER
-dbus_glib_marshal_nm_exported_connection_NONE__POINTER
-dbus_glib_marshal_nm_exported_connection_NONE__STRING_BOXED_BOOLEAN_POINTER
-dbus_glib_marshal_nm_exported_connection_VOID__BOXED_POINTER
-dbus_glib_marshal_nm_exported_connection_VOID__POINTER
-dbus_glib_marshal_nm_exported_connection_VOID__STRING_BOXED_BOOLEAN_POINTER
-dbus_glib_nm_exported_connection_object_info
-g_marshal_value_peek_boolean
-g_marshal_value_peek_boxed
-g_marshal_value_peek_char
-g_marshal_value_peek_double
-g_marshal_value_peek_enum
-g_marshal_value_peek_flags
-g_marshal_value_peek_float
-g_marshal_value_peek_int
-g_marshal_value_peek_int64
-g_marshal_value_peek_long
-g_marshal_value_peek_object
-g_marshal_value_peek_param
-g_marshal_value_peek_pointer
-g_marshal_value_peek_string
-g_marshal_value_peek_uchar
-g_marshal_value_peek_uint
-g_marshal_value_peek_uint64
-g_marshal_value_peek_ulong
-g_marshal_value_peek_variant
-

-
 

 nm-glib-enum-types
 
 NM_TYPE_CLIENT_PERMISSION
 NM_TYPE_CLIENT_PERMISSION_RESULT
+NM_TYPE_DEVICE_ADSL_ERROR
+NM_TYPE_DEVICE_BOND_ERROR
+NM_TYPE_DEVICE_BT_ERROR
+NM_TYPE_DEVICE_ETHERNET_ERROR
+NM_TYPE_DEVICE_INFINIBAND_ERROR
+NM_TYPE_DEVICE_MODEM_ERROR
+NM_TYPE_DEVICE_OLPC_MESH_ERROR
+NM_TYPE_DEVICE_VLAN_ERROR
+NM_TYPE_DEVICE_WIFI_ERROR
+NM_TYPE_DEVICE_WIMAX_ERROR
+NM_TYPE_OBJECT_ERROR
 NM_TYPE_REMOTE_SETTINGS_ERROR
 NM_TYPE_SECRET_AGENT_ERROR
 NM_TYPE_SECRET_AGENT_GET_SECRETS_FLAGS
 NM_TYPE_WIMAX_NSP_NETWORK_TYPE
 nm_client_permission_get_type
 nm_client_permission_result_get_type
+nm_device_adsl_error_get_type
+nm_device_bond_error_get_type
+nm_device_bt_error_get_type
+nm_device_ethernet_error_get_type
+nm_device_infiniband_error_get_type
+nm_device_modem_error_get_type
+nm_device_olpc_mesh_error_get_type
+nm_device_vlan_error_get_type
+nm_device_wifi_error_get_type
+nm_device_wimax_error_get_type
+nm_object_error_get_type
 nm_remote_settings_error_get_type
 nm_secret_agent_error_get_type
 nm_secret_agent_get_secrets_flags_get_type
@@ -566,8 +585,11 @@ nm_ip6_config_get_type
 NMObject
 NMObject
 NMObjectClass
+NMObjectError
 NM_OBJECT_DBUS_CONNECTION
 NM_OBJECT_DBUS_PATH
+NM_OBJECT_ERROR
+nm_object_error_quark
 nm_object_get_connection
 nm_object_get_path
 
@@ -651,9 +673,11 @@ NMSecretAgentSaveSecretsFunc
 NM_SECRET_AGENT_AUTO_REGISTER
 NM_SECRET_AGENT_ERROR
 NM_SECRET_AGENT_IDENTIFIER
+NM_SECRET_AGENT_REGISTERED
 NM_SECRET_AGENT_REGISTRATION_RESULT
 nm_secret_agent_delete_secrets
 nm_secret_agent_error_quark
+nm_secret_agent_get_registered
 nm_secret_agent_get_secrets
 nm_secret_agent_register
 nm_secret_agent_save_secrets
@@ -668,50 +692,6 @@ NM_TYPE_SECRET_AGENT
 nm_secret_agent_get_type
 

 
-

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

-
-

-nm-settings-system-bindings
-DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManagerSettings_System
-dbus_g_proxy_begin_call
-org_freedesktop_NetworkManagerSettings_System_get_permissions
-org_freedesktop_NetworkManagerSettings_System_get_permissions_async
-org_freedesktop_NetworkManagerSettings_System_get_permissions_async_callback
-org_freedesktop_NetworkManagerSettings_System_get_permissions_reply
-org_freedesktop_NetworkManagerSettings_System_save_hostname
-org_freedesktop_NetworkManagerSettings_System_save_hostname_async
-org_freedesktop_NetworkManagerSettings_System_save_hostname_async_callback
-org_freedesktop_NetworkManagerSettings_System_save_hostname_reply
-

-
 

 nm-types
 
@@ -773,7 +753,9 @@ nm_vpn_plugin_error_quark
 nm_vpn_plugin_failure
 nm_vpn_plugin_get_connection
 nm_vpn_plugin_get_state
+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
 
diff --git a/docs/libnm-glib/tmpl/nm-device-adsl.sgml b/docs/libnm-glib/tmpl/nm-device-adsl.sgml
new file mode 100644
index 00000000..dc26b35c
--- /dev/null
+++ b/docs/libnm-glib/tmpl/nm-device-adsl.sgml
@@ -0,0 +1,93 @@
+
+NMDeviceAdsl
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@parent: 
+
+
+
+
+
+
+@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: 
+
+
+
+
+
+
+
+@device: 
+@Returns: 
+
+
+
+
+
+
+
+@connection: 
+@path: 
+@Returns: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-device-bond.sgml b/docs/libnm-glib/tmpl/nm-device-bond.sgml
index d719184c..8f9e8db6 100644
--- a/docs/libnm-glib/tmpl/nm-device-bond.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-bond.sgml
@@ -49,6 +49,16 @@ NMDeviceBond
 @_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: 
+
 
 
 
@@ -56,6 +66,13 @@ NMDeviceBond
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -63,6 +80,15 @@ NMDeviceBond
 
 
 
+
+
+
+
+
+@void: 
+@Returns: 
+
+
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-bt.sgml b/docs/libnm-glib/tmpl/nm-device-bt.sgml
index bcf2d3c6..26582065 100644
--- a/docs/libnm-glib/tmpl/nm-device-bt.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-bt.sgml
@@ -54,6 +54,18 @@ NMDeviceBt
 @_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: 
+
 
 
 
@@ -61,6 +73,13 @@ NMDeviceBt
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -75,6 +94,15 @@ NMDeviceBt
 
 
 
+
+
+
+
+
+@void: 
+@Returns: 
+
+
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-ethernet.sgml b/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
index b3620ab0..ea04914e 100644
--- a/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
@@ -59,6 +59,17 @@ NMDeviceEthernet
 @_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: 
+
 
 
 
@@ -66,6 +77,13 @@ NMDeviceEthernet
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -87,6 +105,15 @@ NMDeviceEthernet
 
 
 
+
+
+
+
+
+@void: 
+@Returns: 
+
+
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-infiniband-bindings.sgml b/docs/libnm-glib/tmpl/nm-device-infiniband-bindings.sgml
deleted file mode 100644
index 09405987..00000000
--- a/docs/libnm-glib/tmpl/nm-device-infiniband-bindings.sgml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-nm-device-infiniband-bindings
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-infiniband.sgml b/docs/libnm-glib/tmpl/nm-device-infiniband.sgml
index bd2ef58e..e94c6bae 100644
--- a/docs/libnm-glib/tmpl/nm-device-infiniband.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-infiniband.sgml
@@ -49,6 +49,17 @@ NMDeviceInfiniband
 @_reserved5: 
 @_reserved6: 
 
+
+
+
+
+
+@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: 
+
 
 
 
@@ -56,6 +67,13 @@ NMDeviceInfiniband
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -63,6 +81,15 @@ NMDeviceInfiniband
 
 
 
+
+
+
+
+
+@void: 
+@Returns: 
+
+
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-modem.sgml b/docs/libnm-glib/tmpl/nm-device-modem.sgml
index a67c4777..259db939 100644
--- a/docs/libnm-glib/tmpl/nm-device-modem.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-modem.sgml
@@ -49,6 +49,16 @@ NMDeviceModem
 @_reserved5: 
 @_reserved6: 
 
+
+
+
+
+
+@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: 
+
 
 
 
@@ -56,6 +66,13 @@ NMDeviceModem
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -63,6 +80,15 @@ NMDeviceModem
 
 
 
+
+
+
+
+
+@void: 
+@Returns: 
+
+
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml b/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml
index 69e2cd52..a604a43a 100644
--- a/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml
@@ -54,6 +54,15 @@ NMDeviceOlpcMesh
 @_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: 
+
 
 
 
@@ -68,6 +77,13 @@ NMDeviceOlpcMesh
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -75,6 +91,15 @@ NMDeviceOlpcMesh
 
 
 
+
+
+
+
+
+@void: 
+@Returns: 
+
+
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-vlan.sgml b/docs/libnm-glib/tmpl/nm-device-vlan.sgml
index 5d38d111..5a58b7b2 100644
--- a/docs/libnm-glib/tmpl/nm-device-vlan.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-vlan.sgml
@@ -54,6 +54,17 @@ NMDeviceVlan
 @_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: 
+
 
 
 
@@ -61,6 +72,13 @@ NMDeviceVlan
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -75,6 +93,15 @@ NMDeviceVlan
 
 
 
+
+
+
+
+
+@void: 
+@Returns: 
+
+
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-wifi.sgml b/docs/libnm-glib/tmpl/nm-device-wifi.sgml
index 94cc3e9f..89ead82a 100644
--- a/docs/libnm-glib/tmpl/nm-device-wifi.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-wifi.sgml
@@ -87,6 +87,19 @@ NMDeviceWifi
 @_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: 
+
 
 
 
@@ -108,6 +121,13 @@ NMDeviceWifi
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -129,6 +149,15 @@ NMDeviceWifi
 
 
 
+
+
+
+
+
+@void: 
+@Returns: 
+
+
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device-wimax.sgml b/docs/libnm-glib/tmpl/nm-device-wimax.sgml
index fbda3469..8d23e4da 100644
--- a/docs/libnm-glib/tmpl/nm-device-wimax.sgml
+++ b/docs/libnm-glib/tmpl/nm-device-wimax.sgml
@@ -86,6 +86,17 @@ NMDeviceWimax
 @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: 
+
 
 
 
@@ -114,6 +125,13 @@ NMDeviceWimax
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -135,6 +153,15 @@ NMDeviceWimax
 
 
 
+
+
+
+
+
+@void: 
+@Returns: 
+
+
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-device.sgml b/docs/libnm-glib/tmpl/nm-device.sgml
index c2d02f96..68df46f9 100644
--- a/docs/libnm-glib/tmpl/nm-device.sgml
+++ b/docs/libnm-glib/tmpl/nm-device.sgml
@@ -41,6 +41,11 @@ NMDevice
 
 
 
+
+
+
+
+
 
 
 
@@ -66,11 +71,21 @@ NMDevice
 
 
 
+
+
+
+
+
 
 
 
 
 
+
+
+
+
+
 
 
 
@@ -153,6 +168,13 @@ NMDevice
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -188,6 +210,13 @@ NMDevice
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -195,6 +224,13 @@ NMDevice
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -265,6 +301,17 @@ NMDevice
 
 
 
+
+
+
+
+
+@device: 
+@connection: 
+@error: 
+@Returns: 
+
+
 
 
 
@@ -304,6 +351,15 @@ NMDevice
 @Returns: 
 
 
+
+
+
+
+
+@device: 
+@Returns: 
+
+
 
 
 
@@ -349,6 +405,15 @@ NMDevice
 @Returns: 
 
 
+
+
+
+
+
+@device: 
+@Returns: 
+
+
 
 
 
@@ -358,6 +423,15 @@ NMDevice
 @Returns: 
 
 
+
+
+
+
+
+@device: 
+@Returns: 
+
+
 
 
 
@@ -459,3 +533,12 @@ NMDevice
 @Returns: 
 
 
+
+
+
+
+
+@device: 
+@autoconnect: 
+
+
diff --git a/docs/libnm-glib/tmpl/nm-exported-connection-bindings.sgml b/docs/libnm-glib/tmpl/nm-exported-connection-bindings.sgml
deleted file mode 100644
index 6d7bd83d..00000000
--- a/docs/libnm-glib/tmpl/nm-exported-connection-bindings.sgml
+++ /dev/null
@@ -1,213 +0,0 @@
-
-nm-exported-connection-bindings
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@Param1: 
-@Returns: 
-
-
-
-
-
-
-
-@proxy: 
-@IN_setting_name: 
-@IN_hints: 
-@IN_request_new: 
-@OUT_secrets: 
-@Returns: 
-
-
-
-
-
-
-
-@proxy: 
-@IN_setting_name: 
-@IN_hints: 
-@IN_request_new: 
-@callback: 
-@Returns: 
-
-
-
-
-
-
-
-@proxy: 
-@call: 
-@user_data: 
-
-
-
-
-
-
-
-@proxy: 
-@OUT_secrets: 
-@error: 
-@userdata: 
-
-
-
-
-
-
-
-@proxy: 
-@Returns: 
-
-
-
-
-
-
-
-@proxy: 
-@callback: 
-@Returns: 
-
-
-
-
-
-
-
-@proxy: 
-@call: 
-@user_data: 
-
-
-
-
-
-
-
-@proxy: 
-@error: 
-@userdata: 
-
-
-
-
-
-
-
-@proxy: 
-@OUT_settings: 
-@Returns: 
-
-
-
-
-
-
-
-@proxy: 
-@callback: 
-@Returns: 
-
-
-
-
-
-
-
-@proxy: 
-@call: 
-@user_data: 
-
-
-
-
-
-
-
-@proxy: 
-@OUT_settings: 
-@error: 
-@userdata: 
-
-
-
-
-
-
-
-@proxy: 
-@IN_properties: 
-@Returns: 
-
-
-
-
-
-
-
-@proxy: 
-@IN_properties: 
-@callback: 
-@Returns: 
-
-
-
-
-
-
-
-@proxy: 
-@call: 
-@user_data: 
-
-
-
-
-
-
-
-@proxy: 
-@error: 
-@userdata: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-exported-connection-glue.sgml b/docs/libnm-glib/tmpl/nm-exported-connection-glue.sgml
deleted file mode 100644
index fda72e2e..00000000
--- a/docs/libnm-glib/tmpl/nm-exported-connection-glue.sgml
+++ /dev/null
@@ -1,247 +0,0 @@
-
-nm-exported-connection-glue
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@closure: 
-@return_value: 
-@n_param_values: 
-@param_values: 
-@invocation_hint: 
-@marshal_data: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@closure: 
-@return_value: 
-@n_param_values: 
-@param_values: 
-@invocation_hint: 
-@marshal_data: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@closure: 
-@return_value: 
-@n_param_values: 
-@param_values: 
-@invocation_hint: 
-@marshal_data: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-object.sgml b/docs/libnm-glib/tmpl/nm-object.sgml
index d79c1522..aaf91b49 100644
--- a/docs/libnm-glib/tmpl/nm-object.sgml
+++ b/docs/libnm-glib/tmpl/nm-object.sgml
@@ -26,6 +26,15 @@ NMObject
 
 
 
+
+
+
+
+
+@nmobject: the object which received the signal.
+@arg1: 
+@arg2: 
+
 
 
 
@@ -42,6 +51,7 @@ NMObject
 
 
 @parent: 
+@object_creation_failed: 
 @_reserved1: 
 @_reserved2: 
 @_reserved3: 
@@ -49,6 +59,14 @@ NMObject
 @_reserved5: 
 @_reserved6: 
 
+
+
+
+
+
+@NM_OBJECT_ERROR_UNKNOWN: 
+@NM_OBJECT_ERROR_OBJECT_CREATION_FAILURE: 
+
 
 
 
@@ -63,6 +81,22 @@ NMObject
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-secret-agent-glue.sgml b/docs/libnm-glib/tmpl/nm-secret-agent-glue.sgml
deleted file mode 100644
index f8b51d7d..00000000
--- a/docs/libnm-glib/tmpl/nm-secret-agent-glue.sgml
+++ /dev/null
@@ -1,240 +0,0 @@
-
-nm-secret-agent-glue
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@closure: 
-@return_value: 
-@n_param_values: 
-@param_values: 
-@invocation_hint: 
-@marshal_data: 
-
-
-
-
-
-
-
-@closure: 
-@return_value: 
-@n_param_values: 
-@param_values: 
-@invocation_hint: 
-@marshal_data: 
-
-
-
-
-
-
-
-@closure: 
-@return_value: 
-@n_param_values: 
-@param_values: 
-@invocation_hint: 
-@marshal_data: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
-
-
-
-
-
-@v: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-secret-agent.sgml b/docs/libnm-glib/tmpl/nm-secret-agent.sgml
index 9f31c86b..428b7afd 100644
--- a/docs/libnm-glib/tmpl/nm-secret-agent.sgml
+++ b/docs/libnm-glib/tmpl/nm-secret-agent.sgml
@@ -98,6 +98,7 @@ NMSecretAgent
 @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: 
 
 
 
@@ -143,6 +144,13 @@ NMSecretAgent
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -170,6 +178,15 @@ NMSecretAgent
 @Returns: 
 
 
+
+
+
+
+
+@self: 
+@Returns: 
+
+
 
 
 
diff --git a/docs/libnm-glib/tmpl/nm-settings-system-bindings.sgml b/docs/libnm-glib/tmpl/nm-settings-system-bindings.sgml
deleted file mode 100644
index 29790794..00000000
--- a/docs/libnm-glib/tmpl/nm-settings-system-bindings.sgml
+++ /dev/null
@@ -1,120 +0,0 @@
-
-nm-settings-system-bindings
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@Param1: 
-@Returns: 
-
-
-
-
-
-
-
-@proxy: 
-@OUT_permissions: 
-@Returns: 
-
-
-
-
-
-
-
-@proxy: 
-@callback: 
-@Returns: 
-
-
-
-
-
-
-
-@proxy: 
-@call: 
-@user_data: 
-
-
-
-
-
-
-
-@proxy: 
-@OUT_permissions: 
-@error: 
-@userdata: 
-
-
-
-
-
-
-
-@proxy: 
-@IN_hostname: 
-@Returns: 
-
-
-
-
-
-
-
-@proxy: 
-@IN_hostname: 
-@callback: 
-@Returns: 
-
-
-
-
-
-
-
-@proxy: 
-@call: 
-@user_data: 
-
-
-
-
-
-
-
-@proxy: 
-@error: 
-@userdata: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
index 08e0807c..c04eb296 100644
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
+++ b/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
@@ -41,12 +41,12 @@ NMVPNPlugin
 @login_banner: 
 @failure: 
 @quit: 
+@config: 
+@ip6_config: 
 @_reserved1: 
 @_reserved2: 
 @_reserved3: 
 @_reserved4: 
-@_reserved5: 
-@_reserved6: 
 
 
 
@@ -123,6 +123,15 @@ NMVPNPlugin
 @Returns: 
 
 
+
+
+
+
+
+@plugin: 
+@config: 
+
+
 
 
 
@@ -132,6 +141,15 @@ NMVPNPlugin
 @ip4_config: 
 
 
+
+
+
+
+
+@plugin: 
+@ip6_config: 
+
+
 
 
 
diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in
index 281aa765..de0a694a 100644
--- a/docs/libnm-util/Makefile.in
+++ b/docs/libnm-util/Makefile.in
@@ -53,7 +53,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
 	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -141,6 +141,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
 INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
@@ -236,6 +240,9 @@ UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
 UUID_CFLAGS = @UUID_CFLAGS@
 UUID_LIBS = @UUID_LIBS@
+VAPIGEN = @VAPIGEN@
+VAPIGEN_MAKEFILE = @VAPIGEN_MAKEFILE@
+VAPIGEN_VAPIDIR = @VAPIGEN_VAPIDIR@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
@@ -274,6 +281,8 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html
index 45911ba8..c1bd42e1 100644
--- a/docs/libnm-util/html/NMConnection.html
+++ b/docs/libnm-util/html/NMConnection.html
@@ -78,16 +78,17 @@ const char *        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);
+NMSettingBond *     nm_connection_get_setting_bond      (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);
 NMSettingGsm *      nm_connection_get_setting_gsm       (NMConnection *connection);
-NMSettingInfiniband * nm_connection_get_setting_infiniband
+NMSettingInfiniband * nm_connection_get_setting_infiniband
                                                         (NMConnection *connection);
 NMSettingIP4Config * nm_connection_get_setting_ip4_config
                                                         (NMConnection *connection);
@@ -97,7 +98,7 @@ 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);
+NMSettingVlan *     nm_connection_get_setting_vlan      (NMConnection *connection);
 NMSettingVPN *      nm_connection_get_setting_vpn       (NMConnection *connection);
 NMSettingWimax *    nm_connection_get_setting_wimax     (NMConnection *connection);
 NMSettingWired *    nm_connection_get_setting_wired     (NMConnection *connection);
@@ -629,6 +630,29 @@ A shortcut to return any 
+
nm_connection_get_setting_adsl ()

+
NMSettingAdsl *     nm_connection_get_setting_adsl      (NMConnection *connection);

+

+A shortcut to return any NMSettingAdsl the connection might contain.
+

+

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


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

+

+

+

 
nm_connection_get_setting_bluetooth ()

 
NMSettingBluetooth * nm_connection_get_setting_bluetooth
                                                         (NMConnection *connection);

@@ -654,9 +678,9 @@ A shortcut to return any 
 
nm_connection_get_setting_bond ()

-
NMSettingBond *     nm_connection_get_setting_bond      (NMConnection *connection);

+
NMSettingBond *     nm_connection_get_setting_bond      (NMConnection *connection);

 

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

 
@@ -668,7 +692,7 @@ A shortcut to return any NMSettingBond the connection
 
-
@@ -777,10 +801,10 @@ A shortcut to return any 
 
nm_connection_get_setting_infiniband ()

-
NMSettingInfiniband * nm_connection_get_setting_infiniband
+
NMSettingInfiniband * nm_connection_get_setting_infiniband
                                                         (NMConnection *connection);

 

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

 

 

 

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

 
@@ -792,7 +816,7 @@ A shortcut to return any NMSettingInfiniband the conne
 
-
@@ -941,9 +965,9 @@ A shortcut to return any 
 
nm_connection_get_setting_vlan ()

-
NMSettingVlan *     nm_connection_get_setting_vlan      (NMConnection *connection);

+
NMSettingVlan *     nm_connection_get_setting_vlan      (NMConnection *connection);

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

 

 

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

 
 
 
@@ -955,7 +979,7 @@ A shortcut to return any NMSettingVlan the connection
 
-
diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html
index 3e64eeb0..cccfd00b 100644
--- a/docs/libnm-util/html/NMSetting.html
+++ b/docs/libnm-util/html/NMSetting.html
@@ -113,19 +113,20 @@ const char *        GObject
    +----NMSetting
          +----NMSetting8021x
+         +----NMSettingAdsl
          +----NMSettingBluetooth
-         +----NMSettingBond
+         +----NMSettingBond
          +----NMSettingCdma
          +----NMSettingConnection
          +----NMSettingGsm
-         +----NMSettingInfiniband
+         +----NMSettingInfiniband
          +----NMSettingIP4Config
          +----NMSettingIP6Config
          +----NMSettingOlpcMesh
          +----NMSettingPPP
          +----NMSettingPPPOE
          +----NMSettingSerial
-         +----NMSettingVlan
+         +----NMSettingVlan
          +----NMSettingVPN
          +----NMSettingWimax
          +----NMSettingWired
diff --git a/docs/libnm-util/html/NMSettingBond.html b/docs/libnm-util/html/NMSettingBond.html
new file mode 100644
index 00000000..e29bca05
--- /dev/null
+++ b/docs/libnm-util/html/NMSettingBond.html
@@ -0,0 +1,547 @@
+
+
+
+
+NMSettingBond
+
+
+
+
+
+
+
+
+
+

 

 

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

 

+
+
+
+
+
+
+
+
+
+

+

+

+
+
+

+
NMSettingBond

+
NMSettingBond — Describes connection properties for bonds

+

+

+
Synopsis

+
+#include <nm-setting-bond.h>
+
+                    NMSettingBond;
+                    NMSettingBondClass;
+enum                NMSettingBondError;
+#define             NM_SETTING_BOND_ERROR
+#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_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);
+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,
+                                                         guint32 idx,
+                                                         const char **out_name,
+                                                         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,
+                                                         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 *name);
+

+

+

+
Object Hierarchy

+
+  GObject
+   +----NMSetting
+         +----NMSettingBond
+

+
+  GEnum
+   +----NMSettingBondError
+

+

+

+
Properties

+
+  "interface-name"           gchar*                : Read / Write
+  "options"                  GHashTable_gchararray+gchararray_*  : Read / Write
+

+

+

+
Description

+

+The NMSettingBond object is a NMSetting subclass that describes properties
+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;
+

+

+

+

+

+

+
enum NMSettingBondError

+
typedef enum {
+	NM_SETTING_BOND_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
+	NM_SETTING_BOND_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
+	NM_SETTING_BOND_ERROR_MISSING_PROPERTY, /*< nick=MissingProperty >*/
+	NM_SETTING_BOND_ERROR_INVALID_OPTION,   /*< nick=InvalidOption >*/
+	NM_SETTING_BOND_ERROR_MISSING_OPTION,   /*< nick=MissingOption >*/
+} NMSettingBondError;
+

+

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


NM_SETTING_BOND_ERROR_UNKNOWN
unknown or unclassified error
+
NM_SETTING_BOND_ERROR_INVALID_PROPERTY
the property was invalid
+
NM_SETTING_BOND_ERROR_MISSING_PROPERTY
the property was missing and is
+required
+
NM_SETTING_BOND_ERROR_INVALID_OPTION

+
NM_SETTING_BOND_ERROR_MISSING_OPTION

+

+

+

+

+
NM_SETTING_BOND_ERROR

+
#define NM_SETTING_BOND_ERROR nm_setting_bond_error_quark ()
+

+

+

+

+

+

+
NM_SETTING_BOND_INTERFACE_NAME

+
#define NM_SETTING_BOND_INTERFACE_NAME "interface-name"
+

+

+

+

+

+

+
NM_SETTING_BOND_OPTIONS

+
#define NM_SETTING_BOND_OPTIONS "options"
+

+

+

+

+

+

+
NM_SETTING_BOND_OPTION_ARP_INTERVAL

+
#define NM_SETTING_BOND_OPTION_ARP_INTERVAL  "arp_interval"
+

+

+

+

+

+

+
NM_SETTING_BOND_OPTION_ARP_IP_TARGET

+
#define NM_SETTING_BOND_OPTION_ARP_IP_TARGET "arp_ip_target"
+

+

+

+

+

+

+
NM_SETTING_BOND_OPTION_DOWNDELAY

+
#define NM_SETTING_BOND_OPTION_DOWNDELAY     "downdelay"
+

+

+

+

+

+

+
NM_SETTING_BOND_OPTION_MIIMON

+
#define NM_SETTING_BOND_OPTION_MIIMON        "miimon"
+

+

+

+

+

+

+
NM_SETTING_BOND_OPTION_MODE

+
#define NM_SETTING_BOND_OPTION_MODE          "mode"
+

+

+

+

+

+

+
NM_SETTING_BOND_OPTION_UPDELAY

+
#define NM_SETTING_BOND_OPTION_UPDELAY       "updelay"
+

+

+

+

+

+

+
NM_SETTING_BOND_SETTING_NAME

+
#define NM_SETTING_BOND_SETTING_NAME "bond"
+

+

+

+

+

+

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

+

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


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

+

+Registers an error quark for NMSettingBond if necessary.
+

+

++
+
+
+
+


Returns :
the error quark used for NMSettingBond errors.

+

+

+

+
nm_setting_bond_get_interface_name ()

+
const char *        nm_setting_bond_get_interface_name  (NMSettingBond *setting);

+

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


setting :
the NMSettingBond
+
Returns :
the "interface-name" property of the setting

+

+

+

+
nm_setting_bond_get_num_options ()

+
guint32             nm_setting_bond_get_num_options     (NMSettingBond *setting);

+

+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 :
the NMSettingBond
+
Returns :
the number of bonding options

+

+

+

+
nm_setting_bond_get_option ()

+
gboolean            nm_setting_bond_get_option          (NMSettingBond *setting,
+                                                         guint32 idx,
+                                                         const char **out_name,
+                                                         const char **out_value);

+

+Given an index, return the value of the bonding option at that index.  Indexes
+are *not* guaranteed to be static across modifications to options done by
+nm_setting_bond_add_option() and nm_setting_bond_remove_option(),
+and should not be used to refer to options except for short periods of time
+such as during option iteration.
+

+

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


setting :
the NMSettingBond
+
idx :
index of the desired option, from 0 to
+nm_setting_bond_get_num_options() - 1
out_name :
on return, the name of the bonding option; this
+value is owned by the setting and should not be modified. [out]
+
out_value :
on return, the value of the name of the bonding
+option; this value is owned by the setting and should not be modified. [out]
+
Returns :

+TRUE on success if the index was valid and an option was found,
+FALSE if the index was invalid (ie, greater than the number of options
+currently held by the setting)

+

+

+

+
nm_setting_bond_get_option_by_name ()

+
const char *        nm_setting_bond_get_option_by_name  (NMSettingBond *setting,
+                                                         const char *name);

+

+Returns the value associated with the bonding option specified by
+name, if it exists.
+

+

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


setting :
the NMSettingBond
+
name :
the option name for which to retrieve the value
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

+

+

+

+
nm_setting_bond_get_option_default ()

+
const char *        nm_setting_bond_get_option_default  (NMSettingBond *setting,
+                                                         const char *name);

+

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


setting :
the NMSettingBond
+
name :
the name of the option
Returns :
the value of the bond option if not overridden by an entry in
+the "options" property.

+

+

+

+
nm_setting_bond_get_valid_options ()

+
const char **       nm_setting_bond_get_valid_options   (NMSettingBond *setting);

+

+Returns a list of valid bond options.
+

+

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


setting :
the NMSettingBond
+
Returns :
a NULL-terminated array of strings of valid bond options. [transfer none]
+

+

+

+

+
nm_setting_bond_new ()

+
NMSetting *         nm_setting_bond_new                 (void);

+

+Creates a new NMSettingBond object with default values.
+

+

++
+
+
+
+


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

+

+

+

+
nm_setting_bond_remove_option ()

+
gboolean            nm_setting_bond_remove_option       (NMSettingBond *setting,
+                                                         const char *name);

+

+Remove the bonding option referenced by name from the internal option
+list.
+

+

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


setting :
the NMSettingBond
+
name :
name of the option to remove
Returns :

+TRUE if the option was found and removed from the internal option
+list, FALSE if it was not.

+

+

+

+
Property Details

+

+
The "interface-name" property

+
  "interface-name"           gchar*                : Read / Write

+

+The name of the virtual in-kernel bonding network interface
+

+
Default value: NULL

+

+

+

+
The "options" property

+
  "options"                  GHashTable_gchararray+gchararray_*  : Read / Write

+

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

+

+

+

+

+

+          Generated by GTK-Doc V1.18

+
+
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html
index 360c9743..339919d2 100644
--- a/docs/libnm-util/html/NMSettingConnection.html
+++ b/docs/libnm-util/html/NMSettingConnection.html
@@ -697,7 +697,7 @@ Returns the type :

-the setting name (ie NM_SETTING_BOND_SETTING_NAME) to be matched
+the setting name (ie NM_SETTING_BOND_SETTING_NAME) to be matched
 against setting's slave type
 
 
@@ -849,7 +849,7 @@ if the connection is read-only and cannot be modified.
 
  "slave-type"               gchar*                : Read / Write

 

 Setting name describing the type of slave device (ie
-NM_SETTING_BOND_SETTING_NAME) or NULL if this connection is not a slave.
+NM_SETTING_BOND_SETTING_NAME) or NULL if this connection is not a slave.
 

 
Default value: NULL

 

diff --git a/docs/libnm-util/html/NMSettingInfiniband.html b/docs/libnm-util/html/NMSettingInfiniband.html
new file mode 100644
index 00000000..a208bff1
--- /dev/null
+++ b/docs/libnm-util/html/NMSettingInfiniband.html
@@ -0,0 +1,318 @@
+
+
+
+
+NMSettingInfiniband
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+

+
+
+

+
NMSettingInfiniband

+
NMSettingInfiniband — Describes connection properties for IP-over-InfiniBand networks

+

+

+
Synopsis

+
+#include <nm-setting-infiniband.h>
+
+                    NMSettingInfiniband;
+                    NMSettingInfinibandClass;
+enum                NMSettingInfinibandError;
+#define             NM_SETTING_INFINIBAND_ERROR
+#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);
+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

+
+  GObject
+   +----NMSetting
+         +----NMSettingInfiniband
+

+
+  GEnum
+   +----NMSettingInfinibandError
+

+

+

+
Properties

+
+  "mac-address"              GArray_guchar_*       : Read / Write
+  "mtu"                      guint                 : Read / Write / Construct
+  "transport-mode"           gchar*                : Read / Write / Construct
+

+

+

+
Description

+

+The NMSettingInfiniband object is a NMSetting subclass that describes properties
+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;
+

+

+

+

+

+

+
enum NMSettingInfinibandError

+
typedef enum {
+	NM_SETTING_INFINIBAND_ERROR_UNKNOWN = 0,      /*< nick=UnknownError >*/
+	NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
+	NM_SETTING_INFINIBAND_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
+} NMSettingInfinibandError;
+

+

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


NM_SETTING_INFINIBAND_ERROR_UNKNOWN
unknown or unclassified error
+
NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY
the property was invalid
+
NM_SETTING_INFINIBAND_ERROR_MISSING_PROPERTY
the property was missing and is
+required
+

+

+

+

+
NM_SETTING_INFINIBAND_ERROR

+
#define NM_SETTING_INFINIBAND_ERROR nm_setting_infiniband_error_quark ()
+

+

+

+

+

+

+
NM_SETTING_INFINIBAND_MAC_ADDRESS

+
#define NM_SETTING_INFINIBAND_MAC_ADDRESS    "mac-address"
+

+

+

+

+

+

+
NM_SETTING_INFINIBAND_MTU

+
#define NM_SETTING_INFINIBAND_MTU            "mtu"
+

+

+

+

+

+

+
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_error_quark ()

+
GQuark              nm_setting_infiniband_error_quark   (void);

+

+Registers an error quark for NMSettingInfiniband if necessary.
+

+

++
+
+
+
+


Returns :
the error quark used for NMSettingInfiniband errors.

+

+

+

+
nm_setting_infiniband_get_mac_address ()

+
const GByteArray *  nm_setting_infiniband_get_mac_address
+                                                        (NMSettingInfiniband *setting);

+

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


setting :
the NMSettingInfiniband
+
Returns :
the "mac-address" property of the setting

+

+

+

+
nm_setting_infiniband_get_mtu ()

+
guint32             nm_setting_infiniband_get_mtu       (NMSettingInfiniband *setting);

+

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


setting :
the NMSettingInfiniband
+
Returns :
the "mtu" property of the setting

+

+

+

+
nm_setting_infiniband_get_transport_mode ()

+
const char *        nm_setting_infiniband_get_transport_mode
+                                                        (NMSettingInfiniband *setting);

+

+Returns the transport mode for this device. Either 'datagram' or
+'connected'.
+

+

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


setting :
the NMSettingInfiniband
+
Returns :
the IPoIB transport mode

+

+

+

+
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

+

+
The "mac-address" property

+
  "mac-address"              GArray_guchar_*       : Read / Write

+

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

+

+

+

+
The "mtu" property

+
  "mtu"                      guint                 : Read / Write / Construct

+

+If non-zero, only transmit packets of the specified size or smaller,
+breaking larger packets up into multiple frames.
+

+
Default value: 0

+

+

+

+
The "transport-mode" property

+
  "transport-mode"           gchar*                : Read / Write / Construct

+

+The IP-over-InfiniBand transport mode. Either 'datagram' or
+'connected'.
+

+
Default value: NULL

+

+

+

+

+

+          Generated by GTK-Doc V1.18

+
+
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingOlpcMesh.html b/docs/libnm-util/html/NMSettingOlpcMesh.html
index 15992600..53ee169c 100644
--- a/docs/libnm-util/html/NMSettingOlpcMesh.html
+++ b/docs/libnm-util/html/NMSettingOlpcMesh.html
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -14,7 +14,7 @@
 
 
-
+
diff --git a/docs/libnm-util/html/NMSettingPPP.html b/docs/libnm-util/html/NMSettingPPP.html
index 0f95d8f6..c4d92133 100644
--- a/docs/libnm-util/html/NMSettingPPP.html
+++ b/docs/libnm-util/html/NMSettingPPP.html
@@ -375,128 +375,344 @@ Registers an error quark for 
 
nm_setting_ppp_get_baud ()
guint32             nm_setting_ppp_get_baud             (NMSettingPPP *setting);

-

-

+

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


setting :
the NMSettingPPP
+
Returns :
the "baud" property of the setting

 

 

 

 
nm_setting_ppp_get_crtscts ()

 
gboolean            nm_setting_ppp_get_crtscts          (NMSettingPPP *setting);

-

-

+

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


setting :
the NMSettingPPP
+
Returns :
the "crtscts" property of the setting

 

 

 

 
nm_setting_ppp_get_lcp_echo_failure ()

 
guint32             nm_setting_ppp_get_lcp_echo_failure (NMSettingPPP *setting);

-

-

+

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


setting :
the NMSettingPPP
+
Returns :
the "lcp-echo-failure" property of the setting

 

 

 

 
nm_setting_ppp_get_lcp_echo_interval ()

 
guint32             nm_setting_ppp_get_lcp_echo_interval
                                                         (NMSettingPPP *setting);

-

-

+

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


setting :
the NMSettingPPP
+
Returns :
the "lcp-echo-interval" property of the setting

 

 

 

 
nm_setting_ppp_get_mppe_stateful ()

 
gboolean            nm_setting_ppp_get_mppe_stateful    (NMSettingPPP *setting);

-

-

+

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


setting :
the NMSettingPPP
+
Returns :
the "mppe-stateful" property of the setting

 

 

 

 
nm_setting_ppp_get_mru ()

 
guint32             nm_setting_ppp_get_mru              (NMSettingPPP *setting);

-

-

+

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


setting :
the NMSettingPPP
+
Returns :
the "mru" property of the setting

 

 

 

 
nm_setting_ppp_get_mtu ()

 
guint32             nm_setting_ppp_get_mtu              (NMSettingPPP *setting);

-

-

+

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


setting :
the NMSettingPPP
+
Returns :
the "mtu" property of the setting

 

 

 

 
nm_setting_ppp_get_no_vj_comp ()

 
gboolean            nm_setting_ppp_get_no_vj_comp       (NMSettingPPP *setting);

-

-

+

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


setting :
the NMSettingPPP
+
Returns :
the "no-vj-comp" property of the setting

 

 

 

 
nm_setting_ppp_get_noauth ()

 
gboolean            nm_setting_ppp_get_noauth           (NMSettingPPP *setting);

-

-

+

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


setting :
the NMSettingPPP
+
Returns :
the "noauth" property of the setting

 

 

 

 
nm_setting_ppp_get_nobsdcomp ()

 
gboolean            nm_setting_ppp_get_nobsdcomp        (NMSettingPPP *setting);

-

-

+

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


setting :
the NMSettingPPP
+
Returns :
the "nobsdcomp" property of the setting

 

 

 

 
nm_setting_ppp_get_nodeflate ()

 
gboolean            nm_setting_ppp_get_nodeflate        (NMSettingPPP *setting);

-

-

+

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


setting :
the NMSettingPPP
+
Returns :
the "nodeflate" property of the setting

 

 

 

 
nm_setting_ppp_get_refuse_chap ()

 
gboolean            nm_setting_ppp_get_refuse_chap      (NMSettingPPP *setting);

-

-

+

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


setting :
the NMSettingPPP
+
Returns :
the "refuse-chap" property of the setting

 

 

 

 
nm_setting_ppp_get_refuse_eap ()

 
gboolean            nm_setting_ppp_get_refuse_eap       (NMSettingPPP *setting);

-

-

+

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


setting :
the NMSettingPPP
+
Returns :
the "refuse-eap" property of the setting

 

 

 

 
nm_setting_ppp_get_refuse_mschap ()

 
gboolean            nm_setting_ppp_get_refuse_mschap    (NMSettingPPP *setting);

-

-

+

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


setting :
the NMSettingPPP
+
Returns :
the "refuse-mschap" property of the setting

 

 

 

 
nm_setting_ppp_get_refuse_mschapv2 ()

 
gboolean            nm_setting_ppp_get_refuse_mschapv2  (NMSettingPPP *setting);

-

-

+

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


setting :
the NMSettingPPP
+
Returns :
the "refuse-mschapv2" property of the setting

 

 

 

 
nm_setting_ppp_get_refuse_pap ()

 
gboolean            nm_setting_ppp_get_refuse_pap       (NMSettingPPP *setting);

-

-

+

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


setting :
the NMSettingPPP
+
Returns :
the "refuse-pap" property of the setting

 

 

 

 
nm_setting_ppp_get_require_mppe ()

 
gboolean            nm_setting_ppp_get_require_mppe     (NMSettingPPP *setting);

-

-

+

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


setting :
the NMSettingPPP
+
Returns :
the "require-mppe" property of the setting

 

 

 

 
nm_setting_ppp_get_require_mppe_128 ()

 
gboolean            nm_setting_ppp_get_require_mppe_128 (NMSettingPPP *setting);

-

-

+

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


setting :
the NMSettingPPP
+
Returns :
the "require-mppe-128" property of the setting

 

 

 

diff --git a/docs/libnm-util/html/NMSettingPPPOE.html b/docs/libnm-util/html/NMSettingPPPOE.html
index bdbeeead..3f20ccec 100644
--- a/docs/libnm-util/html/NMSettingPPPOE.html
+++ b/docs/libnm-util/html/NMSettingPPPOE.html
@@ -220,8 +220,20 @@ Registers an error quark for 
 
nm_setting_pppoe_get_password ()

 
const char *        nm_setting_pppoe_get_password       (NMSettingPPPOE *setting);

-

-

+

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


setting :
the NMSettingPPPOE
+
Returns :
the "password" property of the setting

 

 

 

@@ -258,7 +270,7 @@ Registers an error quark for Returns :

-the "password" property of the setting
+the "service" property of the setting
 
 
 

@@ -267,8 +279,20 @@ Registers an error quark for 
 
nm_setting_pppoe_get_username ()

 
const char *        nm_setting_pppoe_get_username       (NMSettingPPPOE *setting);

-

-

+

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


setting :
the NMSettingPPPOE
+
Returns :
the "username" property of the setting

 

 

 

diff --git a/docs/libnm-util/html/NMSettingVlan.html b/docs/libnm-util/html/NMSettingVlan.html
new file mode 100644
index 00000000..cc50161e
--- /dev/null
+++ b/docs/libnm-util/html/NMSettingVlan.html
@@ -0,0 +1,708 @@
+
+
+
+
+NMSettingVlan
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+

+
+
+

+
NMSettingVlan

+
NMSettingVlan — Describes connection properties for VLAN interfaces

+

+

+
Synopsis

+
+#include <nm-setting-vlan.h>
+
+                    NMSettingVlan;
+                    NMSettingVlanClass;
+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
+#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);
+const char *        nm_setting_vlan_get_interface_name  (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);
+void                nm_setting_vlan_remove_priority     (NMSettingVlan *setting,
+                                                         NMVlanPriorityMap map,
+                                                         guint32 idx);
+

+

+

+
Object Hierarchy

+
+  GObject
+   +----NMSetting
+         +----NMSettingVlan
+

+
+  GEnum
+   +----NMSettingVlanError
+

+
+  GEnum
+   +----NMVlanFlags
+

+
+  GEnum
+   +----NMVlanPriorityMap
+

+

+

+
Properties

+
+  "egress-priority-map"      GSList_gchararray_*   : Read / Write
+  "flags"                    guint                 : Read / Write / Construct
+  "id"                       guint                 : Read / Write / Construct
+  "ingress-priority-map"     GSList_gchararray_*   : Read / Write
+  "interface-name"           gchar*                : Read / Write / Construct
+  "parent"                   gchar*                : Read / Write / Construct
+

+

+

+
Description

+

+The NMSettingVlan object is a NMSetting subclass that describes properties
+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;
+

+

+

+

+

+

+
enum NMSettingVlanError

+
typedef enum {
+	NM_SETTING_VLAN_ERROR_UNKNOWN = 0,      /*< nick=Unknown >*/
+	NM_SETTING_VLAN_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
+	NM_SETTING_VLAN_ERROR_MISSING_PROPERTY  /*< nick=MissingProperty >*/
+} NMSettingVlanError;
+

+

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


NM_SETTING_VLAN_ERROR_UNKNOWN
unknown or unclassified error
+
NM_SETTING_VLAN_ERROR_INVALID_PROPERTY
the property was invalid
+
NM_SETTING_VLAN_ERROR_MISSING_PROPERTY
the property was missing and is
+required
+

+

+

+

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

+

+NMVlanFlags values control the behavior of the VLAN interface.
+

+

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


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

+

+A selector for traffic priority maps; these map Linux SKB priorities
+to 802.1p priorities used in VLANs.
+

+

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


NM_VLAN_INGRESS_MAP
map for incoming data
+
NM_VLAN_EGRESS_MAP
map for outgoing data
+

+

+

+

+
NM_SETTING_VLAN_EGRESS_PRIORITY_MAP

+
#define NM_SETTING_VLAN_EGRESS_PRIORITY_MAP  "egress-priority-map"
+

+

+

+

+

+

+
NM_SETTING_VLAN_ERROR

+
#define NM_SETTING_VLAN_ERROR nm_setting_vlan_error_quark ()
+

+

+

+

+

+

+
NM_SETTING_VLAN_FLAGS

+
#define NM_SETTING_VLAN_FLAGS                "flags"
+

+

+

+

+

+

+
NM_SETTING_VLAN_ID

+
#define NM_SETTING_VLAN_ID                   "id"
+

+

+

+

+

+

+
NM_SETTING_VLAN_INGRESS_PRIORITY_MAP

+
#define NM_SETTING_VLAN_INGRESS_PRIORITY_MAP "ingress-priority-map"
+

+

+

+

+

+

+
NM_SETTING_VLAN_INTERFACE_NAME

+
#define NM_SETTING_VLAN_INTERFACE_NAME       "interface-name"
+

+

+

+

+

+

+
NM_SETTING_VLAN_PARENT

+
#define NM_SETTING_VLAN_PARENT               "parent"
+

+

+

+

+

+

+
NM_SETTING_VLAN_SETTING_NAME

+
#define NM_SETTING_VLAN_SETTING_NAME "vlan"
+

+

+

+

+

+

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

+

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

+

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


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

+

+

+

+
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

+

+

+

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

+

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


setting :
the NMSettingVlan
+
Returns :
the "flags" property of the setting

+

+

+

+
nm_setting_vlan_get_id ()

+
guint32             nm_setting_vlan_get_id              (NMSettingVlan *setting);

+

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


setting :
the NMSettingVlan
+
Returns :
the "id" property of the setting

+

+

+

+
nm_setting_vlan_get_interface_name ()

+
const char *        nm_setting_vlan_get_interface_name  (NMSettingVlan *setting);

+

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


setting :
the NMSettingVlan
+
Returns :
the "interface_name" property of the setting

+

+

+

+
nm_setting_vlan_get_num_priorities ()

+
gint32              nm_setting_vlan_get_num_priorities  (NMSettingVlan *setting,
+                                                         NMVlanPriorityMap map);

+

+Returns the number of entires in the
+"ingress_priority_map" or "egress_priority_map"
+properties of this setting.
+

+

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


setting :
the NMSettingVlan
+
map :
the type of priority map
Returns :
return the number of ingress/egress priority entries, -1 if error

+

+

+

+
nm_setting_vlan_get_parent ()

+
const char *        nm_setting_vlan_get_parent          (NMSettingVlan *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,
+                                                         guint32 idx,
+                                                         guint32 *out_from,
+                                                         guint32 *out_to);

+

+Retrieve one of the entries of the "ingress_priority_map"
+or "egress_priority_map" properties of this setting.
+

+

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


setting :
the NMSettingVlan
+
map :
the type of priority map
idx :
the zero-based index of the ingress/egress priority map entry
out_from :
on return the value of the priority map's 'from' item. [out]
+
out_to :
on return the value of priority map's 'to' item. [out]
+
Returns :

+TRUE if a priority map was returned, FALSE if error

+

+

+

+
nm_setting_vlan_new ()

+
NMSetting *         nm_setting_vlan_new                 (void);

+

+Creates a new NMSettingVlan object with default values.
+

+

++
+
+
+
+


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

+

+

+

+
nm_setting_vlan_remove_priority ()

+
void                nm_setting_vlan_remove_priority     (NMSettingVlan *setting,
+                                                         NMVlanPriorityMap map,
+                                                         guint32 idx);

+

+Removes the priority map at index idx from the
+"ingress_priority_map" or "egress_priority_map"
+properties.
+

+

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


setting :
the NMSettingVlan
+
map :
the type of priority map
idx :
the zero-based index of the priority map to remove

+

+

+

+
Property Details

+

+
The "egress-priority-map" property

+
  "egress-priority-map"      GSList_gchararray_*   : Read / Write

+

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

+

+

+

+
The "flags" property

+
  "flags"                    guint                 : Read / Write / Construct

+

+One or more of NMVlanFlags which control the behavior and features of
+the VLAN interface.
+

+
Default value: 0

+

+

+

+
The "id" property

+
  "id"                       guint                 : Read / Write / Construct

+

+The VLAN identifier the interface created by this connection should be
+assigned.
+

+
Allowed values: <= 4095

+
Default value: 0

+

+

+

+
The "ingress-priority-map" property

+
  "ingress-priority-map"     GSList_gchararray_*   : Read / Write

+

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

+

+

+

+
The "interface-name" property

+
  "interface-name"           gchar*                : Read / Write / Construct

+

+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" , ex 'eth2.1'. The parent
+interface may be given by the "parent" property or by a
+hardware address property, eg "mac-address" or
+"mac-address".
+

+
Default value: NULL

+

+

+

+
The "parent" property

+
  "parent"                   gchar*                : Read / Write / Construct

+

+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 "mac-address" or
+"mac-address".
+

+
Default value: NULL

+

+

+

+

+

+          Generated by GTK-Doc V1.18

+
+
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWimax.html b/docs/libnm-util/html/NMSettingWimax.html
index 66f68ba9..ee30d02e 100644
--- a/docs/libnm-util/html/NMSettingWimax.html
+++ b/docs/libnm-util/html/NMSettingWimax.html
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -18,7 +18,7 @@
 Up
 Home
 libnm-util Reference Manual
-Next
+Next
 
 
 Top
diff --git a/docs/libnm-util/html/NMSettingWireless.html b/docs/libnm-util/html/NMSettingWireless.html
index ab05340e..85e17c1d 100644
--- a/docs/libnm-util/html/NMSettingWireless.html
+++ b/docs/libnm-util/html/NMSettingWireless.html
@@ -52,6 +52,7 @@ enum                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_MAC_ADDRESS
 #define             NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST
 #define             NM_SETTING_WIRELESS_MODE
@@ -79,6 +80,7 @@ const guint32             nm_setting_wireless_get_channel     (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);
@@ -114,6 +116,7 @@ const bssid"                    GArray_guchar_*       : Read / Write
   "channel"                  guint                 : Read / Write / Construct
   "cloned-mac-address"       GArray_guchar_*       : Read / Write
+  "hidden"                   gboolean              : Read / Write
   "mac-address"              GArray_guchar_*       : Read / Write
   "mac-address-blacklist"    GSList_gchararray_*   : Read / Write
   "mode"                     gchar*                : Read / Write
@@ -243,6 +246,14 @@ set to a value that requires the 
+
NM_SETTING_WIRELESS_HIDDEN

+
#define NM_SETTING_WIRELESS_HIDDEN      "hidden"
+

+

+

+

+

+

 
NM_SETTING_WIRELESS_MAC_ADDRESS

 
#define NM_SETTING_WIRELESS_MAC_ADDRESS "mac-address"
 

@@ -522,6 +533,25 @@ Registers an error quark for 
 

 

+
nm_setting_wireless_get_hidden ()

+
gboolean            nm_setting_wireless_get_hidden      (NMSettingWireless *setting);

+

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


setting :
the NMSettingWireless
+
Returns :
the "hidden" property of the setting

+

+

+

 
nm_setting_wireless_get_mac_address ()

 
const GByteArray *  nm_setting_wireless_get_mac_address (NMSettingWireless *setting);

 

@@ -786,6 +816,19 @@ permanent MAC address.  This is known as MAC cloning or spoofing.
 

+
The "hidden" property

+
  "hidden"                   gboolean              : Read / Write

+

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

+
Default value: FALSE

+

+

+

 
The "mac-address" property

 
  "mac-address"              GArray_guchar_*       : Read / Write

 

diff --git a/docs/libnm-util/html/NMSettingWirelessSecurity.html b/docs/libnm-util/html/NMSettingWirelessSecurity.html
index b9022091..94ff1432 100644
--- a/docs/libnm-util/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm-util/html/NMSettingWirelessSecurity.html
@@ -653,7 +653,15 @@ specified then all protocols are allowed.
 
GQuark              nm_setting_wireless_security_error_quark
                                                         (void);

 

+Registers an error quark for NMSettingWired if necessary.
 

+

 
 

++
+
+
+
+


Returns :
the error quark used for NMSettingWired errors.

 

 

 

diff --git a/docs/libnm-util/html/api-index-full.html b/docs/libnm-util/html/api-index-full.html
index 9f287353..7ceff0ba 100644
--- a/docs/libnm-util/html/api-index-full.html
+++ b/docs/libnm-util/html/api-index-full.html
@@ -123,6 +123,10 @@
 
 

 

+nm_connection_get_setting_adsl, function in NMConnection
+

+

+

 nm_connection_get_setting_bluetooth, function in NMConnection
 

 

@@ -617,6 +621,46 @@
 
 

 

+NMSettingAdsl, struct in NMSettingAdsl
+

+

+

+NMSettingAdsl:encapsulation, object property in NMSettingAdsl
+

+

+

+NMSettingAdsl:password, object property in NMSettingAdsl
+

+

+

+NMSettingAdsl:password-flags, object property in NMSettingAdsl
+

+

+

+NMSettingAdsl:protocol, object property in NMSettingAdsl
+

+

+

+NMSettingAdsl:username, object property in NMSettingAdsl
+

+

+

+NMSettingAdsl:vci, object property in NMSettingAdsl
+

+

+

+NMSettingAdsl:vpi, object property in NMSettingAdsl
+

+

+

+NMSettingAdslClass, struct in NMSettingAdsl
+

+

+

+NMSettingAdslError, enum in NMSettingAdsl
+

+

+

 NMSettingBluetooth, struct in NMSettingBluetooth
 

 

@@ -637,23 +681,23 @@
 
 

 

-NMSettingBond, struct in NMSettingBond
+NMSettingBond, struct in NMSettingBond
 

 

 

-NMSettingBond:interface-name, object property in NMSettingBond
+NMSettingBond:interface-name, object property in NMSettingBond
 

 

 

-NMSettingBond:options, object property in NMSettingBond
+NMSettingBond:options, object property in NMSettingBond
 

 

 

-NMSettingBondClass, struct in NMSettingBond
+NMSettingBondClass, struct in NMSettingBond
 

 

 

-NMSettingBondError, enum in NMSettingBond
+NMSettingBondError, enum in NMSettingBond
 

 

 

@@ -825,27 +869,27 @@ NMSettingBondError, enum in NMSettingBond
 

 

 

-NMSettingInfiniband, struct in NMSettingInfiniband
+NMSettingInfiniband, struct in NMSettingInfiniband
 

 

 

-NMSettingInfiniband:mac-address, object property in NMSettingInfiniband
+NMSettingInfiniband:mac-address, object property in NMSettingInfiniband
 

 

 

-NMSettingInfiniband:mtu, object property in NMSettingInfiniband
+NMSettingInfiniband:mtu, object property in NMSettingInfiniband
 

 

 

-NMSettingInfiniband:transport-mode, object property in NMSettingInfiniband
+NMSettingInfiniband:transport-mode, object property in NMSettingInfiniband
 

 

 

-NMSettingInfinibandClass, struct in NMSettingInfiniband
+NMSettingInfinibandClass, struct in NMSettingInfiniband
 

 

 

-NMSettingInfinibandError, enum in NMSettingInfiniband
+NMSettingInfinibandError, enum in NMSettingInfiniband
 

 

 

@@ -1141,39 +1185,39 @@ NMSettingInfinibandError, enum in NMSettingInfiniband
 

 

 

-NMSettingVlan, struct in NMSettingVlan
+NMSettingVlan, struct in NMSettingVlan
 

 

 

-NMSettingVlan:egress-priority-map, object property in NMSettingVlan
+NMSettingVlan:egress-priority-map, object property in NMSettingVlan
 

 

 

-NMSettingVlan:flags, object property in NMSettingVlan
+NMSettingVlan:flags, object property in NMSettingVlan
 

 

 

-NMSettingVlan:id, object property in NMSettingVlan
+NMSettingVlan:id, object property in NMSettingVlan
 

 

 

-NMSettingVlan:ingress-priority-map, object property in NMSettingVlan
+NMSettingVlan:ingress-priority-map, object property in NMSettingVlan
 

 

 

-NMSettingVlan:interface-name, object property in NMSettingVlan
+NMSettingVlan:interface-name, object property in NMSettingVlan
 

 

 

-NMSettingVlan:parent, object property in NMSettingVlan
+NMSettingVlan:parent, object property in NMSettingVlan
 

 

 

-NMSettingVlanClass, struct in NMSettingVlan
+NMSettingVlanClass, struct in NMSettingVlan
 

 

 

-NMSettingVlanError, enum in NMSettingVlan
+NMSettingVlanError, enum in NMSettingVlan
 

 

 

@@ -1301,6 +1345,10 @@ NMSettingVlanError, enum in NMSettingVlan
 

 

 

+NMSettingWireless:hidden, object property in NMSettingWireless
+

+

+

 NMSettingWireless:mac-address, object property in NMSettingWireless
 

 

@@ -1825,6 +1873,98 @@ NMSettingVlanError, enum in NMSettingVlan
 
 

 

+NM_SETTING_ADSL_ENCAPSULATION, macro in NMSettingAdsl
+

+

+

+NM_SETTING_ADSL_ENCAPSULATION_LLC, macro in NMSettingAdsl
+

+

+

+NM_SETTING_ADSL_ENCAPSULATION_VCMUX, macro in NMSettingAdsl
+

+

+

+NM_SETTING_ADSL_ERROR, macro in NMSettingAdsl
+

+

+

+nm_setting_adsl_error_quark, function in NMSettingAdsl
+

+

+

+nm_setting_adsl_get_encapsulation, function in NMSettingAdsl
+

+

+

+nm_setting_adsl_get_password, function in NMSettingAdsl
+

+

+

+nm_setting_adsl_get_password_flags, function in NMSettingAdsl
+

+

+

+nm_setting_adsl_get_protocol, function in NMSettingAdsl
+

+

+

+nm_setting_adsl_get_username, function in NMSettingAdsl
+

+

+

+nm_setting_adsl_get_vci, function in NMSettingAdsl
+

+

+

+nm_setting_adsl_get_vpi, function in NMSettingAdsl
+

+

+

+nm_setting_adsl_new, function in NMSettingAdsl
+

+

+

+NM_SETTING_ADSL_PASSWORD, macro in NMSettingAdsl
+

+

+

+NM_SETTING_ADSL_PASSWORD_FLAGS, macro in NMSettingAdsl
+

+

+

+NM_SETTING_ADSL_PROTOCOL, macro in NMSettingAdsl
+

+

+

+NM_SETTING_ADSL_PROTOCOL_IPOATM, macro in NMSettingAdsl
+

+

+

+NM_SETTING_ADSL_PROTOCOL_PPPOA, macro in NMSettingAdsl
+

+

+

+NM_SETTING_ADSL_PROTOCOL_PPPOE, macro in NMSettingAdsl
+

+

+

+NM_SETTING_ADSL_SETTING_NAME, macro in NMSettingAdsl
+

+

+

+NM_SETTING_ADSL_USERNAME, macro in NMSettingAdsl
+

+

+

+NM_SETTING_ADSL_VCI, macro in NMSettingAdsl
+

+

+

+NM_SETTING_ADSL_VPI, macro in NMSettingAdsl
+

+

+

 NM_SETTING_BLUETOOTH_BDADDR, macro in NMSettingBluetooth
 

 

@@ -1865,83 +2005,83 @@ NMSettingVlanError, enum in NMSettingVlan
 
 

 

-nm_setting_bond_add_option, function in NMSettingBond
+nm_setting_bond_add_option, function in NMSettingBond
 

 

 

-NM_SETTING_BOND_ERROR, macro in NMSettingBond
+NM_SETTING_BOND_ERROR, macro in NMSettingBond
 

 

 

-nm_setting_bond_error_quark, function in NMSettingBond
+nm_setting_bond_error_quark, function in NMSettingBond
 

 

 

-nm_setting_bond_get_interface_name, function in NMSettingBond
+nm_setting_bond_get_interface_name, function in NMSettingBond
 

 

 

-nm_setting_bond_get_num_options, function in NMSettingBond
+nm_setting_bond_get_num_options, function in NMSettingBond
 

 

 

-nm_setting_bond_get_option, function in NMSettingBond
+nm_setting_bond_get_option, function in NMSettingBond
 

 

 

-nm_setting_bond_get_option_by_name, function in NMSettingBond
+nm_setting_bond_get_option_by_name, function in NMSettingBond
 

 

 

-nm_setting_bond_get_option_default, function in NMSettingBond
+nm_setting_bond_get_option_default, function in NMSettingBond
 

 

 

-nm_setting_bond_get_valid_options, function in NMSettingBond
+nm_setting_bond_get_valid_options, function in NMSettingBond
 

 

 

-NM_SETTING_BOND_INTERFACE_NAME, macro in NMSettingBond
+NM_SETTING_BOND_INTERFACE_NAME, macro in NMSettingBond
 

 

 

-nm_setting_bond_new, function in NMSettingBond
+nm_setting_bond_new, function in NMSettingBond
 

 

 

-NM_SETTING_BOND_OPTIONS, macro in NMSettingBond
+NM_SETTING_BOND_OPTIONS, macro in NMSettingBond
 

 

 

-NM_SETTING_BOND_OPTION_ARP_INTERVAL, macro in NMSettingBond
+NM_SETTING_BOND_OPTION_ARP_INTERVAL, macro in NMSettingBond
 

 

 

-NM_SETTING_BOND_OPTION_ARP_IP_TARGET, macro in NMSettingBond
+NM_SETTING_BOND_OPTION_ARP_IP_TARGET, macro in NMSettingBond
 

 

 

-NM_SETTING_BOND_OPTION_DOWNDELAY, macro in NMSettingBond
+NM_SETTING_BOND_OPTION_DOWNDELAY, macro in NMSettingBond
 

 

 

-NM_SETTING_BOND_OPTION_MIIMON, macro in NMSettingBond
+NM_SETTING_BOND_OPTION_MIIMON, macro in NMSettingBond
 

 

 

-NM_SETTING_BOND_OPTION_MODE, macro in NMSettingBond
+NM_SETTING_BOND_OPTION_MODE, macro in NMSettingBond
 

 

 

-NM_SETTING_BOND_OPTION_UPDELAY, macro in NMSettingBond
+NM_SETTING_BOND_OPTION_UPDELAY, macro in NMSettingBond
 

 

 

-nm_setting_bond_remove_option, function in NMSettingBond
+nm_setting_bond_remove_option, function in NMSettingBond
 

 

 

-NM_SETTING_BOND_SETTING_NAME, macro in NMSettingBond
+NM_SETTING_BOND_SETTING_NAME, macro in NMSettingBond
 

 

 

@@ -2277,43 +2417,43 @@ NM_SETTING_BOND_SETTING_NAME, macro in NMSettingBond
 

 

 

-NM_SETTING_INFINIBAND_ERROR, macro in NMSettingInfiniband
+NM_SETTING_INFINIBAND_ERROR, macro in NMSettingInfiniband
 

 

 

-nm_setting_infiniband_error_quark, function in NMSettingInfiniband
+nm_setting_infiniband_error_quark, function in NMSettingInfiniband
 

 

 

-nm_setting_infiniband_get_mac_address, function in NMSettingInfiniband
+nm_setting_infiniband_get_mac_address, function in NMSettingInfiniband
 

 

 

-nm_setting_infiniband_get_mtu, function in NMSettingInfiniband
+nm_setting_infiniband_get_mtu, function in NMSettingInfiniband
 

 

 

-nm_setting_infiniband_get_transport_mode, function in NMSettingInfiniband
+nm_setting_infiniband_get_transport_mode, function in NMSettingInfiniband
 

 

 

-NM_SETTING_INFINIBAND_MAC_ADDRESS, macro in NMSettingInfiniband
+NM_SETTING_INFINIBAND_MAC_ADDRESS, macro in NMSettingInfiniband
 

 

 

-NM_SETTING_INFINIBAND_MTU, macro in NMSettingInfiniband
+NM_SETTING_INFINIBAND_MTU, macro in NMSettingInfiniband
 

 

 

-nm_setting_infiniband_new, function in NMSettingInfiniband
+nm_setting_infiniband_new, function in NMSettingInfiniband
 

 

 

-NM_SETTING_INFINIBAND_SETTING_NAME, macro in NMSettingInfiniband
+NM_SETTING_INFINIBAND_SETTING_NAME, macro in NMSettingInfiniband
 

 

 

-NM_SETTING_INFINIBAND_TRANSPORT_MODE, macro in NMSettingInfiniband
+NM_SETTING_INFINIBAND_TRANSPORT_MODE, macro in NMSettingInfiniband
 

 

 

@@ -3053,83 +3193,83 @@ NM_SETTING_SECRET_FLAGS_ALL, macro in nm-setting-private
 

 

 

-nm_setting_vlan_add_priority, function in NMSettingVlan
+nm_setting_vlan_add_priority, function in NMSettingVlan
 

 

 

-nm_setting_vlan_add_priority_str, function in NMSettingVlan
+nm_setting_vlan_add_priority_str, function in NMSettingVlan
 

 

 

-nm_setting_vlan_clear_priorities, function in NMSettingVlan
+nm_setting_vlan_clear_priorities, function in NMSettingVlan
 

 

 

-NM_SETTING_VLAN_EGRESS_PRIORITY_MAP, macro in NMSettingVlan
+NM_SETTING_VLAN_EGRESS_PRIORITY_MAP, macro in NMSettingVlan
 

 

 

-NM_SETTING_VLAN_ERROR, macro in NMSettingVlan
+NM_SETTING_VLAN_ERROR, macro in NMSettingVlan
 

 

 

-nm_setting_vlan_error_quark, function in NMSettingVlan
+nm_setting_vlan_error_quark, function in NMSettingVlan
 

 

 

-NM_SETTING_VLAN_FLAGS, macro in NMSettingVlan
+NM_SETTING_VLAN_FLAGS, macro in NMSettingVlan
 

 

 

-nm_setting_vlan_get_flags, function in NMSettingVlan
+nm_setting_vlan_get_flags, function in NMSettingVlan
 

 

 

-nm_setting_vlan_get_id, function in NMSettingVlan
+nm_setting_vlan_get_id, function in NMSettingVlan
 

 

 

-nm_setting_vlan_get_interface_name, function in NMSettingVlan
+nm_setting_vlan_get_interface_name, function in NMSettingVlan
 

 

 

-nm_setting_vlan_get_num_priorities, function in NMSettingVlan
+nm_setting_vlan_get_num_priorities, function in NMSettingVlan
 

 

 

-nm_setting_vlan_get_parent, function in NMSettingVlan
+nm_setting_vlan_get_parent, function in NMSettingVlan
 

 

 

-nm_setting_vlan_get_priority, function in NMSettingVlan
+nm_setting_vlan_get_priority, function in NMSettingVlan
 

 

 

-NM_SETTING_VLAN_ID, macro in NMSettingVlan
+NM_SETTING_VLAN_ID, macro in NMSettingVlan
 

 

 

-NM_SETTING_VLAN_INGRESS_PRIORITY_MAP, macro in NMSettingVlan
+NM_SETTING_VLAN_INGRESS_PRIORITY_MAP, macro in NMSettingVlan
 

 

 

-NM_SETTING_VLAN_INTERFACE_NAME, macro in NMSettingVlan
+NM_SETTING_VLAN_INTERFACE_NAME, macro in NMSettingVlan
 

 

 

-nm_setting_vlan_new, function in NMSettingVlan
+nm_setting_vlan_new, function in NMSettingVlan
 

 

 

-NM_SETTING_VLAN_PARENT, macro in NMSettingVlan
+NM_SETTING_VLAN_PARENT, macro in NMSettingVlan
 

 

 

-nm_setting_vlan_remove_priority, function in NMSettingVlan
+nm_setting_vlan_remove_priority, function in NMSettingVlan
 

 

 

-NM_SETTING_VLAN_SETTING_NAME, macro in NMSettingVlan
+NM_SETTING_VLAN_SETTING_NAME, macro in NMSettingVlan
 

 

 

@@ -3413,6 +3553,10 @@ NM_SETTING_VLAN_SETTING_NAME, macro in NMSettingVlan
 

 

 

+nm_setting_wireless_get_hidden, function in NMSettingWireless
+

+

+

 nm_setting_wireless_get_mac_address, function in NMSettingWireless
 

 

@@ -3453,6 +3597,10 @@ NM_SETTING_VLAN_SETTING_NAME, macro in NMSettingVlan
 
 

 

+NM_SETTING_WIRELESS_HIDDEN, macro in NMSettingWireless
+

+

+

 NM_SETTING_WIRELESS_MAC_ADDRESS, macro in NMSettingWireless
 

 

@@ -3843,11 +3991,11 @@ NM_SETTING_VLAN_SETTING_NAME, macro in NMSettingVlan
 

 
V

 

-NMVlanFlags, enum in NMSettingVlan
+NMVlanFlags, enum in NMSettingVlan
 

 

 

-NMVlanPriorityMap, enum in NMSettingVlan
+NMVlanPriorityMap, enum in NMSettingVlan
 

 

 

diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html
index c23e7223..1cddc6b2 100644
--- a/docs/libnm-util/html/ch01.html
+++ b/docs/libnm-util/html/ch01.html
@@ -21,7 +21,7 @@
 
 

 

-libnm-util API Reference

+libnm-util API Reference

 

 

 NMConnection — Describes a connection to specific network or provider
@@ -59,6 +59,15 @@ serial communications
 NMSettingWimax — Describes 802.16e Mobile WiMAX connection properties
 

 

+NMSettingBond — Describes connection properties for bonds
+

+

+NMSettingInfiniband — Describes connection properties for IP-over-InfiniBand networks
+

+

+NMSettingVlan — Describes connection properties for VLAN interfaces
+

+

 NMSettingOlpcMesh
 

 

diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html
index 6f6ac022..dea375f6 100644
--- a/docs/libnm-util/html/index.html
+++ b/docs/libnm-util/html/index.html
@@ -61,6 +61,15 @@ serial communications
 NMSettingWimax — Describes 802.16e Mobile WiMAX connection properties
 

 

+NMSettingBond — Describes connection properties for bonds
+

+

+NMSettingInfiniband — Describes connection properties for IP-over-InfiniBand networks
+

+

+NMSettingVlan — Describes connection properties for VLAN interfaces
+

+

 NMSettingOlpcMesh
 

 

diff --git a/docs/libnm-util/html/index.sgml b/docs/libnm-util/html/index.sgml
index 18260e91..c2b27338 100644
--- a/docs/libnm-util/html/index.sgml
+++ b/docs/libnm-util/html/index.sgml
@@ -30,6 +30,7 @@
 
 
 
+
 
 
 
@@ -268,6 +269,7 @@
 
 
 
+
 
 
 
@@ -287,6 +289,7 @@
 
 
 
+
 
 
 
@@ -303,6 +306,7 @@
 
 
 
+
 
 
 
@@ -593,6 +597,120 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html
index a17c1ece..a4404b33 100644
--- a/docs/libnm-util/html/libnm-util-nm-utils.html
+++ b/docs/libnm-util/html/libnm-util-nm-utils.html
@@ -664,7 +664,25 @@ which should be unset by the caller (when no longer needed) with
 
nm_utils_ip6_dns_from_gvalue ()

 
GSList *            nm_utils_ip6_dns_from_gvalue        (const GValue *value);

 

+Converts a GValue containing a GPtrArray of IP6 DNS, represented as
+GByteArrays into a GSList of in6_addrs.
 

+

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


value :
a GValue
+
Returns :
a GSList of IP6
+addresses. [transfer full][element-type Posix.in6_addr]
+

 

 

 

@@ -672,7 +690,26 @@ which should be unset by the caller (when no longer needed) with
 
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
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().

 

 

 

diff --git a/docs/libnm-util/html/libnm-util.devhelp2 b/docs/libnm-util/html/libnm-util.devhelp2
index 993a29d7..fb3955a3 100644
--- a/docs/libnm-util/html/libnm-util.devhelp2
+++ b/docs/libnm-util/html/libnm-util.devhelp2
@@ -14,6 +14,9 @@
       
       
       
+      
+      
+      
       
       
       
@@ -47,6 +50,7 @@
     
     
     
+    
     
     
     
@@ -215,6 +219,7 @@
     
     
     
+    
     
     
     
@@ -234,6 +239,7 @@
     
     
     
+    
     
     
     
@@ -249,6 +255,7 @@
     
     
     
+    
     
     
     
@@ -438,6 +445,78 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -996,6 +1075,22 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
diff --git a/docs/libnm-util/html/object-tree.html b/docs/libnm-util/html/object-tree.html
index 8670ba6c..edb82a82 100644
--- a/docs/libnm-util/html/object-tree.html
+++ b/docs/libnm-util/html/object-tree.html
@@ -27,19 +27,20 @@
         NMConnection
         NMSetting
             NMSetting8021x
+            NMSettingAdsl
             NMSettingBluetooth
-            NMSettingBond
+            NMSettingBond
             NMSettingCdma
             NMSettingConnection
             NMSettingGsm
-            NMSettingInfiniband
+            NMSettingInfiniband
             NMSettingIP4Config
             NMSettingIP6Config
             NMSettingOlpcMesh
             NMSettingPPP
             NMSettingPPPOE
             NMSettingSerial
-            NMSettingVlan
+            NMSettingVlan
             NMSettingVPN
             NMSettingWimax
             NMSettingWired
@@ -50,8 +51,9 @@
         NMSetting8021xCKFormat
         NMSetting8021xCKScheme
         NMSetting8021xError
+        NMSettingAdslError
         NMSettingBluetoothError
-        NMSettingBondError
+        NMSettingBondError
         NMSettingCdmaError
         NMSettingCompareFlags
         NMSettingConnectionError
@@ -61,7 +63,7 @@
         NMSettingGsmNetworkBand
         NMSettingGsmNetworkType
         NMSettingHashFlags
-        NMSettingInfinibandError
+        NMSettingInfinibandError
         NMSettingIP4ConfigError
         NMSettingIP6ConfigError
         NMSettingIP6ConfigPrivacy
@@ -70,15 +72,15 @@
         NMSettingPPPOEError
         NMSettingSecretFlags
         NMSettingSerialError
-        NMSettingVlanError
+        NMSettingVlanError
         NMSettingVpnError
         NMSettingWimaxError
         NMSettingWiredError
         NMSettingWirelessError
         NMSettingWirelessSecurityError
         NMUtilsSecurityType
-        NMVlanFlags
-        NMVlanPriorityMap
+        NMVlanFlags
+        NMVlanPriorityMap
         NMWepKeyType
     GBoxed
         NMIP4Address
diff --git a/docs/libnm-util/libnm-util-docs.sgml b/docs/libnm-util/libnm-util-docs.sgml
index f717db37..f389971b 100644
--- a/docs/libnm-util/libnm-util-docs.sgml
+++ b/docs/libnm-util/libnm-util-docs.sgml
@@ -27,6 +27,9 @@
     
     
     
+    
+    
+    
     
     
     
diff --git a/docs/libnm-util/libnm-util-sections.txt b/docs/libnm-util/libnm-util-sections.txt
index a278e8e8..c55c690f 100644
--- a/docs/libnm-util/libnm-util-sections.txt
+++ b/docs/libnm-util/libnm-util-sections.txt
@@ -20,6 +20,7 @@ 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_by_name
@@ -226,6 +227,45 @@ NM_TYPE_SETTING_802_1X
 nm_setting_802_1x_get_type
 
 
+

+nm-setting-adsl
+NMSettingAdsl
+NMSettingAdsl
+NMSettingAdslClass
+NMSettingAdslError
+NM_SETTING_ADSL_ENCAPSULATION
+NM_SETTING_ADSL_ENCAPSULATION_LLC
+NM_SETTING_ADSL_ENCAPSULATION_VCMUX
+NM_SETTING_ADSL_ERROR
+NM_SETTING_ADSL_PASSWORD
+NM_SETTING_ADSL_PASSWORD_FLAGS
+NM_SETTING_ADSL_PROTOCOL
+NM_SETTING_ADSL_PROTOCOL_IPOATM
+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_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_vpi
+nm_setting_adsl_new
+
+NM_IS_SETTING_ADSL
+NM_IS_SETTING_ADSL_CLASS
+NM_SETTING_ADSL
+NM_SETTING_ADSL_CLASS
+NM_SETTING_ADSL_GET_CLASS
+NM_TYPE_SETTING_ADSL
+nm_setting_adsl_get_type
+

+
 

 nm-setting-bluetooth
 NMSettingBluetooth
@@ -921,6 +961,7 @@ 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_MAC_ADDRESS
 NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST
 NM_SETTING_WIRELESS_MODE
@@ -940,6 +981,7 @@ 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_mac_address
 nm_setting_wireless_get_mac_address_blacklist
 nm_setting_wireless_get_mode
@@ -1073,6 +1115,7 @@ NM_TYPE_CONNECTION_ERROR
 NM_TYPE_SETTING_802_1X_CK_FORMAT
 NM_TYPE_SETTING_802_1X_CK_SCHEME
 NM_TYPE_SETTING_802_1X_ERROR
+NM_TYPE_SETTING_ADSL_ERROR
 NM_TYPE_SETTING_BLUETOOTH_ERROR
 NM_TYPE_SETTING_BOND_ERROR
 NM_TYPE_SETTING_CDMA_ERROR
@@ -1107,6 +1150,7 @@ nm_connection_error_get_type
 nm_setting_802_1x_ck_format_get_type
 nm_setting_802_1x_ck_scheme_get_type
 nm_setting_802_1x_error_get_type
+nm_setting_adsl_error_get_type
 nm_setting_bluetooth_error_get_type
 nm_setting_bond_error_get_type
 nm_setting_cdma_error_get_type
diff --git a/docs/libnm-util/libnm-util.types b/docs/libnm-util/libnm-util.types
index 72f62e06..511e539d 100644
--- a/docs/libnm-util/libnm-util.types
+++ b/docs/libnm-util/libnm-util.types
@@ -8,6 +8,8 @@ nm_setting_802_1x_ck_format_get_type
 nm_setting_802_1x_ck_scheme_get_type
 nm_setting_802_1x_error_get_type
 nm_setting_802_1x_get_type
+nm_setting_adsl_error_get_type
+nm_setting_adsl_get_type
 nm_setting_bluetooth_error_get_type
 nm_setting_bluetooth_get_type
 nm_setting_bond_error_get_type
diff --git a/docs/libnm-util/tmpl/libnm-util-unused.sgml b/docs/libnm-util/tmpl/libnm-util-unused.sgml
index 26fd8b52..e69de29b 100644
--- a/docs/libnm-util/tmpl/libnm-util-unused.sgml
+++ b/docs/libnm-util/tmpl/libnm-util-unused.sgml
@@ -1,260 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-NMSettingAdsl
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@_reserved1: 
-@_reserved2: 
-@_reserved3: 
-@_reserved4: 
-
-
-
-
-
-
-@NM_SETTING_ADSL_ERROR_UNKNOWN: 
-@NM_SETTING_ADSL_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_ADSL_ERROR_MISSING_PROPERTY: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
diff --git a/docs/libnm-util/tmpl/nm-connection.sgml b/docs/libnm-util/tmpl/nm-connection.sgml
index 434e0d1b..59799611 100644
--- a/docs/libnm-util/tmpl/nm-connection.sgml
+++ b/docs/libnm-util/tmpl/nm-connection.sgml
@@ -210,6 +210,15 @@ NMConnection
 @Returns: 
 
 
+
+
+
+
+
+@connection: 
+@Returns: 
+
+
 
 
 
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless.sgml b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
index 3790e252..6a34f4c5 100644
--- a/docs/libnm-util/tmpl/nm-setting-wireless.sgml
+++ b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
@@ -46,6 +46,11 @@ NMSettingWireless
 
 
 
+
+
+
+
+
 
 
 
@@ -148,6 +153,13 @@ NMSettingWireless
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -301,6 +313,15 @@ NMSettingWireless
 @Returns: 
 
 
+
+
+
+
+
+@setting: 
+@Returns: 
+
+
 
 
 
-- 
cgit 1.3.0-6-gf8a5