GNOME.org
 

[vala/wip/nm-bindings] NetworkManager: Updated metadata files

commit f9bd11b76fefefd11a7a24953076b11d88f46c79
Author: Alberto Ruiz <aruiz gnome org>
Date:   Tue Jun 5 18:49:32 2012 +0100

    NetworkManager: Updated metadata files

 vapi/libnm-glib.deps                      |    1 +
 vapi/libnm-glib.vapi                      |  536 ++++++++++++++--------------
 vapi/libnm-utils.deps                     |    2 +-
 vapi/libnm-utils.vapi                     |   44 +++-
 vapi/metadata/NMClient-1.0.metadata       |  143 ++------
 vapi/metadata/NetworkManager-1.0.metadata |    8 +-
 6 files changed, 348 insertions(+), 386 deletions(-)
---
diff --git a/vapi/libnm-glib.deps b/vapi/libnm-glib.deps
index 4bd331e..af37dbc 100644
--- a/vapi/libnm-glib.deps
+++ b/vapi/libnm-glib.deps
@@ -1,2 +1,3 @@
+dbus-glib-1
 libnm-utils
 gio-2.0
diff --git a/vapi/libnm-glib.vapi b/vapi/libnm-glib.vapi
index 0d69ea2..fb81bc0 100644
--- a/vapi/libnm-glib.vapi
+++ b/vapi/libnm-glib.vapi
@@ -1,11 +1,31 @@
-/* libnm-glib.vapi generated by lt-vapigen, do not modify. */
+/* libnm-glib.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "NM", gir_namespace = "NMClient", gir_version = "1.0", lower_case_cprefix = "nm__")]
 namespace NM {
 	[CCode (cheader_filename = "nm-access-point.h", type_id = "nm_access_point_get_type ()")]
 	public class AccessPoint : NM.Object, GLib.AsyncInitable, GLib.Initable {
+		[CCode (cheader_filename = "nm-access-point.h", cname = "NM_ACCESS_POINT_BSSID")]
+		public const string BSSID;
+		[CCode (cheader_filename = "nm-access-point.h", cname = "NM_ACCESS_POINT_FLAGS")]
+		public const string FLAGS;
+		[CCode (cheader_filename = "nm-access-point.h", cname = "NM_ACCESS_POINT_FREQUENCY")]
+		public const string FREQUENCY;
+		[CCode (cheader_filename = "nm-access-point.h", cname = "NM_ACCESS_POINT_HW_ADDRESS")]
+		public const string HW_ADDRESS;
+		[CCode (cheader_filename = "nm-access-point.h", cname = "NM_ACCESS_POINT_MAX_BITRATE")]
+		public const string MAX_BITRATE;
+		[CCode (cheader_filename = "nm-access-point.h", cname = "NM_ACCESS_POINT_MODE")]
+		public const string MODE;
+		[CCode (cheader_filename = "nm-access-point.h", cname = "NM_ACCESS_POINT_RSN_FLAGS")]
+		public const string RSN_FLAGS;
+		[CCode (cheader_filename = "nm-access-point.h", cname = "NM_ACCESS_POINT_SSID")]
+		public const string SSID;
+		[CCode (cheader_filename = "nm-access-point.h", cname = "NM_ACCESS_POINT_STRENGTH")]
+		public const string STRENGTH;
+		[CCode (cheader_filename = "nm-access-point.h", cname = "NM_ACCESS_POINT_WPA_FLAGS")]
+		public const string WPA_FLAGS;
 		[CCode (cname = "nm_access_point_new", has_construct_function = false, type = "GObject*")]
-		public AccessPoint (DBus.Connection connection, string path);
+		public AccessPoint (DBusGLib.Connection connection, string path);
 		[CCode (cname = "nm_access_point_connection_valid")]
 		public bool connection_valid (NM.Connection connection);
 		[CCode (cname = "nm_access_point_filter_connections")]
@@ -54,8 +74,24 @@ namespace NM {
 	}
 	[CCode (cheader_filename = "nm-active-connection.h", type_id = "nm_active_connection_get_type ()")]
 	public class ActiveConnection : NM.Object, GLib.AsyncInitable, GLib.Initable {
+		[CCode (cheader_filename = "nm-active-connection.h", cname = "NM_ACTIVE_CONNECTION_CONNECTION")]
+		public const string CONNECTION;
+		[CCode (cheader_filename = "nm-active-connection.h", cname = "NM_ACTIVE_CONNECTION_DEFAULT")]
+		public const string DEFAULT;
+		[CCode (cheader_filename = "nm-active-connection.h", cname = "NM_ACTIVE_CONNECTION_DEFAULT6")]
+		public const string DEFAULT6;
+		[CCode (cheader_filename = "nm-active-connection.h", cname = "NM_ACTIVE_CONNECTION_DEVICES")]
+		public const string DEVICES;
+		[CCode (cheader_filename = "nm-active-connection.h", cname = "NM_ACTIVE_CONNECTION_MASTER")]
+		public const string MASTER;
+		[CCode (cheader_filename = "nm-active-connection.h", cname = "NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT")]
+		public const string SPECIFIC_OBJECT;
+		[CCode (cheader_filename = "nm-active-connection.h", cname = "NM_ACTIVE_CONNECTION_STATE")]
+		public const string STATE;
+		[CCode (cheader_filename = "nm-active-connection.h", cname = "NM_ACTIVE_CONNECTION_UUID")]
+		public const string UUID;
 		[CCode (cname = "nm_active_connection_new", has_construct_function = false, type = "GObject*")]
-		public ActiveConnection (DBus.Connection connection, string path);
+		public ActiveConnection (DBusGLib.Connection connection, string path);
 		[CCode (cname = "nm_active_connection_get_connection")]
 		public unowned string get_connection ();
 		[CCode (cname = "nm_active_connection_get_default")]
@@ -91,6 +127,28 @@ namespace NM {
 	}
 	[CCode (cheader_filename = "nm-client.h", type_id = "nm_client_get_type ()")]
 	public class Client : NM.Object, GLib.AsyncInitable, GLib.Initable {
+		[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_ACTIVE_CONNECTIONS")]
+		public const string ACTIVE_CONNECTIONS;
+		[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_MANAGER_RUNNING")]
+		public const string MANAGER_RUNNING;
+		[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_NETWORKING_ENABLED")]
+		public const string NETWORKING_ENABLED;
+		[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_STATE")]
+		public const string STATE;
+		[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_VERSION")]
+		public const string VERSION;
+		[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_WIMAX_ENABLED")]
+		public const string WIMAX_ENABLED;
+		[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_WIMAX_HARDWARE_ENABLED")]
+		public const string WIMAX_HARDWARE_ENABLED;
+		[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_WIRELESS_ENABLED")]
+		public const string WIRELESS_ENABLED;
+		[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_WIRELESS_HARDWARE_ENABLED")]
+		public const string WIRELESS_HARDWARE_ENABLED;
+		[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_WWAN_ENABLED")]
+		public const string WWAN_ENABLED;
+		[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_WWAN_HARDWARE_ENABLED")]
+		public const string WWAN_HARDWARE_ENABLED;
 		[CCode (cname = "nm_client_new", has_construct_function = false)]
 		public Client ();
 		[CCode (cname = "nm_client_activate_connection")]
@@ -169,8 +227,10 @@ namespace NM {
 	}
 	[CCode (cheader_filename = "nm-dhcp4-config.h", lower_case_csuffix = "dhcp4_config", type_id = "nm_dhcp4_config_get_type ()")]
 	public class DHCP4Config : NM.Object, GLib.AsyncInitable, GLib.Initable {
+		[CCode (cheader_filename = "nm-dhcp4-config.h", cname = "NM_DHCP4_CONFIG_OPTIONS")]
+		public const string OPTIONS;
 		[CCode (cname = "nm_dhcp4_config_new", has_construct_function = false, type = "GObject*")]
-		public DHCP4Config (DBus.Connection connection, string object_path);
+		public DHCP4Config (DBusGLib.Connection connection, string object_path);
 		[CCode (cname = "nm_dhcp4_config_get_one_option")]
 		public unowned string get_one_option (string option);
 		[CCode (cname = "nm_dhcp4_config_get_options")]
@@ -178,8 +238,10 @@ namespace NM {
 	}
 	[CCode (cheader_filename = "nm-dhcp6-config.h", lower_case_csuffix = "dhcp6_config", type_id = "nm_dhcp6_config_get_type ()")]
 	public class DHCP6Config : NM.Object, GLib.AsyncInitable, GLib.Initable {
+		[CCode (cheader_filename = "nm-dhcp6-config.h", cname = "NM_DHCP6_CONFIG_OPTIONS")]
+		public const string DHCP6_CONFIG_OPTIONS;
 		[CCode (cname = "nm_dhcp6_config_new", has_construct_function = false, type = "GObject*")]
-		public DHCP6Config (DBus.Connection connection, string object_path);
+		public DHCP6Config (DBusGLib.Connection connection, string object_path);
 		[CCode (cname = "nm_dhcp6_config_get_one_option")]
 		public unowned string get_one_option (string option);
 		[CCode (cname = "nm_dhcp6_config_get_options")]
@@ -187,13 +249,71 @@ namespace NM {
 	}
 	[CCode (cheader_filename = "nm-device.h", type_id = "nm_device_get_type ()")]
 	public class Device : NM.Object, GLib.AsyncInitable, GLib.Initable {
+		[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_ACTIVE_CONNECTION")]
+		public const string ACTIVE_CONNECTION;
+		[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_AUTOCONNECT")]
+		public const string AUTOCONNECT;
+		[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_CAPABILITIES")]
+		public const string CAPABILITIES;
+		[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_DEVICE_TYPE")]
+		public const string DEVICE_TYPE;
+		[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_DHCP4_CONFIG")]
+		public const string DHCP4_CONFIG;
+		[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_DHCP6_CONFIG")]
+		public const string DHCP6_CONFIG;
+		[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_DRIVER")]
+		public const string DRIVER;
+		[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_FIRMWARE_MISSING")]
+		public const string FIRMWARE_MISSING;
+		[CCode (cheader_filename = "nm-device-infiniband.h", cname = "NM_DEVICE_INFINIBAND_CARRIER")]
+		public const string INFINIBAND_CARRIER;
+		[CCode (cheader_filename = "nm-device-infiniband.h", cname = "NM_DEVICE_INFINIBAND_HW_ADDRESS")]
+		public const string INFINIBAND_HW_ADDRESS;
+		[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_INTERFACE")]
+		public const string INTERFACE;
+		[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_IP4_CONFIG")]
+		public const string IP4_CONFIG;
+		[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_IP6_CONFIG")]
+		public const string IP6_CONFIG;
+		[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_IP_INTERFACE")]
+		public const string IP_INTERFACE;
+		[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_MANAGED")]
+		public const string MANAGED;
+		[CCode (cheader_filename = "nm-device-modem.h", cname = "NM_DEVICE_MODEM_CURRENT_CAPABILITIES")]
+		public const string MODEM_CURRENT_CAPABILITIES;
+		[CCode (cheader_filename = "nm-device-modem.h", cname = "NM_DEVICE_MODEM_MODEM_CAPABILITIES")]
+		public const string MODEM_MODEM_CAPABILITIES;
+		[CCode (cheader_filename = "nm-device-olpc-mesh.h", cname = "NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL")]
+		public const string OLPC_MESH_ACTIVE_CHANNEL;
+		[CCode (cheader_filename = "nm-device-olpc-mesh.h", cname = "NM_DEVICE_OLPC_MESH_COMPANION")]
+		public const string OLPC_MESH_COMPANION;
+		[CCode (cheader_filename = "nm-device-olpc-mesh.h", cname = "NM_DEVICE_OLPC_MESH_HW_ADDRESS")]
+		public const string OLPC_MESH_HW_ADDRESS;
+		[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_PRODUCT")]
+		public const string PRODUCT;
+		[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_STATE")]
+		public const string STATE;
+		[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_STATE_REASON")]
+		public const string STATE_REASON;
+		[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_UDI")]
+		public const string UDI;
+		[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_VENDOR")]
+		public const string VENDOR;
 		[CCode (cname = "nm_device_new", has_construct_function = false, type = "GObject*")]
-		public Device (DBus.Connection connection, string path);
+		public Device (DBusGLib.Connection connection, string path);
+		[CCode (cheader_filename = "nm-device-adsl.h", cname = "nm_device_adsl_error_quark")]
+		public static GLib.Quark adsl_error_quark ();
+		[CCode (cheader_filename = "nm-device-bond.h", cname = "nm_device_bond_error_quark")]
+		public static GLib.Quark bond_error_quark ();
+		[CCode (cheader_filename = "nm-device-bt.h", cname = "nm_device_bt_error_quark")]
+		public static GLib.Quark bt_error_quark ();
 		public virtual bool connection_compatible (NM.Connection connection) throws GLib.Error;
 		[CCode (cname = "nm_device_connection_valid")]
 		public bool connection_valid (NM.Connection connection);
 		[CCode (cname = "nm_device_disconnect")]
 		public void disconnect (NM.DeviceDeactivateFn? callback);
+		[CCode (cheader_filename = "nm-device-ethernet.h", cname = "nm_device_ethernet_error_quark")]
+		public static GLib.Quark ethernet_error_quark ();
 		[CCode (cname = "nm_device_filter_connections")]
 		public GLib.SList<weak NM.Connection> filter_connections (GLib.SList<NM.Connection> connections);
 		[CCode (cname = "nm_device_get_active_connection")]
@@ -232,8 +352,20 @@ namespace NM {
 		public unowned string get_udi ();
 		[CCode (cname = "nm_device_get_vendor")]
 		public unowned string get_vendor ();
+		[CCode (cheader_filename = "nm-device-infiniband.h", cname = "nm_device_infiniband_error_quark")]
+		public static GLib.Quark infiniband_error_quark ();
+		[CCode (cheader_filename = "nm-device-modem.h", cname = "nm_device_modem_error_quark")]
+		public static GLib.Quark modem_error_quark ();
+		[CCode (cheader_filename = "nm-device-olpc-mesh.h", cname = "nm_device_olpc_mesh_error_quark")]
+		public static GLib.Quark olpc_mesh_error_quark ();
 		[CCode (cname = "nm_device_set_autoconnect")]
 		public void set_autoconnect (bool autoconnect);
+		[CCode (cheader_filename = "nm-device-vlan.h", cname = "nm_device_vlan_error_quark")]
+		public static GLib.Quark vlan_error_quark ();
+		[CCode (cheader_filename = "nm-device-wifi.h", cname = "nm_device_wifi_error_quark")]
+		public static GLib.Quark wifi_error_quark ();
+		[CCode (cheader_filename = "nm-device-wimax.h", cname = "nm_device_wimax_error_quark")]
+		public static GLib.Quark wimax_error_quark ();
 		[NoAccessorMethod]
 		public NM.ActiveConnection active_connection { owned get; }
 		[NoAccessorMethod]
@@ -272,8 +404,10 @@ namespace NM {
 	}
 	[CCode (cheader_filename = "nm-device-adsl.h", type_id = "nm_device_adsl_get_type ()")]
 	public class DeviceAdsl : NM.Device, GLib.AsyncInitable, GLib.Initable {
+		[CCode (cheader_filename = "nm-device-adsl.h", cname = "NM_DEVICE_ADSL_CARRIER")]
+		public const string CARRIER;
 		[CCode (cname = "nm_device_adsl_new", has_construct_function = false, type = "GObject*")]
-		public DeviceAdsl (DBus.Connection connection, string path);
+		public DeviceAdsl (DBusGLib.Connection connection, string path);
 		[CCode (cname = "nm_device_adsl_get_carrier")]
 		public bool get_carrier ();
 		[NoAccessorMethod]
@@ -281,8 +415,12 @@ namespace NM {
 	}
 	[CCode (cheader_filename = "nm-device-bond.h", type_id = "nm_device_bond_get_type ()")]
 	public class DeviceBond : NM.Device, GLib.AsyncInitable, GLib.Initable {
+		[CCode (cheader_filename = "nm-device-bond.h", cname = "NM_DEVICE_BOND_CARRIER")]
+		public const string CARRIER;
+		[CCode (cheader_filename = "nm-device-bond.h", cname = "NM_DEVICE_BOND_HW_ADDRESS")]
+		public const string HW_ADDRESS;
 		[CCode (cname = "nm_device_bond_new", has_construct_function = false, type = "GObject*")]
-		public DeviceBond (DBus.Connection connection, string path);
+		public DeviceBond (DBusGLib.Connection connection, string path);
 		[CCode (cname = "nm_device_bond_get_carrier")]
 		public bool get_carrier ();
 		[CCode (cname = "nm_device_bond_get_hw_address")]
@@ -294,8 +432,14 @@ namespace NM {
 	}
 	[CCode (cheader_filename = "nm-device-bt.h", type_id = "nm_device_bt_get_type ()")]
 	public class DeviceBt : NM.Device, GLib.AsyncInitable, GLib.Initable {
+		[CCode (cheader_filename = "nm-device-bt.h", cname = "NM_DEVICE_BT_CAPABILITIES")]
+		public const string CAPABILITIES;
+		[CCode (cheader_filename = "nm-device-bt.h", cname = "NM_DEVICE_BT_HW_ADDRESS")]
+		public const string HW_ADDRESS;
+		[CCode (cheader_filename = "nm-device-bt.h", cname = "NM_DEVICE_BT_NAME")]
+		public const string NAME;
 		[CCode (cname = "nm_device_bt_new", has_construct_function = false, type = "GObject*")]
-		public DeviceBt (DBus.Connection connection, string path);
+		public DeviceBt (DBusGLib.Connection connection, string path);
 		[CCode (cname = "nm_device_bt_get_capabilities")]
 		public NM.BluetoothCapabilities get_capabilities ();
 		[CCode (cname = "nm_device_bt_get_hw_address")]
@@ -311,8 +455,16 @@ namespace NM {
 	}
 	[CCode (cheader_filename = "nm-device-ethernet.h", type_id = "nm_device_ethernet_get_type ()")]
 	public class DeviceEthernet : NM.Device, GLib.AsyncInitable, GLib.Initable {
+		[CCode (cheader_filename = "nm-device-ethernet.h", cname = "NM_DEVICE_ETHERNET_CARRIER")]
+		public const string CARRIER;
+		[CCode (cheader_filename = "nm-device-ethernet.h", cname = "NM_DEVICE_ETHERNET_HW_ADDRESS")]
+		public const string HW_ADDRESS;
+		[CCode (cheader_filename = "nm-device-ethernet.h", cname = "NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS")]
+		public const string PERMANENT_HW_ADDRESS;
+		[CCode (cheader_filename = "nm-device-ethernet.h", cname = "NM_DEVICE_ETHERNET_SPEED")]
+		public const string SPEED;
 		[CCode (cname = "nm_device_ethernet_new", has_construct_function = false, type = "GObject*")]
-		public DeviceEthernet (DBus.Connection connection, string path);
+		public DeviceEthernet (DBusGLib.Connection connection, string path);
 		[CCode (cname = "nm_device_ethernet_get_carrier")]
 		public bool get_carrier ();
 		[CCode (cname = "nm_device_ethernet_get_hw_address")]
@@ -333,7 +485,7 @@ namespace NM {
 	[CCode (cheader_filename = "nm-device-infiniband.h", type_id = "nm_device_infiniband_get_type ()")]
 	public class DeviceInfiniband : NM.Device, GLib.AsyncInitable, GLib.Initable {
 		[CCode (cname = "nm_device_infiniband_new", has_construct_function = false, type = "GObject*")]
-		public DeviceInfiniband (DBus.Connection connection, string path);
+		public DeviceInfiniband (DBusGLib.Connection connection, string path);
 		[CCode (cname = "nm_device_infiniband_get_carrier")]
 		public bool get_carrier ();
 		[CCode (cname = "nm_device_infiniband_get_hw_address")]
@@ -359,7 +511,7 @@ namespace NM {
 	[CCode (cheader_filename = "nm-device-olpc-mesh.h", type_id = "nm_device_olpc_mesh_get_type ()")]
 	public class DeviceOlpcMesh : NM.Device, GLib.AsyncInitable, GLib.Initable {
 		[CCode (cname = "nm_device_olpc_mesh_new", has_construct_function = false, type = "GObject*")]
-		public DeviceOlpcMesh (DBus.Connection connection, string path);
+		public DeviceOlpcMesh (DBusGLib.Connection connection, string path);
 		[CCode (cname = "nm_device_olpc_mesh_get_active_channel")]
 		public uint32 get_active_channel ();
 		[CCode (cname = "nm_device_olpc_mesh_get_companion")]
@@ -375,8 +527,14 @@ namespace NM {
 	}
 	[CCode (cheader_filename = "nm-device-vlan.h", type_id = "nm_device_vlan_get_type ()")]
 	public class DeviceVlan : NM.Device, GLib.AsyncInitable, GLib.Initable {
+		[CCode (cheader_filename = "nm-device-vlan.h", cname = "NM_DEVICE_VLAN_CARRIER")]
+		public const string CARRIER;
+		[CCode (cheader_filename = "nm-device-vlan.h", cname = "NM_DEVICE_VLAN_HW_ADDRESS")]
+		public const string HW_ADDRESS;
+		[CCode (cheader_filename = "nm-device-vlan.h", cname = "NM_DEVICE_VLAN_VLAN_ID")]
+		public const string VLAN_ID;
 		[CCode (cname = "nm_device_vlan_new", has_construct_function = false, type = "GObject*")]
-		public DeviceVlan (DBus.Connection connection, string path);
+		public DeviceVlan (DBusGLib.Connection connection, string path);
 		[CCode (cname = "nm_device_vlan_get_carrier")]
 		public bool get_carrier ();
 		[CCode (cname = "nm_device_vlan_get_hw_address")]
@@ -392,8 +550,20 @@ namespace NM {
 	}
 	[CCode (cheader_filename = "nm-device-wifi.h", type_id = "nm_device_wifi_get_type ()")]
 	public class DeviceWifi : NM.Device, GLib.AsyncInitable, GLib.Initable {
+		[CCode (cheader_filename = "nm-device-wifi.h", cname = "NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT")]
+		public const string ACTIVE_ACCESS_POINT;
+		[CCode (cheader_filename = "nm-device-wifi.h", cname = "NM_DEVICE_WIFI_BITRATE")]
+		public const string BITRATE;
+		[CCode (cheader_filename = "nm-device-wifi.h", cname = "NM_DEVICE_WIFI_CAPABILITIES")]
+		public const string CAPABILITIES;
+		[CCode (cheader_filename = "nm-device-wifi.h", cname = "NM_DEVICE_WIFI_HW_ADDRESS")]
+		public const string HW_ADDRESS;
+		[CCode (cheader_filename = "nm-device-wifi.h", cname = "NM_DEVICE_WIFI_MODE")]
+		public const string MODE;
+		[CCode (cheader_filename = "nm-device-wifi.h", cname = "NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS")]
+		public const string PERMANENT_HW_ADDRESS;
 		[CCode (cname = "nm_device_wifi_new", has_construct_function = false, type = "GObject*")]
-		public DeviceWifi (DBus.Connection connection, string path);
+		public DeviceWifi (DBusGLib.Connection connection, string path);
 		[CCode (cname = "nm_device_wifi_get_access_point_by_path")]
 		public unowned NM.AccessPoint get_access_point_by_path (string path);
 		[CCode (cname = "nm_device_wifi_get_access_points")]
@@ -427,8 +597,22 @@ namespace NM {
 	}
 	[CCode (cheader_filename = "nm-device-wimax.h", type_id = "nm_device_wimax_get_type ()")]
 	public class DeviceWimax : NM.Device, GLib.AsyncInitable, GLib.Initable {
+		[CCode (cheader_filename = "nm-device-wimax.h", cname = "NM_DEVICE_WIMAX_ACTIVE_NSP")]
+		public const string ACTIVE_NSP;
+		[CCode (cheader_filename = "nm-device-wimax.h", cname = "NM_DEVICE_WIMAX_BSID")]
+		public const string BSID;
+		[CCode (cheader_filename = "nm-device-wimax.h", cname = "NM_DEVICE_WIMAX_CENTER_FREQUENCY")]
+		public const string CENTER_FREQUENCY;
+		[CCode (cheader_filename = "nm-device-wimax.h", cname = "NM_DEVICE_WIMAX_CINR")]
+		public const string CINR;
+		[CCode (cheader_filename = "nm-device-wimax.h", cname = "NM_DEVICE_WIMAX_HW_ADDRESS")]
+		public const string HW_ADDRESS;
+		[CCode (cheader_filename = "nm-device-wimax.h", cname = "NM_DEVICE_WIMAX_RSSI")]
+		public const string RSSI;
+		[CCode (cheader_filename = "nm-device-wimax.h", cname = "NM_DEVICE_WIMAX_TX_POWER")]
+		public const string TX_POWER;
 		[CCode (cname = "nm_device_wimax_new", has_construct_function = false, type = "GObject*")]
-		public DeviceWimax (DBus.Connection connection, string path);
+		public DeviceWimax (DBusGLib.Connection connection, string path);
 		[CCode (cname = "nm_device_wimax_get_active_nsp")]
 		public NM.WimaxNsp get_active_nsp ();
 		[CCode (cname = "nm_device_wimax_get_bsid")]
@@ -466,8 +650,18 @@ namespace NM {
 	}
 	[CCode (cheader_filename = "nm-ip4-config.h", type_id = "nm_ip4_config_get_type ()")]
 	public class IP4Config : NM.Object, GLib.AsyncInitable, GLib.Initable {
+		[CCode (cheader_filename = "nm-ip4-config.h", cname = "NM_IP4_CONFIG_ADDRESSES")]
+		public const string ADDRESSES;
+		[CCode (cheader_filename = "nm-ip4-config.h", cname = "NM_IP4_CONFIG_DOMAINS")]
+		public const string DOMAINS;
+		[CCode (cheader_filename = "nm-ip4-config.h", cname = "NM_IP4_CONFIG_NAMESERVERS")]
+		public const string NAMESERVERS;
+		[CCode (cheader_filename = "nm-ip4-config.h", cname = "NM_IP4_CONFIG_ROUTES")]
+		public const string ROUTES;
+		[CCode (cheader_filename = "nm-ip4-config.h", cname = "NM_IP4_CONFIG_WINS_SERVERS")]
+		public const string WINS_SERVERS;
 		[CCode (cname = "nm_ip4_config_new", has_construct_function = false, type = "GObject*")]
-		public IP4Config (DBus.Connection connection, string object_path);
+		public IP4Config (DBusGLib.Connection connection, string object_path);
 		[CCode (cname = "nm_ip4_config_get_addresses")]
 		public unowned GLib.SList<NM.IP4Address> get_addresses ();
 		[CCode (cname = "nm_ip4_config_get_domains")]
@@ -499,8 +693,16 @@ namespace NM {
 	}
 	[CCode (cheader_filename = "nm-ip6-config.h", type_id = "nm_ip6_config_get_type ()")]
 	public class IP6Config : NM.Object, GLib.AsyncInitable, GLib.Initable {
+		[CCode (cheader_filename = "nm-ip6-config.h", cname = "NM_IP6_CONFIG_ADDRESSES")]
+		public const string ADDRESSES;
+		[CCode (cheader_filename = "nm-ip6-config.h", cname = "NM_IP6_CONFIG_DOMAINS")]
+		public const string DOMAINS;
+		[CCode (cheader_filename = "nm-ip6-config.h", cname = "NM_IP6_CONFIG_NAMESERVERS")]
+		public const string NAMESERVERS;
+		[CCode (cheader_filename = "nm-ip6-config.h", cname = "NM_IP6_CONFIG_ROUTES")]
+		public const string ROUTES;
 		[CCode (cname = "nm_ip6_config_new", has_construct_function = false, type = "GObject*")]
-		public IP6Config (DBus.Connection connection, string object_path);
+		public IP6Config (DBusGLib.Connection connection, string object_path);
 		[CCode (cname = "nm_ip6_config_get_addresses")]
 		public unowned GLib.SList<NM.IP6Address> get_addresses ();
 		[CCode (cname = "nm_ip6_config_get_domains")]
@@ -522,10 +724,16 @@ namespace NM {
 	}
 	[CCode (cheader_filename = "nm-object.h", type_id = "nm_object_get_type ()")]
 	public abstract class Object : GLib.Object, GLib.AsyncInitable, GLib.Initable {
+		[CCode (cheader_filename = "nm-object.h", cname = "NM_OBJECT_DBUS_CONNECTION")]
+		public const string DBUS_CONNECTION;
+		[CCode (cheader_filename = "nm-object.h", cname = "NM_OBJECT_DBUS_PATH")]
+		public const string DBUS_PATH;
 		[CCode (has_construct_function = false)]
 		protected Object ();
+		[CCode (cheader_filename = "nm-object.h", cname = "nm_object_error_quark")]
+		public static GLib.Quark error_quark ();
 		[CCode (cname = "nm_object_get_connection")]
-		public unowned DBus.Connection get_connection ();
+		public DBusGLib.Connection get_connection ();
 		[CCode (cname = "nm_object_get_path")]
 		public unowned string get_path ();
 		[NoAccessorMethod]
@@ -538,8 +746,12 @@ namespace NM {
 	}
 	[CCode (cheader_filename = "nm-remote-connection.h", type_id = "nm_remote_connection_get_type ()")]
 	public class RemoteConnection : NM.Connection, GLib.AsyncInitable, GLib.Initable {
+		[CCode (cheader_filename = "nm-remote-connection.h", cname = "NM_REMOTE_CONNECTION_REMOVED")]
+		public const string REMOVED;
+		[CCode (cheader_filename = "nm-remote-connection.h", cname = "NM_REMOTE_CONNECTION_UPDATED")]
+		public const string UPDATED;
 		[CCode (cname = "nm_remote_connection_new", has_construct_function = false)]
-		public RemoteConnection (DBus.Connection bus, string path);
+		public RemoteConnection (DBusGLib.Connection bus, string path);
 		[CCode (cname = "nm_remote_connection_commit_changes")]
 		public void commit_changes (NM.RemoteConnectionCommitFunc? callback);
 		[CCode (cname = "nm_remote_connection_delete")]
@@ -552,8 +764,20 @@ namespace NM {
 	}
 	[CCode (cheader_filename = "nm-remote-settings.h", type_id = "nm_remote_settings_get_type ()")]
 	public class RemoteSettings : GLib.Object, GLib.AsyncInitable, GLib.Initable {
+		[CCode (cheader_filename = "nm-remote-settings.h", cname = "NM_REMOTE_SETTINGS_BUS")]
+		public const string BUS;
+		[CCode (cheader_filename = "nm-remote-settings.h", cname = "NM_REMOTE_SETTINGS_CAN_MODIFY")]
+		public const string CAN_MODIFY;
+		[CCode (cheader_filename = "nm-remote-settings.h", cname = "NM_REMOTE_SETTINGS_CONNECTIONS_READ")]
+		public const string CONNECTIONS_READ;
+		[CCode (cheader_filename = "nm-remote-settings.h", cname = "NM_REMOTE_SETTINGS_HOSTNAME")]
+		public const string HOSTNAME;
+		[CCode (cheader_filename = "nm-remote-settings.h", cname = "NM_REMOTE_SETTINGS_NEW_CONNECTION")]
+		public const string NEW_CONNECTION;
+		[CCode (cheader_filename = "nm-remote-settings.h", cname = "NM_REMOTE_SETTINGS_SERVICE_RUNNING")]
+		public const string SERVICE_RUNNING;
 		[CCode (cname = "nm_remote_settings_new", has_construct_function = false)]
-		public RemoteSettings (DBus.Connection? bus);
+		public RemoteSettings (DBusGLib.Connection? bus);
 		[CCode (cname = "nm_remote_settings_add_connection")]
 		public bool add_connection (NM.Connection connection, NM.RemoteSettingsAddConnectionFunc callback);
 		[CCode (cname = "nm_remote_settings_new_finish", has_construct_function = false)]
@@ -566,6 +790,8 @@ namespace NM {
 		public GLib.SList<weak NM.RemoteConnection> list_connections ();
 		[CCode (cname = "nm_remote_settings_save_hostname")]
 		public bool save_hostname (string hostname, NM.RemoteSettingsSaveHostnameFunc? callback);
+		[CCode (cheader_filename = "nm-remote-settings.h", cname = "nm_remote_settings_error_quark")]
+		public static GLib.Quark settings_error_quark ();
 		[NoAccessorMethod]
 		public bool can_modify { get; }
 		[NoAccessorMethod]
@@ -577,12 +803,22 @@ namespace NM {
 	}
 	[CCode (cheader_filename = "nm-secret-agent.h", type_id = "nm_secret_agent_get_type ()")]
 	public abstract class SecretAgent : GLib.Object {
+		[CCode (cheader_filename = "nm-secret-agent.h", cname = "NM_SECRET_AGENT_AUTO_REGISTER")]
+		public const string AUTO_REGISTER;
+		[CCode (cheader_filename = "nm-secret-agent.h", cname = "NM_SECRET_AGENT_IDENTIFIER")]
+		public const string IDENTIFIER;
+		[CCode (cheader_filename = "nm-secret-agent.h", cname = "NM_SECRET_AGENT_REGISTERED")]
+		public const string REGISTERED;
+		[CCode (cheader_filename = "nm-secret-agent.h", cname = "NM_SECRET_AGENT_REGISTRATION_RESULT")]
+		public const string REGISTRATION_RESULT;
 		[CCode (has_construct_function = false)]
 		protected SecretAgent ();
 		[NoWrapper]
 		public virtual void cancel_get_secrets (string connection_path, string setting_name);
 		[CCode (cname = "nm_secret_agent_delete_secrets")]
 		public void delete_secrets (NM.Connection connection, NM.SecretAgentDeleteSecretsFunc callback);
+		[CCode (cheader_filename = "nm-secret-agent.h", cname = "nm_secret_agent_error_quark")]
+		public static GLib.Quark error_quark ();
 		[CCode (cname = "nm_secret_agent_get_registered")]
 		public bool get_registered ();
 		[CCode (cname = "nm_secret_agent_get_secrets")]
@@ -615,8 +851,12 @@ namespace NM {
 	}
 	[CCode (cheader_filename = "nm-vpn-connection.h", type_id = "nm_vpn_connection_get_type ()")]
 	public class VPNConnection : NM.ActiveConnection, GLib.AsyncInitable, GLib.Initable {
+		[CCode (cheader_filename = "nm-vpn-connection.h", cname = "NM_VPN_CONNECTION_BANNER")]
+		public const string BANNER;
+		[CCode (cheader_filename = "nm-vpn-connection.h", cname = "NM_VPN_CONNECTION_VPN_STATE")]
+		public const string VPN_STATE;
 		[CCode (cname = "nm_vpn_connection_new", has_construct_function = false, type = "GObject*")]
-		public VPNConnection (DBus.Connection connection, string path);
+		public VPNConnection (DBusGLib.Connection connection, string path);
 		[CCode (cname = "nm_vpn_connection_get_banner")]
 		public unowned string get_banner ();
 		[CCode (cname = "nm_vpn_connection_get_vpn_state")]
@@ -629,8 +869,14 @@ namespace NM {
 	}
 	[CCode (cheader_filename = "nm-wimax-nsp.h", type_id = "nm_wimax_nsp_get_type ()")]
 	public class WimaxNsp : NM.Object, GLib.AsyncInitable, GLib.Initable {
+		[CCode (cheader_filename = "nm-wimax-nsp.h", cname = "NM_WIMAX_NSP_NAME")]
+		public const string NAME;
+		[CCode (cheader_filename = "nm-wimax-nsp.h", cname = "NM_WIMAX_NSP_NETWORK_TYPE")]
+		public const string NETWORK_TYPE;
+		[CCode (cheader_filename = "nm-wimax-nsp.h", cname = "NM_WIMAX_NSP_SIGNAL_QUALITY")]
+		public const string SIGNAL_QUALITY;
 		[CCode (cname = "nm_wimax_nsp_new", has_construct_function = false, type = "GObject*")]
-		public WimaxNsp (DBus.Connection connection, string path);
+		public WimaxNsp (DBusGLib.Connection connection, string path);
 		[CCode (cname = "nm_wimax_nsp_connection_valid")]
 		public bool connection_valid (NM.Connection connection);
 		[CCode (cname = "nm_wimax_nsp_filter_connections")]
@@ -859,250 +1105,4 @@ namespace NM {
 	public delegate void SecretAgentGetSecretsFunc (NM.SecretAgent agent, NM.Connection connection, GLib.HashTable<string,GLib.HashTable<void*,void*>> secrets, GLib.Error error);
 	[CCode (cheader_filename = "nm-secret-agent.h", instance_pos = 3.9)]
 	public delegate void SecretAgentSaveSecretsFunc (NM.SecretAgent agent, NM.Connection connection, GLib.Error error);
-	[CCode (cheader_filename = "nm-access-point.h", cname = "NM_ACCESS_POINT_BSSID")]
-	public const string ACCESS_POINT_BSSID;
-	[CCode (cheader_filename = "nm-access-point.h", cname = "NM_ACCESS_POINT_FLAGS")]
-	public const string ACCESS_POINT_FLAGS;
-	[CCode (cheader_filename = "nm-access-point.h", cname = "NM_ACCESS_POINT_FREQUENCY")]
-	public const string ACCESS_POINT_FREQUENCY;
-	[CCode (cheader_filename = "nm-access-point.h", cname = "NM_ACCESS_POINT_HW_ADDRESS")]
-	public const string ACCESS_POINT_HW_ADDRESS;
-	[CCode (cheader_filename = "nm-access-point.h", cname = "NM_ACCESS_POINT_MAX_BITRATE")]
-	public const string ACCESS_POINT_MAX_BITRATE;
-	[CCode (cheader_filename = "nm-access-point.h", cname = "NM_ACCESS_POINT_MODE")]
-	public const string ACCESS_POINT_MODE;
-	[CCode (cheader_filename = "nm-access-point.h", cname = "NM_ACCESS_POINT_RSN_FLAGS")]
-	public const string ACCESS_POINT_RSN_FLAGS;
-	[CCode (cheader_filename = "nm-access-point.h", cname = "NM_ACCESS_POINT_SSID")]
-	public const string ACCESS_POINT_SSID;
-	[CCode (cheader_filename = "nm-access-point.h", cname = "NM_ACCESS_POINT_STRENGTH")]
-	public const string ACCESS_POINT_STRENGTH;
-	[CCode (cheader_filename = "nm-access-point.h", cname = "NM_ACCESS_POINT_WPA_FLAGS")]
-	public const string ACCESS_POINT_WPA_FLAGS;
-	[CCode (cheader_filename = "nm-active-connection.h", cname = "NM_ACTIVE_CONNECTION_CONNECTION")]
-	public const string ACTIVE_CONNECTION_CONNECTION;
-	[CCode (cheader_filename = "nm-active-connection.h", cname = "NM_ACTIVE_CONNECTION_DEFAULT")]
-	public const string ACTIVE_CONNECTION_DEFAULT;
-	[CCode (cheader_filename = "nm-active-connection.h", cname = "NM_ACTIVE_CONNECTION_DEFAULT6")]
-	public const string ACTIVE_CONNECTION_DEFAULT6;
-	[CCode (cheader_filename = "nm-active-connection.h", cname = "NM_ACTIVE_CONNECTION_DEVICES")]
-	public const string ACTIVE_CONNECTION_DEVICES;
-	[CCode (cheader_filename = "nm-active-connection.h", cname = "NM_ACTIVE_CONNECTION_MASTER")]
-	public const string ACTIVE_CONNECTION_MASTER;
-	[CCode (cheader_filename = "nm-active-connection.h", cname = "NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT")]
-	public const string ACTIVE_CONNECTION_SPECIFIC_OBJECT;
-	[CCode (cheader_filename = "nm-active-connection.h", cname = "NM_ACTIVE_CONNECTION_STATE")]
-	public const string ACTIVE_CONNECTION_STATE;
-	[CCode (cheader_filename = "nm-active-connection.h", cname = "NM_ACTIVE_CONNECTION_UUID")]
-	public const string ACTIVE_CONNECTION_UUID;
-	[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_ACTIVE_CONNECTIONS")]
-	public const string CLIENT_ACTIVE_CONNECTIONS;
-	[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_MANAGER_RUNNING")]
-	public const string CLIENT_MANAGER_RUNNING;
-	[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_NETWORKING_ENABLED")]
-	public const string CLIENT_NETWORKING_ENABLED;
-	[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_STATE")]
-	public const string CLIENT_STATE;
-	[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_VERSION")]
-	public const string CLIENT_VERSION;
-	[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_WIMAX_ENABLED")]
-	public const string CLIENT_WIMAX_ENABLED;
-	[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_WIMAX_HARDWARE_ENABLED")]
-	public const string CLIENT_WIMAX_HARDWARE_ENABLED;
-	[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_WIRELESS_ENABLED")]
-	public const string CLIENT_WIRELESS_ENABLED;
-	[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_WIRELESS_HARDWARE_ENABLED")]
-	public const string CLIENT_WIRELESS_HARDWARE_ENABLED;
-	[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_WWAN_ENABLED")]
-	public const string CLIENT_WWAN_ENABLED;
-	[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_WWAN_HARDWARE_ENABLED")]
-	public const string CLIENT_WWAN_HARDWARE_ENABLED;
-	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_ACTIVE_CONNECTION")]
-	public const string DEVICE_ACTIVE_CONNECTION;
-	[CCode (cheader_filename = "nm-device-adsl.h", cname = "NM_DEVICE_ADSL_CARRIER")]
-	public const string DEVICE_ADSL_CARRIER;
-	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_AUTOCONNECT")]
-	public const string DEVICE_AUTOCONNECT;
-	[CCode (cheader_filename = "nm-device-bond.h", cname = "NM_DEVICE_BOND_CARRIER")]
-	public const string DEVICE_BOND_CARRIER;
-	[CCode (cheader_filename = "nm-device-bond.h", cname = "NM_DEVICE_BOND_HW_ADDRESS")]
-	public const string DEVICE_BOND_HW_ADDRESS;
-	[CCode (cheader_filename = "nm-device-bt.h", cname = "NM_DEVICE_BT_CAPABILITIES")]
-	public const string DEVICE_BT_CAPABILITIES;
-	[CCode (cheader_filename = "nm-device-bt.h", cname = "NM_DEVICE_BT_HW_ADDRESS")]
-	public const string DEVICE_BT_HW_ADDRESS;
-	[CCode (cheader_filename = "nm-device-bt.h", cname = "NM_DEVICE_BT_NAME")]
-	public const string DEVICE_BT_NAME;
-	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_CAPABILITIES")]
-	public const string DEVICE_CAPABILITIES;
-	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_DEVICE_TYPE")]
-	public const string DEVICE_DEVICE_TYPE;
-	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_DHCP4_CONFIG")]
-	public const string DEVICE_DHCP4_CONFIG;
-	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_DHCP6_CONFIG")]
-	public const string DEVICE_DHCP6_CONFIG;
-	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_DRIVER")]
-	public const string DEVICE_DRIVER;
-	[CCode (cheader_filename = "nm-device-ethernet.h", cname = "NM_DEVICE_ETHERNET_CARRIER")]
-	public const string DEVICE_ETHERNET_CARRIER;
-	[CCode (cheader_filename = "nm-device-ethernet.h", cname = "NM_DEVICE_ETHERNET_HW_ADDRESS")]
-	public const string DEVICE_ETHERNET_HW_ADDRESS;
-	[CCode (cheader_filename = "nm-device-ethernet.h", cname = "NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS")]
-	public const string DEVICE_ETHERNET_PERMANENT_HW_ADDRESS;
-	[CCode (cheader_filename = "nm-device-ethernet.h", cname = "NM_DEVICE_ETHERNET_SPEED")]
-	public const string DEVICE_ETHERNET_SPEED;
-	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_FIRMWARE_MISSING")]
-	public const string DEVICE_FIRMWARE_MISSING;
-	[CCode (cheader_filename = "nm-device-infiniband.h", cname = "NM_DEVICE_INFINIBAND_CARRIER")]
-	public const string DEVICE_INFINIBAND_CARRIER;
-	[CCode (cheader_filename = "nm-device-infiniband.h", cname = "NM_DEVICE_INFINIBAND_HW_ADDRESS")]
-	public const string DEVICE_INFINIBAND_HW_ADDRESS;
-	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_INTERFACE")]
-	public const string DEVICE_INTERFACE;
-	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_IP4_CONFIG")]
-	public const string DEVICE_IP4_CONFIG;
-	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_IP6_CONFIG")]
-	public const string DEVICE_IP6_CONFIG;
-	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_IP_INTERFACE")]
-	public const string DEVICE_IP_INTERFACE;
-	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_MANAGED")]
-	public const string DEVICE_MANAGED;
-	[CCode (cheader_filename = "nm-device-modem.h", cname = "NM_DEVICE_MODEM_CURRENT_CAPABILITIES")]
-	public const string DEVICE_MODEM_CURRENT_CAPABILITIES;
-	[CCode (cheader_filename = "nm-device-modem.h", cname = "NM_DEVICE_MODEM_MODEM_CAPABILITIES")]
-	public const string DEVICE_MODEM_MODEM_CAPABILITIES;
-	[CCode (cheader_filename = "nm-device-olpc-mesh.h", cname = "NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL")]
-	public const string DEVICE_OLPC_MESH_ACTIVE_CHANNEL;
-	[CCode (cheader_filename = "nm-device-olpc-mesh.h", cname = "NM_DEVICE_OLPC_MESH_COMPANION")]
-	public const string DEVICE_OLPC_MESH_COMPANION;
-	[CCode (cheader_filename = "nm-device-olpc-mesh.h", cname = "NM_DEVICE_OLPC_MESH_HW_ADDRESS")]
-	public const string DEVICE_OLPC_MESH_HW_ADDRESS;
-	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_PRODUCT")]
-	public const string DEVICE_PRODUCT;
-	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_STATE")]
-	public const string DEVICE_STATE;
-	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_STATE_REASON")]
-	public const string DEVICE_STATE_REASON;
-	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_UDI")]
-	public const string DEVICE_UDI;
-	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_VENDOR")]
-	public const string DEVICE_VENDOR;
-	[CCode (cheader_filename = "nm-device-vlan.h", cname = "NM_DEVICE_VLAN_CARRIER")]
-	public const string DEVICE_VLAN_CARRIER;
-	[CCode (cheader_filename = "nm-device-vlan.h", cname = "NM_DEVICE_VLAN_HW_ADDRESS")]
-	public const string DEVICE_VLAN_HW_ADDRESS;
-	[CCode (cheader_filename = "nm-device-vlan.h", cname = "NM_DEVICE_VLAN_VLAN_ID")]
-	public const string DEVICE_VLAN_VLAN_ID;
-	[CCode (cheader_filename = "nm-device-wifi.h", cname = "NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT")]
-	public const string DEVICE_WIFI_ACTIVE_ACCESS_POINT;
-	[CCode (cheader_filename = "nm-device-wifi.h", cname = "NM_DEVICE_WIFI_BITRATE")]
-	public const string DEVICE_WIFI_BITRATE;
-	[CCode (cheader_filename = "nm-device-wifi.h", cname = "NM_DEVICE_WIFI_CAPABILITIES")]
-	public const string DEVICE_WIFI_CAPABILITIES;
-	[CCode (cheader_filename = "nm-device-wifi.h", cname = "NM_DEVICE_WIFI_HW_ADDRESS")]
-	public const string DEVICE_WIFI_HW_ADDRESS;
-	[CCode (cheader_filename = "nm-device-wifi.h", cname = "NM_DEVICE_WIFI_MODE")]
-	public const string DEVICE_WIFI_MODE;
-	[CCode (cheader_filename = "nm-device-wifi.h", cname = "NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS")]
-	public const string DEVICE_WIFI_PERMANENT_HW_ADDRESS;
-	[CCode (cheader_filename = "nm-device-wimax.h", cname = "NM_DEVICE_WIMAX_ACTIVE_NSP")]
-	public const string DEVICE_WIMAX_ACTIVE_NSP;
-	[CCode (cheader_filename = "nm-device-wimax.h", cname = "NM_DEVICE_WIMAX_BSID")]
-	public const string DEVICE_WIMAX_BSID;
-	[CCode (cheader_filename = "nm-device-wimax.h", cname = "NM_DEVICE_WIMAX_CENTER_FREQUENCY")]
-	public const string DEVICE_WIMAX_CENTER_FREQUENCY;
-	[CCode (cheader_filename = "nm-device-wimax.h", cname = "NM_DEVICE_WIMAX_CINR")]
-	public const string DEVICE_WIMAX_CINR;
-	[CCode (cheader_filename = "nm-device-wimax.h", cname = "NM_DEVICE_WIMAX_HW_ADDRESS")]
-	public const string DEVICE_WIMAX_HW_ADDRESS;
-	[CCode (cheader_filename = "nm-device-wimax.h", cname = "NM_DEVICE_WIMAX_RSSI")]
-	public const string DEVICE_WIMAX_RSSI;
-	[CCode (cheader_filename = "nm-device-wimax.h", cname = "NM_DEVICE_WIMAX_TX_POWER")]
-	public const string DEVICE_WIMAX_TX_POWER;
-	[CCode (cheader_filename = "nm-dhcp4-config.h", cname = "NM_DHCP4_CONFIG_OPTIONS")]
-	public const string DHCP4_CONFIG_OPTIONS;
-	[CCode (cheader_filename = "nm-dhcp6-config.h", cname = "NM_DHCP6_CONFIG_OPTIONS")]
-	public const string DHCP6_CONFIG_OPTIONS;
-	[CCode (cheader_filename = "nm-ip4-config.h", cname = "NM_IP4_CONFIG_ADDRESSES")]
-	public const string IP4_CONFIG_ADDRESSES;
-	[CCode (cheader_filename = "nm-ip4-config.h", cname = "NM_IP4_CONFIG_DOMAINS")]
-	public const string IP4_CONFIG_DOMAINS;
-	[CCode (cheader_filename = "nm-ip4-config.h", cname = "NM_IP4_CONFIG_NAMESERVERS")]
-	public const string IP4_CONFIG_NAMESERVERS;
-	[CCode (cheader_filename = "nm-ip4-config.h", cname = "NM_IP4_CONFIG_ROUTES")]
-	public const string IP4_CONFIG_ROUTES;
-	[CCode (cheader_filename = "nm-ip4-config.h", cname = "NM_IP4_CONFIG_WINS_SERVERS")]
-	public const string IP4_CONFIG_WINS_SERVERS;
-	[CCode (cheader_filename = "nm-ip6-config.h", cname = "NM_IP6_CONFIG_ADDRESSES")]
-	public const string IP6_CONFIG_ADDRESSES;
-	[CCode (cheader_filename = "nm-ip6-config.h", cname = "NM_IP6_CONFIG_DOMAINS")]
-	public const string IP6_CONFIG_DOMAINS;
-	[CCode (cheader_filename = "nm-ip6-config.h", cname = "NM_IP6_CONFIG_NAMESERVERS")]
-	public const string IP6_CONFIG_NAMESERVERS;
-	[CCode (cheader_filename = "nm-ip6-config.h", cname = "NM_IP6_CONFIG_ROUTES")]
-	public const string IP6_CONFIG_ROUTES;
-	[CCode (cheader_filename = "nm-object.h", cname = "NM_OBJECT_DBUS_CONNECTION")]
-	public const string OBJECT_DBUS_CONNECTION;
-	[CCode (cheader_filename = "nm-object.h", cname = "NM_OBJECT_DBUS_PATH")]
-	public const string OBJECT_DBUS_PATH;
-	[CCode (cheader_filename = "nm-remote-connection.h", cname = "NM_REMOTE_CONNECTION_REMOVED")]
-	public const string REMOTE_CONNECTION_REMOVED;
-	[CCode (cheader_filename = "nm-remote-connection.h", cname = "NM_REMOTE_CONNECTION_UPDATED")]
-	public const string REMOTE_CONNECTION_UPDATED;
-	[CCode (cheader_filename = "nm-remote-settings.h", cname = "NM_REMOTE_SETTINGS_BUS")]
-	public const string REMOTE_SETTINGS_BUS;
-	[CCode (cheader_filename = "nm-remote-settings.h", cname = "NM_REMOTE_SETTINGS_CAN_MODIFY")]
-	public const string REMOTE_SETTINGS_CAN_MODIFY;
-	[CCode (cheader_filename = "nm-remote-settings.h", cname = "NM_REMOTE_SETTINGS_CONNECTIONS_READ")]
-	public const string REMOTE_SETTINGS_CONNECTIONS_READ;
-	[CCode (cheader_filename = "nm-remote-settings.h", cname = "NM_REMOTE_SETTINGS_HOSTNAME")]
-	public const string REMOTE_SETTINGS_HOSTNAME;
-	[CCode (cheader_filename = "nm-remote-settings.h", cname = "NM_REMOTE_SETTINGS_NEW_CONNECTION")]
-	public const string REMOTE_SETTINGS_NEW_CONNECTION;
-	[CCode (cheader_filename = "nm-remote-settings.h", cname = "NM_REMOTE_SETTINGS_SERVICE_RUNNING")]
-	public const string REMOTE_SETTINGS_SERVICE_RUNNING;
-	[CCode (cheader_filename = "nm-secret-agent.h", cname = "NM_SECRET_AGENT_AUTO_REGISTER")]
-	public const string SECRET_AGENT_AUTO_REGISTER;
-	[CCode (cheader_filename = "nm-secret-agent.h", cname = "NM_SECRET_AGENT_IDENTIFIER")]
-	public const string SECRET_AGENT_IDENTIFIER;
-	[CCode (cheader_filename = "nm-secret-agent.h", cname = "NM_SECRET_AGENT_REGISTERED")]
-	public const string SECRET_AGENT_REGISTERED;
-	[CCode (cheader_filename = "nm-secret-agent.h", cname = "NM_SECRET_AGENT_REGISTRATION_RESULT")]
-	public const string SECRET_AGENT_REGISTRATION_RESULT;
-	[CCode (cheader_filename = "nm-vpn-connection.h", cname = "NM_VPN_CONNECTION_BANNER")]
-	public const string VPN_CONNECTION_BANNER;
-	[CCode (cheader_filename = "nm-vpn-connection.h", cname = "NM_VPN_CONNECTION_VPN_STATE")]
-	public const string VPN_CONNECTION_VPN_STATE;
-	[CCode (cheader_filename = "nm-wimax-nsp.h", cname = "NM_WIMAX_NSP_NAME")]
-	public const string WIMAX_NSP_NAME;
-	[CCode (cheader_filename = "nm-wimax-nsp.h", cname = "NM_WIMAX_NSP_NETWORK_TYPE")]
-	public const string WIMAX_NSP_NETWORK_TYPE;
-	[CCode (cheader_filename = "nm-wimax-nsp.h", cname = "NM_WIMAX_NSP_SIGNAL_QUALITY")]
-	public const string WIMAX_NSP_SIGNAL_QUALITY;
-	[CCode (cheader_filename = "nm-device-adsl.h", cname = "nm_device_adsl_error_quark")]
-	public static GLib.Quark device_adsl_error_quark ();
-	[CCode (cheader_filename = "nm-device-bond.h", cname = "nm_device_bond_error_quark")]
-	public static GLib.Quark device_bond_error_quark ();
-	[CCode (cheader_filename = "nm-device-bt.h", cname = "nm_device_bt_error_quark")]
-	public static GLib.Quark device_bt_error_quark ();
-	[CCode (cheader_filename = "nm-device-ethernet.h", cname = "nm_device_ethernet_error_quark")]
-	public static GLib.Quark device_ethernet_error_quark ();
-	[CCode (cheader_filename = "nm-device-infiniband.h", cname = "nm_device_infiniband_error_quark")]
-	public static GLib.Quark device_infiniband_error_quark ();
-	[CCode (cheader_filename = "nm-device-modem.h", cname = "nm_device_modem_error_quark")]
-	public static GLib.Quark device_modem_error_quark ();
-	[CCode (cheader_filename = "nm-device-olpc-mesh.h", cname = "nm_device_olpc_mesh_error_quark")]
-	public static GLib.Quark device_olpc_mesh_error_quark ();
-	[CCode (cheader_filename = "nm-device-vlan.h", cname = "nm_device_vlan_error_quark")]
-	public static GLib.Quark device_vlan_error_quark ();
-	[CCode (cheader_filename = "nm-device-wifi.h", cname = "nm_device_wifi_error_quark")]
-	public static GLib.Quark device_wifi_error_quark ();
-	[CCode (cheader_filename = "nm-device-wimax.h", cname = "nm_device_wimax_error_quark")]
-	public static GLib.Quark device_wimax_error_quark ();
-	[CCode (cheader_filename = "nm-object.h", cname = "nm_object_error_quark")]
-	public static GLib.Quark object_error_quark ();
-	[CCode (cheader_filename = "nm-remote-settings.h", cname = "nm_remote_settings_error_quark")]
-	public static GLib.Quark remote_settings_error_quark ();
-	[CCode (cheader_filename = "nm-secret-agent.h", cname = "nm_secret_agent_error_quark")]
-	public static GLib.Quark secret_agent_error_quark ();
 }
diff --git a/vapi/libnm-utils.deps b/vapi/libnm-utils.deps
index 4527bad..efd2584 100644
--- a/vapi/libnm-utils.deps
+++ b/vapi/libnm-utils.deps
@@ -1,2 +1,2 @@
-gio-2.0
 dbus-glib-1
+gio-2.0
diff --git a/vapi/libnm-utils.vapi b/vapi/libnm-utils.vapi
index 296bf9e..6beba59 100644
--- a/vapi/libnm-utils.vapi
+++ b/vapi/libnm-utils.vapi
@@ -1,4 +1,4 @@
-/* libnm-utils.vapi generated by lt-vapigen, do not modify. */
+/* libnm-utils.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "NM", gir_namespace = "NetworkManager", gir_version = "1.0", lower_case_cprefix = "nm__")]
 namespace NM {
@@ -2379,6 +2379,48 @@ namespace NM {
 		CONNECTED_SITE,
 		CONNECTED_GLOBAL
 	}
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cprefix = "NM_VPN_CONNECTION_STATE_")]
+	public enum VPNConnectionState {
+		UNKNOWN,
+		PREPARE,
+		NEED_AUTH,
+		CONNECT,
+		IP_CONFIG_GET,
+		ACTIVATED,
+		FAILED,
+		DISCONNECTED
+	}
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cprefix = "NM_VPN_CONNECTION_STATE_REASON_")]
+	public enum VPNConnectionStateReason {
+		UNKNOWN,
+		NONE,
+		USER_DISCONNECTED,
+		DEVICE_DISCONNECTED,
+		SERVICE_STOPPED,
+		IP_CONFIG_INVALID,
+		CONNECT_TIMEOUT,
+		SERVICE_START_TIMEOUT,
+		SERVICE_START_FAILED,
+		NO_SECRETS,
+		LOGIN_FAILED,
+		CONNECTION_REMOVED
+	}
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cprefix = "NM_VPN_PLUGIN_FAILURE_")]
+	public enum VPNPluginFailure {
+		LOGIN_FAILED,
+		CONNECT_FAILED,
+		BAD_IP_CONFIG
+	}
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cprefix = "NM_VPN_SERVICE_STATE_")]
+	public enum VPNServiceState {
+		UNKNOWN,
+		INIT,
+		SHUTDOWN,
+		STARTING,
+		STARTED,
+		STOPPING,
+		STOPPED
+	}
 	[CCode (cheader_filename = "nm-setting-vlan.h", cprefix = "NM_VLAN_FLAG_")]
 	public enum VlanFlags {
 		REORDER_HEADERS,
diff --git a/vapi/metadata/NMClient-1.0.metadata b/vapi/metadata/NMClient-1.0.metadata
index e8c513b..280f096 100644
--- a/vapi/metadata/NMClient-1.0.metadata
+++ b/vapi/metadata/NMClient-1.0.metadata
@@ -2,117 +2,33 @@ RemoteSettings.new_async skip
 RemoteConnection.updated#virtual_method skip
 Client.new_async skip
 
-ACCESS_POINT_BSSID cheader_filename="nm-access-point.h"
-ACCESS_POINT_FLAGS cheader_filename="nm-access-point.h"
-ACCESS_POINT_FREQUENCY cheader_filename="nm-access-point.h"
-ACCESS_POINT_HW_ADDRESS cheader_filename="nm-access-point.h"
-ACCESS_POINT_MAX_BITRATE cheader_filename="nm-access-point.h"
-ACCESS_POINT_MODE cheader_filename="nm-access-point.h"
-ACCESS_POINT_RSN_FLAGS cheader_filename="nm-access-point.h"
-ACCESS_POINT_SSID cheader_filename="nm-access-point.h"
-ACCESS_POINT_STRENGTH cheader_filename="nm-access-point.h"
-ACCESS_POINT_WPA_FLAGS cheader_filename="nm-access-point.h"
-ACTIVE_CONNECTION_CONNECTION cheader_filename="nm-active-connection.h"
-ACTIVE_CONNECTION_DEFAULT cheader_filename="nm-active-connection.h"
-ACTIVE_CONNECTION_DEFAULT6 cheader_filename="nm-active-connection.h"
-ACTIVE_CONNECTION_DEVICES cheader_filename="nm-active-connection.h"
-ACTIVE_CONNECTION_MASTER cheader_filename="nm-active-connection.h"
-ACTIVE_CONNECTION_SPECIFIC_OBJECT cheader_filename="nm-active-connection.h"
-ACTIVE_CONNECTION_STATE cheader_filename="nm-active-connection.h"
-ACTIVE_CONNECTION_UUID cheader_filename="nm-active-connection.h"
-CLIENT_ACTIVE_CONNECTIONS cheader_filename="nm-client.h"
-CLIENT_MANAGER_RUNNING cheader_filename="nm-client.h"
-CLIENT_NETWORKING_ENABLED cheader_filename="nm-client.h"
-CLIENT_STATE cheader_filename="nm-client.h"
-CLIENT_VERSION cheader_filename="nm-client.h"
-CLIENT_WIMAX_ENABLED cheader_filename="nm-client.h"
-CLIENT_WIMAX_HARDWARE_ENABLED cheader_filename="nm-client.h"
-CLIENT_WIRELESS_ENABLED cheader_filename="nm-client.h"
-CLIENT_WIRELESS_HARDWARE_ENABLED cheader_filename="nm-client.h"
-CLIENT_WWAN_ENABLED cheader_filename="nm-client.h"
-CLIENT_WWAN_HARDWARE_ENABLED cheader_filename="nm-client.h"
-DEVICE_ACTIVE_CONNECTION cheader_filename="nm-device.h"
-DEVICE_ADSL_CARRIER cheader_filename="nm-device-adsl.h"
-DEVICE_AUTOCONNECT cheader_filename="nm-device.h"
-DEVICE_BOND_CARRIER cheader_filename="nm-device-bond.h"
-DEVICE_BOND_HW_ADDRESS cheader_filename="nm-device-bond.h"
-DEVICE_BT_CAPABILITIES cheader_filename="nm-device-bt.h"
-DEVICE_BT_HW_ADDRESS cheader_filename="nm-device-bt.h"
-DEVICE_BT_NAME cheader_filename="nm-device-bt.h"
-DEVICE_CAPABILITIES cheader_filename="nm-device.h"
-DEVICE_DEVICE_TYPE cheader_filename="nm-device.h"
-DEVICE_DHCP4_CONFIG cheader_filename="nm-device.h"
-DEVICE_DHCP6_CONFIG cheader_filename="nm-device.h"
-DEVICE_DRIVER cheader_filename="nm-device.h"
-DEVICE_ETHERNET_CARRIER cheader_filename="nm-device-ethernet.h"
-DEVICE_ETHERNET_HW_ADDRESS cheader_filename="nm-device-ethernet.h"
-DEVICE_ETHERNET_PERMANENT_HW_ADDRESS cheader_filename="nm-device-ethernet.h"
-DEVICE_ETHERNET_SPEED cheader_filename="nm-device-ethernet.h"
-DEVICE_FIRMWARE_MISSING cheader_filename="nm-device.h"
-DEVICE_INFINIBAND_CARRIER cheader_filename="nm-device-infiniband.h"
-DEVICE_INFINIBAND_HW_ADDRESS cheader_filename="nm-device-infiniband.h"
-DEVICE_INTERFACE cheader_filename="nm-device.h"
-DEVICE_IP4_CONFIG cheader_filename="nm-device.h"
-DEVICE_IP6_CONFIG cheader_filename="nm-device.h"
-DEVICE_IP_INTERFACE cheader_filename="nm-device.h"
-DEVICE_MANAGED cheader_filename="nm-device.h"
-DEVICE_MODEM_CURRENT_CAPABILITIES cheader_filename="nm-device-modem.h"
-DEVICE_MODEM_MODEM_CAPABILITIES cheader_filename="nm-device-modem.h"
-DEVICE_OLPC_MESH_ACTIVE_CHANNEL cheader_filename="nm-device-olpc-mesh.h"
-DEVICE_OLPC_MESH_COMPANION cheader_filename="nm-device-olpc-mesh.h"
-DEVICE_OLPC_MESH_HW_ADDRESS cheader_filename="nm-device-olpc-mesh.h"
-DEVICE_PRODUCT cheader_filename="nm-device.h"
-DEVICE_STATE cheader_filename="nm-device.h"
-DEVICE_STATE_REASON cheader_filename="nm-device.h"
-DEVICE_UDI cheader_filename="nm-device.h"
-DEVICE_VENDOR cheader_filename="nm-device.h"
-DEVICE_VLAN_CARRIER cheader_filename="nm-device-vlan.h"
-DEVICE_VLAN_HW_ADDRESS cheader_filename="nm-device-vlan.h"
-DEVICE_VLAN_VLAN_ID cheader_filename="nm-device-vlan.h"
-DEVICE_WIFI_ACTIVE_ACCESS_POINT cheader_filename="nm-device-wifi.h"
-DEVICE_WIFI_BITRATE cheader_filename="nm-device-wifi.h"
-DEVICE_WIFI_CAPABILITIES cheader_filename="nm-device-wifi.h"
-DEVICE_WIFI_HW_ADDRESS cheader_filename="nm-device-wifi.h"
-DEVICE_WIFI_MODE cheader_filename="nm-device-wifi.h"
-DEVICE_WIFI_PERMANENT_HW_ADDRESS cheader_filename="nm-device-wifi.h"
-DEVICE_WIMAX_ACTIVE_NSP cheader_filename="nm-device-wimax.h"
-DEVICE_WIMAX_BSID cheader_filename="nm-device-wimax.h"
-DEVICE_WIMAX_CENTER_FREQUENCY cheader_filename="nm-device-wimax.h"
-DEVICE_WIMAX_CINR cheader_filename="nm-device-wimax.h"
-DEVICE_WIMAX_HW_ADDRESS cheader_filename="nm-device-wimax.h"
-DEVICE_WIMAX_RSSI cheader_filename="nm-device-wimax.h"
-DEVICE_WIMAX_TX_POWER cheader_filename="nm-device-wimax.h"
-DHCP4_CONFIG_OPTIONS cheader_filename="nm-dhcp4-config.h"
-DHCP6_CONFIG_OPTIONS cheader_filename="nm-dhcp6-config.h"
-IP4_CONFIG_ADDRESSES cheader_filename="nm-ip4-config.h"
-IP4_CONFIG_DOMAINS cheader_filename="nm-ip4-config.h"
-IP4_CONFIG_NAMESERVERS cheader_filename="nm-ip4-config.h"
-IP4_CONFIG_ROUTES cheader_filename="nm-ip4-config.h"
-IP4_CONFIG_WINS_SERVERS cheader_filename="nm-ip4-config.h"
-IP6_CONFIG_ADDRESSES cheader_filename="nm-ip6-config.h"
-IP6_CONFIG_DOMAINS cheader_filename="nm-ip6-config.h"
-IP6_CONFIG_NAMESERVERS cheader_filename="nm-ip6-config.h"
-IP6_CONFIG_ROUTES cheader_filename="nm-ip6-config.h"
-OBJECT_DBUS_CONNECTION cheader_filename="nm-object.h"
-OBJECT_DBUS_PATH cheader_filename="nm-object.h"
-REMOTE_CONNECTION_REMOVED cheader_filename="nm-remote-connection.h"
-REMOTE_CONNECTION_UPDATED cheader_filename="nm-remote-connection.h"
-REMOTE_SETTINGS_BUS cheader_filename="nm-remote-settings.h"
-REMOTE_SETTINGS_CAN_MODIFY cheader_filename="nm-remote-settings.h"
-REMOTE_SETTINGS_CONNECTIONS_READ cheader_filename="nm-remote-settings.h"
-REMOTE_SETTINGS_HOSTNAME cheader_filename="nm-remote-settings.h"
-REMOTE_SETTINGS_NEW_CONNECTION cheader_filename="nm-remote-settings.h"
-REMOTE_SETTINGS_SERVICE_RUNNING cheader_filename="nm-remote-settings.h"
-SECRET_AGENT_AUTO_REGISTER cheader_filename="nm-secret-agent.h"
-SECRET_AGENT_IDENTIFIER cheader_filename="nm-secret-agent.h"
-SECRET_AGENT_REGISTERED cheader_filename="nm-secret-agent.h"
-SECRET_AGENT_REGISTRATION_RESULT cheader_filename="nm-secret-agent.h"
-VPN_CONNECTION_BANNER cheader_filename="nm-vpn-connection.h"
-VPN_CONNECTION_VPN_STATE cheader_filename="nm-vpn-connection.h"
-WIMAX_NSP_NAME cheader_filename="nm-wimax-nsp.h"
-WIMAX_NSP_NETWORK_TYPE cheader_filename="nm-wimax-nsp.h"
-WIMAX_NSP_SIGNAL_QUALITY cheader_filename="nm-wimax-nsp.h"
+ACTIVE_CONNECTION_* cheader_filename="nm-active-connection.h" name="ACTIVE_CONNECTION_(.+)" parent="NM.ActiveConnection"
+CLIENT_*            cheader_filename="nm-client.h"            name="CLIENT_(.+)"       parent="NM.Client"
+ACCESS_POINT_*      cheader_filename="nm-access-point.h"      name="ACCESS_POINT_(.+)" parent="NM.AccessPoint"
 
+DEVICE_*          cheader_filename="nm-device.h"          name="DEVICE_(.+)"       parent="NM.Device"
+DEVICE_ADSL_*     cheader_filename="nm-device-adsl.h"     name="DEVICE_ADSL_(.+)"       parent="NM.DeviceAdsl"
+DEVICE_BOND_*     cheader_filename="nm-device-bond.h"     name="DEVICE_BOND_(.+)"       parent="NM.DeviceBond"
+DEVICE_BT_*       cheader_filename="nm-device-bt.h"       name="DEVICE_BT_(.+)"       parent="NM.DeviceBt"
+DEVICE_ETHERNET_* cheader_filename="nm-device-ethernet.h" name="DEVICE_ETHERNET_(.+)" parent="NM.DeviceEthernet"
+
+DEVICE_INFINIBAND_* cheader_filename="nm-device-infiniband.h"
+DEVICE_MODEM_* cheader_filename="nm-device-modem.h"
+DEVICE_OLPC_* cheader_filename="nm-device-olpc-mesh.h"
+
+DEVICE_VLAN_* cheader_filename="nm-device-vlan.h"             name="DEVICE_VLAN_(.+)"  parent="NM.DeviceVlan"
+DEVICE_WIFI_* cheader_filename="nm-device-wifi.h"             name="DEVICE_WIFI_(.+)"  parent="NM.DeviceWifi"
+DEVICE_WIMAX_* cheader_filename="nm-device-wimax.h"           name="DEVICE_WIMAX_(.+)" parent="NM.DeviceWimax"
+DHCP4_CONFIG_OPTIONS cheader_filename="nm-dhcp4-config.h"     name="DHCP4_CONFIG_(.+)" parent="NM.DHCP4Config"
+DHCP6_CONFIG_OPTIONS cheader_filename="nm-dhcp6-config.h"     name="DHCP4_CONFIG_(.+)" parent="NM.DHCP6Config"
+IP4_CONFIG_* cheader_filename="nm-ip4-config.h"               name="IP4_CONFIG_(.+)"   parent="NM.IP4Config"
+IP6_CONFIG_* cheader_filename="nm-ip6-config.h"               name="IP6_CONFIG_(.+)"   parent="NM.IP6Config"
+OBJECT_* cheader_filename="nm-object.h"                       name="OBJECT_(.+)"       parent="NM.Object"
+REMOTE_CONNECTION_* cheader_filename="nm-remote-connection.h" name="REMOTE_CONNECTION_(.+)" parent="NM.RemoteConnection"
+REMOTE_SETTINGS_* cheader_filename="nm-remote-settings.h"     name="REMOTE_SETTINGS_(.+)"   parent="NM.RemoteSettings"
+SECRET_AGENT_* cheader_filename="nm-secret-agent.h"           name="SECRET_AGENT_(.+)"      parent="NM.SecretAgent"
+VPN_CONNECTION_* cheader_filename="nm-vpn-connection.h"       name="VPN_CONNECTION_(.+)"    parent="NM.VPNConnection"
+WIMAX_NSP_* cheader_filename="nm-wimax-nsp.h"                 name="WIMAX_NSP_(.+)"         parent="NM.WimaxNsp"
 
 AccessPoint cheader_filename="nm-access-point.h"
 ActiveConnection cheader_filename="nm-active-connection.h"
@@ -175,6 +91,8 @@ SecretAgentDeleteSecretsFunc cheader_filename="nm-secret-agent.h"
 SecretAgentGetSecretsFunc cheader_filename="nm-secret-agent.h"
 SecretAgentSaveSecretsFunc cheader_filename="nm-secret-agent.h"
 
+device_* name="device_(.+)" parent="NM.Device"
+object_* name="object_(.+)" parent="NM.Object"
 
 device_adsl_error_quark cheader_filename="nm-device-adsl.h"
 device_bond_error_quark cheader_filename="nm-device-bond.h"
@@ -187,8 +105,9 @@ device_vlan_error_quark cheader_filename="nm-device-vlan.h"
 device_wifi_error_quark cheader_filename="nm-device-wifi.h"
 device_wimax_error_quark cheader_filename="nm-device-wimax.h"
 object_error_quark cheader_filename="nm-object.h"
-remote_settings_error_quark cheader_filename="nm-remote-settings.h"
-secret_agent_error_quark cheader_filename="nm-secret-agent.h"
+
+remote_settings_error_quark cheader_filename="nm-remote-settings.h" name="remote_(.+)" parent="NM.RemoteSettings"
+secret_agent_error_quark    cheader_filename="nm-secret-agent.h"    name="secret_agent_(.+)" parent="NM.SecretAgent"
 
 Object cheader_filename="nm-object.h"
 SecretAgent cheader_filename="nm-secret-agent.h"
diff --git a/vapi/metadata/NetworkManager-1.0.metadata b/vapi/metadata/NetworkManager-1.0.metadata
index 655f9c4..64f7767 100644
--- a/vapi/metadata/NetworkManager-1.0.metadata
+++ b/vapi/metadata/NetworkManager-1.0.metadata
@@ -73,10 +73,10 @@ SettingWirelessError cheader_filename="nm-setting-wireless.h"
 SettingWirelessSecurityError cheader_filename="nm-setting-wireless-security.h"
 State cheader_filename="NetworkManager.h"
 
-VPNConnectionState cheader_filename="NetworkManagerVPN.h" parent="NM.Setting.VPN" name="VPN(.+)"
-VPNConnectionStateReason cheader_filename="NetworkManagerVPN.h" parent="NM.Setting.VPN" name="VPN(.+)"
-VPNPluginFailure cheader_filename="NetworkManagerVPN.h" parent="NM.Setting.VPN" name="VPN(.+)"
-VPNServiceState cheader_filename="NetworkManagerVPN.h" parent="NM.Setting.VPN" name="VPN(.+)"
+VPNConnectionState cheader_filename="NetworkManagerVPN.h"
+VPNConnectionStateReason cheader_filename="NetworkManagerVPN.h"
+VPNPluginFailure cheader_filename="NetworkManagerVPN.h"
+VPNServiceState cheader_filename="NetworkManagerVPN.h"
 
 VlanFlags cheader_filename="nm-setting-vlan.h"
 VlanPriorityMap cheader_filename="nm-setting-vlan.h"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]