Imported Upstream version 1.0.2 upstream/1.0.2

1 files changed, 12 insertions, 0 deletions

diff --git a/vapi/NetworkManager-1.0.metadata b/vapi/NetworkManager-1.0.metadata
index d757828f..e568f6dd 100644
--- a/vapi/NetworkManager-1.0.metadata
+++ b/vapi/NetworkManager-1.0.metadata
@@ -10,8 +10,10 @@ 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"
@@ -21,6 +23,7 @@ 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"
@@ -47,11 +50,13 @@ 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"
@@ -65,6 +70,7 @@ 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"
@@ -103,8 +109,10 @@ 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_(.+)"
@@ -113,6 +121,7 @@ SETTING_OLPC_*       parent="NM.SettingOLPC"       cheader_filename="nm-setting-
 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_(.+)"
@@ -128,9 +137,11 @@ setting_802_1x_error_quark cheader_filename="nm-setting-8021x.h"          name="
 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"
@@ -139,6 +150,7 @@ setting_olpc_mesh_error_quark cheader_filename="nm-setting-olpc-mesh.h"   name="
 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"