Imported Upstream version 1.0.2 upstream/1.0.2

3 files changed, 43 insertions, 8 deletions

diff --git a/vapi/Makefile.in b/vapi/Makefile.in
index 99e5d023..fb321ea2 100644
--- a/vapi/Makefile.in
+++ b/vapi/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -53,7 +53,17 @@
 #       The files which should be used to generate the VAPI.
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -116,8 +126,6 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.vapigen $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am
 subdir = vapi
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \
@@ -135,6 +143,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \
 	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -188,6 +197,7 @@ am__uninstall_files_from_dir = { \
 am__installdirs = "$(DESTDIR)$(vapidir)"
 DATA = $(vapi_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.vapigen
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -214,7 +224,6 @@ CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
 DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_GLIB_100_CFLAGS = @DBUS_GLIB_100_CFLAGS@
 DBUS_GLIB_100_LIBS = @DBUS_GLIB_100_LIBS@
@@ -249,6 +258,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -488,7 +498,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/Ma
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu vapi/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu vapi/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -497,7 +506,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
-$(srcdir)/Makefile.vapigen:
+$(srcdir)/Makefile.vapigen $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -689,6 +698,8 @@ uninstall-am: uninstall-vapiDATA
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
 	ps ps-am tags-am uninstall uninstall-am uninstall-vapiDATA
 
+.PRECIOUS: Makefile
+
 
 @ENABLE_VAPIGEN_TRUE@$(if $(VAPIGEN),,$(error You must define VAPIGEN))
 
diff --git a/vapi/NMClient-1.0.metadata b/vapi/NMClient-1.0.metadata
index 2d894d8e..b8a022f6 100644
--- a/vapi/NMClient-1.0.metadata
+++ b/vapi/NMClient-1.0.metadata
@@ -9,13 +9,16 @@ ACCESS_POINT_*      cheader_filename="nm-access-point.h"      name="ACCESS_POINT
 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"
@@ -38,11 +41,14 @@ 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"
@@ -65,11 +71,14 @@ 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"
@@ -93,11 +102,14 @@ 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_(.+)"
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"