summary refs log tree commit diff
path: root/vapi
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2015-01-22 00:29:39 +0100
committerMichael Biebl <biebl@debian.org>2015-01-22 00:29:39 +0100
commit2c032d8f1c6292c1338a615e6ec40252889ba85c (patch)
tree1f77182220b2b0264288ba4a476ab47e5bc48716 /vapi
parent33491bc4279481db8ae47213e34a6d695a0e8830 (diff)
Imported Upstream version 1.0.0 upstream/1.0.0
Diffstat (limited to 'vapi')
-rw-r--r--vapi/Makefile.in10
-rw-r--r--vapi/Makefile.vapigen4
-rw-r--r--vapi/NMClient-1.0.metadata4
3 files changed, 13 insertions, 5 deletions
diff --git a/vapi/Makefile.in b/vapi/Makefile.in
index 8274cda1..99e5d023 100644
--- a/vapi/Makefile.in
+++ b/vapi/Makefile.in
@@ -198,6 +198,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLUEZ5_CFLAGS = @BLUEZ5_CFLAGS@
+BLUEZ5_LIBS = @BLUEZ5_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -321,6 +323,7 @@ NEWT_CFLAGS = @NEWT_CFLAGS@
 NEWT_LIBS = @NEWT_LIBS@
 NM = @NM@
 NMEDIT = @NMEDIT@
+NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT = @NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
@@ -340,6 +343,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@@ -366,7 +370,7 @@ SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
 SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
 SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
-UDEV_BASE_DIR = @UDEV_BASE_DIR@
+UDEV_DIR = @UDEV_DIR@
 USE_NLS = @USE_NLS@
 UUID_CFLAGS = @UUID_CFLAGS@
 UUID_LIBS = @UUID_LIBS@
@@ -690,7 +694,9 @@ uninstall-am: uninstall-vapiDATA
 
 @ENABLE_VAPIGEN_TRUE@define vapigen
 @ENABLE_VAPIGEN_TRUE@$(1): $$($(_vapi_name)_GIR)
-@ENABLE_VAPIGEN_TRUE@	$(_vapigen_silent_prefix) $(VAPIGEN) $(_vapigen_silent_opts) \
+@ENABLE_VAPIGEN_TRUE@	$(_vapigen_silent_prefix) \
+@ENABLE_VAPIGEN_TRUE@	G_DEBUG='' \
+@ENABLE_VAPIGEN_TRUE@	$(VAPIGEN) $(_vapigen_silent_opts) \
 @ENABLE_VAPIGEN_TRUE@	  --library $(1:.vapi=) \
 @ENABLE_VAPIGEN_TRUE@	  $(foreach _vapi_metadatadir_name,$(if $($(_vapi_name)_METADATADIRS),$($(_vapi_name)_METADATADIRS),$(VAPIGEN_METADATADIRS)),--metadatadir $(_vapi_metadatadir_name)) \
 @ENABLE_VAPIGEN_TRUE@	  $(foreach _vapi_dir_name,$(if $($(_vapi_name)_VAPIDIRS),$($(_vapi_name)_VAPIDIRS),$(VAPIGEN_VAPIDIRS)),--vapidir $(_vapi_dir_name)) \
diff --git a/vapi/Makefile.vapigen b/vapi/Makefile.vapigen
index feb56334..5163af13 100644
--- a/vapi/Makefile.vapigen
+++ b/vapi/Makefile.vapigen
@@ -49,7 +49,9 @@ _vapi_name = $(subst /,_,$(subst -,_,$(subst .,_,$(1))))
 
 define vapigen
 $(1): $$($(_vapi_name)_GIR)
-	$(_vapigen_silent_prefix) $(VAPIGEN) $(_vapigen_silent_opts) \
+	$(_vapigen_silent_prefix) \
+	G_DEBUG='' \
+	$(VAPIGEN) $(_vapigen_silent_opts) \
 	  --library $(1:.vapi=) \
 	  $(foreach _vapi_metadatadir_name,$(if $($(_vapi_name)_METADATADIRS),$($(_vapi_name)_METADATADIRS),$(VAPIGEN_METADATADIRS)),--metadatadir $(_vapi_metadatadir_name)) \
 	  $(foreach _vapi_dir_name,$(if $($(_vapi_name)_VAPIDIRS),$($(_vapi_name)_VAPIDIRS),$(VAPIGEN_VAPIDIRS)),--vapidir $(_vapi_dir_name)) \
diff --git a/vapi/NMClient-1.0.metadata b/vapi/NMClient-1.0.metadata
index 12f14699..2d894d8e 100644
--- a/vapi/NMClient-1.0.metadata
+++ b/vapi/NMClient-1.0.metadata
@@ -1,6 +1,6 @@
-RemoteSettings.new_async skip
+RemoteSettings.new_finish symbol_type="function"
 RemoteConnection.updated#virtual_method skip
-Client.new_async 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"