all: goodbye libnm-glib

This removes libnm-glib, libnm-glib-vpn, and libnm-util for good.
The it has been replaced with libnm since NetworkManager 1.0, disabled
by default since 1.12 and no up-to-date distributions ship it for years
now.

Removing the libraries allows us to:

* Remove the horrible hacks that were in place to deal with accidental use
  of both the new and old library in a single process.
* Relief the translators of maintenance burden of similar yet different
  strings.
* Get rid of known bad code without chances of ever getting fixed
  (libnm-glib/nm-object.c and libnm-glib/nm-object-cache.c)
* Generally lower the footprint of the releases and our workspace

If there are some really really legacy users; they can just build
libnm-glib and friends from the NetworkManager-1.16 distribution. The
D-Bus API is stable and old libnm-glib will keep working forever.

https://github.com/NetworkManager/NetworkManager/pull/308

5 files changed, 0 insertions, 312 deletions

diff --git a/vapi/NMClient-1.0.metadata b/vapi/NMClient-1.0.metadata
deleted file mode 100644
index b8a022f6b7..0000000000
--- a/vapi/NMClient-1.0.metadata
+++ /dev/null
@@ -1,121 +0,0 @@
-RemoteSettings.new_finish symbol_type="function"
-RemoteConnection.updated#virtual_method skip
-Client.new_finish symbol_type="function"
-
-ACTIVE_CONNECTION_* cheader_filename="nm-active-connection.h" name="ACTIVE_CONNECTION_(.+)" parent="NM.ActiveConnection"
-CLIENT_*            cheader_filename="nm-client.h"            name="CLIENT_(.+)"       parent="NM.Client"
-ACCESS_POINT_*      cheader_filename="nm-access-point.h"      name="ACCESS_POINT_(.+)" parent="NM.AccessPoint"
-
-DEVICE_*          cheader_filename="nm-device.h"          name="DEVICE_(.+)"       parent="NM.Device"
-DEVICE_ADSL_*     cheader_filename="nm-device-adsl.h"     name="DEVICE_ADSL_(.+)"       parent="NM.DeviceAdsl"
-DEVICE_BOND_*     cheader_filename="nm-device-bond.h"     name="DEVICE_BOND_(.+)"       parent="NM.DeviceBond"
-DEVICE_BRIDGE_*   cheader_filename="nm-device-bridge.h"   name="DEVICE_BRIDGE_(.+)"     parent="NM.DeviceBridge"
-DEVICE_BT_*       cheader_filename="nm-device-bt.h"       name="DEVICE_BT_(.+)"       parent="NM.DeviceBt"
-DEVICE_ETHERNET_* cheader_filename="nm-device-ethernet.h" name="DEVICE_ETHERNET_(.+)" parent="NM.DeviceEthernet"
-DEVICE_GENERIC_*  cheader_filename="nm-device-generic.h"  name="DEVICE_GENERIC_(.+)"  parent="NM.DeviceGeneric"
-
-DEVICE_INFINIBAND_* cheader_filename="nm-device-infiniband.h" name="DEVICE_INFINIBAND_(.+)" parent="NM.DeviceInfiniband"
-DEVICE_MODEM_* cheader_filename="nm-device-modem.h"           name="DEVICE_MODEM_(.+)"      parent="NM.DeviceModem"
-DEVICE_OLPC_MESH_* cheader_filename="nm-device-olpc-mesh.h"        name="DEVICE_OLPC_(.+)"       parent="NM.DeviceOlpcMesh"
-
-DEVICE_TEAM_* cheader_filename="nm-device-team.h"             name="DEVICE_TEAM_(.+)"  parent="NM.DeviceTeam"
-DEVICE_VLAN_* cheader_filename="nm-device-vlan.h"             name="DEVICE_VLAN_(.+)"  parent="NM.DeviceVlan"
-DEVICE_WIFI_* cheader_filename="nm-device-wifi.h"             name="DEVICE_WIFI_(.+)"  parent="NM.DeviceWifi"
-DEVICE_WIMAX_* cheader_filename="nm-device-wimax.h"           name="DEVICE_WIMAX_(.+)" parent="NM.DeviceWimax"
-DHCP4_CONFIG_OPTIONS cheader_filename="nm-dhcp4-config.h"     name="DHCP4_CONFIG_(.+)" parent="NM.DHCP4Config"
-DHCP6_CONFIG_OPTIONS cheader_filename="nm-dhcp6-config.h"     name="DHCP4_CONFIG_(.+)" parent="NM.DHCP6Config"
-IP4_CONFIG_* cheader_filename="nm-ip4-config.h"               name="IP4_CONFIG_(.+)"   parent="NM.IP4Config"
-IP6_CONFIG_* cheader_filename="nm-ip6-config.h"               name="IP6_CONFIG_(.+)"   parent="NM.IP6Config"
-OBJECT_* cheader_filename="nm-object.h"                       name="OBJECT_(.+)"       parent="NM.Object"
-REMOTE_CONNECTION_* cheader_filename="nm-remote-connection.h" name="REMOTE_CONNECTION_(.+)" parent="NM.RemoteConnection"
-REMOTE_SETTINGS_* cheader_filename="nm-remote-settings.h"     name="REMOTE_SETTINGS_(.+)"   parent="NM.RemoteSettings"
-SECRET_AGENT_* cheader_filename="nm-secret-agent.h"           name="SECRET_AGENT_(.+)"      parent="NM.SecretAgent"
-VPN_CONNECTION_* cheader_filename="nm-vpn-connection.h"       name="VPN_CONNECTION_(.+)"    parent="NM.VPNConnection"
-WIMAX_NSP_* cheader_filename="nm-wimax-nsp.h"                 name="WIMAX_NSP_(.+)"         parent="NM.WimaxNsp"
-
-AccessPoint cheader_filename="nm-access-point.h"
-ActiveConnection cheader_filename="nm-active-connection.h"
-Client cheader_filename="nm-client.h"
-DHCP4Config cheader_filename="nm-dhcp4-config.h"
-DHCP6Config cheader_filename="nm-dhcp6-config.h"
-Device cheader_filename="nm-device.h"
-DeviceAdsl cheader_filename="nm-device-adsl.h"
-DeviceBond cheader_filename="nm-device-bond.h"
-DeviceBridge cheader_filename="nm-device-bridge.h"
-DeviceBt cheader_filename="nm-device-bt.h"
-DeviceEthernet cheader_filename="nm-device-ethernet.h"
-DeviceGeneric cheader_filename="nm-device-generic.h"
-DeviceInfiniband cheader_filename="nm-device-infiniband.h"
-DeviceModem cheader_filename="nm-device-modem.h"
-DeviceOlpcMesh cheader_filename="nm-device-olpc-mesh.h"
-DeviceTeam cheader_filename="nm-device-team.h"
-DeviceVlan cheader_filename="nm-device-vlan.h"
-DeviceWifi cheader_filename="nm-device-wifi.h"
-DeviceWimax cheader_filename="nm-device-wimax.h"
-IP4Config cheader_filename="nm-ip4-config.h"
-IP6AddressArray cheader_filename="nm-types.h"
-IP6AddressObjectArray cheader_filename="nm-types.h"
-IP6Config cheader_filename="nm-ip6-config.h"
-IP6RouteObjectArray cheader_filename="nm-types.h"
-ObjectArray cheader_filename="nm-types.h"
-RemoteConnection cheader_filename="nm-remote-connection.h"
-RemoteSettings cheader_filename="nm-remote-settings.h"
-Ssid cheader_filename="nm-types.h"
-StringArray cheader_filename="nm-types.h"
-UintArray cheader_filename="nm-types.h"
-VPNConnection cheader_filename="nm-vpn-connection.h"
-WimaxNsp cheader_filename="nm-wimax-nsp.h"
-
-
-ClientPermission cheader_filename="nm-client.h"
-ClientPermissionResult cheader_filename="nm-client.h"
-DeviceAdslError cheader_filename="nm-device-adsl.h"
-DeviceBondError cheader_filename="nm-device-bond.h"
-DeviceBridgeError cheader_filename="nm-device-bridge.h"
-DeviceBtError cheader_filename="nm-device-bt.h"
-DeviceEthernetError cheader_filename="nm-device-ethernet.h"
-DeviceGenericError cheader_filename="nm-device-generic.h"
-DeviceInfinibandError cheader_filename="nm-device-infiniband.h"
-DeviceModemError cheader_filename="nm-device-modem.h"
-DeviceOlpcMeshError cheader_filename="nm-device-olpc-mesh.h"
-DeviceTeamError cheader_filename="nm-device-team.h"
-DeviceVlanError cheader_filename="nm-device-vlan.h"
-DeviceWifiError cheader_filename="nm-device-wifi.h"
-DeviceWimaxError cheader_filename="nm-device-wimax.h"
-ObjectError cheader_filename="nm-object.h"
-RemoteSettingsError cheader_filename="nm-remote-settings.h"
-SecretAgentError cheader_filename="nm-secret-agent.h"
-SecretAgentGetSecretsFlags cheader_filename="nm-secret-agent.h"
-WimaxNspNetworkType cheader_filename="nm-wimax-nsp.h"
-
-ClientActivateFn cheader_filename="nm-client.h"
-ClientAddActivateFn cheader_filename="nm-client.h"
-DeviceDeactivateFn cheader_filename="nm-device.h"
-RemoteConnectionCommitFunc cheader_filename="nm-remote-connection.h"
-RemoteConnectionDeleteFunc cheader_filename="nm-remote-connection.h"
-RemoteConnectionGetSecretsFunc cheader_filename="nm-remote-connection.h"
-RemoteSettingsAddConnectionFunc cheader_filename="nm-remote-settings.h"
-RemoteSettingsSaveHostnameFunc cheader_filename="nm-remote-settings.h"
-SecretAgentDeleteSecretsFunc cheader_filename="nm-secret-agent.h"
-SecretAgentGetSecretsFunc cheader_filename="nm-secret-agent.h"
-SecretAgentSaveSecretsFunc cheader_filename="nm-secret-agent.h"
-
-device_adsl_error_quark       cheader_filename="nm-device-adsl.h"       parent="NM.DeviceAdslError" name="device_adsl_error_(.+)"
-device_bond_error_quark       cheader_filename="nm-device-bond.h"       parent="NM.DeviceBondError" name="device_bond_error_(.+)"
-device_bridge_error_quark     cheader_filename="nm-device-bridge.h"     parent="NM.DeviceBridgeError" name="device_bridge_error_(.+)"
-device_bt_error_quark         cheader_filename="nm-device-bt.h"         parent="NM.DeviceBtError"   name="device_bt_error_(.+)"
-device_ethernet_error_quark   cheader_filename="nm-device-ethernet.h"   parent="NM.DeviceEthernetError"   name="device_ethernet_error_(.+)"
-device_generic_error_quark    cheader_filename="nm-device-generic.h"    parent="NM.DeviceGenericError"    name="device_generic_error_(.+)"
-device_infiniband_error_quark cheader_filename="nm-device-infiniband.h" parent="NM.DeviceInfinibandError" name="device_infiniband_error_(.+)"
-device_modem_error_quark      cheader_filename="nm-device-modem.h"      parent="NM.DeviceModemError"      name="device_modem_error_(.+)"
-device_olpc_mesh_error_quark  cheader_filename="nm-device-olpc-mesh.h"  parent="NM.DeviceOlpcMeshError"   name="device_olpc_mesh_error_(.+)"
-device_team_error_quark       cheader_filename="nm-device-team.h"       parent="NM.DeviceTeamError"       name="device_team_error(.+)"
-device_vlan_error_quark       cheader_filename="nm-device-vlan.h"       parent="NM.DeviceVlanError"       name="device_vlan_error(.+)"
-device_wifi_error_quark       cheader_filename="nm-device-wifi.h"       parent="NM.DeviceWifiError"       name="device_wifi_error_(.+)"
-device_wimax_error_quark      cheader_filename="nm-device-wimax.h"      parent="NM.DeviceWimaxError"      name="device_wimax_error_(.+)"
-object_error_quark            cheader_filename="nm-object.h"            parent="NM.ObjectError"           name="object_error_(.+)"
-remote_settings_error_quark   cheader_filename="nm-remote-settings.h"   name="remote_settings_error_(.+)" parent="NM.RemoteSettingsError"
-secret_agent_error_quark      cheader_filename="nm-secret-agent.h"      name="secret_agent_error_(.+)"    parent="NM.SecretAgentError"
-
-Object cheader_filename="nm-object.h"
-SecretAgent cheader_filename="nm-secret-agent.h"
diff --git a/vapi/NetworkManager-1.0.metadata b/vapi/NetworkManager-1.0.metadata
deleted file mode 100644
index e568f6ddbb..0000000000
--- a/vapi/NetworkManager-1.0.metadata
+++ /dev/null
@@ -1,164 +0,0 @@
-Setting.get_secret_flags#virtual_method skip
-Setting.set_secret_flags#virtual_method skip
-
-Connection cheader_filename="nm-connection.h"
-IP4Address cheader_filename="nm-setting-ip4-config.h"
-IP4Route cheader_filename="nm-setting-ip4-config.h"
-IP6Address cheader_filename="nm-setting-ip6-config.h"
-IP6Route cheader_filename="nm-setting-ip6-config.h"
-Setting8021x cheader_filename="nm-setting-8021x.h"
-SettingAdsl cheader_filename="nm-setting-adsl.h"
-SettingBluetooth cheader_filename="nm-setting-bluetooth.h"
-SettingBond cheader_filename="nm-setting-bond.h"
-SettingBridge cheader_filename="nm-setting-bridge.h"
-SettingCdma cheader_filename="nm-setting-cdma.h"
-SettingConnection cheader_filename="nm-setting-connection.h"
-SettingGeneric cheader_filename="nm-setting-generic.h"
-SettingGsm cheader_filename="nm-setting-gsm.h"
-SettingIP4Config cheader_filename="nm-setting-ip4-config.h"
-SettingIP6Config cheader_filename="nm-setting-ip6-config.h"
-SettingInfiniband cheader_filename="nm-setting-infiniband.h"
-SettingOlpcMesh cheader_filename="nm-setting-olpc-mesh.h"
-SettingPPP cheader_filename="nm-setting-ppp.h"
-SettingPPPOE cheader_filename="nm-setting-pppoe.h"
-SettingSerial cheader_filename="nm-setting-serial.h"
-SettingVPN cheader_filename="nm-setting-vpn.h"
-SettingTeam cheader_filename="nm-setting-team.h"
-SettingVlan cheader_filename="nm-setting-vlan.h"
-SettingWimax cheader_filename="nm-setting-wimax.h"
-SettingWired cheader_filename="nm-setting-wired.h"
-SettingWireless cheader_filename="nm-setting-wireless.h"
-SettingWirelessSecurity cheader_filename="nm-setting-wireless-security.h"
-
-Setting cheader_filename="nm-setting.h"
-
-80211ApFlags cheader_filename="NetworkManager.h"
-80211ApSecurityFlags cheader_filename="NetworkManager.h"
-80211Mode cheader_filename="NetworkManager.h"
-ActiveConnectionState cheader_filename="NetworkManager.h"
-BluetoothCapabilities cheader_filename="NetworkManager.h"
-ConnectionError cheader_filename="nm-connection.h"
-DeviceCapabilities cheader_filename="NetworkManager.h"
-DeviceModemCapabilities cheader_filename="NetworkManager.h"
-DeviceState cheader_filename="NetworkManager.h"
-DeviceStateReason cheader_filename="NetworkManager.h"
-DeviceType cheader_filename="NetworkManager.h"
-DeviceWifiCapabilities cheader_filename="NetworkManager.h"
-Setting8021xCKFormat cheader_filename="nm-setting-8021x.h"
-Setting8021xCKScheme cheader_filename="nm-setting-8021x.h"
-Setting8021xError cheader_filename="nm-setting-8021x.h"
-SettingAdslError cheader_filename="nm-setting-adsl.h"
-SettingBluetoothError cheader_filename="nm-setting-bluetooth.h"
-SettingBondError cheader_filename="nm-setting-bond.h"
-SettingBridgeError cheader_filename="nm-setting-bridge.h"
-SettingCdmaError cheader_filename="nm-setting-cdma.h"
-SettingCompareFlags cheader_filename="nm-setting.h"
-SettingConnectionError cheader_filename="nm-setting-connection.h"
-SettingDiffResult cheader_filename="nm-setting.h"
-SettingError cheader_filename="nm-setting.h"
-SettingGenericError cheader_filename="nm-setting-generic.h"
-SettingGsmError cheader_filename="nm-setting-gsm.h"
-SettingGsmNetworkBand cheader_filename="nm-setting-gsm.h"
-SettingGsmNetworkType cheader_filename="nm-setting-gsm.h"
-SettingHashFlags cheader_filename="nm-setting.h"
-SettingIP4ConfigError cheader_filename="nm-setting-ip4-config.h"
-SettingIP6ConfigError cheader_filename="nm-setting-ip6-config.h"
-SettingIP6ConfigPrivacy cheader_filename="nm-setting-ip6-config.h"
-SettingInfinibandError cheader_filename="nm-setting-infiniband.h"
-SettingOlpcMeshError cheader_filename="nm-setting-olpc-mesh.h"
-SettingPPPError cheader_filename="nm-setting-ppp.h"
-SettingPPPOEError cheader_filename="nm-setting-pppoe.h"
-SettingSecretFlags cheader_filename="nm-setting.h"
-SettingSerialError cheader_filename="nm-setting-serial.h"
-SettingTeamError cheader_filename="nm-setting-team.h"
-SettingVlanError cheader_filename="nm-setting-vlan.h"
-SettingVpnError cheader_filename="nm-setting-vpn.h"
-SettingWimaxError cheader_filename="nm-setting-wimax.h"
-SettingWiredError cheader_filename="nm-setting-wired.h"
-SettingWirelessError cheader_filename="nm-setting-wireless.h"
-SettingWirelessSecurityError cheader_filename="nm-setting-wireless-security.h"
-State cheader_filename="NetworkManager.h"
-
-VPNConnectionState cheader_filename="NetworkManagerVPN.h"
-VPNConnectionStateReason cheader_filename="NetworkManagerVPN.h"
-VPNPluginFailure cheader_filename="NetworkManagerVPN.h"
-VPNServiceState cheader_filename="NetworkManagerVPN.h"
-
-VlanFlags cheader_filename="nm-setting-vlan.h"
-VlanPriorityMap cheader_filename="nm-setting-vlan.h"
-WepKeyType cheader_filename="nm-setting-wireless-security.h"
-
-SettingClearSecretsWithFlagsFn cheader_filename="nm-setting.h"
-SettingValueIterFn             cheader_filename="nm-setting.h"
-VPNIterFunc                    cheader_filename="nm-setting-vpn.h"
-
-CONNECTION_PATH cheader_filename="nm-connection.h"
-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"
-
-SETTING_802_1X_*     parent="NM.Setting8021x" name="SETTING_802_1X_(.+)"
-SETTING_ADSL_*       parent="NM.SettingAdsl"      cheader_filename="nm-setting-adsl.h"         name="SETTING_ADSL_(.+)"
-SETTING_BLUETOOTH_*  parent="NM.SettingBluetooth" cheader_filename="nm-setting-bluetooth.h"    name="SETTING_BLUETOOTH_(.+)"
-SETTING_BOND_*       parent="NM.SettingBond"      cheader_filename="nm-setting-bond.h"         name="SETTING_BOND_(.+)"
-SETTING_BRIDGE_*     parent="NM.SettingBridge"    cheader_filename="nm-setting-bridge.h"       name="SETTING_BRIDGE_(.+)"
-SETTING_CDMA_*       parent="NM.SettingCdma"      cheader_filename="nm-setting-cdma.h"         name="SETTING_CDMA_(.+)"
-SETTING_CONNECTION_* parent="NM.SettingConnection" cheader_filename="nm-setting-connection.h"  name="SETTING_CONNECTION_(.+)"
-SETTING_GENERIC_*    parent="NM.SettingGeneric"    cheader_filename="nm-setting-generic.h"     name="SETTING_GENERIC_(.+)"
-SETTING_GSM_*        parent="NM.SettingGsm"        cheader_filename="nm-setting-gsm.h"         name="SETTING_GSM_(.+)"
-SETTING_INFINIBAND_* parent="NM.SettingInfiniband" cheader_filename="nm-setting-infiniband.h"  name="SETTING_INFINIBAND_(.+)"
-SETTING_IP4_*        parent="NM.SettingIP4"        cheader_filename="nm-setting-ip4-config.h"  name="SETTING_IP4_(.+)"
-SETTING_IP6_*        parent="NM.SettingIP6"        cheader_filename="nm-setting-ip6-config.h"  name="SETTING_IP6_(.+)"
-SETTING_OLPC_*       parent="NM.SettingOLPC"       cheader_filename="nm-setting-olpc-mesh.h"   name="SETTING_OLPC_(.+)"
-SETTING_PPP_*        parent="NM.SettingPPP"        cheader_filename="nm-setting-ppp.h"         name="SETTING_PPP_(.+)"
-SETTING_PPPOE_*      parent="NM.SettingPPPOE"      cheader_filename="nm-setting-pppoe.h"       name="SETTING_PPPOE_(.+)"
-SETTING_SERIAL_*     parent="NM.SettingSerial"     cheader_filename="nm-setting-serial.h"      name="SETTING_SERIAL_(.+)"
-SETTING_TEAM_*       parent="NM.SettingTeam"       cheader_filename="nm-setting-team.h"        name="SETTING_TEAM_(.+)"
-SETTING_VLAN_*       parent="NM.SettingVlan"       cheader_filename="nm-setting-vlan.h"        name="SETTING_VLAN_(.+)"
-SETTING_VPN_*        parent="NM.SettingVpn"        cheader_filename="nm-setting-vpn.h"         name="SETTING_VPN_(.+)"
-SETTING_WIMAX_*      parent="NM.SettingWimax"      cheader_filename="nm-setting-wimax.h"       name="SETTING_WIMAX_(.+)"
-SETTING_WIRED_*      parent="NM.SettingWired"      cheader_filename="nm-setting-wired.h"       name="SETTING_WIRED_(.+)"
-SETTING_WIRELESS_*   parent="NM.SettingWireless"   cheader_filename="nm-setting-wireless.h"    name="SETTING_WIRELESS_(.+)"
-SETTING_WIRELESS_SECURITY_*   parent="NM.SettingWirelessSecurity" cheader_filename="nm-setting-wireless-security.h"    name="SETTING_WIRELESS_SECURITY_(.+)"
-
-VPN_* parent="NM.VPN" name="VPN_(.+)" cheader_filename="NetworkManagerVPN.h"
-
-connection_error_quark cheader_filename="nm-connection.h" name="connection_(.+)" parent="NM.Connection"
-
-setting_802_1x_error_quark cheader_filename="nm-setting-8021x.h"          name="setting_802_1x_error_(.+)"        parent="NM.Setting8021xError"
-setting_adsl_error_quark cheader_filename="nm-setting-adsl.h"             name="setting_adsl_error_(.+)"          parent="NM.SettingAdslError"
-setting_bluetooth_error_quark cheader_filename="nm-setting-bluetooth.h"   name="setting_bluetooth_error_(.+)"     parent="NM.SettingBluetoothError"
-setting_bond_error_quark cheader_filename="nm-setting-bond.h"             name="setting_bond_error_(.+)"          parent="NM.SettingBondError"
-setting_bridge_error_quark cheader_filename="nm-setting-bridge.h"         name="setting_bridge_error_(.+)"        parent="NM.SettingBridgeError"
-setting_cdma_error_quark cheader_filename="nm-setting-cdma.h"             name="setting_cdma_error_(.+)"          parent="NM.SettingCdmaError"
-setting_connection_error_quark cheader_filename="nm-setting-connection.h" name="setting_connection_error_(.+)"    parent="NM.SettingConnectionError"
-setting_error_quark cheader_filename="nm-setting.h"                       name="setting_error_(.+)"               parent="NM.SettingError"
-setting_generic_error_quark cheader_filename="nm-setting-generic.h"       name="setting_generic_error_(.+)"       parent="NM.SettingGenericError"
-setting_gsm_error_quark cheader_filename="nm-setting-gsm.h"               name="setting_gsm_error_(.+)"           parent="NM.SettingGsmError"
-setting_infiniband_error_quark cheader_filename="nm-setting-infiniband.h" name="setting_infiniband_error_(.+)"    parent="NM.SettingInfinibandError"
-setting_ip4_config_error_quark cheader_filename="nm-setting-ip4-config.h" name="setting_ip4_config_error_(.+)"    parent="NM.SettingIP4ConfigError"
-setting_ip6_config_error_quark cheader_filename="nm-setting-ip6-config.h" name="setting_ip6_config_error_(.+)"    parent="NM.SettingIP6ConfigError"
-setting_olpc_mesh_error_quark cheader_filename="nm-setting-olpc-mesh.h"   name="setting_olpc_mesh_error_(.+)"     parent="NM.SettingOlpcMeshError"
-setting_ppp_error_quark cheader_filename="nm-setting-ppp.h"               name="setting_ppp_error_(.+)"           parent="NM.SettingPPPError"
-setting_pppoe_error_quark cheader_filename="nm-setting-pppoe.h"           name="setting_pppoe_error_(.+)"         parent="NM.SettingPPPOEError"
-setting_serial_error_quark cheader_filename="nm-setting-serial.h"         name="setting_serial_error_(.+)"        parent="NM.SettingSerialError"
-setting_team_error_quark cheader_filename="nm-setting-team.h"             name="setting_team_error_(.+)"          parent="NM.SettingTeamError"
-setting_vlan_error_quark cheader_filename="nm-setting-vlan.h"             name="setting_vlan_error_(.+)"          parent="NM.SettingVlanError"
-setting_vpn_error_quark cheader_filename="nm-setting-vpn.h"               name="setting_vpn_error_(.+)"           parent="NM.SettingVpnError"
-setting_wimax_error_quark cheader_filename="nm-setting-wimax.h"           name="setting_wimax_error_(.+)"         parent="NM.SettingWimaxError"
-setting_wired_error_quark cheader_filename="nm-setting-wired.h"           name="setting_wired_error_(.+)"         parent="NM.SettingWiredError"
-setting_wireless_error_quark          cheader_filename="nm-setting-wireless.h"          name="setting_wireless_error_(.+)"          parent="NM.SettingWirelessError"
-setting_wireless_security_error_quark cheader_filename="nm-setting-wireless-security.h" name="setting_wireless_security_error_(.+)" parent="NM.SettingWirelessSecurityError"
-
-SETTING_PARAM_* cheader_filename="nm-setting.h" parent="NM.Setting" name="SETTING_PARAM_(.+)"
-utils_* cheader_filename="nm-utils.h" parent="NM.Utils" name="utils_(.+)"
-UTILS_* cheader_filename="nm-utils.h" parent="NM.Utils" name="UTILS_(.+)"
-UtilsSecurityType cheader_filename="nm-utils.h" parent="NM.Utils" name="SecurityType"
diff --git a/vapi/libnm-glib.deps b/vapi/libnm-glib.deps
deleted file mode 100644
index 56e9985907..0000000000
--- a/vapi/libnm-glib.deps
+++ /dev/null
@@ -1,3 +0,0 @@
-dbus-glib-1
-libnm-util
-gio-2.0
diff --git a/vapi/libnm-util.deps b/vapi/libnm-util.deps
deleted file mode 100644
index efd2584db2..0000000000
--- a/vapi/libnm-util.deps
+++ /dev/null
@@ -1,2 +0,0 @@
-dbus-glib-1
-gio-2.0
diff --git a/vapi/meson.build b/vapi/meson.build
index addc8d7dd6..bc0984f22e 100644
--- a/vapi/meson.build
+++ b/vapi/meson.build
@@ -4,25 +4,3 @@ gnome.generate_vapi(
   packages: 'gio-2.0',
   install: true,
 )
-
-if enable_libnm_glib
-  packages = [
-    'dbus-glib-1',
-    'gio-2.0',
-  ]
-
-  libnm_util_vapi = gnome.generate_vapi(
-    libnm_util_name,
-    sources: libnm_util_gir[0],
-    packages: packages,
-    install: true,
-  )
-
-  gnome.generate_vapi(
-    libnm_glib_name,
-    sources: libnm_glib_gir[0],
-    packages: packages + [libnm_util_vapi],
-    gir_dirs: [join_paths(meson.current_build_dir(), '..', 'libnm-util')],
-    install: true,
-  )
-endif