[vala/wip/nm-bindings] Avoid metadata that triggers #677591



commit 623bf9d9f1fd3344d7d2b647ae2c4ca95e20147d
Author: Alberto Ruiz <aruiz gnome org>
Date:   Thu Jun 7 01:37:05 2012 +0100

    Avoid metadata that triggers #677591

 vapi/libnm-glib.vapi                      |  411 ++++-------------
 vapi/libnm-utils.vapi                     |  676 ++++++----------------------
 vapi/metadata/NetworkManager-1.0.metadata |   13 +-
 3 files changed, 251 insertions(+), 849 deletions(-)
---
diff --git a/vapi/libnm-glib.vapi b/vapi/libnm-glib.vapi
index fb81bc0..f34698d 100644
--- a/vapi/libnm-glib.vapi
+++ b/vapi/libnm-glib.vapi
@@ -1,6 +1,6 @@
-/* libnm-glib.vapi generated by vapigen, do not modify. */
+/* libnm-glib.vapi generated by lt-vapigen, do not modify. */
 
-[CCode (cprefix = "NM", gir_namespace = "NMClient", gir_version = "1.0", lower_case_cprefix = "nm__")]
+[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 {
@@ -24,52 +24,30 @@ namespace NM {
 		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 (DBusGLib.Connection connection, string path);
-		[CCode (cname = "nm_access_point_connection_valid")]
+		[CCode (has_construct_function = false, type = "GObject*")]
+		public AccessPoint (DBus.Connection connection, string path);
 		public bool connection_valid (NM.Connection connection);
-		[CCode (cname = "nm_access_point_filter_connections")]
 		public GLib.SList<weak NM.Connection> filter_connections (GLib.SList<NM.Connection> connections);
-		[CCode (cname = "nm_access_point_get_bssid")]
 		public unowned string get_bssid ();
-		[CCode (cname = "nm_access_point_get_flags")]
 		public NM.80211ApFlags get_flags ();
-		[CCode (cname = "nm_access_point_get_frequency")]
 		public uint32 get_frequency ();
-		[CCode (cname = "nm_access_point_get_hw_address")]
 		[Deprecated (since = "0.9")]
 		public unowned string get_hw_address ();
-		[CCode (cname = "nm_access_point_get_max_bitrate")]
 		public uint32 get_max_bitrate ();
-		[CCode (cname = "nm_access_point_get_mode")]
 		public NM.80211Mode get_mode ();
-		[CCode (cname = "nm_access_point_get_rsn_flags")]
 		public NM.80211ApSecurityFlags get_rsn_flags ();
-		[CCode (cname = "nm_access_point_get_ssid")]
 		public unowned GLib.ByteArray get_ssid ();
-		[CCode (cname = "nm_access_point_get_strength")]
 		public uint8 get_strength ();
-		[CCode (cname = "nm_access_point_get_wpa_flags")]
 		public NM.80211ApSecurityFlags get_wpa_flags ();
-		[NoAccessorMethod]
-		public string bssid { owned get; }
-		[NoAccessorMethod]
+		public string bssid { get; }
 		public uint flags { get; }
-		[NoAccessorMethod]
 		public uint frequency { get; }
-		[NoAccessorMethod]
-		public string hw_address { owned get; }
-		[NoAccessorMethod]
+		public string hw_address { get; }
 		public uint max_bitrate { get; }
-		[NoAccessorMethod]
 		public uint mode { get; }
-		[NoAccessorMethod]
 		public uint rsn_flags { get; }
-		[NoAccessorMethod]
-		public NM.Ssid ssid { owned get; }
-		[NoAccessorMethod]
+		public NM.Ssid ssid { get; }
 		public uint8 strength { get; }
-		[NoAccessorMethod]
 		public uint wpa_flags { get; }
 	}
 	[CCode (cheader_filename = "nm-active-connection.h", type_id = "nm_active_connection_get_type ()")]
@@ -90,40 +68,24 @@ namespace NM {
 		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 (DBusGLib.Connection connection, string path);
-		[CCode (cname = "nm_active_connection_get_connection")]
+		[CCode (has_construct_function = false, type = "GObject*")]
+		public ActiveConnection (DBus.Connection connection, string path);
 		public unowned string get_connection ();
-		[CCode (cname = "nm_active_connection_get_default")]
 		public bool get_default ();
-		[CCode (cname = "nm_active_connection_get_default6")]
 		public bool get_default6 ();
-		[CCode (cname = "nm_active_connection_get_devices")]
 		public unowned GLib.GenericArray<NM.Device> get_devices ();
-		[CCode (cname = "nm_active_connection_get_master")]
 		public unowned string get_master ();
-		[CCode (cname = "nm_active_connection_get_specific_object")]
 		public unowned string get_specific_object ();
-		[CCode (cname = "nm_active_connection_get_state")]
 		public NM.ActiveConnectionState get_state ();
-		[CCode (cname = "nm_active_connection_get_uuid")]
 		public unowned string get_uuid ();
-		[NoAccessorMethod]
-		public string connection { owned get; }
-		[NoAccessorMethod]
+		public string connection { get; }
 		public bool @default { get; }
-		[NoAccessorMethod]
 		public bool default6 { get; }
-		[NoAccessorMethod]
-		public NM.ObjectArray devices { owned get; }
-		[NoAccessorMethod]
-		public string master { owned get; }
-		[NoAccessorMethod]
-		public string specific_object { owned get; }
-		[NoAccessorMethod]
+		public NM.ObjectArray devices { get; }
+		public string master { get; }
+		public string specific_object { get; }
 		public uint state { get; }
-		[NoAccessorMethod]
-		public string uuid { owned get; }
+		public string uuid { get; }
 	}
 	[CCode (cheader_filename = "nm-client.h", type_id = "nm_client_get_type ()")]
 	public class Client : NM.Object, GLib.AsyncInitable, GLib.Initable {
@@ -149,66 +111,39 @@ namespace NM {
 		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)]
+		[CCode (has_construct_function = false)]
 		public Client ();
-		[CCode (cname = "nm_client_activate_connection")]
 		public void activate_connection (NM.Connection connection, NM.Device? device, string? specific_object, NM.ClientActivateFn? callback);
-		[CCode (cname = "nm_client_add_and_activate_connection")]
 		public void add_and_activate_connection (NM.Connection? partial, NM.Device device, string? specific_object, NM.ClientAddActivateFn? callback);
-		[CCode (cname = "nm_client_deactivate_connection")]
 		public void deactivate_connection (NM.ActiveConnection active);
-		[CCode (cname = "nm_client_new_finish", has_construct_function = false)]
+		[CCode (has_construct_function = false)]
 		public Client.finish (GLib.AsyncResult result) throws GLib.Error;
-		[CCode (cname = "nm_client_get_active_connections")]
 		public unowned GLib.GenericArray<NM.ActiveConnection> get_active_connections ();
-		[CCode (cname = "nm_client_get_device_by_iface")]
 		public unowned NM.Device get_device_by_iface (string iface);
-		[CCode (cname = "nm_client_get_device_by_path")]
 		public unowned NM.Device get_device_by_path (string object_path);
-		[CCode (cname = "nm_client_get_devices")]
 		public unowned GLib.GenericArray<NM.Device> get_devices ();
-		[CCode (cname = "nm_client_get_manager_running")]
 		public bool get_manager_running ();
-		[CCode (cname = "nm_client_get_permission_result")]
 		public NM.ClientPermissionResult get_permission_result (NM.ClientPermission permission);
-		[CCode (cname = "nm_client_get_state")]
 		public NM.State get_state ();
-		[CCode (cname = "nm_client_get_version")]
 		public unowned string get_version ();
-		[CCode (cname = "nm_client_networking_get_enabled")]
 		public bool networking_get_enabled ();
-		[CCode (cname = "nm_client_networking_set_enabled")]
 		public void networking_set_enabled (bool enabled);
-		[CCode (cname = "nm_client_sleep")]
 		public void sleep (bool sleep_);
-		[CCode (cname = "nm_client_wimax_get_enabled")]
 		public bool wimax_get_enabled ();
-		[CCode (cname = "nm_client_wimax_hardware_get_enabled")]
 		public bool wimax_hardware_get_enabled ();
-		[CCode (cname = "nm_client_wimax_set_enabled")]
 		public void wimax_set_enabled (bool enabled);
-		[CCode (cname = "nm_client_wireless_get_enabled")]
 		public bool wireless_get_enabled ();
-		[CCode (cname = "nm_client_wireless_hardware_get_enabled")]
 		public bool wireless_hardware_get_enabled ();
-		[CCode (cname = "nm_client_wireless_set_enabled")]
 		public void wireless_set_enabled (bool enabled);
-		[CCode (cname = "nm_client_wwan_get_enabled")]
 		public bool wwan_get_enabled ();
-		[CCode (cname = "nm_client_wwan_hardware_get_enabled")]
 		public bool wwan_hardware_get_enabled ();
-		[CCode (cname = "nm_client_wwan_set_enabled")]
 		public void wwan_set_enabled (bool enabled);
-		[NoAccessorMethod]
-		public NM.ObjectArray active_connections { owned get; }
-		[NoAccessorMethod]
+		public NM.ObjectArray active_connections { get; }
 		public bool manager_running { get; }
 		[NoAccessorMethod]
 		public bool networking_enabled { get; set; }
-		[NoAccessorMethod]
 		public uint state { get; }
-		[NoAccessorMethod]
-		public string version { owned get; }
+		public string version { get; }
 		[NoAccessorMethod]
 		public bool wimax_enabled { get; set; }
 		[NoAccessorMethod]
@@ -229,22 +164,18 @@ namespace NM {
 	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 (DBusGLib.Connection connection, string object_path);
-		[CCode (cname = "nm_dhcp4_config_get_one_option")]
+		[CCode (has_construct_function = false, type = "GObject*")]
+		public DHCP4Config (DBus.Connection connection, string object_path);
 		public unowned string get_one_option (string option);
-		[CCode (cname = "nm_dhcp4_config_get_options")]
 		public unowned GLib.HashTable<string,GLib.Value?> get_options ();
 	}
 	[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 (DBusGLib.Connection connection, string object_path);
-		[CCode (cname = "nm_dhcp6_config_get_one_option")]
+		[CCode (has_construct_function = false, type = "GObject*")]
+		public DHCP6Config (DBus.Connection connection, string object_path);
 		public unowned string get_one_option (string option);
-		[CCode (cname = "nm_dhcp6_config_get_options")]
 		public unowned GLib.HashTable<string,GLib.Value?> get_options ();
 	}
 	[CCode (cheader_filename = "nm-device.h", type_id = "nm_device_get_type ()")]
@@ -299,118 +230,79 @@ namespace NM {
 		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 (DBusGLib.Connection connection, string path);
-		[CCode (cheader_filename = "nm-device-adsl.h", cname = "nm_device_adsl_error_quark")]
+		[CCode (has_construct_function = false, type = "GObject*")]
+		public Device (DBus.Connection connection, string path);
+		[CCode (cheader_filename = "nm-device-adsl.h")]
 		public static GLib.Quark adsl_error_quark ();
-		[CCode (cheader_filename = "nm-device-bond.h", cname = "nm_device_bond_error_quark")]
+		[CCode (cheader_filename = "nm-device-bond.h")]
 		public static GLib.Quark bond_error_quark ();
-		[CCode (cheader_filename = "nm-device-bt.h", cname = "nm_device_bt_error_quark")]
+		[CCode (cheader_filename = "nm-device-bt.h")]
 		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")]
+		[CCode (cheader_filename = "nm-device-ethernet.h")]
 		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")]
 		public unowned NM.ActiveConnection get_active_connection ();
-		[CCode (cname = "nm_device_get_autoconnect")]
 		public bool get_autoconnect ();
-		[CCode (cname = "nm_device_get_capabilities")]
 		public NM.DeviceCapabilities get_capabilities ();
-		[CCode (cname = "nm_device_get_device_type")]
 		public NM.DeviceType get_device_type ();
-		[CCode (cname = "nm_device_get_dhcp4_config")]
 		public unowned NM.DHCP4Config get_dhcp4_config ();
-		[CCode (cname = "nm_device_get_dhcp6_config")]
 		public unowned NM.DHCP6Config get_dhcp6_config ();
-		[CCode (cname = "nm_device_get_driver")]
 		public unowned string get_driver ();
-		[CCode (cname = "nm_device_get_firmware_missing")]
 		public bool get_firmware_missing ();
-		[CCode (cname = "nm_device_get_iface")]
 		public unowned string get_iface ();
-		[CCode (cname = "nm_device_get_ip4_config")]
 		public unowned NM.IP4Config get_ip4_config ();
-		[CCode (cname = "nm_device_get_ip6_config")]
 		public unowned NM.IP6Config get_ip6_config ();
-		[CCode (cname = "nm_device_get_ip_iface")]
 		public unowned string get_ip_iface ();
-		[CCode (cname = "nm_device_get_managed")]
 		public bool get_managed ();
-		[CCode (cname = "nm_device_get_product")]
 		public unowned string get_product ();
-		[CCode (cname = "nm_device_get_state")]
 		public NM.DeviceState get_state ();
-		[CCode (cname = "nm_device_get_state_reason")]
 		public NM.DeviceState get_state_reason (out NM.DeviceStateReason reason);
-		[CCode (cname = "nm_device_get_udi")]
 		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")]
+		[CCode (cheader_filename = "nm-device-infiniband.h")]
 		public static GLib.Quark infiniband_error_quark ();
-		[CCode (cheader_filename = "nm-device-modem.h", cname = "nm_device_modem_error_quark")]
+		[CCode (cheader_filename = "nm-device-modem.h")]
 		public static GLib.Quark modem_error_quark ();
-		[CCode (cheader_filename = "nm-device-olpc-mesh.h", cname = "nm_device_olpc_mesh_error_quark")]
+		[CCode (cheader_filename = "nm-device-olpc-mesh.h")]
 		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")]
+		[CCode (cheader_filename = "nm-device-vlan.h")]
 		public static GLib.Quark vlan_error_quark ();
-		[CCode (cheader_filename = "nm-device-wifi.h", cname = "nm_device_wifi_error_quark")]
+		[CCode (cheader_filename = "nm-device-wifi.h")]
 		public static GLib.Quark wifi_error_quark ();
-		[CCode (cheader_filename = "nm-device-wimax.h", cname = "nm_device_wimax_error_quark")]
+		[CCode (cheader_filename = "nm-device-wimax.h")]
 		public static GLib.Quark wimax_error_quark ();
-		[NoAccessorMethod]
-		public NM.ActiveConnection active_connection { owned get; }
-		[NoAccessorMethod]
+		public NM.ActiveConnection active_connection { get; }
 		public bool autoconnect { get; set; }
-		[NoAccessorMethod]
 		public uint capabilities { get; }
-		[NoAccessorMethod]
 		public uint device_type { get; }
-		[NoAccessorMethod]
-		public NM.DHCP4Config dhcp4_config { owned get; }
-		[NoAccessorMethod]
-		public NM.DHCP6Config dhcp6_config { owned get; }
-		[NoAccessorMethod]
-		public string driver { owned get; }
-		[NoAccessorMethod]
+		public NM.DHCP4Config dhcp4_config { get; }
+		public NM.DHCP6Config dhcp6_config { get; }
+		public string driver { get; }
 		public bool firmware_missing { get; }
 		[NoAccessorMethod]
 		public string @interface { owned get; }
-		[NoAccessorMethod]
-		public NM.IP4Config ip4_config { owned get; }
-		[NoAccessorMethod]
-		public NM.IP6Config ip6_config { owned get; }
+		public NM.IP4Config ip4_config { get; }
+		public NM.IP6Config ip6_config { get; }
 		[NoAccessorMethod]
 		public string ip_interface { owned get; }
-		[NoAccessorMethod]
 		public bool managed { get; }
-		[NoAccessorMethod]
-		public string product { owned get; }
-		[NoAccessorMethod]
+		public string product { get; }
 		public uint state { get; }
-		[NoAccessorMethod]
-		public string udi { owned get; }
-		[NoAccessorMethod]
-		public string vendor { owned get; }
+		public string udi { get; }
+		public string vendor { get; }
 		public virtual signal void state_changed (uint new_state, uint old_state, uint reason);
 	}
 	[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 (DBusGLib.Connection connection, string path);
-		[CCode (cname = "nm_device_adsl_get_carrier")]
+		[CCode (has_construct_function = false, type = "GObject*")]
+		public DeviceAdsl (DBus.Connection connection, string path);
 		public bool get_carrier ();
-		[NoAccessorMethod]
 		public bool carrier { get; }
 	}
 	[CCode (cheader_filename = "nm-device-bond.h", type_id = "nm_device_bond_get_type ()")]
@@ -419,16 +311,12 @@ namespace NM {
 		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 (DBusGLib.Connection connection, string path);
-		[CCode (cname = "nm_device_bond_get_carrier")]
+		[CCode (has_construct_function = false, type = "GObject*")]
+		public DeviceBond (DBus.Connection connection, string path);
 		public bool get_carrier ();
-		[CCode (cname = "nm_device_bond_get_hw_address")]
 		public unowned string get_hw_address ();
-		[NoAccessorMethod]
 		public bool carrier { get; }
-		[NoAccessorMethod]
-		public string hw_address { owned get; }
+		public string hw_address { get; }
 	}
 	[CCode (cheader_filename = "nm-device-bt.h", type_id = "nm_device_bt_get_type ()")]
 	public class DeviceBt : NM.Device, GLib.AsyncInitable, GLib.Initable {
@@ -438,20 +326,15 @@ namespace NM {
 		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 (DBusGLib.Connection connection, string path);
-		[CCode (cname = "nm_device_bt_get_capabilities")]
+		[CCode (has_construct_function = false, type = "GObject*")]
+		public DeviceBt (DBus.Connection connection, string path);
 		public NM.BluetoothCapabilities get_capabilities ();
-		[CCode (cname = "nm_device_bt_get_hw_address")]
 		public unowned string get_hw_address ();
-		[CCode (cname = "nm_device_bt_get_name")]
 		public unowned string get_name ();
 		[NoAccessorMethod]
 		public uint bt_capabilities { get; }
-		[NoAccessorMethod]
-		public string hw_address { owned get; }
-		[NoAccessorMethod]
-		public string name { owned get; }
+		public string hw_address { get; }
+		public string name { get; }
 	}
 	[CCode (cheader_filename = "nm-device-ethernet.h", type_id = "nm_device_ethernet_get_type ()")]
 	public class DeviceEthernet : NM.Device, GLib.AsyncInitable, GLib.Initable {
@@ -463,67 +346,46 @@ namespace NM {
 		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 (DBusGLib.Connection connection, string path);
-		[CCode (cname = "nm_device_ethernet_get_carrier")]
+		[CCode (has_construct_function = false, type = "GObject*")]
+		public DeviceEthernet (DBus.Connection connection, string path);
 		public bool get_carrier ();
-		[CCode (cname = "nm_device_ethernet_get_hw_address")]
 		public unowned string get_hw_address ();
-		[CCode (cname = "nm_device_ethernet_get_permanent_hw_address")]
 		public unowned string get_permanent_hw_address ();
-		[CCode (cname = "nm_device_ethernet_get_speed")]
 		public uint32 get_speed ();
-		[NoAccessorMethod]
 		public bool carrier { get; }
-		[NoAccessorMethod]
-		public string hw_address { owned get; }
+		public string hw_address { get; }
 		[NoAccessorMethod]
 		public string perm_hw_address { owned get; }
-		[NoAccessorMethod]
 		public uint speed { get; }
 	}
 	[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 (DBusGLib.Connection connection, string path);
-		[CCode (cname = "nm_device_infiniband_get_carrier")]
+		[CCode (has_construct_function = false, type = "GObject*")]
+		public DeviceInfiniband (DBus.Connection connection, string path);
 		public bool get_carrier ();
-		[CCode (cname = "nm_device_infiniband_get_hw_address")]
 		public unowned string get_hw_address ();
-		[NoAccessorMethod]
 		public bool carrier { get; }
-		[NoAccessorMethod]
-		public string hw_address { owned get; }
+		public string hw_address { get; }
 	}
 	[CCode (cheader_filename = "nm-device-modem.h", type_id = "nm_device_modem_get_type ()")]
 	public class DeviceModem : NM.Device, GLib.AsyncInitable, GLib.Initable {
 		[CCode (has_construct_function = false)]
 		protected DeviceModem ();
-		[CCode (cname = "nm_device_modem_get_current_capabilities")]
 		public NM.DeviceModemCapabilities get_current_capabilities ();
-		[CCode (cname = "nm_device_modem_get_modem_capabilities")]
 		public NM.DeviceModemCapabilities get_modem_capabilities ();
-		[NoAccessorMethod]
 		public uint current_capabilities { get; }
-		[NoAccessorMethod]
 		public uint modem_capabilities { get; }
 	}
 	[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 (DBusGLib.Connection connection, string path);
-		[CCode (cname = "nm_device_olpc_mesh_get_active_channel")]
+		[CCode (has_construct_function = false, type = "GObject*")]
+		public DeviceOlpcMesh (DBus.Connection connection, string path);
 		public uint32 get_active_channel ();
-		[CCode (cname = "nm_device_olpc_mesh_get_companion")]
 		public unowned NM.DeviceWifi get_companion ();
-		[CCode (cname = "nm_device_olpc_mesh_get_hw_address")]
 		public unowned string get_hw_address ();
-		[NoAccessorMethod]
 		public uint active_channel { get; }
-		[NoAccessorMethod]
-		public NM.DeviceWifi companion { owned get; }
-		[NoAccessorMethod]
-		public string hw_address { owned get; }
+		public NM.DeviceWifi companion { get; }
+		public string hw_address { get; }
 	}
 	[CCode (cheader_filename = "nm-device-vlan.h", type_id = "nm_device_vlan_get_type ()")]
 	public class DeviceVlan : NM.Device, GLib.AsyncInitable, GLib.Initable {
@@ -533,19 +395,13 @@ namespace NM {
 		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 (DBusGLib.Connection connection, string path);
-		[CCode (cname = "nm_device_vlan_get_carrier")]
+		[CCode (has_construct_function = false, type = "GObject*")]
+		public DeviceVlan (DBus.Connection connection, string path);
 		public bool get_carrier ();
-		[CCode (cname = "nm_device_vlan_get_hw_address")]
 		public unowned string get_hw_address ();
-		[CCode (cname = "nm_device_vlan_get_vlan_id")]
 		public uint get_vlan_id ();
-		[NoAccessorMethod]
 		public bool carrier { get; }
-		[NoAccessorMethod]
-		public string hw_address { owned get; }
-		[NoAccessorMethod]
+		public string hw_address { get; }
 		public uint vlan_id { get; }
 	}
 	[CCode (cheader_filename = "nm-device-wifi.h", type_id = "nm_device_wifi_get_type ()")]
@@ -562,31 +418,19 @@ namespace NM {
 		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 (DBusGLib.Connection connection, string path);
-		[CCode (cname = "nm_device_wifi_get_access_point_by_path")]
+		[CCode (has_construct_function = false, type = "GObject*")]
+		public DeviceWifi (DBus.Connection connection, string path);
 		public unowned NM.AccessPoint get_access_point_by_path (string path);
-		[CCode (cname = "nm_device_wifi_get_access_points")]
 		public unowned GLib.GenericArray<NM.AccessPoint> get_access_points ();
-		[CCode (cname = "nm_device_wifi_get_active_access_point")]
 		public unowned NM.AccessPoint get_active_access_point ();
-		[CCode (cname = "nm_device_wifi_get_bitrate")]
 		public uint32 get_bitrate ();
-		[CCode (cname = "nm_device_wifi_get_capabilities")]
 		public NM.DeviceWifiCapabilities get_capabilities ();
-		[CCode (cname = "nm_device_wifi_get_hw_address")]
 		public unowned string get_hw_address ();
-		[CCode (cname = "nm_device_wifi_get_mode")]
 		public NM.80211Mode get_mode ();
-		[CCode (cname = "nm_device_wifi_get_permanent_hw_address")]
 		public unowned string get_permanent_hw_address ();
-		[NoAccessorMethod]
-		public NM.AccessPoint active_access_point { owned get; }
-		[NoAccessorMethod]
+		public NM.AccessPoint active_access_point { get; }
 		public uint bitrate { get; }
-		[NoAccessorMethod]
-		public string hw_address { owned get; }
-		[NoAccessorMethod]
+		public string hw_address { get; }
 		public uint mode { get; }
 		[NoAccessorMethod]
 		public string perm_hw_address { owned get; }
@@ -611,39 +455,23 @@ namespace NM {
 		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 (DBusGLib.Connection connection, string path);
-		[CCode (cname = "nm_device_wimax_get_active_nsp")]
+		[CCode (has_construct_function = false, type = "GObject*")]
+		public DeviceWimax (DBus.Connection connection, string path);
 		public NM.WimaxNsp get_active_nsp ();
-		[CCode (cname = "nm_device_wimax_get_bsid")]
 		public unowned string get_bsid ();
-		[CCode (cname = "nm_device_wimax_get_center_frequency")]
 		public uint get_center_frequency ();
-		[CCode (cname = "nm_device_wimax_get_cinr")]
 		public int get_cinr ();
-		[CCode (cname = "nm_device_wimax_get_hw_address")]
 		public unowned string get_hw_address ();
-		[CCode (cname = "nm_device_wimax_get_nsp_by_path")]
 		public unowned NM.WimaxNsp get_nsp_by_path (string path);
-		[CCode (cname = "nm_device_wimax_get_nsps")]
 		public unowned GLib.GenericArray<NM.WimaxNsp> get_nsps ();
-		[CCode (cname = "nm_device_wimax_get_rssi")]
 		public int get_rssi ();
-		[CCode (cname = "nm_device_wimax_get_tx_power")]
 		public int get_tx_power ();
-		[NoAccessorMethod]
 		public NM.WimaxNsp active_nsp { owned get; }
-		[NoAccessorMethod]
-		public string bsid { owned get; }
-		[NoAccessorMethod]
+		public string bsid { get; }
 		public uint center_frequency { get; }
-		[NoAccessorMethod]
 		public int cinr { get; }
-		[NoAccessorMethod]
-		public string hw_address { owned get; }
-		[NoAccessorMethod]
+		public string hw_address { get; }
 		public int rssi { get; }
-		[NoAccessorMethod]
 		public int tx_power { get; }
 		public virtual signal void nsp_added (GLib.Object nsp);
 		public virtual signal void nsp_removed (GLib.Object nsp);
@@ -660,28 +488,18 @@ namespace NM {
 		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 (DBusGLib.Connection connection, string object_path);
-		[CCode (cname = "nm_ip4_config_get_addresses")]
+		[CCode (has_construct_function = false, type = "GObject*")]
+		public IP4Config (DBus.Connection connection, string object_path);
 		public unowned GLib.SList<NM.IP4Address> get_addresses ();
-		[CCode (cname = "nm_ip4_config_get_domains")]
 		public unowned GLib.GenericArray<string> get_domains ();
-		[CCode (cname = "nm_ip4_config_get_nameservers")]
 		public unowned GLib.Array<uint32> get_nameservers ();
-		[CCode (cname = "nm_ip4_config_get_routes")]
 		public unowned GLib.SList<NM.IP4Route> get_routes ();
-		[CCode (cname = "nm_ip4_config_get_wins_servers")]
 		public unowned GLib.Array<uint32> get_wins_servers ();
-		[NoAccessorMethod]
 		public void* addresses { get; }
-		[NoAccessorMethod]
-		public NM.StringArray domains { owned get; }
-		[NoAccessorMethod]
-		public NM.UintArray nameservers { owned get; }
-		[NoAccessorMethod]
+		public NM.StringArray domains { get; }
+		public NM.UintArray nameservers { get; }
 		public void* routes { get; }
-		[NoAccessorMethod]
-		public NM.UintArray wins_servers { owned get; }
+		public NM.UintArray wins_servers { get; }
 	}
 	[CCode (cheader_filename = "nm-types.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "nm_ip6_address_array_get_type ()")]
 	[Compact]
@@ -701,22 +519,16 @@ namespace NM {
 		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 (DBusGLib.Connection connection, string object_path);
-		[CCode (cname = "nm_ip6_config_get_addresses")]
+		[CCode (has_construct_function = false, type = "GObject*")]
+		public IP6Config (DBus.Connection connection, string object_path);
 		public unowned GLib.SList<NM.IP6Address> get_addresses ();
-		[CCode (cname = "nm_ip6_config_get_domains")]
 		public unowned GLib.GenericArray<string> get_domains ();
-		[CCode (cname = "nm_ip6_config_get_routes")]
 		public unowned GLib.SList<NM.IP6Route> get_routes ();
-		[NoAccessorMethod]
-		public NM.IP6AddressObjectArray addresses { owned get; }
-		[NoAccessorMethod]
-		public NM.StringArray domains { owned get; }
+		public NM.IP6AddressObjectArray addresses { get; }
+		public NM.StringArray domains { get; }
 		[NoAccessorMethod]
 		public NM.IP6AddressArray nameservers { owned get; }
-		[NoAccessorMethod]
-		public NM.IP6RouteObjectArray routes { owned get; }
+		public NM.IP6RouteObjectArray routes { get; }
 	}
 	[CCode (cheader_filename = "nm-types.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "nm_ip6_route_object_array_get_type ()")]
 	[Compact]
@@ -730,11 +542,9 @@ namespace NM {
 		public const string DBUS_PATH;
 		[CCode (has_construct_function = false)]
 		protected Object ();
-		[CCode (cheader_filename = "nm-object.h", cname = "nm_object_error_quark")]
+		[CCode (cheader_filename = "nm-object.h")]
 		public static GLib.Quark error_quark ();
-		[CCode (cname = "nm_object_get_connection")]
-		public DBusGLib.Connection get_connection ();
-		[CCode (cname = "nm_object_get_path")]
+		public unowned DBus.Connection get_connection ();
 		public unowned string get_path ();
 		[NoAccessorMethod]
 		public string dbus_path { owned get; construct; }
@@ -750,13 +560,10 @@ namespace NM {
 		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 (DBusGLib.Connection bus, string path);
-		[CCode (cname = "nm_remote_connection_commit_changes")]
+		[CCode (has_construct_function = false)]
+		public RemoteConnection (DBus.Connection bus, string path);
 		public void commit_changes (NM.RemoteConnectionCommitFunc? callback);
-		[CCode (cname = "nm_remote_connection_delete")]
 		public void @delete (NM.RemoteConnectionDeleteFunc? callback);
-		[CCode (cname = "nm_remote_connection_get_secrets")]
 		public void get_secrets (string setting_name, NM.RemoteConnectionGetSecretsFunc callback);
 		public virtual signal void removed ();
 		public virtual signal void updated ();
@@ -776,19 +583,14 @@ namespace NM {
 		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 (DBusGLib.Connection? bus);
-		[CCode (cname = "nm_remote_settings_add_connection")]
+		[CCode (has_construct_function = false)]
+		public RemoteSettings (DBus.Connection? bus);
 		public bool add_connection (NM.Connection connection, NM.RemoteSettingsAddConnectionFunc callback);
-		[CCode (cname = "nm_remote_settings_new_finish", has_construct_function = false)]
+		[CCode (has_construct_function = false)]
 		public RemoteSettings.finish (GLib.AsyncResult result) throws GLib.Error;
-		[CCode (cname = "nm_remote_settings_get_connection_by_path")]
 		public unowned NM.RemoteConnection get_connection_by_path (string path);
-		[CCode (cname = "nm_remote_settings_get_connection_by_uuid")]
 		public unowned NM.RemoteConnection get_connection_by_uuid (string uuid);
-		[CCode (cname = "nm_remote_settings_list_connections")]
 		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 ();
@@ -815,25 +617,18 @@ namespace NM {
 		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")]
+		[CCode (cheader_filename = "nm-secret-agent.h")]
 		public static GLib.Quark error_quark ();
-		[CCode (cname = "nm_secret_agent_get_registered")]
 		public bool get_registered ();
-		[CCode (cname = "nm_secret_agent_get_secrets")]
 		public void get_secrets (NM.Connection connection, string setting_name, [CCode (array_length = false, array_null_terminated = true)] string[] hints, NM.SecretAgentGetSecretsFlags flags, NM.SecretAgentGetSecretsFunc callback);
-		[CCode (cname = "nm_secret_agent_register")]
 		public bool register ();
-		[CCode (cname = "nm_secret_agent_save_secrets")]
 		public void save_secrets (NM.Connection connection, NM.SecretAgentSaveSecretsFunc callback);
-		[CCode (cname = "nm_secret_agent_unregister")]
 		public bool unregister ();
 		[NoAccessorMethod]
 		public bool auto_register { get; set construct; }
 		[NoAccessorMethod]
 		public string identifier { owned get; construct; }
-		[NoAccessorMethod]
 		public bool registered { get; }
 		public virtual signal void registration_result (void* error);
 	}
@@ -855,15 +650,11 @@ namespace NM {
 		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 (DBusGLib.Connection connection, string path);
-		[CCode (cname = "nm_vpn_connection_get_banner")]
+		[CCode (has_construct_function = false, type = "GObject*")]
+		public VPNConnection (DBus.Connection connection, string path);
 		public unowned string get_banner ();
-		[CCode (cname = "nm_vpn_connection_get_vpn_state")]
 		public NM.VPNConnectionState get_vpn_state ();
-		[NoAccessorMethod]
-		public string banner { owned get; }
-		[NoAccessorMethod]
+		public string banner { get; }
 		public uint vpn_state { get; }
 		public virtual signal void vpn_state_changed (uint state, uint reason);
 	}
@@ -875,23 +666,15 @@ namespace NM {
 		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 (DBusGLib.Connection connection, string path);
-		[CCode (cname = "nm_wimax_nsp_connection_valid")]
+		[CCode (has_construct_function = false, type = "GObject*")]
+		public WimaxNsp (DBus.Connection connection, string path);
 		public bool connection_valid (NM.Connection connection);
-		[CCode (cname = "nm_wimax_nsp_filter_connections")]
 		public GLib.SList<weak NM.Connection> filter_connections (GLib.SList<NM.Connection> connections);
-		[CCode (cname = "nm_wimax_nsp_get_name")]
 		public unowned string get_name ();
-		[CCode (cname = "nm_wimax_nsp_get_network_type")]
 		public NM.WimaxNspNetworkType get_network_type ();
-		[CCode (cname = "nm_wimax_nsp_get_signal_quality")]
 		public uint32 get_signal_quality ();
-		[NoAccessorMethod]
-		public string name { owned get; }
-		[NoAccessorMethod]
+		public string name { get; }
 		public uint network_type { get; }
-		[NoAccessorMethod]
 		public uint signal_quality { get; }
 	}
 	[CCode (cheader_filename = "nm-client.h", cprefix = "NM_CLIENT_PERMISSION_")]
diff --git a/vapi/libnm-utils.vapi b/vapi/libnm-utils.vapi
index 6beba59..bc0f14a 100644
--- a/vapi/libnm-utils.vapi
+++ b/vapi/libnm-utils.vapi
@@ -1,73 +1,7 @@
-/* libnm-utils.vapi generated by vapigen, do not modify. */
+/* libnm-utils.vapi generated by lt-vapigen, do not modify. */
 
-[CCode (cprefix = "NM", gir_namespace = "NetworkManager", gir_version = "1.0", lower_case_cprefix = "nm__")]
+[CCode (cprefix = "NM", gir_namespace = "NetworkManager", gir_version = "1.0", lower_case_cprefix = "nm_")]
 namespace NM {
-	namespace DBus {
-		namespace VPN {
-			[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_ALREADY_STARTED")]
-			public const string ALREADY_STARTED;
-			[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_ALREADY_STOPPED")]
-			public const string ALREADY_STOPPED;
-			[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_BAD_ARGUMENTS")]
-			public const string BAD_ARGUMENTS;
-			[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_SIGNAL_CONNECT_FAILED")]
-			public const string SIGNAL_CONNECT_FAILED;
-			[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_SIGNAL_IP4_CONFIG")]
-			public const string SIGNAL_IP4_CONFIG;
-			[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD")]
-			public const string SIGNAL_IP_CONFIG_BAD;
-			[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED")]
-			public const string SIGNAL_LAUNCH_FAILED;
-			[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_SIGNAL_LOGIN_BANNER")]
-			public const string SIGNAL_LOGIN_BANNER;
-			[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_SIGNAL_LOGIN_FAILED")]
-			public const string SIGNAL_LOGIN_FAILED;
-			[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_SIGNAL_STATE_CHANGE")]
-			public const string SIGNAL_STATE_CHANGE;
-			[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD")]
-			public const string SIGNAL_VPN_CONFIG_BAD;
-			[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_STARTING_IN_PROGRESS")]
-			public const string STARTING_IN_PROGRESS;
-			[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_STOPPING_IN_PROGRESS")]
-			public const string STOPPING_IN_PROGRESS;
-			[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_WRONG_STATE")]
-			public const string WRONG_STATE;
-		}
-		[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_IFACE_SETTINGS")]
-		public const string IFACE_SETTINGS;
-		[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_IFACE_SETTINGS_CONNECTION")]
-		public const string IFACE_SETTINGS_CONNECTION;
-		[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_IFACE_SETTINGS_CONNECTION_SECRETS")]
-		public const string IFACE_SETTINGS_CONNECTION_SECRETS;
-		[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_INTERFACE")]
-		public const string INTERFACE;
-		[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_INTERFACE_VPN")]
-		public const string INTERFACE_VPN;
-		[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_INTERFACE_VPN_CONNECTION")]
-		public const string INTERFACE_VPN_CONNECTION;
-		[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_INVALID_VPN_CONNECTION")]
-		public const string INVALID_VPN_CONNECTION;
-		[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_NO_ACTIVE_VPN_CONNECTION")]
-		public const string NO_ACTIVE_VPN_CONNECTION;
-		[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_NO_VPN_CONNECTIONS")]
-		public const string NO_VPN_CONNECTIONS;
-		[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_PATH")]
-		public const string PATH;
-		[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_PATH_AGENT_MANAGER")]
-		public const string PATH_AGENT_MANAGER;
-		[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_PATH_SECRET_AGENT")]
-		public const string PATH_SECRET_AGENT;
-		[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_PATH_SETTINGS")]
-		public const string PATH_SETTINGS;
-		[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_PATH_SETTINGS_CONNECTION")]
-		public const string PATH_SETTINGS_CONNECTION;
-		[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_PATH_VPN")]
-		public const string PATH_VPN;
-		[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_PATH_VPN_CONNECTION")]
-		public const string PATH_VPN_CONNECTION;
-		[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_SERVICE")]
-		public const string SERVICE;
-	}
 	namespace SettingIp4 {
 		[CCode (cheader_filename = "nm-setting-ip4-config.h", cname = "NM_SETTING_IP4_CONFIG_ADDRESSES")]
 		public const string CONFIG_ADDRESSES;
@@ -180,67 +114,67 @@ namespace NM {
 		}
 		[CCode (cheader_filename = "nm-utils.h", cname = "NM_UTILS_HWADDR_LEN_MAX")]
 		public const int HWADDR_LEN_MAX;
-		[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_deinit")]
+		[CCode (cheader_filename = "nm-utils.h")]
 		public static void deinit ();
-		[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_escape_ssid")]
+		[CCode (cheader_filename = "nm-utils.h")]
 		public static unowned string escape_ssid (uint8 ssid, uint32 len);
-		[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_gvalue_hash_dup")]
+		[CCode (cheader_filename = "nm-utils.h")]
 		public static GLib.HashTable<weak string,weak GLib.Value?> gvalue_hash_dup (GLib.HashTable<void*,void*> hash);
-		[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_hwaddr_atoba")]
+		[CCode (cheader_filename = "nm-utils.h")]
 		public static GLib.ByteArray hwaddr_atoba (string asc, int type);
-		[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_hwaddr_aton")]
+		[CCode (cheader_filename = "nm-utils.h")]
 		public static uint8 hwaddr_aton (string asc, int type, void* buffer);
-		[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_hwaddr_len")]
+		[CCode (cheader_filename = "nm-utils.h")]
 		public static int hwaddr_len (int type);
-		[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_hwaddr_ntoa")]
+		[CCode (cheader_filename = "nm-utils.h")]
 		public static string hwaddr_ntoa (void* addr, int type);
-		[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_hwaddr_type")]
+		[CCode (cheader_filename = "nm-utils.h")]
 		public static int hwaddr_type (int len);
-		[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_init")]
+		[CCode (cheader_filename = "nm-utils.h")]
 		public static bool init () throws GLib.Error;
-		[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_ip4_addresses_from_gvalue")]
+		[CCode (cheader_filename = "nm-utils.h")]
 		public static GLib.SList<NM.IP4Address> ip4_addresses_from_gvalue (GLib.Value value);
-		[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_ip4_addresses_to_gvalue")]
+		[CCode (cheader_filename = "nm-utils.h")]
 		public static void ip4_addresses_to_gvalue (GLib.SList<NM.IP4Address> list, GLib.Value value);
-		[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_ip4_get_default_prefix")]
+		[CCode (cheader_filename = "nm-utils.h")]
 		public static uint32 ip4_get_default_prefix (uint32 ip);
-		[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_ip4_netmask_to_prefix")]
+		[CCode (cheader_filename = "nm-utils.h")]
 		public static uint32 ip4_netmask_to_prefix (uint32 netmask);
-		[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_ip4_prefix_to_netmask")]
+		[CCode (cheader_filename = "nm-utils.h")]
 		public static uint32 ip4_prefix_to_netmask (uint32 prefix);
-		[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_ip4_routes_from_gvalue")]
+		[CCode (cheader_filename = "nm-utils.h")]
 		public static GLib.SList<NM.IP4Route> ip4_routes_from_gvalue (GLib.Value value);
-		[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_ip4_routes_to_gvalue")]
+		[CCode (cheader_filename = "nm-utils.h")]
 		public static void ip4_routes_to_gvalue (GLib.SList<NM.IP4Route> list, GLib.Value value);
-		[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_ip6_addresses_from_gvalue")]
+		[CCode (cheader_filename = "nm-utils.h")]
 		public static GLib.SList<NM.IP6Address> ip6_addresses_from_gvalue (GLib.Value value);
-		[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_ip6_addresses_to_gvalue")]
+		[CCode (cheader_filename = "nm-utils.h")]
 		public static void ip6_addresses_to_gvalue (GLib.SList<NM.IP6Address> list, GLib.Value value);
-		[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_ip6_routes_from_gvalue")]
+		[CCode (cheader_filename = "nm-utils.h")]
 		public static GLib.SList<NM.IP6Route> ip6_routes_from_gvalue (GLib.Value value);
-		[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_ip6_routes_to_gvalue")]
+		[CCode (cheader_filename = "nm-utils.h")]
 		public static void ip6_routes_to_gvalue (GLib.SList<NM.IP6Route> list, GLib.Value value);
-		[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_is_empty_ssid")]
+		[CCode (cheader_filename = "nm-utils.h")]
 		public static bool is_empty_ssid (uint8 ssid, int len);
-		[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_rsa_key_encrypt")]
+		[CCode (cheader_filename = "nm-utils.h")]
 		public static GLib.ByteArray rsa_key_encrypt (GLib.ByteArray data, string? in_password, out string out_password) throws GLib.Error;
-		[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_same_ssid")]
+		[CCode (cheader_filename = "nm-utils.h")]
 		public static bool same_ssid (GLib.ByteArray ssid1, GLib.ByteArray ssid2, bool ignore_trailing_null);
-		[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_security_valid")]
+		[CCode (cheader_filename = "nm-utils.h")]
 		public static bool security_valid (NM.Utils.SecurityType type, NM.DeviceWifiCapabilities wifi_caps, bool have_ap, bool adhoc, NM.80211ApFlags ap_flags, NM.80211ApSecurityFlags ap_wpa, NM.80211ApSecurityFlags ap_rsn);
-		[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_ssid_to_utf8")]
+		[CCode (cheader_filename = "nm-utils.h")]
 		public static string ssid_to_utf8 (GLib.ByteArray ssid);
-		[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_uuid_generate")]
+		[CCode (cheader_filename = "nm-utils.h")]
 		public static string uuid_generate ();
-		[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_uuid_generate_from_string")]
+		[CCode (cheader_filename = "nm-utils.h")]
 		public static string uuid_generate_from_string (string s);
-		[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_wifi_channel_to_freq")]
+		[CCode (cheader_filename = "nm-utils.h")]
 		public static uint32 wifi_channel_to_freq (uint32 channel, string band);
-		[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_wifi_find_next_channel")]
+		[CCode (cheader_filename = "nm-utils.h")]
 		public static uint32 wifi_find_next_channel (uint32 channel, int direction, string band);
-		[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_wifi_freq_to_channel")]
+		[CCode (cheader_filename = "nm-utils.h")]
 		public static uint32 wifi_freq_to_channel (uint32 freq);
-		[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_wifi_is_channel_valid")]
+		[CCode (cheader_filename = "nm-utils.h")]
 		public static bool wifi_is_channel_valid (uint32 channel, string band);
 	}
 	namespace VPN {
@@ -305,217 +239,127 @@ namespace NM {
 	}
 	[CCode (cheader_filename = "nm-connection.h", type_id = "nm_connection_get_type ()")]
 	public class Connection : GLib.Object {
-		[CCode (cname = "nm_connection_new", has_construct_function = false)]
+		[CCode (has_construct_function = false)]
 		public Connection ();
-		[CCode (cname = "nm_connection_add_setting")]
 		public void add_setting (owned NM.Setting setting);
-		[CCode (cname = "nm_connection_clear_secrets")]
 		public void clear_secrets ();
-		[CCode (cname = "nm_connection_clear_secrets_with_flags")]
 		public void clear_secrets_with_flags (NM.SettingClearSecretsWithFlagsFn func);
-		[CCode (cname = "nm_connection_compare")]
 		public bool compare (NM.Connection b, NM.SettingCompareFlags flags);
-		[CCode (cname = "nm_connection_create_setting")]
 		public static NM.Setting create_setting (string name);
-		[CCode (cname = "nm_connection_diff")]
 		public bool diff (NM.Connection b, NM.SettingCompareFlags flags, GLib.HashTable<string,GLib.HashTable<void*,void*>> out_settings);
-		[CCode (cname = "nm_connection_dump")]
 		public void dump ();
-		[CCode (cname = "nm_connection_duplicate")]
 		public NM.Connection duplicate ();
-		[CCode (cheader_filename = "nm-connection.h", cname = "nm_connection_error_quark")]
+		[CCode (cheader_filename = "nm-connection.h")]
 		public static GLib.Quark error_quark ();
-		[CCode (cname = "nm_connection_for_each_setting_value")]
 		public void for_each_setting_value (NM.SettingValueIterFn func);
-		[CCode (cname = "nm_connection_new_from_hash", has_construct_function = false)]
+		[CCode (has_construct_function = false)]
 		public Connection.from_hash (GLib.HashTable<string,GLib.HashTable<void*,void*>> hash) throws GLib.Error;
-		[CCode (cname = "nm_connection_get_id")]
 		public unowned string get_id ();
-		[CCode (cname = "nm_connection_get_path")]
 		public unowned string get_path ();
-		[CCode (cname = "nm_connection_get_setting")]
 		public unowned NM.Setting get_setting (GLib.Type setting_type);
-		[CCode (cname = "nm_connection_get_setting_802_1x")]
 		public unowned NM.Setting8021x get_setting_802_1x ();
-		[CCode (cname = "nm_connection_get_setting_adsl")]
 		public unowned NM.SettingAdsl get_setting_adsl ();
-		[CCode (cname = "nm_connection_get_setting_bluetooth")]
 		public unowned NM.SettingBluetooth get_setting_bluetooth ();
-		[CCode (cname = "nm_connection_get_setting_bond")]
 		public unowned NM.SettingBond get_setting_bond ();
-		[CCode (cname = "nm_connection_get_setting_by_name")]
 		public unowned NM.Setting get_setting_by_name (string name);
-		[CCode (cname = "nm_connection_get_setting_cdma")]
 		public unowned NM.SettingCdma get_setting_cdma ();
-		[CCode (cname = "nm_connection_get_setting_connection")]
 		public unowned NM.SettingConnection get_setting_connection ();
-		[CCode (cname = "nm_connection_get_setting_gsm")]
 		public unowned NM.SettingGsm get_setting_gsm ();
-		[CCode (cname = "nm_connection_get_setting_infiniband")]
 		public unowned NM.SettingInfiniband get_setting_infiniband ();
-		[CCode (cname = "nm_connection_get_setting_ip4_config")]
 		public unowned NM.SettingIP4Config get_setting_ip4_config ();
-		[CCode (cname = "nm_connection_get_setting_ip6_config")]
 		public unowned NM.SettingIP6Config get_setting_ip6_config ();
-		[CCode (cname = "nm_connection_get_setting_olpc_mesh")]
 		public unowned NM.SettingOlpcMesh get_setting_olpc_mesh ();
-		[CCode (cname = "nm_connection_get_setting_ppp")]
 		public unowned NM.SettingPPP get_setting_ppp ();
-		[CCode (cname = "nm_connection_get_setting_pppoe")]
 		public unowned NM.SettingPPPOE get_setting_pppoe ();
-		[CCode (cname = "nm_connection_get_setting_serial")]
 		public unowned NM.SettingSerial get_setting_serial ();
-		[CCode (cname = "nm_connection_get_setting_vlan")]
 		public unowned NM.SettingVlan get_setting_vlan ();
-		[CCode (cname = "nm_connection_get_setting_vpn")]
 		public unowned NM.SettingVPN get_setting_vpn ();
-		[CCode (cname = "nm_connection_get_setting_wimax")]
 		public unowned NM.SettingWimax get_setting_wimax ();
-		[CCode (cname = "nm_connection_get_setting_wired")]
 		public unowned NM.SettingWired get_setting_wired ();
-		[CCode (cname = "nm_connection_get_setting_wireless")]
 		public unowned NM.SettingWireless get_setting_wireless ();
-		[CCode (cname = "nm_connection_get_setting_wireless_security")]
 		public unowned NM.SettingWirelessSecurity get_setting_wireless_security ();
-		[CCode (cname = "nm_connection_get_uuid")]
 		public unowned string get_uuid ();
-		[CCode (cname = "nm_connection_get_virtual_iface_name")]
 		public unowned string get_virtual_iface_name ();
-		[CCode (cname = "nm_connection_is_type")]
 		public bool is_type (string type);
-		[CCode (cname = "nm_connection_lookup_setting_type")]
 		public static GLib.Type lookup_setting_type (string name);
-		[CCode (cname = "nm_connection_lookup_setting_type_by_quark")]
 		public static GLib.Type lookup_setting_type_by_quark (GLib.Quark error_quark);
-		[CCode (cname = "nm_connection_need_secrets")]
 		public unowned string need_secrets (out GLib.GenericArray<string> hints);
-		[CCode (cname = "nm_connection_remove_setting")]
 		public void remove_setting (GLib.Type setting_type);
-		[CCode (cname = "nm_connection_replace_settings")]
 		public bool replace_settings (GLib.HashTable<string,GLib.HashTable<void*,void*>> new_settings) throws GLib.Error;
-		[CCode (cname = "nm_connection_set_path")]
 		public void set_path (string path);
-		[CCode (cname = "nm_connection_to_hash")]
 		public GLib.HashTable<string,GLib.HashTable<void*,void*>> to_hash (NM.SettingHashFlags flags);
-		[CCode (cname = "nm_connection_update_secrets")]
 		public bool update_secrets (string setting_name, GLib.HashTable<string,GLib.Value?> secrets) throws GLib.Error;
-		[CCode (cname = "nm_connection_verify")]
 		public bool verify () throws GLib.Error;
-		[NoAccessorMethod]
-		public string path { owned get; set construct; }
+		public string path { get; set construct; }
 		public signal void secrets_cleared ();
 		public virtual signal void secrets_updated (string setting);
 	}
 	[CCode (cheader_filename = "nm-setting-ip4-config.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "nm_ip4_address_get_type ()")]
 	[Compact]
 	public class IP4Address {
-		[CCode (cname = "nm_ip4_address_new", has_construct_function = false)]
+		[CCode (has_construct_function = false)]
 		public IP4Address ();
-		[CCode (cname = "nm_ip4_address_compare")]
 		public bool compare (NM.IP4Address other);
-		[CCode (cname = "nm_ip4_address_dup")]
 		public NM.IP4Address dup ();
-		[CCode (cname = "nm_ip4_address_get_address")]
 		public uint32 get_address ();
-		[CCode (cname = "nm_ip4_address_get_gateway")]
 		public uint32 get_gateway ();
-		[CCode (cname = "nm_ip4_address_get_prefix")]
 		public uint32 get_prefix ();
-		[CCode (cname = "nm_ip4_address_ref")]
 		public void @ref ();
-		[CCode (cname = "nm_ip4_address_set_address")]
 		public void set_address (uint32 addr);
-		[CCode (cname = "nm_ip4_address_set_gateway")]
 		public void set_gateway (uint32 gateway);
-		[CCode (cname = "nm_ip4_address_set_prefix")]
 		public void set_prefix (uint32 prefix);
-		[CCode (cname = "nm_ip4_address_unref")]
 		public void unref ();
 	}
 	[CCode (cheader_filename = "nm-setting-ip4-config.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "nm_ip4_route_get_type ()")]
 	[Compact]
 	public class IP4Route {
-		[CCode (cname = "nm_ip4_route_new", has_construct_function = false)]
+		[CCode (has_construct_function = false)]
 		public IP4Route ();
-		[CCode (cname = "nm_ip4_route_compare")]
 		public bool compare (NM.IP4Route other);
-		[CCode (cname = "nm_ip4_route_dup")]
 		public NM.IP4Route dup ();
-		[CCode (cname = "nm_ip4_route_get_dest")]
 		public uint32 get_dest ();
-		[CCode (cname = "nm_ip4_route_get_metric")]
 		public uint32 get_metric ();
-		[CCode (cname = "nm_ip4_route_get_next_hop")]
 		public uint32 get_next_hop ();
-		[CCode (cname = "nm_ip4_route_get_prefix")]
 		public uint32 get_prefix ();
-		[CCode (cname = "nm_ip4_route_ref")]
 		public void @ref ();
-		[CCode (cname = "nm_ip4_route_set_dest")]
 		public void set_dest (uint32 dest);
-		[CCode (cname = "nm_ip4_route_set_metric")]
 		public void set_metric (uint32 metric);
-		[CCode (cname = "nm_ip4_route_set_next_hop")]
 		public void set_next_hop (uint32 next_hop);
-		[CCode (cname = "nm_ip4_route_set_prefix")]
 		public void set_prefix (uint32 prefix);
-		[CCode (cname = "nm_ip4_route_unref")]
 		public void unref ();
 	}
 	[CCode (cheader_filename = "nm-setting-ip6-config.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "nm_ip6_address_get_type ()")]
 	[Compact]
 	public class IP6Address {
-		[CCode (cname = "nm_ip6_address_new", has_construct_function = false)]
+		[CCode (has_construct_function = false)]
 		public IP6Address ();
-		[CCode (cname = "nm_ip6_address_compare")]
 		public bool compare (NM.IP6Address other);
-		[CCode (cname = "nm_ip6_address_dup")]
 		public NM.IP6Address dup ();
-		[CCode (cname = "nm_ip6_address_get_address")]
 		public void* get_address ();
-		[CCode (cname = "nm_ip6_address_get_gateway")]
 		public void* get_gateway ();
-		[CCode (cname = "nm_ip6_address_get_prefix")]
 		public uint32 get_prefix ();
-		[CCode (cname = "nm_ip6_address_ref")]
 		public void @ref ();
-		[CCode (cname = "nm_ip6_address_set_address")]
 		public void set_address (void* addr);
-		[CCode (cname = "nm_ip6_address_set_gateway")]
 		public void set_gateway (void* gateway);
-		[CCode (cname = "nm_ip6_address_set_prefix")]
 		public void set_prefix (uint32 prefix);
-		[CCode (cname = "nm_ip6_address_unref")]
 		public void unref ();
 	}
 	[CCode (cheader_filename = "nm-setting-ip6-config.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "nm_ip6_route_get_type ()")]
 	[Compact]
 	public class IP6Route {
-		[CCode (cname = "nm_ip6_route_new", has_construct_function = false)]
+		[CCode (has_construct_function = false)]
 		public IP6Route ();
-		[CCode (cname = "nm_ip6_route_compare")]
 		public bool compare (NM.IP6Route other);
-		[CCode (cname = "nm_ip6_route_dup")]
 		public NM.IP6Route dup ();
-		[CCode (cname = "nm_ip6_route_get_dest")]
 		public void* get_dest ();
-		[CCode (cname = "nm_ip6_route_get_metric")]
 		public uint32 get_metric ();
-		[CCode (cname = "nm_ip6_route_get_next_hop")]
 		public void* get_next_hop ();
-		[CCode (cname = "nm_ip6_route_get_prefix")]
 		public uint32 get_prefix ();
-		[CCode (cname = "nm_ip6_route_ref")]
 		public void @ref ();
-		[CCode (cname = "nm_ip6_route_set_dest")]
 		public void set_dest (void* dest);
-		[CCode (cname = "nm_ip6_route_set_metric")]
 		public void set_metric (uint32 metric);
-		[CCode (cname = "nm_ip6_route_set_next_hop")]
 		public void set_next_hop (void* next_hop);
-		[CCode (cname = "nm_ip6_route_set_prefix")]
 		public void set_prefix (uint32 prefix);
-		[CCode (cname = "nm_ip6_route_unref")]
 		public void unref ();
 	}
 	[CCode (cheader_filename = "nm-setting.h", type_id = "nm_setting_get_type ()")]
@@ -530,80 +374,68 @@ namespace NM {
 		public const int SERIALIZE;
 		[CCode (has_construct_function = false)]
 		protected Setting ();
-		[CCode (cheader_filename = "nm-setting-8021x.h", cname = "nm_setting_802_1x_error_quark")]
+		[CCode (cheader_filename = "nm-setting-8021x.h")]
 		public static GLib.Quark @802_1x_error_quark ();
-		[CCode (cheader_filename = "nm-setting-adsl.h", cname = "nm_setting_adsl_error_quark")]
+		[CCode (cheader_filename = "nm-setting-adsl.h")]
 		public static GLib.Quark adsl_error_quark ();
-		[CCode (cheader_filename = "nm-setting-bluetooth.h", cname = "nm_setting_bluetooth_error_quark")]
+		[CCode (cheader_filename = "nm-setting-bluetooth.h")]
 		public static GLib.Quark bluetooth_error_quark ();
-		[CCode (cheader_filename = "nm-setting-bond.h", cname = "nm_setting_bond_error_quark")]
+		[CCode (cheader_filename = "nm-setting-bond.h")]
 		public static GLib.Quark bond_error_quark ();
-		[CCode (cheader_filename = "nm-setting-cdma.h", cname = "nm_setting_cdma_error_quark")]
+		[CCode (cheader_filename = "nm-setting-cdma.h")]
 		public static GLib.Quark cdma_error_quark ();
-		[CCode (cname = "nm_setting_clear_secrets")]
 		public void clear_secrets ();
-		[CCode (cname = "nm_setting_clear_secrets_with_flags")]
 		public void clear_secrets_with_flags (NM.SettingClearSecretsWithFlagsFn func);
-		[CCode (cname = "nm_setting_compare")]
 		public bool compare (NM.Setting b, NM.SettingCompareFlags flags);
 		[NoWrapper]
 		public virtual bool compare_property (NM.Setting other, GLib.ParamSpec prop_spec, NM.SettingCompareFlags flags);
-		[CCode (cheader_filename = "nm-setting-connection.h", cname = "nm_setting_connection_error_quark")]
+		[CCode (cheader_filename = "nm-setting-connection.h")]
 		public static GLib.Quark connection_error_quark ();
-		[CCode (cname = "nm_setting_diff")]
 		public bool diff (NM.Setting b, NM.SettingCompareFlags flags, bool invert_results, ref GLib.HashTable<string,uint32> results);
-		[CCode (cname = "nm_setting_duplicate")]
 		public NM.Setting duplicate ();
-		[CCode (cname = "nm_setting_enumerate_values")]
 		public void enumerate_values (NM.SettingValueIterFn func);
-		[CCode (cheader_filename = "nm-setting.h", cname = "nm_setting_error_quark")]
+		[CCode (cheader_filename = "nm-setting.h")]
 		public static GLib.Quark error_quark ();
-		[CCode (cname = "nm_setting_new_from_hash", has_construct_function = false)]
+		[CCode (has_construct_function = false)]
 		public Setting.from_hash (GLib.Type setting_type, GLib.HashTable<string,GLib.Value?> hash);
-		[CCode (cname = "nm_setting_get_name")]
 		public unowned string get_name ();
-		[CCode (cname = "nm_setting_get_secret_flags")]
 		public bool get_secret_flags (string secret_name, NM.SettingSecretFlags out_flags) throws GLib.Error;
 		public virtual unowned string get_virtual_iface_name ();
-		[CCode (cheader_filename = "nm-setting-gsm.h", cname = "nm_setting_gsm_error_quark")]
+		[CCode (cheader_filename = "nm-setting-gsm.h")]
 		public static GLib.Quark gsm_error_quark ();
-		[CCode (cheader_filename = "nm-setting-infiniband.h", cname = "nm_setting_infiniband_error_quark")]
+		[CCode (cheader_filename = "nm-setting-infiniband.h")]
 		public static GLib.Quark infiniband_error_quark ();
-		[CCode (cheader_filename = "nm-setting-ip4-config.h", cname = "nm_setting_ip4_config_error_quark")]
+		[CCode (cheader_filename = "nm-setting-ip4-config.h")]
 		public static GLib.Quark ip4_config_error_quark ();
-		[CCode (cheader_filename = "nm-setting-ip6-config.h", cname = "nm_setting_ip6_config_error_quark")]
+		[CCode (cheader_filename = "nm-setting-ip6-config.h")]
 		public static GLib.Quark ip6_config_error_quark ();
 		public virtual GLib.GenericArray<string> need_secrets ();
-		[CCode (cheader_filename = "nm-setting-olpc-mesh.h", cname = "nm_setting_olpc_mesh_error_quark")]
+		[CCode (cheader_filename = "nm-setting-olpc-mesh.h")]
 		public static GLib.Quark olpc_mesh_error_quark ();
-		[CCode (cheader_filename = "nm-setting-ppp.h", cname = "nm_setting_ppp_error_quark")]
+		[CCode (cheader_filename = "nm-setting-ppp.h")]
 		public static GLib.Quark ppp_error_quark ();
-		[CCode (cheader_filename = "nm-setting-pppoe.h", cname = "nm_setting_pppoe_error_quark")]
+		[CCode (cheader_filename = "nm-setting-pppoe.h")]
 		public static GLib.Quark pppoe_error_quark ();
-		[CCode (cheader_filename = "nm-setting-serial.h", cname = "nm_setting_serial_error_quark")]
+		[CCode (cheader_filename = "nm-setting-serial.h")]
 		public static GLib.Quark serial_error_quark ();
-		[CCode (cname = "nm_setting_set_secret_flags")]
 		public bool set_secret_flags (string secret_name, NM.SettingSecretFlags flags) throws GLib.Error;
-		[CCode (cname = "nm_setting_to_hash")]
 		public GLib.HashTable<string,GLib.Value?> to_hash (NM.SettingHashFlags flags);
-		[CCode (cname = "nm_setting_to_string")]
 		public string to_string ();
 		[NoWrapper]
 		public virtual bool update_one_secret (string key, GLib.Value value) throws GLib.Error;
-		[CCode (cname = "nm_setting_update_secrets")]
 		public bool update_secrets (GLib.HashTable<string,GLib.Value?> secrets) throws GLib.Error;
 		public virtual bool verify (GLib.SList<NM.Setting> all_settings) throws GLib.Error;
-		[CCode (cheader_filename = "nm-setting-vlan.h", cname = "nm_setting_vlan_error_quark")]
+		[CCode (cheader_filename = "nm-setting-vlan.h")]
 		public static GLib.Quark vlan_error_quark ();
-		[CCode (cheader_filename = "nm-setting-vpn.h", cname = "nm_setting_vpn_error_quark")]
+		[CCode (cheader_filename = "nm-setting-vpn.h")]
 		public static GLib.Quark vpn_error_quark ();
-		[CCode (cheader_filename = "nm-setting-wimax.h", cname = "nm_setting_wimax_error_quark")]
+		[CCode (cheader_filename = "nm-setting-wimax.h")]
 		public static GLib.Quark wimax_error_quark ();
-		[CCode (cheader_filename = "nm-setting-wired.h", cname = "nm_setting_wired_error_quark")]
+		[CCode (cheader_filename = "nm-setting-wired.h")]
 		public static GLib.Quark wired_error_quark ();
-		[CCode (cheader_filename = "nm-setting-wireless.h", cname = "nm_setting_wireless_error_quark")]
+		[CCode (cheader_filename = "nm-setting-wireless.h")]
 		public static GLib.Quark wireless_error_quark ();
-		[CCode (cheader_filename = "nm-setting-wireless-security.h", cname = "nm_setting_wireless_security_error_quark")]
+		[CCode (cheader_filename = "nm-setting-wireless-security.h")]
 		public static GLib.Quark wireless_security_error_quark ();
 		[NoAccessorMethod]
 		public string name { owned get; set; }
@@ -676,135 +508,71 @@ namespace NM {
 		public const string SUBJECT_MATCH;
 		[CCode (cname = "NM_SETTING_802_1X_SYSTEM_CA_CERTS")]
 		public const string SYSTEM_CA_CERTS;
-		[CCode (cname = "nm_setting_802_1x_new", has_construct_function = false, type = "NMSetting*")]
+		[CCode (has_construct_function = false, type = "NMSetting*")]
 		public Setting8021x ();
-		[CCode (cname = "nm_setting_802_1x_add_altsubject_match")]
 		public bool add_altsubject_match (string altsubject_match);
-		[CCode (cname = "nm_setting_802_1x_add_eap_method")]
 		public bool add_eap_method (string eap);
-		[CCode (cname = "nm_setting_802_1x_add_phase2_altsubject_match")]
 		public bool add_phase2_altsubject_match (string phase2_altsubject_match);
-		[CCode (cname = "nm_setting_802_1x_clear_altsubject_matches")]
 		public void clear_altsubject_matches ();
-		[CCode (cname = "nm_setting_802_1x_clear_eap_methods")]
 		public void clear_eap_methods ();
-		[CCode (cname = "nm_setting_802_1x_clear_phase2_altsubject_matches")]
 		public void clear_phase2_altsubject_matches ();
-		[CCode (cname = "nm_setting_802_1x_get_altsubject_match")]
 		public unowned string get_altsubject_match (uint32 i);
-		[CCode (cname = "nm_setting_802_1x_get_anonymous_identity")]
 		public unowned string get_anonymous_identity ();
-		[CCode (cname = "nm_setting_802_1x_get_ca_cert_blob")]
 		public unowned GLib.ByteArray get_ca_cert_blob ();
-		[CCode (cname = "nm_setting_802_1x_get_ca_cert_path")]
 		public unowned string get_ca_cert_path ();
-		[CCode (cname = "nm_setting_802_1x_get_ca_cert_scheme")]
 		public NM.Setting8021xCKScheme get_ca_cert_scheme ();
-		[CCode (cname = "nm_setting_802_1x_get_ca_path")]
 		public unowned string get_ca_path ();
-		[CCode (cname = "nm_setting_802_1x_get_client_cert_blob")]
 		public unowned GLib.ByteArray get_client_cert_blob ();
-		[CCode (cname = "nm_setting_802_1x_get_client_cert_path")]
 		public unowned string get_client_cert_path ();
-		[CCode (cname = "nm_setting_802_1x_get_client_cert_scheme")]
 		public NM.Setting8021xCKScheme get_client_cert_scheme ();
-		[CCode (cname = "nm_setting_802_1x_get_eap_method")]
 		public unowned string get_eap_method (uint32 i);
-		[CCode (cname = "nm_setting_802_1x_get_identity")]
 		public unowned string get_identity ();
-		[CCode (cname = "nm_setting_802_1x_get_num_altsubject_matches")]
 		public uint32 get_num_altsubject_matches ();
-		[CCode (cname = "nm_setting_802_1x_get_num_eap_methods")]
 		public uint32 get_num_eap_methods ();
-		[CCode (cname = "nm_setting_802_1x_get_num_phase2_altsubject_matches")]
 		public uint32 get_num_phase2_altsubject_matches ();
-		[CCode (cname = "nm_setting_802_1x_get_pac_file")]
 		public unowned string get_pac_file ();
-		[CCode (cname = "nm_setting_802_1x_get_password")]
 		public unowned string get_password ();
-		[CCode (cname = "nm_setting_802_1x_get_password_flags")]
 		public NM.SettingSecretFlags get_password_flags ();
-		[CCode (cname = "nm_setting_802_1x_get_password_raw")]
 		public unowned GLib.ByteArray get_password_raw ();
-		[CCode (cname = "nm_setting_802_1x_get_password_raw_flags")]
 		public NM.SettingSecretFlags get_password_raw_flags ();
-		[CCode (cname = "nm_setting_802_1x_get_phase1_fast_provisioning")]
 		public unowned string get_phase1_fast_provisioning ();
-		[CCode (cname = "nm_setting_802_1x_get_phase1_peaplabel")]
 		public unowned string get_phase1_peaplabel ();
-		[CCode (cname = "nm_setting_802_1x_get_phase1_peapver")]
 		public unowned string get_phase1_peapver ();
-		[CCode (cname = "nm_setting_802_1x_get_phase2_altsubject_match")]
 		public unowned string get_phase2_altsubject_match (uint32 i);
-		[CCode (cname = "nm_setting_802_1x_get_phase2_auth")]
 		public unowned string get_phase2_auth ();
-		[CCode (cname = "nm_setting_802_1x_get_phase2_autheap")]
 		public unowned string get_phase2_autheap ();
-		[CCode (cname = "nm_setting_802_1x_get_phase2_ca_cert_blob")]
 		public unowned GLib.ByteArray get_phase2_ca_cert_blob ();
-		[CCode (cname = "nm_setting_802_1x_get_phase2_ca_cert_path")]
 		public unowned string get_phase2_ca_cert_path ();
-		[CCode (cname = "nm_setting_802_1x_get_phase2_ca_cert_scheme")]
 		public NM.Setting8021xCKScheme get_phase2_ca_cert_scheme ();
-		[CCode (cname = "nm_setting_802_1x_get_phase2_ca_path")]
 		public unowned string get_phase2_ca_path ();
-		[CCode (cname = "nm_setting_802_1x_get_phase2_client_cert_blob")]
 		public unowned GLib.ByteArray get_phase2_client_cert_blob ();
-		[CCode (cname = "nm_setting_802_1x_get_phase2_client_cert_path")]
 		public unowned string get_phase2_client_cert_path ();
-		[CCode (cname = "nm_setting_802_1x_get_phase2_client_cert_scheme")]
 		public NM.Setting8021xCKScheme get_phase2_client_cert_scheme ();
-		[CCode (cname = "nm_setting_802_1x_get_phase2_private_key_blob")]
 		public unowned GLib.ByteArray get_phase2_private_key_blob ();
-		[CCode (cname = "nm_setting_802_1x_get_phase2_private_key_format")]
 		public NM.Setting8021xCKFormat get_phase2_private_key_format ();
-		[CCode (cname = "nm_setting_802_1x_get_phase2_private_key_password")]
 		public unowned string get_phase2_private_key_password ();
-		[CCode (cname = "nm_setting_802_1x_get_phase2_private_key_password_flags")]
 		public NM.SettingSecretFlags get_phase2_private_key_password_flags ();
-		[CCode (cname = "nm_setting_802_1x_get_phase2_private_key_path")]
 		public unowned string get_phase2_private_key_path ();
-		[CCode (cname = "nm_setting_802_1x_get_phase2_private_key_scheme")]
 		public NM.Setting8021xCKScheme get_phase2_private_key_scheme ();
-		[CCode (cname = "nm_setting_802_1x_get_phase2_subject_match")]
 		public unowned string get_phase2_subject_match ();
-		[CCode (cname = "nm_setting_802_1x_get_pin")]
 		public unowned string get_pin ();
-		[CCode (cname = "nm_setting_802_1x_get_pin_flags")]
 		public NM.SettingSecretFlags get_pin_flags ();
-		[CCode (cname = "nm_setting_802_1x_get_private_key_blob")]
 		public unowned GLib.ByteArray get_private_key_blob ();
-		[CCode (cname = "nm_setting_802_1x_get_private_key_format")]
 		public NM.Setting8021xCKFormat get_private_key_format ();
-		[CCode (cname = "nm_setting_802_1x_get_private_key_password")]
 		public unowned string get_private_key_password ();
-		[CCode (cname = "nm_setting_802_1x_get_private_key_password_flags")]
 		public NM.SettingSecretFlags get_private_key_password_flags ();
-		[CCode (cname = "nm_setting_802_1x_get_private_key_path")]
 		public unowned string get_private_key_path ();
-		[CCode (cname = "nm_setting_802_1x_get_private_key_scheme")]
 		public NM.Setting8021xCKScheme get_private_key_scheme ();
-		[CCode (cname = "nm_setting_802_1x_get_subject_match")]
 		public unowned string get_subject_match ();
-		[CCode (cname = "nm_setting_802_1x_get_system_ca_certs")]
 		public bool get_system_ca_certs ();
-		[CCode (cname = "nm_setting_802_1x_remove_altsubject_match")]
 		public void remove_altsubject_match (uint32 i);
-		[CCode (cname = "nm_setting_802_1x_remove_eap_method")]
 		public void remove_eap_method (uint32 i);
-		[CCode (cname = "nm_setting_802_1x_remove_phase2_altsubject_match")]
 		public void remove_phase2_altsubject_match (uint32 i);
-		[CCode (cname = "nm_setting_802_1x_set_ca_cert")]
 		public bool set_ca_cert (string cert_path, NM.Setting8021xCKScheme scheme, NM.Setting8021xCKFormat out_format) throws GLib.Error;
-		[CCode (cname = "nm_setting_802_1x_set_client_cert")]
 		public bool set_client_cert (string cert_path, NM.Setting8021xCKScheme scheme, NM.Setting8021xCKFormat out_format) throws GLib.Error;
-		[CCode (cname = "nm_setting_802_1x_set_phase2_ca_cert")]
 		public bool set_phase2_ca_cert (string cert_path, NM.Setting8021xCKScheme scheme, NM.Setting8021xCKFormat out_format) throws GLib.Error;
-		[CCode (cname = "nm_setting_802_1x_set_phase2_client_cert")]
 		public bool set_phase2_client_cert (string cert_path, NM.Setting8021xCKScheme scheme, NM.Setting8021xCKFormat out_format) throws GLib.Error;
-		[CCode (cname = "nm_setting_802_1x_set_phase2_private_key")]
 		public bool set_phase2_private_key (string key_path, string password, NM.Setting8021xCKScheme scheme, NM.Setting8021xCKFormat out_format) throws GLib.Error;
-		[CCode (cname = "nm_setting_802_1x_set_private_key")]
 		public bool set_private_key (string key_path, string password, NM.Setting8021xCKScheme scheme, NM.Setting8021xCKFormat out_format) throws GLib.Error;
 		[NoAccessorMethod]
 		public string anonymous_identity { owned get; set; }
@@ -875,21 +643,14 @@ namespace NM {
 		public const string VCI;
 		[CCode (cheader_filename = "nm-setting-adsl.h", cname = "NM_SETTING_ADSL_VPI")]
 		public const string VPI;
-		[CCode (cname = "nm_setting_adsl_new", has_construct_function = false, type = "NMSetting*")]
+		[CCode (has_construct_function = false, type = "NMSetting*")]
 		public SettingAdsl ();
-		[CCode (cname = "nm_setting_adsl_get_encapsulation")]
 		public unowned string get_encapsulation ();
-		[CCode (cname = "nm_setting_adsl_get_password")]
 		public unowned string get_password ();
-		[CCode (cname = "nm_setting_adsl_get_password_flags")]
 		public NM.SettingSecretFlags get_password_flags ();
-		[CCode (cname = "nm_setting_adsl_get_protocol")]
 		public unowned string get_protocol ();
-		[CCode (cname = "nm_setting_adsl_get_username")]
 		public unowned string get_username ();
-		[CCode (cname = "nm_setting_adsl_get_vci")]
 		public uint32 get_vci ();
-		[CCode (cname = "nm_setting_adsl_get_vpi")]
 		public uint32 get_vpi ();
 		[NoAccessorMethod]
 		public string encapsulation { owned get; set; }
@@ -918,11 +679,9 @@ namespace NM {
 		public const string TYPE_DUN;
 		[CCode (cheader_filename = "nm-setting-bluetooth.h", cname = "NM_SETTING_BLUETOOTH_TYPE_PANU")]
 		public const string TYPE_PANU;
-		[CCode (cname = "nm_setting_bluetooth_new", has_construct_function = false, type = "NMSetting*")]
+		[CCode (has_construct_function = false, type = "NMSetting*")]
 		public SettingBluetooth ();
-		[CCode (cname = "nm_setting_bluetooth_get_bdaddr")]
 		public unowned GLib.ByteArray get_bdaddr ();
-		[CCode (cname = "nm_setting_bluetooth_get_connection_type")]
 		public unowned string get_connection_type ();
 		[NoAccessorMethod]
 		public string type { owned get; set; }
@@ -947,21 +706,14 @@ namespace NM {
 		public const string OPTION_UPDELAY;
 		[CCode (cheader_filename = "nm-setting-bond.h", cname = "NM_SETTING_BOND_SETTING_NAME")]
 		public const string SETTING_NAME;
-		[CCode (cname = "nm_setting_bond_new", has_construct_function = false, type = "NMSetting*")]
+		[CCode (has_construct_function = false, type = "NMSetting*")]
 		public SettingBond ();
-		[CCode (cname = "nm_setting_bond_add_option")]
 		public bool add_option (string name, string value);
-		[CCode (cname = "nm_setting_bond_get_interface_name")]
 		public unowned string get_interface_name ();
-		[CCode (cname = "nm_setting_bond_get_num_options")]
 		public uint32 get_num_options ();
-		[CCode (cname = "nm_setting_bond_get_option")]
 		public bool get_option (uint32 idx, out string out_name, out string out_value);
-		[CCode (cname = "nm_setting_bond_get_option_by_name")]
 		public unowned string get_option_by_name (string name);
-		[CCode (cname = "nm_setting_bond_get_option_default")]
 		public unowned string get_option_default (string name);
-		[CCode (cname = "nm_setting_bond_remove_option")]
 		public bool remove_option (string name);
 		[NoAccessorMethod]
 		public string interface_name { owned get; set; }
@@ -978,15 +730,11 @@ namespace NM {
 		public const string SETTING_NAME;
 		[CCode (cheader_filename = "nm-setting-cdma.h", cname = "NM_SETTING_CDMA_USERNAME")]
 		public const string USERNAME;
-		[CCode (cname = "nm_setting_cdma_new", has_construct_function = false, type = "NMSetting*")]
+		[CCode (has_construct_function = false, type = "NMSetting*")]
 		public SettingCdma ();
-		[CCode (cname = "nm_setting_cdma_get_number")]
 		public unowned string get_number ();
-		[CCode (cname = "nm_setting_cdma_get_password")]
 		public unowned string get_password ();
-		[CCode (cname = "nm_setting_cdma_get_password_flags")]
 		public NM.SettingSecretFlags get_password_flags ();
-		[CCode (cname = "nm_setting_cdma_get_username")]
 		public unowned string get_username ();
 		[NoAccessorMethod]
 		public string number { owned get; set; }
@@ -1031,37 +779,22 @@ namespace NM {
 		public const string ZONE_TRUSTED;
 		[CCode (cheader_filename = "nm-setting-connection.h", cname = "NM_SETTING_CONNECTION_ZONE_WORK")]
 		public const string ZONE_WORK;
-		[CCode (cname = "nm_setting_connection_new", has_construct_function = false, type = "NMSetting*")]
+		[CCode (has_construct_function = false, type = "NMSetting*")]
 		public SettingConnection ();
-		[CCode (cname = "nm_setting_connection_add_permission")]
 		public bool add_permission (string ptype, string pitem, string? detail);
-		[CCode (cname = "nm_setting_connection_get_autoconnect")]
 		public bool get_autoconnect ();
-		[CCode (cname = "nm_setting_connection_get_connection_type")]
 		public unowned string get_connection_type ();
-		[CCode (cname = "nm_setting_connection_get_id")]
 		public unowned string get_id ();
-		[CCode (cname = "nm_setting_connection_get_master")]
 		public unowned string get_master ();
-		[CCode (cname = "nm_setting_connection_get_num_permissions")]
 		public uint32 get_num_permissions ();
-		[CCode (cname = "nm_setting_connection_get_permission")]
 		public bool get_permission (uint32 idx, string out_ptype, string out_pitem, string out_detail);
-		[CCode (cname = "nm_setting_connection_get_read_only")]
 		public bool get_read_only ();
-		[CCode (cname = "nm_setting_connection_get_slave_type")]
 		public unowned string get_slave_type ();
-		[CCode (cname = "nm_setting_connection_get_timestamp")]
 		public uint64 get_timestamp ();
-		[CCode (cname = "nm_setting_connection_get_uuid")]
 		public unowned string get_uuid ();
-		[CCode (cname = "nm_setting_connection_get_zone")]
 		public unowned string get_zone ();
-		[CCode (cname = "nm_setting_connection_is_slave_type")]
 		public bool is_slave_type (string type);
-		[CCode (cname = "nm_setting_connection_permissions_user_allowed")]
 		public bool permissions_user_allowed (string uname);
-		[CCode (cname = "nm_setting_connection_remove_permission")]
 		public void remove_permission (uint32 idx);
 		[NoAccessorMethod]
 		public bool autoconnect { get; set construct; }
@@ -1108,29 +841,18 @@ namespace NM {
 		public const string SETTING_NAME;
 		[CCode (cheader_filename = "nm-setting-gsm.h", cname = "NM_SETTING_GSM_USERNAME")]
 		public const string USERNAME;
-		[CCode (cname = "nm_setting_gsm_new", has_construct_function = false, type = "NMSetting*")]
+		[CCode (has_construct_function = false, type = "NMSetting*")]
 		public SettingGsm ();
-		[CCode (cname = "nm_setting_gsm_get_allowed_bands")]
 		public uint32 get_allowed_bands ();
-		[CCode (cname = "nm_setting_gsm_get_apn")]
 		public unowned string get_apn ();
-		[CCode (cname = "nm_setting_gsm_get_home_only")]
 		public bool get_home_only ();
-		[CCode (cname = "nm_setting_gsm_get_network_id")]
 		public unowned string get_network_id ();
-		[CCode (cname = "nm_setting_gsm_get_network_type")]
 		public int get_network_type ();
-		[CCode (cname = "nm_setting_gsm_get_number")]
 		public unowned string get_number ();
-		[CCode (cname = "nm_setting_gsm_get_password")]
 		public unowned string get_password ();
-		[CCode (cname = "nm_setting_gsm_get_password_flags")]
 		public NM.SettingSecretFlags get_password_flags ();
-		[CCode (cname = "nm_setting_gsm_get_pin")]
 		public unowned string get_pin ();
-		[CCode (cname = "nm_setting_gsm_get_pin_flags")]
 		public NM.SettingSecretFlags get_pin_flags ();
-		[CCode (cname = "nm_setting_gsm_get_username")]
 		public unowned string get_username ();
 		[NoAccessorMethod]
 		public uint allowed_bands { get; set construct; }
@@ -1157,63 +879,35 @@ namespace NM {
 	}
 	[CCode (cheader_filename = "nm-setting-ip4-config.h", type_id = "nm_setting_ip4_config_get_type ()")]
 	public class SettingIP4Config : NM.Setting {
-		[CCode (cname = "nm_setting_ip4_config_new", has_construct_function = false, type = "NMSetting*")]
+		[CCode (has_construct_function = false, type = "NMSetting*")]
 		public SettingIP4Config ();
-		[CCode (cname = "nm_setting_ip4_config_add_address")]
 		public bool add_address (NM.IP4Address address);
-		[CCode (cname = "nm_setting_ip4_config_add_dns")]
 		public bool add_dns (uint32 dns);
-		[CCode (cname = "nm_setting_ip4_config_add_dns_search")]
 		public bool add_dns_search (string dns_search);
-		[CCode (cname = "nm_setting_ip4_config_add_route")]
 		public bool add_route (NM.IP4Route route);
-		[CCode (cname = "nm_setting_ip4_config_clear_addresses")]
 		public void clear_addresses ();
-		[CCode (cname = "nm_setting_ip4_config_clear_dns")]
 		public void clear_dns ();
-		[CCode (cname = "nm_setting_ip4_config_clear_dns_searches")]
 		public void clear_dns_searches ();
-		[CCode (cname = "nm_setting_ip4_config_clear_routes")]
 		public void clear_routes ();
-		[CCode (cname = "nm_setting_ip4_config_get_address")]
 		public NM.IP4Address get_address (uint32 i);
-		[CCode (cname = "nm_setting_ip4_config_get_dhcp_client_id")]
 		public unowned string get_dhcp_client_id ();
-		[CCode (cname = "nm_setting_ip4_config_get_dhcp_hostname")]
 		public unowned string get_dhcp_hostname ();
-		[CCode (cname = "nm_setting_ip4_config_get_dhcp_send_hostname")]
 		public bool get_dhcp_send_hostname ();
-		[CCode (cname = "nm_setting_ip4_config_get_dns")]
 		public uint32 get_dns (uint32 i);
-		[CCode (cname = "nm_setting_ip4_config_get_dns_search")]
 		public unowned string get_dns_search (uint32 i);
-		[CCode (cname = "nm_setting_ip4_config_get_ignore_auto_dns")]
 		public bool get_ignore_auto_dns ();
-		[CCode (cname = "nm_setting_ip4_config_get_ignore_auto_routes")]
 		public bool get_ignore_auto_routes ();
-		[CCode (cname = "nm_setting_ip4_config_get_may_fail")]
 		public bool get_may_fail ();
-		[CCode (cname = "nm_setting_ip4_config_get_method")]
 		public unowned string get_method ();
-		[CCode (cname = "nm_setting_ip4_config_get_never_default")]
 		public bool get_never_default ();
-		[CCode (cname = "nm_setting_ip4_config_get_num_addresses")]
 		public uint32 get_num_addresses ();
-		[CCode (cname = "nm_setting_ip4_config_get_num_dns")]
 		public uint32 get_num_dns ();
-		[CCode (cname = "nm_setting_ip4_config_get_num_dns_searches")]
 		public uint32 get_num_dns_searches ();
-		[CCode (cname = "nm_setting_ip4_config_get_num_routes")]
 		public uint32 get_num_routes ();
-		[CCode (cname = "nm_setting_ip4_config_get_route")]
 		public NM.IP4Route get_route (uint32 i);
-		[CCode (cname = "nm_setting_ip4_config_remove_address")]
 		public void remove_address (uint32 i);
-		[CCode (cname = "nm_setting_ip4_config_remove_dns")]
 		public void remove_dns (uint32 i);
-		[CCode (cname = "nm_setting_ip4_config_remove_dns_search")]
 		public void remove_dns_search (uint32 i);
-		[CCode (cname = "nm_setting_ip4_config_remove_route")]
 		public void remove_route (uint32 i);
 		[NoAccessorMethod]
 		public string dhcp_client_id { owned get; set; }
@@ -1234,59 +928,33 @@ namespace NM {
 	}
 	[CCode (cheader_filename = "nm-setting-ip6-config.h", type_id = "nm_setting_ip6_config_get_type ()")]
 	public class SettingIP6Config : NM.Setting {
-		[CCode (cname = "nm_setting_ip6_config_new", has_construct_function = false, type = "NMSetting*")]
+		[CCode (has_construct_function = false, type = "NMSetting*")]
 		public SettingIP6Config ();
-		[CCode (cname = "nm_setting_ip6_config_add_address")]
 		public bool add_address (NM.IP6Address address);
-		[CCode (cname = "nm_setting_ip6_config_add_dns")]
 		public bool add_dns (void* dns);
-		[CCode (cname = "nm_setting_ip6_config_add_dns_search")]
 		public bool add_dns_search (string dns_search);
-		[CCode (cname = "nm_setting_ip6_config_add_route")]
 		public bool add_route (NM.IP6Route route);
-		[CCode (cname = "nm_setting_ip6_config_clear_addresses")]
 		public void clear_addresses ();
-		[CCode (cname = "nm_setting_ip6_config_clear_dns")]
 		public void clear_dns ();
-		[CCode (cname = "nm_setting_ip6_config_clear_dns_searches")]
 		public void clear_dns_searches ();
-		[CCode (cname = "nm_setting_ip6_config_clear_routes")]
 		public void clear_routes ();
-		[CCode (cname = "nm_setting_ip6_config_get_address")]
 		public NM.IP6Address get_address (uint32 i);
-		[CCode (cname = "nm_setting_ip6_config_get_dns")]
 		public void* get_dns (uint32 i);
-		[CCode (cname = "nm_setting_ip6_config_get_dns_search")]
 		public unowned string get_dns_search (uint32 i);
-		[CCode (cname = "nm_setting_ip6_config_get_ignore_auto_dns")]
 		public bool get_ignore_auto_dns ();
-		[CCode (cname = "nm_setting_ip6_config_get_ignore_auto_routes")]
 		public bool get_ignore_auto_routes ();
-		[CCode (cname = "nm_setting_ip6_config_get_ip6_privacy")]
 		public NM.SettingIP6ConfigPrivacy get_ip6_privacy ();
-		[CCode (cname = "nm_setting_ip6_config_get_may_fail")]
 		public bool get_may_fail ();
-		[CCode (cname = "nm_setting_ip6_config_get_method")]
 		public unowned string get_method ();
-		[CCode (cname = "nm_setting_ip6_config_get_never_default")]
 		public bool get_never_default ();
-		[CCode (cname = "nm_setting_ip6_config_get_num_addresses")]
 		public uint32 get_num_addresses ();
-		[CCode (cname = "nm_setting_ip6_config_get_num_dns")]
 		public uint32 get_num_dns ();
-		[CCode (cname = "nm_setting_ip6_config_get_num_dns_searches")]
 		public uint32 get_num_dns_searches ();
-		[CCode (cname = "nm_setting_ip6_config_get_num_routes")]
 		public uint32 get_num_routes ();
-		[CCode (cname = "nm_setting_ip6_config_get_route")]
 		public NM.IP6Route get_route (uint32 i);
-		[CCode (cname = "nm_setting_ip6_config_remove_address")]
 		public void remove_address (uint32 i);
-		[CCode (cname = "nm_setting_ip6_config_remove_dns")]
 		public void remove_dns (uint32 i);
-		[CCode (cname = "nm_setting_ip6_config_remove_dns_search")]
 		public void remove_dns_search (uint32 i);
-		[CCode (cname = "nm_setting_ip6_config_remove_route")]
 		public void remove_route (uint32 i);
 		[NoAccessorMethod]
 		public bool ignore_auto_dns { get; set construct; }
@@ -1311,13 +979,10 @@ namespace NM {
 		public const string SETTING_NAME;
 		[CCode (cheader_filename = "nm-setting-infiniband.h", cname = "NM_SETTING_INFINIBAND_TRANSPORT_MODE")]
 		public const string TRANSPORT_MODE;
-		[CCode (cname = "nm_setting_infiniband_new", has_construct_function = false, type = "NMSetting*")]
+		[CCode (has_construct_function = false, type = "NMSetting*")]
 		public SettingInfiniband ();
-		[CCode (cname = "nm_setting_infiniband_get_mac_address")]
 		public unowned GLib.ByteArray get_mac_address ();
-		[CCode (cname = "nm_setting_infiniband_get_mtu")]
 		public uint32 get_mtu ();
-		[CCode (cname = "nm_setting_infiniband_get_transport_mode")]
 		public unowned string get_transport_mode ();
 		[NoAccessorMethod]
 		public uint mtu { get; set construct; }
@@ -1326,13 +991,10 @@ namespace NM {
 	}
 	[CCode (cheader_filename = "nm-setting-olpc-mesh.h", type_id = "nm_setting_olpc_mesh_get_type ()")]
 	public class SettingOlpcMesh : NM.Setting {
-		[CCode (cname = "nm_setting_olpc_mesh_new", has_construct_function = false, type = "NMSetting*")]
+		[CCode (has_construct_function = false, type = "NMSetting*")]
 		public SettingOlpcMesh ();
-		[CCode (cname = "nm_setting_olpc_mesh_get_channel")]
 		public uint32 get_channel ();
-		[CCode (cname = "nm_setting_olpc_mesh_get_dhcp_anycast_address")]
 		public unowned GLib.ByteArray get_dhcp_anycast_address ();
-		[CCode (cname = "nm_setting_olpc_mesh_get_ssid")]
 		public unowned GLib.ByteArray get_ssid ();
 		[NoAccessorMethod]
 		public uint channel { get; set construct; }
@@ -1377,43 +1039,25 @@ namespace NM {
 		public const string REQUIRE_MPPE_128;
 		[CCode (cheader_filename = "nm-setting-ppp.h", cname = "NM_SETTING_PPP_SETTING_NAME")]
 		public const string SETTING_NAME;
-		[CCode (cname = "nm_setting_ppp_new", has_construct_function = false, type = "NMSetting*")]
+		[CCode (has_construct_function = false, type = "NMSetting*")]
 		public SettingPPP ();
-		[CCode (cname = "nm_setting_ppp_get_baud")]
 		public uint32 get_baud ();
-		[CCode (cname = "nm_setting_ppp_get_crtscts")]
 		public bool get_crtscts ();
-		[CCode (cname = "nm_setting_ppp_get_lcp_echo_failure")]
 		public uint32 get_lcp_echo_failure ();
-		[CCode (cname = "nm_setting_ppp_get_lcp_echo_interval")]
 		public uint32 get_lcp_echo_interval ();
-		[CCode (cname = "nm_setting_ppp_get_mppe_stateful")]
 		public bool get_mppe_stateful ();
-		[CCode (cname = "nm_setting_ppp_get_mru")]
 		public uint32 get_mru ();
-		[CCode (cname = "nm_setting_ppp_get_mtu")]
 		public uint32 get_mtu ();
-		[CCode (cname = "nm_setting_ppp_get_no_vj_comp")]
 		public bool get_no_vj_comp ();
-		[CCode (cname = "nm_setting_ppp_get_noauth")]
 		public bool get_noauth ();
-		[CCode (cname = "nm_setting_ppp_get_nobsdcomp")]
 		public bool get_nobsdcomp ();
-		[CCode (cname = "nm_setting_ppp_get_nodeflate")]
 		public bool get_nodeflate ();
-		[CCode (cname = "nm_setting_ppp_get_refuse_chap")]
 		public bool get_refuse_chap ();
-		[CCode (cname = "nm_setting_ppp_get_refuse_eap")]
 		public bool get_refuse_eap ();
-		[CCode (cname = "nm_setting_ppp_get_refuse_mschap")]
 		public bool get_refuse_mschap ();
-		[CCode (cname = "nm_setting_ppp_get_refuse_mschapv2")]
 		public bool get_refuse_mschapv2 ();
-		[CCode (cname = "nm_setting_ppp_get_refuse_pap")]
 		public bool get_refuse_pap ();
-		[CCode (cname = "nm_setting_ppp_get_require_mppe")]
 		public bool get_require_mppe ();
-		[CCode (cname = "nm_setting_ppp_get_require_mppe_128")]
 		public bool get_require_mppe_128 ();
 		[NoAccessorMethod]
 		public uint baud { get; set construct; }
@@ -1464,15 +1108,11 @@ namespace NM {
 		public const string SETTING_NAME;
 		[CCode (cheader_filename = "nm-setting-pppoe.h", cname = "NM_SETTING_PPPOE_USERNAME")]
 		public const string USERNAME;
-		[CCode (cname = "nm_setting_pppoe_new", has_construct_function = false, type = "NMSetting*")]
+		[CCode (has_construct_function = false, type = "NMSetting*")]
 		public SettingPPPOE ();
-		[CCode (cname = "nm_setting_pppoe_get_password")]
 		public unowned string get_password ();
-		[CCode (cname = "nm_setting_pppoe_get_password_flags")]
 		public NM.SettingSecretFlags get_password_flags ();
-		[CCode (cname = "nm_setting_pppoe_get_service")]
 		public unowned string get_service ();
-		[CCode (cname = "nm_setting_pppoe_get_username")]
 		public unowned string get_username ();
 		[NoAccessorMethod]
 		public string password { owned get; set; }
@@ -1497,17 +1137,12 @@ namespace NM {
 		public const string SETTING_NAME;
 		[CCode (cheader_filename = "nm-setting-serial.h", cname = "NM_SETTING_SERIAL_STOPBITS")]
 		public const string STOPBITS;
-		[CCode (cname = "nm_setting_serial_new", has_construct_function = false, type = "NMSetting*")]
+		[CCode (has_construct_function = false, type = "NMSetting*")]
 		public SettingSerial ();
-		[CCode (cname = "nm_setting_serial_get_baud")]
 		public uint get_baud ();
-		[CCode (cname = "nm_setting_serial_get_bits")]
 		public uint get_bits ();
-		[CCode (cname = "nm_setting_serial_get_parity")]
 		public char get_parity ();
-		[CCode (cname = "nm_setting_serial_get_send_delay")]
 		public uint64 get_send_delay ();
-		[CCode (cname = "nm_setting_serial_get_stopbits")]
 		public uint get_stopbits ();
 		[NoAccessorMethod]
 		public uint baud { get; set construct; }
@@ -1522,31 +1157,19 @@ namespace NM {
 	}
 	[CCode (cheader_filename = "nm-setting-vpn.h", type_id = "nm_setting_vpn_get_type ()")]
 	public class SettingVPN : NM.Setting {
-		[CCode (cname = "nm_setting_vpn_new", has_construct_function = false, type = "NMSetting*")]
+		[CCode (has_construct_function = false, type = "NMSetting*")]
 		public SettingVPN ();
-		[CCode (cname = "nm_setting_vpn_add_data_item")]
 		public void add_data_item (string key, string item);
-		[CCode (cname = "nm_setting_vpn_add_secret")]
 		public void add_secret (string key, string secret);
-		[CCode (cname = "nm_setting_vpn_foreach_data_item")]
 		public void foreach_data_item (NM.VPNIterFunc func);
-		[CCode (cname = "nm_setting_vpn_foreach_secret")]
 		public void foreach_secret (NM.VPNIterFunc func);
-		[CCode (cname = "nm_setting_vpn_get_data_item")]
 		public unowned string get_data_item (string key);
-		[CCode (cname = "nm_setting_vpn_get_num_data_items")]
 		public uint32 get_num_data_items ();
-		[CCode (cname = "nm_setting_vpn_get_num_secrets")]
 		public uint32 get_num_secrets ();
-		[CCode (cname = "nm_setting_vpn_get_secret")]
 		public unowned string get_secret (string key);
-		[CCode (cname = "nm_setting_vpn_get_service_type")]
 		public unowned string get_service_type ();
-		[CCode (cname = "nm_setting_vpn_get_user_name")]
 		public unowned string get_user_name ();
-		[CCode (cname = "nm_setting_vpn_remove_data_item")]
 		public void remove_data_item (string key);
-		[CCode (cname = "nm_setting_vpn_remove_secret")]
 		public void remove_secret (string key);
 		[NoAccessorMethod]
 		public string service_type { owned get; set; }
@@ -1569,27 +1192,17 @@ namespace NM {
 		public const string PARENT;
 		[CCode (cheader_filename = "nm-setting-vlan.h", cname = "NM_SETTING_VLAN_SETTING_NAME")]
 		public const string SETTING_NAME;
-		[CCode (cname = "nm_setting_vlan_new", has_construct_function = false, type = "NMSetting*")]
+		[CCode (has_construct_function = false, type = "NMSetting*")]
 		public SettingVlan ();
-		[CCode (cname = "nm_setting_vlan_add_priority")]
 		public bool add_priority (NM.VlanPriorityMap map, uint32 from, uint32 to);
-		[CCode (cname = "nm_setting_vlan_add_priority_str")]
 		public bool add_priority_str (NM.VlanPriorityMap map, string str);
-		[CCode (cname = "nm_setting_vlan_clear_priorities")]
 		public void clear_priorities (NM.VlanPriorityMap map);
-		[CCode (cname = "nm_setting_vlan_get_flags")]
 		public uint32 get_flags ();
-		[CCode (cname = "nm_setting_vlan_get_id")]
 		public uint32 get_id ();
-		[CCode (cname = "nm_setting_vlan_get_interface_name")]
 		public unowned string get_interface_name ();
-		[CCode (cname = "nm_setting_vlan_get_num_priorities")]
 		public int32 get_num_priorities (NM.VlanPriorityMap map);
-		[CCode (cname = "nm_setting_vlan_get_parent")]
 		public unowned string get_parent ();
-		[CCode (cname = "nm_setting_vlan_get_priority")]
 		public bool get_priority (NM.VlanPriorityMap map, uint32 idx, out uint32 out_from, out uint32 out_to);
-		[CCode (cname = "nm_setting_vlan_remove_priority")]
 		public void remove_priority (NM.VlanPriorityMap map, uint32 idx);
 		[NoAccessorMethod]
 		public uint flags { get; set construct; }
@@ -1608,11 +1221,9 @@ namespace NM {
 		public const string NETWORK_NAME;
 		[CCode (cheader_filename = "nm-setting-wimax.h", cname = "NM_SETTING_WIMAX_SETTING_NAME")]
 		public const string SETTING_NAME;
-		[CCode (cname = "nm_setting_wimax_new", has_construct_function = false, type = "NMSetting*")]
+		[CCode (has_construct_function = false, type = "NMSetting*")]
 		public SettingWimax ();
-		[CCode (cname = "nm_setting_wimax_get_mac_address")]
 		public unowned GLib.ByteArray get_mac_address ();
-		[CCode (cname = "nm_setting_wimax_get_network_name")]
 		public unowned string get_network_name ();
 		[NoAccessorMethod]
 		public string network_name { owned get; set; }
@@ -1643,37 +1254,22 @@ namespace NM {
 		public const string SETTING_NAME;
 		[CCode (cheader_filename = "nm-setting-wired.h", cname = "NM_SETTING_WIRED_SPEED")]
 		public const string SPEED;
-		[CCode (cname = "nm_setting_wired_new", has_construct_function = false, type = "NMSetting*")]
+		[CCode (has_construct_function = false, type = "NMSetting*")]
 		public SettingWired ();
-		[CCode (cname = "nm_setting_wired_add_s390_option")]
 		public bool add_s390_option (string key, string item);
-		[CCode (cname = "nm_setting_wired_get_auto_negotiate")]
 		public bool get_auto_negotiate ();
-		[CCode (cname = "nm_setting_wired_get_cloned_mac_address")]
 		public unowned GLib.ByteArray get_cloned_mac_address ();
-		[CCode (cname = "nm_setting_wired_get_duplex")]
 		public unowned string get_duplex ();
-		[CCode (cname = "nm_setting_wired_get_mac_address")]
 		public unowned GLib.ByteArray get_mac_address ();
-		[CCode (cname = "nm_setting_wired_get_mac_address_blacklist")]
 		public unowned GLib.SList<GLib.ByteArray> get_mac_address_blacklist ();
-		[CCode (cname = "nm_setting_wired_get_mtu")]
 		public uint32 get_mtu ();
-		[CCode (cname = "nm_setting_wired_get_num_s390_options")]
 		public uint32 get_num_s390_options ();
-		[CCode (cname = "nm_setting_wired_get_port")]
 		public unowned string get_port ();
-		[CCode (cname = "nm_setting_wired_get_s390_nettype")]
 		public unowned string get_s390_nettype ();
-		[CCode (cname = "nm_setting_wired_get_s390_option")]
 		public bool get_s390_option (uint32 idx, out string out_key, out string out_value);
-		[CCode (cname = "nm_setting_wired_get_s390_option_by_key")]
 		public unowned string get_s390_option_by_key (string key);
-		[CCode (cname = "nm_setting_wired_get_s390_subchannels")]
 		public unowned GLib.GenericArray<string> get_s390_subchannels ();
-		[CCode (cname = "nm_setting_wired_get_speed")]
 		public uint32 get_speed ();
-		[CCode (cname = "nm_setting_wired_remove_s390_option")]
 		public bool remove_s390_option (string key);
 		[NoAccessorMethod]
 		public bool auto_negotiate { get; set construct; }
@@ -1724,41 +1320,24 @@ namespace NM {
 		public const string SSID;
 		[CCode (cheader_filename = "nm-setting-wireless.h", cname = "NM_SETTING_WIRELESS_TX_POWER")]
 		public const string TX_POWER;
-		[CCode (cname = "nm_setting_wireless_new", has_construct_function = false, type = "NMSetting*")]
+		[CCode (has_construct_function = false, type = "NMSetting*")]
 		public SettingWireless ();
-		[CCode (cname = "nm_setting_wireless_add_seen_bssid")]
 		public bool add_seen_bssid (string bssid);
-		[CCode (cname = "nm_setting_wireless_ap_security_compatible")]
 		public bool ap_security_compatible (NM.SettingWirelessSecurity s_wireless_sec, NM.80211ApFlags ap_flags, NM.80211ApSecurityFlags ap_wpa, NM.80211ApSecurityFlags ap_rsn, NM.80211Mode ap_mode);
-		[CCode (cname = "nm_setting_wireless_get_band")]
 		public unowned string get_band ();
-		[CCode (cname = "nm_setting_wireless_get_bssid")]
 		public unowned GLib.ByteArray get_bssid ();
-		[CCode (cname = "nm_setting_wireless_get_channel")]
 		public uint32 get_channel ();
-		[CCode (cname = "nm_setting_wireless_get_cloned_mac_address")]
 		public unowned GLib.ByteArray get_cloned_mac_address ();
-		[CCode (cname = "nm_setting_wireless_get_hidden")]
 		public bool get_hidden ();
-		[CCode (cname = "nm_setting_wireless_get_mac_address")]
 		public unowned GLib.ByteArray get_mac_address ();
-		[CCode (cname = "nm_setting_wireless_get_mac_address_blacklist")]
 		public unowned GLib.SList<GLib.ByteArray> get_mac_address_blacklist ();
-		[CCode (cname = "nm_setting_wireless_get_mode")]
 		public unowned string get_mode ();
-		[CCode (cname = "nm_setting_wireless_get_mtu")]
 		public uint32 get_mtu ();
-		[CCode (cname = "nm_setting_wireless_get_num_seen_bssids")]
 		public uint32 get_num_seen_bssids ();
-		[CCode (cname = "nm_setting_wireless_get_rate")]
 		public uint32 get_rate ();
-		[CCode (cname = "nm_setting_wireless_get_security")]
 		public unowned string get_security ();
-		[CCode (cname = "nm_setting_wireless_get_seen_bssid")]
 		public unowned string get_seen_bssid (uint32 i);
-		[CCode (cname = "nm_setting_wireless_get_ssid")]
 		public unowned GLib.ByteArray get_ssid ();
-		[CCode (cname = "nm_setting_wireless_get_tx_power")]
 		public uint32 get_tx_power ();
 		[NoAccessorMethod]
 		public string band { owned get; set; }
@@ -1815,61 +1394,34 @@ namespace NM {
 		public const string WEP_KEY_TYPE;
 		[CCode (cheader_filename = "nm-setting-wireless-security.h", cname = "NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX")]
 		public const string WEP_TX_KEYIDX;
-		[CCode (cname = "nm_setting_wireless_security_new", has_construct_function = false, type = "NMSetting*")]
+		[CCode (has_construct_function = false, type = "NMSetting*")]
 		public SettingWirelessSecurity ();
-		[CCode (cname = "nm_setting_wireless_security_add_group")]
 		public bool add_group (string group);
-		[CCode (cname = "nm_setting_wireless_security_add_pairwise")]
 		public bool add_pairwise (string pairwise);
-		[CCode (cname = "nm_setting_wireless_security_add_proto")]
 		public bool add_proto (string proto);
-		[CCode (cname = "nm_setting_wireless_security_clear_groups")]
 		public void clear_groups ();
-		[CCode (cname = "nm_setting_wireless_security_clear_pairwise")]
 		public void clear_pairwise ();
-		[CCode (cname = "nm_setting_wireless_security_clear_protos")]
 		public void clear_protos ();
-		[CCode (cname = "nm_setting_wireless_security_get_auth_alg")]
 		public unowned string get_auth_alg ();
-		[CCode (cname = "nm_setting_wireless_security_get_group")]
 		public unowned string get_group (uint32 i);
-		[CCode (cname = "nm_setting_wireless_security_get_key_mgmt")]
 		public unowned string get_key_mgmt ();
-		[CCode (cname = "nm_setting_wireless_security_get_leap_password")]
 		public unowned string get_leap_password ();
-		[CCode (cname = "nm_setting_wireless_security_get_leap_password_flags")]
 		public NM.SettingSecretFlags get_leap_password_flags ();
-		[CCode (cname = "nm_setting_wireless_security_get_leap_username")]
 		public unowned string get_leap_username ();
-		[CCode (cname = "nm_setting_wireless_security_get_num_groups")]
 		public uint32 get_num_groups ();
-		[CCode (cname = "nm_setting_wireless_security_get_num_pairwise")]
 		public uint32 get_num_pairwise ();
-		[CCode (cname = "nm_setting_wireless_security_get_num_protos")]
 		public uint32 get_num_protos ();
-		[CCode (cname = "nm_setting_wireless_security_get_pairwise")]
 		public unowned string get_pairwise (uint32 i);
-		[CCode (cname = "nm_setting_wireless_security_get_proto")]
 		public unowned string get_proto (uint32 i);
-		[CCode (cname = "nm_setting_wireless_security_get_psk")]
 		public unowned string get_psk ();
-		[CCode (cname = "nm_setting_wireless_security_get_psk_flags")]
 		public NM.SettingSecretFlags get_psk_flags ();
-		[CCode (cname = "nm_setting_wireless_security_get_wep_key")]
 		public unowned string get_wep_key (uint32 idx);
-		[CCode (cname = "nm_setting_wireless_security_get_wep_key_flags")]
 		public NM.SettingSecretFlags get_wep_key_flags ();
-		[CCode (cname = "nm_setting_wireless_security_get_wep_key_type")]
 		public NM.WepKeyType get_wep_key_type ();
-		[CCode (cname = "nm_setting_wireless_security_get_wep_tx_keyidx")]
 		public uint32 get_wep_tx_keyidx ();
-		[CCode (cname = "nm_setting_wireless_security_remove_group")]
 		public void remove_group (uint32 i);
-		[CCode (cname = "nm_setting_wireless_security_remove_pairwise")]
 		public void remove_pairwise (uint32 i);
-		[CCode (cname = "nm_setting_wireless_security_remove_proto")]
 		public void remove_proto (uint32 i);
-		[CCode (cname = "nm_setting_wireless_security_set_wep_key")]
 		public void set_wep_key (uint32 idx, string key);
 		[NoAccessorMethod]
 		public string auth_alg { owned get; set; }
@@ -2447,6 +1999,68 @@ namespace NM {
 	public delegate void VPNIterFunc (string key, string value);
 	[CCode (cheader_filename = "nm-connection.h", cname = "NM_CONNECTION_PATH")]
 	public const string CONNECTION_PATH;
+	[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_IFACE_SETTINGS")]
+	public const string DBUS_IFACE_SETTINGS;
+	[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_IFACE_SETTINGS_CONNECTION")]
+	public const string DBUS_IFACE_SETTINGS_CONNECTION;
+	[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_IFACE_SETTINGS_CONNECTION_SECRETS")]
+	public const string DBUS_IFACE_SETTINGS_CONNECTION_SECRETS;
+	[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_INTERFACE")]
+	public const string DBUS_INTERFACE;
+	[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_INTERFACE_VPN")]
+	public const string DBUS_INTERFACE_VPN;
+	[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_INTERFACE_VPN_CONNECTION")]
+	public const string DBUS_INTERFACE_VPN_CONNECTION;
+	[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_INVALID_VPN_CONNECTION")]
+	public const string DBUS_INVALID_VPN_CONNECTION;
+	[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_NO_ACTIVE_VPN_CONNECTION")]
+	public const string DBUS_NO_ACTIVE_VPN_CONNECTION;
+	[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_NO_VPN_CONNECTIONS")]
+	public const string DBUS_NO_VPN_CONNECTIONS;
+	[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_PATH")]
+	public const string DBUS_PATH;
+	[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_PATH_AGENT_MANAGER")]
+	public const string DBUS_PATH_AGENT_MANAGER;
+	[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_PATH_SECRET_AGENT")]
+	public const string DBUS_PATH_SECRET_AGENT;
+	[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_PATH_SETTINGS")]
+	public const string DBUS_PATH_SETTINGS;
+	[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_PATH_SETTINGS_CONNECTION")]
+	public const string DBUS_PATH_SETTINGS_CONNECTION;
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_PATH_VPN")]
+	public const string DBUS_PATH_VPN;
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_PATH_VPN_CONNECTION")]
+	public const string DBUS_PATH_VPN_CONNECTION;
+	[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_SERVICE")]
+	public const string DBUS_SERVICE;
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_ALREADY_STARTED")]
+	public const string DBUS_VPN_ALREADY_STARTED;
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_ALREADY_STOPPED")]
+	public const string DBUS_VPN_ALREADY_STOPPED;
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_BAD_ARGUMENTS")]
+	public const string DBUS_VPN_BAD_ARGUMENTS;
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_SIGNAL_CONNECT_FAILED")]
+	public const string DBUS_VPN_SIGNAL_CONNECT_FAILED;
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_SIGNAL_IP4_CONFIG")]
+	public const string DBUS_VPN_SIGNAL_IP4_CONFIG;
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD")]
+	public const string DBUS_VPN_SIGNAL_IP_CONFIG_BAD;
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED")]
+	public const string DBUS_VPN_SIGNAL_LAUNCH_FAILED;
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_SIGNAL_LOGIN_BANNER")]
+	public const string DBUS_VPN_SIGNAL_LOGIN_BANNER;
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_SIGNAL_LOGIN_FAILED")]
+	public const string DBUS_VPN_SIGNAL_LOGIN_FAILED;
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_SIGNAL_STATE_CHANGE")]
+	public const string DBUS_VPN_SIGNAL_STATE_CHANGE;
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD")]
+	public const string DBUS_VPN_SIGNAL_VPN_CONFIG_BAD;
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_STARTING_IN_PROGRESS")]
+	public const string DBUS_VPN_STARTING_IN_PROGRESS;
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_STOPPING_IN_PROGRESS")]
+	public const string DBUS_VPN_STOPPING_IN_PROGRESS;
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_WRONG_STATE")]
+	public const string DBUS_VPN_WRONG_STATE;
 	[CCode (cheader_filename = "nm-setting.h", cname = "NM_SETTING_NAME")]
 	public const string SETTING_NAME;
 }
diff --git a/vapi/metadata/NetworkManager-1.0.metadata b/vapi/metadata/NetworkManager-1.0.metadata
index 64f7767..925ceae 100644
--- a/vapi/metadata/NetworkManager-1.0.metadata
+++ b/vapi/metadata/NetworkManager-1.0.metadata
@@ -87,10 +87,15 @@ SettingValueIterFn             cheader_filename="nm-setting.h"
 VPNIterFunc                    cheader_filename="nm-setting-vpn.h"
 
 CONNECTION_PATH cheader_filename="nm-connection.h"
-DBUS_*                    parent="NM.DBus"     cheader_filename="NetworkManager.h"     name="DBUS_(.+)"
-DBUS_PATH_VPN             parent="NM.DBus"     cheader_filename="NetworkManagerVPN.h"  name="DBUS_(.+)"
-DBUS_PATH_VPN_CONNECTION  parent="NM.DBus"     cheader_filename="NetworkManagerVPN.h"  name="DBUS_(.+)"
-DBUS_VPN_*                parent="NM.DBus.VPN" cheader_filename="NetworkManagerVPN.h"  name="DBUS_VPN_(.+)"
+DBUS_*                    cheader_filename="NetworkManager.h"
+DBUS_PATH_VPN             cheader_filename="NetworkManagerVPN.h"
+DBUS_PATH_VPN_CONNECTION  cheader_filename="NetworkManagerVPN.h"
+DBUS_VPN_*                cheader_filename="NetworkManagerVPN.h"
+
+//DBUS_*                    parent="NM.DBus"     cheader_filename="NetworkManager.h"     name="DBUS_(.+)"
+//DBUS_PATH_VPN             parent="NM.DBus"     cheader_filename="NetworkManagerVPN.h"  name="DBUS_(.+)"
+//DBUS_PATH_VPN_CONNECTION  parent="NM.DBus"     cheader_filename="NetworkManagerVPN.h"  name="DBUS_(.+)"
+//DBUS_VPN_*                parent="NM.DBus.VPN" cheader_filename="NetworkManagerVPN.h"  name="DBUS_VPN_(.+)"
 
 SETTING_NAME         cheader_filename="nm-setting.h"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]