Merge lp:~noskcaj/ubuntu/utopic/libdmapsharing/2.9.26 into lp:ubuntu/utopic/libdmapsharing

[Jackson Doak]

New upstream release

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

Unmerged revisions

21. By Jackson Doak on 2014-05-27

New upstream release.

=== modified file 'ChangeLog'
--- ChangeLog	2014-02-22 10:48:55 +0000
+++ ChangeLog	2014-05-27 20:54:48 +0000
@@ -1,3 +1,123 @@
+commit c2bf5a60486cb5bc33f47ed5df708ad24d0d5c15
+Author: W. Michael Petullo <[e-mail]>
+Date:   Tue May 27 16:18:11 2014 -0400
+
+    Bump version number
+    
+    Signed-off-by: W. Michael Petullo <[e-mail]>
+
+commit c1447ae3ae9574addab2fa9b82ca4f117609e222
+Author: W. Michael Petullo <[e-mail]>
+Date:   Tue May 27 16:10:56 2014 -0400
+
+    test/Makefile.am: add dmapcopy to EXTRA_DIST
+    
+    Signed-off-by: W. Michael Petullo <[e-mail]>
+
+commit 06edb792b0459af2f0cfe82ca04e035901530c97
+Author: W. Michael Petullo <[e-mail]>
+Date:   Tue Apr 29 21:00:56 2014 -0400
+
+    Update TODO
+    
+    Signed-off-by: W. Michael Petullo <[e-mail]>
+
+commit 7557691ed7e303b1a7927c3003242cbd12e25608
+Author: W. Michael Petullo <[e-mail]>
+Date:   Sat Apr 19 20:18:10 2014 -0400
+
+    update TODO
+    
+    Signed-off-by: W. Michael Petullo <[e-mail]>
+
+commit cea4b17cde4f8f8d567d2d4ac88db83d95dc9b3e
+Author: W. Michael Petullo <[e-mail]>
+Date:   Sat Apr 19 20:16:48 2014 -0400
+
+    fix some compiler warnings
+    
+    Signed-off-by: W. Michael Petullo <[e-mail]>
+
+commit 8ea1adb375998bf0df42cc63912cdbaec3c880e8
+Author: W. Michael Petullo <[e-mail]>
+Date:   Sat Apr 19 19:29:31 2014 -0400
+
+    fix another spelling error
+    
+    Signed-off-by: W. Michael Petullo <[e-mail]>
+
+commit 3e6ef8c75455af7adefba4de7ff85a16e9904f0d
+Author: W. Michael Petullo <[e-mail]>
+Date:   Sat Apr 19 19:21:54 2014 -0400
+
+    fix spelling error
+    
+    Signed-off-by: W. Michael Petullo <[e-mail]>
+
+commit 0e20a911ae6dee6636bfa72a912185b6626a87e6
+Author: W. Michael Petullo <[e-mail]>
+Date:   Sat Apr 19 19:07:10 2014 -0400
+
+    silence builds by default
+    
+    Signed-off-by: W. Michael Petullo <[e-mail]>
+
+commit 66907af4df8b8f9af37b36c6fddad86e2b062a86
+Author: W. Michael Petullo <[e-mail]>
+Date:   Fri Apr 11 20:03:31 2014 -0400
+
+    Bump version number
+    
+    Signed-off-by: W. Michael Petullo <[e-mail]>
+
+commit fbfd169b581d328df1b977dbcce6d2385bd271be
+Author: W. Michael Petullo <[e-mail]>
+Date:   Fri Apr 11 19:55:40 2014 -0400
+
+    Fix for "bytes=" check in daap-share.c; thanks Bastien Nocera
+    
+    Signed-off-by: W. Michael Petullo <[e-mail]>
+
+commit 610a17d2fb60f9f4cb0fc754e0acd8a39c825dd0
+Author: W. Michael Petullo <[e-mail]>
+Date:   Sun Mar 9 22:31:33 2014 -0400
+
+    Small change to a debug message
+    
+    Signed-off-by: W. Michael Petullo <[e-mail]>
+
+commit 55a8417308cd3af0bc306d37c0a887080827c2b2
+Author: W. Michael Petullo <[e-mail]>
+Date:   Sun Feb 2 23:12:35 2014 -0500
+
+    Do not use AM_CONDITIONAL within a shell conditional
+    
+    Signed-off-by: W. Michael Petullo <[e-mail]>
+
+commit e0261c16a0e6a64adc0f84f869e40518984ee5f6
+Author: W. Michael Petullo <[e-mail]>
+Date:   Sun Nov 24 21:02:21 2013 -0500
+
+    Install libdmapsharing-3.0.vapi on "make install"
+    
+    Signed-off-by: W. Michael Petullo <[e-mail]>
+
+commit 3e1b5933336dd3170527d2da2e234c8931520885
+Author: W. Michael Petullo <[e-mail]>
+Date:   Sun Nov 24 14:19:11 2013 -0500
+
+    Update some Vala-related files
+    
+    Signed-off-by: W. Michael Petullo <[e-mail]>
+
+commit 91879548a32c65b0897ecbe58aaafb7646743931
+Author: W. Michael Petullo <[e-mail]>
+Date:   Sun Nov 24 14:17:30 2013 -0500
+
+    Some work related to GObject introspection (there is a lot of work remaining)
+    
+    Signed-off-by: W. Michael Petullo <[e-mail]>
+
 commit 1da947bfbabba1567bdd9c5e2bbb082b8de7d0ec
 Author: W. Michael Petullo <[e-mail]>
 Date:   Thu Nov 7 08:56:03 2013 -0500

=== modified file 'Makefile.in'
--- Makefile.in	2013-06-29 22:28:20 +0000
+++ Makefile.in	2014-05-27 20:54:48 +0000
@@ -95,9 +95,10 @@
 am__aclocal_m4_deps = $(top_srcdir)/m4/as-arch.m4 \
 	$(top_srcdir)/m4/as-compiler-flag.m4 \
 	$(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -302,6 +303,14 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDMAPSHARING_MAJORMINOR = @LIBDMAPSHARING_MAJORMINOR@

=== modified file 'TODO'
--- TODO	2013-06-29 22:28:20 +0000
+++ TODO	2014-05-27 20:54:48 +0000
@@ -1,10 +1,11 @@
 = Short term ===================================================================
 
-Fix use of iTunes as client with recent libsoup:
-	rhythmbox:	GET /databases/1/items/...
-	iTunes:		GET daap://192.168.1.245:3689/databases/...
-	libsoup 2.28.2: OK
-	libsoup 2.42.2: soup-message-server-io.c calls SOUP_URI_VALID_FOR_HTTP!
+GNOME Bugs:
+	344616: support database updates
+	686220: play nicely with firewalld
+	705539: confirm two share scenario fixed (seems to be in rhythmbox 3.0.2)
+	727839: wierd startup warning
+	705949: grilo
 
 Noah: DNS-SD implementation
 	Finish browser side support.
@@ -18,6 +19,10 @@
 
 = Mid term =====================================================================
 
+Fix callbacks so that they do not provide a gpointer (see service-added
+callback). They need to provide a proper GObject type (e.g., a new
+DMAPMdnsBrowserService type) so that Python/GObject introspection works.
+
 Noah: Comment purpose of each source file and describe interfaces, using test
 programs as examples (Note: wait on doxygen vs. gtk-doc decision.
 
@@ -26,6 +31,10 @@
 
 = Long term ====================================================================
 
+API Changes:
+	now_playing_artwork seems to return a filename, so should return a gchar *, not guchar *?
+	Stuff related to Python introspection
+
 Mike: Audit remaining GSoC patch:
 --- dmap-db.c
 --- dmap-share.c

=== modified file 'aclocal.m4'
--- aclocal.m4	2013-06-29 22:28:20 +0000
+++ aclocal.m4	2014-05-27 20:54:48 +0000
@@ -220,6 +220,21 @@
 m4_popdef([pkg_description])
 ]) dnl PKG_NOARCH_INSTALLDIR
 
+
+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# -------------------------------------------
+# Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])# PKG_CHECK_VAR
+
 # Copyright (C) 2002-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -1344,6 +1359,7 @@
 m4_include([m4/as-compiler-flag.m4])
 m4_include([m4/as-version.m4])
 m4_include([m4/gtk-doc.m4])
+m4_include([m4/introspection.m4])
 m4_include([m4/libtool.m4])
 m4_include([m4/ltoptions.m4])
 m4_include([m4/ltsugar.m4])

=== modified file 'config.guess'
--- config.guess	2013-06-29 22:28:20 +0000
+++ config.guess	2014-05-27 20:54:48 +0000
@@ -1,8 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2013 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012, 2013 Free Software Foundation, Inc.
 
-timestamp='2013-06-10'
+timestamp='2012-12-29'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -24,7 +26,7 @@
 # program.  This Exception is an additional permission under section 7
 # of the GNU General Public License, version 3 ("GPLv3").
 #
-# Originally written by Per Bothner.
+# Originally written by Per Bothner. 
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
@@ -50,7 +52,9 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+2012, 2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -132,27 +136,6 @@
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-case "${UNAME_SYSTEM}" in
-Linux|GNU|GNU/*)
-	# If the system lacks a compiler, then just pick glibc.
-	# We could probably try harder.
-	LIBC=gnu
-
-	eval $set_cc_for_build
-	cat <<-EOF > $dummy.c
-	#include <features.h>
-	#if defined(__UCLIBC__)
-	LIBC=uclibc
-	#elif defined(__dietlibc__)
-	LIBC=dietlibc
-	#else
-	LIBC=gnu
-	#endif
-	EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	;;
-esac
-
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -874,21 +857,21 @@
 	exit ;;
     *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -901,54 +884,59 @@
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    arc:Linux:*:* | arceb:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 	else
 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 		| grep -q __ARM_PCS_VFP
 	    then
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
 	    else
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
 	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
-	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -967,63 +955,54 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
-    or1k:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
     or32:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     padre:Linux:*:*)
-	echo sparc-unknown-linux-${LIBC}
+	echo sparc-unknown-linux-gnu
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-${LIBC}
+	echo hppa64-unknown-linux-gnu
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
-	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
-	  *)    echo hppa-unknown-linux-${LIBC} ;;
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-${LIBC}
+	echo powerpc64-unknown-linux-gnu
 	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-${LIBC}
-	exit ;;
-    ppc64le:Linux:*:*)
-	echo powerpc64le-unknown-linux-${LIBC}
-	exit ;;
-    ppcle:Linux:*:*)
-	echo powerpcle-unknown-linux-${LIBC}
+	echo powerpc-unknown-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
     x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1256,21 +1235,19 @@
 	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	eval $set_cc_for_build
-	if test "$UNAME_PROCESSOR" = unknown ; then
-	    UNAME_PROCESSOR=powerpc
-	fi
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
-	    then
-		case $UNAME_PROCESSOR in
-		    i386) UNAME_PROCESSOR=x86_64 ;;
-		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
-		esac
-	    fi
-	fi
+	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
+	    unknown) UNAME_PROCESSOR=powerpc ;;
+	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)

=== modified file 'config.sub'
--- config.sub	2013-06-29 22:28:20 +0000
+++ config.sub	2014-05-27 20:54:48 +0000
@@ -1,8 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2013 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012, 2013 Free Software Foundation, Inc.
 
-timestamp='2013-04-24'
+timestamp='2012-12-29'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -68,7 +70,9 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+2012, 2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -252,7 +256,7 @@
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arceb \
+	| arc \
 	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
 	| avr | avr32 \
 	| be32 | be64 \
@@ -286,17 +290,16 @@
 	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipsr5900 | mipsr5900el \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
 	| moxie \
 	| mt \
 	| msp430 \
 	| nds32 | nds32le | nds32be \
-	| nios | nios2 | nios2eb | nios2el \
+	| nios | nios2 \
 	| ns16k | ns32k \
 	| open8 \
-	| or1k | or32 \
+	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
@@ -366,7 +369,7 @@
 	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
 	| be32-* | be64-* \
@@ -404,13 +407,12 @@
 	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipsr5900-* | mipsr5900el-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
 	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* | nios2eb-* | nios2el-* \
+	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
 	| orion-* \
@@ -1352,7 +1354,7 @@
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* | -plan9* \
+	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1498,6 +1500,9 @@
 	-aros*)
 		os=-aros
 		;;
+	-kaos*)
+		os=-kaos
+		;;
 	-zvmoe)
 		os=-zvmoe
 		;;
@@ -1589,9 +1594,6 @@
 	mips*-*)
 		os=-elf
 		;;
-	or1k-*)
-		os=-elf
-		;;
 	or32-*)
 		os=-coff
 		;;

=== modified file 'configure'
--- configure	2014-02-22 10:48:55 +0000
+++ configure	2014-05-27 20:54:48 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libdmapsharing 2.9.24.
+# Generated by GNU Autoconf 2.69 for libdmapsharing 2.9.26.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -647,8 +647,8 @@
 # Identity of this package.
 PACKAGE_NAME='libdmapsharing'
 PACKAGE_TARNAME='libdmapsharing'
-PACKAGE_VERSION='2.9.24'
-PACKAGE_STRING='libdmapsharing 2.9.24'
+PACKAGE_VERSION='2.9.26'
+PACKAGE_STRING='libdmapsharing 2.9.26'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -693,10 +693,10 @@
 LTLIBOBJS
 LIBOBJS
 DMAP_HAVE_UNALIGNED_ACCESS_DEFINE
-CHECK_LIBS
-CHECK_CFLAGS
 HAVE_CHECK_FALSE
 HAVE_CHECK_TRUE
+CHECK_LIBS
+CHECK_CFLAGS
 BUILD_DPAPVIEW_FALSE
 BUILD_DPAPVIEW_TRUE
 HAVE_GEE_FALSE
@@ -705,11 +705,13 @@
 GEE_CFLAGS
 GTK_LIBS
 GTK_CFLAGS
+BUILD_VAPI_FALSE
+BUILD_VAPI_TRUE
 VAPIGEN
 VALA_GEN_INTROSPECT
+HAVE_VALAC_FALSE
+HAVE_VALAC_TRUE
 VALAC
-HAVE_VALA_FALSE
-HAVE_VALA_TRUE
 USE_GSTREAMERAPP_FALSE
 USE_GSTREAMERAPP_TRUE
 GSTLIB
@@ -764,6 +766,16 @@
 GTKDOC_MKPDF
 GTKDOC_REBASE
 GTKDOC_CHECK
+HAVE_INTROSPECTION_FALSE
+HAVE_INTROSPECTION_TRUE
+INTROSPECTION_MAKEFILE
+INTROSPECTION_LIBS
+INTROSPECTION_CFLAGS
+INTROSPECTION_TYPELIBDIR
+INTROSPECTION_GIRDIR
+INTROSPECTION_GENERATE
+INTROSPECTION_COMPILER
+INTROSPECTION_SCANNER
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
@@ -820,10 +832,6 @@
 MAINTAINER_MODE_TRUE
 SO_VERSION
 LIBDMAPSHARING_MAJORMINOR
-AM_BACKSLASH
-AM_DEFAULT_VERBOSITY
-AM_DEFAULT_V
-AM_V
 am__untar
 am__tar
 AMTAR
@@ -846,6 +854,10 @@
 INSTALL_SCRIPT
 INSTALL_PROGRAM
 API_VERSION
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
 VERSION
 PACKAGE
 LIBDMAPSHARING_NANO_VERSION
@@ -905,6 +917,7 @@
 with_gnu_ld
 with_sysroot
 enable_libtool_lock
+enable_introspection
 with_html_dir
 enable_gtk_doc
 enable_gtk_doc_html
@@ -1494,7 +1507,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libdmapsharing 2.9.24 to adapt to many kinds of systems.
+\`configure' configures libdmapsharing 2.9.26 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1564,7 +1577,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libdmapsharing 2.9.24:";;
+     short | recursive ) echo "Configuration of libdmapsharing 2.9.26:";;
    esac
   cat <<\_ACEOF
 
@@ -1586,6 +1599,8 @@
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
+  --enable-introspection=[no/auto/yes]
+                          Enable introspection for this build
   --enable-gtk-doc        use gtk-doc to build documentation [[default=no]]
   --enable-gtk-doc-html   build documentation in html format [[default=yes]]
   --enable-gtk-doc-pdf    build documentation in pdf format [[default=no]]
@@ -1734,7 +1749,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libdmapsharing configure 2.9.24
+libdmapsharing configure 2.9.26
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2099,7 +2114,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libdmapsharing $as_me 2.9.24, which was
+It was created by libdmapsharing $as_me 2.9.26, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2452,20 +2467,20 @@
   PACKAGE=libdmapsharing
   LIBDMAPSHARING_MAJOR_VERSION=2
   LIBDMAPSHARING_MINOR_VERSION=9
-  LIBDMAPSHARING_MICRO_VERSION=24
+  LIBDMAPSHARING_MICRO_VERSION=26
   NANO=LIBDMAPSHARING_CVS="no"
   LIBDMAPSHARING_NANO_VERSION=$NANO
   if test "x$NANO" = "x" || test "x$NANO" = "x0";
   then
       { $as_echo "$as_me:${as_lineno-$LINENO}: configuring libdmapsharing for release" >&5
 $as_echo "$as_me: configuring libdmapsharing for release" >&6;}
-      VERSION=2.9.24
+      VERSION=2.9.26
       LIBDMAPSHARING_RELEASE=1
             LIBDMAPSHARING_CVS="yes"
   else
       { $as_echo "$as_me:${as_lineno-$LINENO}: configuring libdmapsharing for development with nano $NANO" >&5
 $as_echo "$as_me: configuring libdmapsharing for development with nano $NANO" >&6;}
-      VERSION=2.9.24.$NANO
+      VERSION=2.9.26.$NANO
       LIBDMAPSHARING_RELEASE=`date +%Y%m%d_%H%M%S`
             :
   fi
@@ -2498,6 +2513,47 @@
 
 
 
+# Enable silent build when available (Automake 1.11)
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=0;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
+
 API_VERSION=3.0
 #AC_DEFINE(API_VERSION, $API_VERSION, [library API version])
 
@@ -2956,45 +3012,6 @@
 fi
 rmdir .tst 2>/dev/null
 
-# Check whether --enable-silent-rules was given.
-if test "${enable_silent_rules+set}" = set; then :
-  enableval=$enable_silent_rules;
-fi
-
-case $enable_silent_rules in # (((
-  yes) AM_DEFAULT_VERBOSITY=0;;
-   no) AM_DEFAULT_VERBOSITY=1;;
-    *) AM_DEFAULT_VERBOSITY=1;;
-esac
-am_make=${MAKE-make}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
-$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
-if ${am_cv_make_support_nested_variables+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if $as_echo 'TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-$as_echo "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
-    AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AM_BACKSLASH='\'
-
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
   # is not polluted with repeated "-I."
@@ -3017,7 +3034,7 @@
 
 # Define the identity of the package.
  PACKAGE='libdmapsharing'
- VERSION='2.9.24'
+ VERSION='2.9.26'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7464,10 +7481,10 @@
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_i386"
 	    ;;
-	  powerpcle-*linux*)
+	  powerpc64le-*linux*)
 	    LD="${LD-ld} -m elf32lppclinux"
 	    ;;
-	  powerpc-*linux*)
+	  powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
 	    ;;
 	  s390x-*linux*)
@@ -12472,6 +12489,101 @@
 
 
 
+                # Check whether --enable-introspection was given.
+if test "${enable_introspection+set}" = set; then :
+  enableval=$enable_introspection;
+else
+  enable_introspection=auto
+fi
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gobject-introspection" >&5
+$as_echo_n "checking for gobject-introspection... " >&6; }
+
+        case $enable_introspection in #(
+  no) :
+            found_introspection="no (disabled, use --enable-introspection to enable)"
+     ;; #(
+      yes) :
+            if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  :
+else
+  as_fn_error $? "gobject-introspection-1.0 is not installed" "$LINENO" 5
+fi
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 1.30.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 1.30.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  found_introspection=yes
+else
+  as_fn_error $? "You need to have gobject-introspection >= 1.30.0 installed to build libdmapsharing" "$LINENO" 5
+fi
+     ;; #(
+      auto) :
+            if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 1.30.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 1.30.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  found_introspection=yes
+else
+  found_introspection=no
+fi
+		enable_introspection=$found_introspection
+     ;; #(
+  *) :
+                as_fn_error $? "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5
+     ;;
+esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5
+$as_echo "$found_introspection" >&6; }
+
+    INTROSPECTION_SCANNER=
+    INTROSPECTION_COMPILER=
+    INTROSPECTION_GENERATE=
+    INTROSPECTION_GIRDIR=
+    INTROSPECTION_TYPELIBDIR=
+    if test "x$found_introspection" = "xyes"; then
+       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
+    fi
+
+
+
+
+
+
+
+
+
+     if test "x$found_introspection" = "xyes"; then
+  HAVE_INTROSPECTION_TRUE=
+  HAVE_INTROSPECTION_FALSE='#'
+else
+  HAVE_INTROSPECTION_TRUE='#'
+  HAVE_INTROSPECTION_FALSE=
+fi
+
+
+
+
+
+
+
     # Extract the first word of "gtkdoc-check", so it can be a program name with args.
 set dummy gtkdoc-check; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -14200,16 +14312,7 @@
 
 
 
- if false; then
-  HAVE_VALA_TRUE=
-  HAVE_VALA_FALSE='#'
-else
-  HAVE_VALA_TRUE='#'
-  HAVE_VALA_FALSE=
-fi
-
-if test "x$USE_MAINTAINER_MODE" = "xyes" ; then
-        # Extract the first word of "valac", so it can be a program name with args.
+# Extract the first word of "valac", so it can be a program name with args.
 set dummy valac; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
@@ -14280,10 +14383,16 @@
     else
       :
     fi
-        if test "x$VALAC" = "x" ; then
-                as_fn_error $? "Cannot find the \"valac\" compiler in your PATH" "$LINENO" 5
-        fi
-	# Extract the first word of "vala-gen-introspect", so it can be a program name with args.
+ if test -x "$VALAC"; then
+  HAVE_VALAC_TRUE=
+  HAVE_VALAC_FALSE='#'
+else
+  HAVE_VALAC_TRUE='#'
+  HAVE_VALAC_FALSE=
+fi
+
+
+# Extract the first word of "vala-gen-introspect", so it can be a program name with args.
 set dummy vala-gen-introspect; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
@@ -14323,7 +14432,7 @@
 fi
 
 
-	# Extract the first word of "vapigen", so it can be a program name with args.
+# Extract the first word of "vapigen", so it can be a program name with args.
 set dummy vapigen; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
@@ -14363,14 +14472,17 @@
 fi
 
 
-	 if true; then
-  HAVE_VALA_TRUE=
-  HAVE_VALA_FALSE='#'
+ if test -n "$VALA_GEN_INTROSPECT" -a -n "$VAPIGEN"; then
+  BUILD_VAPI_TRUE=
+  BUILD_VAPI_FALSE='#'
 else
-  HAVE_VALA_TRUE='#'
-  HAVE_VALA_FALSE=
+  BUILD_VAPI_TRUE='#'
+  BUILD_VAPI_FALSE=
 fi
 
+if test -n "$BUILD_VAPI" ; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: will not build vapi" >&5
+$as_echo "$as_me: WARNING: will not build vapi" >&2;}
 fi
 
 
@@ -14531,37 +14643,19 @@
 
 
 
-if test "x$HAVE_VALA" = "xyes" -a "x$HAVE_GEE" = "xyes" -a "x$HAVE_GTK" = "xyes"; then
-	 if true; then
-  BUILD_DPAPVIEW_TRUE=
-  BUILD_DPAPVIEW_FALSE='#'
-else
-  BUILD_DPAPVIEW_TRUE='#'
-  BUILD_DPAPVIEW_FALSE=
-fi
-
-else
-	 if false; then
-  BUILD_DPAPVIEW_TRUE=
-  BUILD_DPAPVIEW_FALSE='#'
-else
-  BUILD_DPAPVIEW_TRUE='#'
-  BUILD_DPAPVIEW_FALSE=
-fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Will not build dpapview" >&5
-$as_echo "$as_me: WARNING: Will not build dpapview" >&2;}
-fi
-
- if false; then
-  HAVE_CHECK_TRUE=
-  HAVE_CHECK_FALSE='#'
-else
-  HAVE_CHECK_TRUE='#'
-  HAVE_CHECK_FALSE=
-fi
-
-if test "x$USE_MAINTAINER_MODE" = "xyes" ; then
+ if test "x$HAVE_VALA" = "xyes" -a "x$HAVE_GEE" = "xyes" -a "x$HAVE_GTK" = "xyes"; then
+  BUILD_DPAPVIEW_TRUE=
+  BUILD_DPAPVIEW_FALSE='#'
+else
+  BUILD_DPAPVIEW_TRUE='#'
+  BUILD_DPAPVIEW_FALSE=
+fi
+
+if test -n "$BUILD_DPAPVIEW" ; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: will not build dpapview" >&5
+$as_echo "$as_me: WARNING: will not build dpapview" >&2;}
+fi
+
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHECK" >&5
@@ -14633,7 +14727,7 @@
 $as_echo "yes" >&6; }
 	have_check=yes
 fi
-	 if test x"$have_check" = "xyes"; then
+ if test x"$have_check" = "xyes"; then
   HAVE_CHECK_TRUE=
   HAVE_CHECK_FALSE='#'
 else
@@ -14641,11 +14735,10 @@
   HAVE_CHECK_FALSE=
 fi
 
-	if test "x$have_check" = "xyes"; then
+if test "x$have_check" = "xyes"; then
 
 $as_echo "#define HAVE_CHECK 1" >>confdefs.h
 
-	fi
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uncompress in -lz" >&5
@@ -14909,6 +15002,10 @@
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -14953,12 +15050,12 @@
   as_fn_error $? "conditional \"USE_GSTREAMERAPP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${HAVE_VALA_TRUE}" && test -z "${HAVE_VALA_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_VALA\" was never defined.
+if test -z "${HAVE_VALAC_TRUE}" && test -z "${HAVE_VALAC_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_VALAC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${HAVE_VALA_TRUE}" && test -z "${HAVE_VALA_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_VALA\" was never defined.
+if test -z "${BUILD_VAPI_TRUE}" && test -z "${BUILD_VAPI_FALSE}"; then
+  as_fn_error $? "conditional \"BUILD_VAPI\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_GEE_TRUE}" && test -z "${HAVE_GEE_FALSE}"; then
@@ -14969,14 +15066,6 @@
   as_fn_error $? "conditional \"BUILD_DPAPVIEW\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${BUILD_DPAPVIEW_TRUE}" && test -z "${BUILD_DPAPVIEW_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_DPAPVIEW\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_CHECK_TRUE}" && test -z "${HAVE_CHECK_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_CHECK\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${HAVE_CHECK_TRUE}" && test -z "${HAVE_CHECK_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_CHECK\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -15378,7 +15467,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libdmapsharing $as_me 2.9.24, which was
+This file was extended by libdmapsharing $as_me 2.9.26, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15444,7 +15533,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libdmapsharing config.status 2.9.24
+libdmapsharing config.status 2.9.26
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2014-02-22 10:48:55 +0000
+++ configure.ac	2014-05-27 20:54:48 +0000
@@ -1,8 +1,11 @@
-AC_INIT(libdmapsharing, 2.9.24)
+AC_INIT(libdmapsharing, 2.9.26)
 
 dnl when going to/from release please set the nano (fourth number) right !
 dnl releases only do Wall, cvs and prerelease does Werror too
-AS_VERSION(libdmapsharing, LIBDMAPSHARING, 2, 9, 24, LIBDMAPSHARING_CVS="no", LIBDMAPSHARING_CVS="yes")
+AS_VERSION(libdmapsharing, LIBDMAPSHARING, 2, 9, 26, LIBDMAPSHARING_CVS="no", LIBDMAPSHARING_CVS="yes")
+
+# Enable silent build when available (Automake 1.11)
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 dnl FIXME:
 dnl would like to automate this off the above definitions, but API might be 2.2 with version 2.1.
@@ -37,6 +40,8 @@
 AC_HEADER_STDC
 AC_PROG_LIBTOOL
 
+GOBJECT_INTROSPECTION_CHECK([1.30.0])
+
 GTK_DOC_CHECK(1.0)
 AC_CONFIG_MACRO_DIR(m4)
 
@@ -336,15 +341,14 @@
 AC_SUBST(GSTREAMERAPP_CFLAGS)
 AC_SUBST(GSTREAMERAPP_LIBS)
 
-AM_CONDITIONAL(HAVE_VALA, false)
-if test "x$USE_MAINTAINER_MODE" = "xyes" ; then
-        AM_PROG_VALAC([0.11.4])
-        if test "x$VALAC" = "x" ; then
-                AC_MSG_ERROR([Cannot find the "valac" compiler in your PATH])
-        fi
-	AC_PATH_PROG(VALA_GEN_INTROSPECT, vala-gen-introspect)
-	AC_PATH_PROG(VAPIGEN, vapigen)
-	AM_CONDITIONAL(HAVE_VALA, true)
+AM_PROG_VALAC([0.11.4])
+AM_CONDITIONAL(HAVE_VALAC, test -x "$VALAC")
+
+AC_PATH_PROG(VALA_GEN_INTROSPECT, vala-gen-introspect)
+AC_PATH_PROG(VAPIGEN, vapigen)
+AM_CONDITIONAL(BUILD_VAPI, test -n "$VALA_GEN_INTROSPECT" -a -n "$VAPIGEN")
+if test -n "$BUILD_VAPI" ; then
+	AC_WARN([will not build vapi])
 fi
 
 PKG_CHECK_MODULES(GTK, gtk+-2.0, HAVE_GTK=yes, HAVE_GTK=no)
@@ -358,20 +362,15 @@
 AC_SUBST(GEE_CFLAGS)
 AC_SUBST(GEE_LIBS)
 
-if test "x$HAVE_VALA" = "xyes" -a "x$HAVE_GEE" = "xyes" -a "x$HAVE_GTK" = "xyes"; then
-	AM_CONDITIONAL(BUILD_DPAPVIEW, true)
-else
-	AM_CONDITIONAL(BUILD_DPAPVIEW, false)
-	AC_WARN([Will not build dpapview])
+AM_CONDITIONAL(BUILD_DPAPVIEW, test "x$HAVE_VALA" = "xyes" -a "x$HAVE_GEE" = "xyes" -a "x$HAVE_GTK" = "xyes")
+if test -n "$BUILD_DPAPVIEW" ; then
+	AC_WARN([will not build dpapview])
 fi
 
-AM_CONDITIONAL(HAVE_CHECK, false)
-if test "x$USE_MAINTAINER_MODE" = "xyes" ; then
-	PKG_CHECK_MODULES([CHECK], [check >= 0.9.4],have_check=yes,have_check=no)
-	AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
-	if test "x$have_check" = "xyes"; then
-		AC_DEFINE(HAVE_CHECK, 1, [Define if check support is enabled])
-	fi
+PKG_CHECK_MODULES([CHECK], [check >= 0.9.4],have_check=yes,have_check=no)
+AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
+if test "x$have_check" = "xyes"; then
+	AC_DEFINE(HAVE_CHECK, 1, [Define if check support is enabled])
 fi
 
 AC_CHECK_LIB(z, uncompress)

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-22 10:48:55 +0000
+++ debian/changelog	2014-05-27 20:54:48 +0000
@@ -1,3 +1,9 @@
+libdmapsharing (2.9.26-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release.
+
+ -- Jackson Doak <[e-mail]>  Wed, 28 May 2014 06:27:12 +1000
+
 libdmapsharing (2.9.24-0ubuntu1) trusty; urgency=medium
 
   * New upstream bugfix release.

=== modified file 'doc/Makefile.in'
--- doc/Makefile.in	2013-06-29 22:28:20 +0000
+++ doc/Makefile.in	2014-05-27 20:54:48 +0000
@@ -90,9 +90,10 @@
 am__aclocal_m4_deps = $(top_srcdir)/m4/as-arch.m4 \
 	$(top_srcdir)/m4/as-compiler-flag.m4 \
 	$(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -184,6 +185,14 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDMAPSHARING_MAJORMINOR = @LIBDMAPSHARING_MAJORMINOR@

=== modified file 'doc/html/libdmapsharing-3.0-DMAPContainerDb.html'
--- doc/html/libdmapsharing-3.0-DMAPContainerDb.html	2013-06-29 22:28:20 +0000
+++ doc/html/libdmapsharing-3.0-DMAPContainerDb.html	2014-05-27 20:54:48 +0000
@@ -138,6 +138,10 @@
 <td>A container database.</td>
 </tr>
 <tr>
+<td><p><span class="term"><em class="parameter"><code>func</code></em> :</span></p></td>
+<td>The function to apply to each record in the database.</td>
+</tr>
+<tr>
 <td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td>
 <td>User data to pass to the function.</td>
 </tr>

=== modified file 'doc/html/libdmapsharing-3.0-DMAPDb.html'
--- doc/html/libdmapsharing-3.0-DMAPDb.html	2013-06-29 22:28:20 +0000
+++ doc/html/libdmapsharing-3.0-DMAPDb.html	2014-05-27 20:54:48 +0000
@@ -96,7 +96,7 @@
 <pre class="programlisting"><span class="returnvalue">guint</span>               dmap_db_add                         (<em class="parameter"><code><span class="type">DMAPDb</span> *db</code></em>,
                                                          <em class="parameter"><code><span class="type">DMAPRecord</span> *record</code></em>);</pre>
 <p>
-Add a record to the database and assign it the given ID.
+Add a record to the database.
 </p>
 <div class="variablelist"><table border="0" class="variablelist">
 <colgroup>
@@ -114,8 +114,11 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>The ID for the newly added record.
-See also the notes for dmap_db_add regarding reference counting.</td>
+<td>The ID for the newly added record. A reference to the record
+will be retained by the database (if required; an adapter-type
+implementation may not want to retain a reference as the record data may
+be placed elsewhere). In all cases, the record should be unrefed by the
+calling code.</td>
 </tr>
 </tbody>
 </table></div>
@@ -157,7 +160,33 @@
                                                          <em class="parameter"><code><span class="type">DMAPRecord</span> *record</code></em>,
                                                          <em class="parameter"><code><span class="type">guint</span> id</code></em>);</pre>
 <p>
+Add a record to the database and assign it the given ID.
 </p>
+<div class="variablelist"><table border="0" class="variablelist">
+<colgroup>
+<col align="left" valign="top">
+<col>
+</colgroup>
+<tbody>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>db</code></em> :</span></p></td>
+<td>A media database.</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>record</code></em> :</span></p></td>
+<td>A database record.</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
+<td>A database record ID.</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>The ID for the newly added record.
+See also the notes for dmap_db_add regarding reference counting.</td>
+</tr>
+</tbody>
+</table></div>
 </div>
 <hr>
 <div class="refsect2">
@@ -208,6 +237,10 @@
 <td>A media database.</td>
 </tr>
 <tr>
+<td><p><span class="term"><em class="parameter"><code>func</code></em> :</span></p></td>
+<td>The function to apply to each record in the database.</td>
+</tr>
+<tr>
 <td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td>
 <td>User data to pass to the function.</td>
 </tr>

=== modified file 'libdmapsharing-3.0-uninstalled.pc'
--- libdmapsharing-3.0-uninstalled.pc	2014-02-22 10:48:55 +0000
+++ libdmapsharing-3.0-uninstalled.pc	2014-05-27 20:54:48 +0000
@@ -5,7 +5,7 @@
 
 Name: libdmapsharing
 Description: libdmapsharing
-Version: 2.9.24
+Version: 2.9.26
 Requires: glib-2.0 libsoup-2.4 gstreamer-1.0
 Libs: -L${libdir} -ldmapsharing-3.0
 Cflags: -I${includedir}

=== modified file 'libdmapsharing/Makefile.am'
--- libdmapsharing/Makefile.am	2013-06-29 22:28:20 +0000
+++ libdmapsharing/Makefile.am	2014-05-27 20:54:48 +0000
@@ -60,6 +60,7 @@
 
 libdmapsharing_3_0_la_LDFLAGS = \
 	-version-info @SO_VERSION@ \
+	$(CHECK_LIBS) \
 	$(GLIB_LIBS) \
 	$(GTHREAD_LIBS) \
 	$(GOBJECT_LIBS) \
@@ -135,4 +136,32 @@
 
 CLEANFILES = $(BUILT_SOURCES)
 
+if HAVE_INTROSPECTION
+include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ARGS = --symbol-prefix=dmap --add-include-path=$(srcdir) --warn-all
+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+
+introspection_sources = $(libdmapsharinginclude_HEADERS) $(libdmapsharinginclude_SOURCES)
+
+DMAP-3.0.gir: libdmapsharing-3.0.la
+DMAP_3_0_gir_INCLUDES = GObject-2.0 Soup-2.4
+DMAP_3_0_gir_CFLAGS = \
+	$(INCLUDES) \
+	$(libdmapsharing_3_0_la_CFLAGS)
+DMAP_3_0_gir_LIBS = \
+	libdmapsharing-3.0.la
+DMAP_3_0_gir_FILES = $(introspection_sources)
+
+INTROSPECTION_GIRS += DMAP-3.0.gir
+
+girdir = $(datadir)/gir-1.0
+gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibdir = $(libdir)/girepository-1.0
+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+CLEANFILES += $(gir_DATA) $(typelib_DATA)
+endif
+
 EXTRA_DIST = dmap-marshal.list

=== modified file 'libdmapsharing/Makefile.in'
--- libdmapsharing/Makefile.in	2013-06-29 22:28:20 +0000
+++ libdmapsharing/Makefile.in	2014-05-27 20:54:48 +0000
@@ -15,6 +15,7 @@
 @SET_MAKE@
 
 
+
 VPATH = @srcdir@
 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
 am__make_running_with_option = \
@@ -98,6 +99,7 @@
 @USE_GSTREAMERAPP_TRUE@	dmap-gst-wav-input-stream.c \
 @USE_GSTREAMERAPP_TRUE@	gst-util.c
 
+@HAVE_INTROSPECTION_TRUE@am__append_5 = $(gir_DATA) $(typelib_DATA)
 subdir = libdmapsharing
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(srcdir)/dmap-config.h.in $(top_srcdir)/depcomp \
@@ -106,9 +108,10 @@
 am__aclocal_m4_deps = $(top_srcdir)/m4/as-arch.m4 \
 	$(top_srcdir)/m4/as-compiler-flag.m4 \
 	$(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -142,7 +145,8 @@
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
-am__installdirs = "$(DESTDIR)$(libdir)" \
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" \
+	"$(DESTDIR)$(typelibdir)" \
 	"$(DESTDIR)$(libdmapsharingincludedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libdmapsharing_3_0_la_LIBADD =
@@ -244,6 +248,7 @@
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+DATA = $(gir_DATA) $(typelib_DATA)
 HEADERS = $(libdmapsharinginclude_HEADERS) $(noinst_HEADERS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
@@ -329,6 +334,14 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDMAPSHARING_MAJORMINOR = @LIBDMAPSHARING_MAJORMINOR@
@@ -455,6 +468,7 @@
 
 libdmapsharing_3_0_la_LDFLAGS = \
 	-version-info @SO_VERSION@ \
+	$(CHECK_LIBS) \
 	$(GLIB_LIBS) \
 	$(GTHREAD_LIBS) \
 	$(GOBJECT_LIBS) \
@@ -502,7 +516,24 @@
 	dmap-gst-wav-input-stream.h \
 	gst-util.h
 
-CLEANFILES = $(BUILT_SOURCES)
+CLEANFILES = $(BUILT_SOURCES) $(am__append_5)
+@HAVE_INTROSPECTION_TRUE@INTROSPECTION_GIRS = DMAP-3.0.gir
+@HAVE_INTROSPECTION_TRUE@INTROSPECTION_SCANNER_ARGS = --symbol-prefix=dmap --add-include-path=$(srcdir) --warn-all
+@HAVE_INTROSPECTION_TRUE@INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+@HAVE_INTROSPECTION_TRUE@introspection_sources = $(libdmapsharinginclude_HEADERS) $(libdmapsharinginclude_SOURCES)
+@HAVE_INTROSPECTION_TRUE@DMAP_3_0_gir_INCLUDES = GObject-2.0 Soup-2.4
+@HAVE_INTROSPECTION_TRUE@DMAP_3_0_gir_CFLAGS = \
+@HAVE_INTROSPECTION_TRUE@	$(INCLUDES) \
+@HAVE_INTROSPECTION_TRUE@	$(libdmapsharing_3_0_la_CFLAGS)
+
+@HAVE_INTROSPECTION_TRUE@DMAP_3_0_gir_LIBS = \
+@HAVE_INTROSPECTION_TRUE@	libdmapsharing-3.0.la
+
+@HAVE_INTROSPECTION_TRUE@DMAP_3_0_gir_FILES = $(introspection_sources)
+@HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
+@HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS)
+@HAVE_INTROSPECTION_TRUE@typelibdir = $(libdir)/girepository-1.0
+@HAVE_INTROSPECTION_TRUE@typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 EXTRA_DIST = dmap-marshal.list
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -877,6 +908,48 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
+install-girDATA: $(gir_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(gir_DATA)'; test -n "$(girdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(girdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(girdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(girdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(girdir)" || exit $$?; \
+	done
+
+uninstall-girDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(gir_DATA)'; test -n "$(girdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(girdir)'; $(am__uninstall_files_from_dir)
+install-typelibDATA: $(typelib_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(typelib_DATA)'; test -n "$(typelibdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(typelibdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(typelibdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(typelibdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(typelibdir)" || exit $$?; \
+	done
+
+uninstall-typelibDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(typelib_DATA)'; test -n "$(typelibdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(typelibdir)'; $(am__uninstall_files_from_dir)
 install-libdmapsharingincludeHEADERS: $(libdmapsharinginclude_HEADERS)
 	@$(NORMAL_INSTALL)
 	@list='$(libdmapsharinginclude_HEADERS)'; test -n "$(libdmapsharingincludedir)" || list=; \
@@ -984,9 +1057,9 @@
 check-am: all-am
 check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libdmapsharingincludedir)"; do \
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(typelibdir)" "$(DESTDIR)$(libdmapsharingincludedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
@@ -1045,7 +1118,8 @@
 
 info-am:
 
-install-data-am: install-libdmapsharingincludeHEADERS
+install-data-am: install-girDATA install-libdmapsharingincludeHEADERS \
+	install-typelibDATA
 
 install-dvi: install-dvi-am
 
@@ -1091,8 +1165,8 @@
 
 ps-am:
 
-uninstall-am: uninstall-libLTLIBRARIES \
-	uninstall-libdmapsharingincludeHEADERS
+uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \
+	uninstall-libdmapsharingincludeHEADERS uninstall-typelibDATA
 
 .MAKE: all check install install-am install-strip
 
@@ -1102,15 +1176,16 @@
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-libLTLIBRARIES \
+	install-exec-am install-girDATA install-html install-html-am \
+	install-info install-info-am install-libLTLIBRARIES \
 	install-libdmapsharingincludeHEADERS install-man install-pdf \
 	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \
-	uninstall-libdmapsharingincludeHEADERS
+	install-typelibDATA installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-girDATA uninstall-libLTLIBRARIES \
+	uninstall-libdmapsharingincludeHEADERS uninstall-typelibDATA
 
 
 dmap-marshal.c: dmap-marshal.list
@@ -1139,6 +1214,10 @@
 	&& sed -e "s/d_map/dmap/" -e "s/D_MAP/DMAP/" -e "s/d_acp/dacp/" -e "s/D_ACP/DACP/" $@.tmp > $@ \
 	&& rm -f $@.tmp
 
+@HAVE_INTROSPECTION_TRUE@include $(INTROSPECTION_MAKEFILE)
+
+@[e-mail]: libdmapsharing-3.0.la
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

=== modified file 'libdmapsharing/daap-share.c'
--- libdmapsharing/daap-share.c	2014-02-22 10:48:55 +0000
+++ libdmapsharing/daap-share.c	2014-05-27 20:54:48 +0000
@@ -185,7 +185,7 @@
 					 SoupMessage * message)
 {
 	soup_message_headers_append (message->response_headers, "DMAP-Server",
-				     "libdmapsharing" VERSION);
+				     "libdmapsharing" "VERSION");
 }
 
 #define DMAP_VERSION 2.0
@@ -398,7 +398,7 @@
 	}
 
 done:
-	g_debug ("    Should%s transcode %s %s", fnval ? "" : " not", format, format2 ? format2 : "[no target format]");
+	g_debug ("    Should%s transcode %s to %s", fnval ? "" : " not", format, format2 ? format2 : "[no target format]");
 
 	return fnval;
 }
@@ -922,7 +922,7 @@
 		const gchar *s;
 		gchar *content_range;
 
-		if (!g_ascii_strncasecmp (range_header, "bytes=", strlen("bytes="))) {
+		if (!g_str_has_prefix (range_header, "bytes=")) {
 			/* Not starting with "bytes=" ? */
 			offset = 0;
 		} else {

=== modified file 'libdmapsharing/dacp-player.h'
--- libdmapsharing/dacp-player.h	2013-08-29 12:30:01 +0000
+++ libdmapsharing/dacp-player.h	2014-05-27 20:54:48 +0000
@@ -91,13 +91,13 @@
 GType dacp_player_get_type (void);
 
 /**
- * dacp_player_now_playing_record
+ * dacp_player_now_playing_record:
  * @player: a player
  */
 DAAPRecord *dacp_player_now_playing_record (DACPPlayer * player);
 
 /**
- * dacp_player_now_playing_artwork
+ * dacp_player_now_playing_artwork:
  * @player: a player
  * @width: width
  * @height: height
@@ -106,37 +106,37 @@
                                          guint width, guint height);
 
 /**
- * dacp_player_play_pause
+ * dacp_player_play_pause:
  * @player: a player
  */
 void dacp_player_play_pause (DACPPlayer * player);
 
 /**
- * dacp_player_pause
+ * dacp_player_pause:
  * @player: a player
  */
 void dacp_player_pause (DACPPlayer * player);
 
 /**
- * dacp_player_next_item
+ * dacp_player_next_item:
  * @player: a player
  */
 void dacp_player_next_item (DACPPlayer * player);
 
 /**
- * dacp_player_now_prev_item
+ * dacp_player_now_prev_item:
  * @player: a player
  */
 void dacp_player_prev_item (DACPPlayer * player);
 
 /**
- * dacp_player_cue_clear
+ * dacp_player_cue_clear:
  * @player: a player
  */
 void dacp_player_cue_clear (DACPPlayer * player);
 
 /**
- * dacp_player_cue_play
+ * dacp_player_cue_play:
  * @player: a player
  * @records : a list of records
  * @index: an index

=== modified file 'libdmapsharing/dacp-share.c'
--- libdmapsharing/dacp-share.c	2011-08-03 02:16:06 +0000
+++ libdmapsharing/dacp-share.c	2014-05-27 20:54:48 +0000
@@ -861,7 +861,7 @@
 		   == 0) {
 		guint width = 320;
 		guint height = 320;
-		gchar *artwork_filename;
+		guchar *artwork_filename;
 		gchar *buffer;
 		gsize buffer_len;
 
@@ -881,7 +881,7 @@
 		}
 #ifdef HAVE_GDKPIXBUF
 		GdkPixbuf *artwork =
-			gdk_pixbuf_new_from_file_at_scale (artwork_filename,
+			gdk_pixbuf_new_from_file_at_scale ((char *) artwork_filename,
 							   width, height,
 							   TRUE, NULL);
 

=== modified file 'libdmapsharing/dmap-connection.h'
--- libdmapsharing/dmap-connection.h	2011-08-03 02:16:06 +0000
+++ libdmapsharing/dmap-connection.h	2014-05-27 20:54:48 +0000
@@ -167,7 +167,7 @@
 					    gint req_id, gboolean send_close);
 
 /**
- * dmap_connection_authenticate_message
+ * dmap_connection_authenticate_message:
  * @connection: A #DMAPConnection
  * @session: A #SoupSession
  * @message: A #SoupMessage

=== modified file 'libdmapsharing/dmap-container-db.h'
--- libdmapsharing/dmap-container-db.h	2011-08-03 02:16:06 +0000
+++ libdmapsharing/dmap-container-db.h	2014-05-27 20:54:48 +0000
@@ -103,7 +103,7 @@
 /**
  * dmap_container_db_foreach:
  * @db: A container database.
- * @fn: The function to apply to each record in the database.
+ * @func: The function to apply to each record in the database.
  * @data: User data to pass to the function.
  *
  * Apply a function to each record in a container database.

=== modified file 'libdmapsharing/dmap-db.c'
--- libdmapsharing/dmap-db.c	2011-08-03 02:16:06 +0000
+++ libdmapsharing/dmap-db.c	2014-05-27 20:54:48 +0000
@@ -268,7 +268,7 @@
 	for (list = fd->filter_def; list != NULL; list = list->next) {
 		for (filter = list->data; filter != NULL;
 		     filter = filter->next) {
-			FilterDefinition *def = filter->data;
+			DMAPDbFilterDefinition *def = filter->data;
 			const gchar *property_name;
 
 			query_key = def->key;

=== modified file 'libdmapsharing/dmap-db.h'
--- libdmapsharing/dmap-db.h	2011-08-03 02:16:06 +0000
+++ libdmapsharing/dmap-db.h	2014-05-27 20:54:48 +0000
@@ -79,12 +79,12 @@
 
 typedef const char *(*RecordGetValueFunc) (DMAPRecord * record);
 
-typedef struct FilterDefinition
+typedef struct DMAPDbFilterDefinition
 {
 	gchar *key;
 	gchar *value;
 	gboolean negate;
-} FilterDefinition;
+} DMAPDbFilterDefinition;
 
 GType dmap_db_get_type (void);
 
@@ -104,7 +104,7 @@
 guint dmap_db_add (DMAPDb * db, DMAPRecord * record);
 
 /**
- * dmap_db_add:
+ * dmap_db_add_with_id:
  * @db: A media database.
  * @record: A database record.
  * @id: A database record ID.
@@ -165,7 +165,7 @@
 /**
  * dmap_db_foreach:
  * @db: A media database.
- * @fn: The function to apply to each record in the database.
+ * @func: The function to apply to each record in the database.
  * @data: User data to pass to the function.
  *
  * Apply a function to each record in a media database.

=== modified file 'libdmapsharing/dmap-gst-input-stream.c'
--- libdmapsharing/dmap-gst-input-stream.c	2013-08-29 12:30:01 +0000
+++ libdmapsharing/dmap-gst-input-stream.c	2014-05-27 20:54:48 +0000
@@ -307,7 +307,7 @@
 	DMAPGstInputStream *gst_stream = DMAP_GST_INPUT_STREAM (stream);
 	gint64 end_time;
 
-	end_time = end_time = g_get_monotonic_time () + QUEUE_POP_WAIT_SECONDS * G_TIME_SPAN_SECOND;
+	end_time = g_get_monotonic_time () + QUEUE_POP_WAIT_SECONDS * G_TIME_SPAN_SECOND;
 
 	g_mutex_lock (&gst_stream->priv->buffer_mutex);
 

=== modified file 'libdmapsharing/dmap-md5.c'
--- libdmapsharing/dmap-md5.c	2014-02-22 10:48:55 +0000
+++ libdmapsharing/dmap-md5.c	2014-05-27 20:54:48 +0000
@@ -142,6 +142,7 @@
 {
 	unsigned count;
 	unsigned char *p;
+	guint32 *tmp;
 
 	/* Compute number of bytes mod 64 */
 	count = (ctx->bits[0] >> 3) & 0x3F;
@@ -170,8 +171,9 @@
 	byteReverse (ctx->in, 14);
 
 	/* Append length in bits and transform */
-	((guint32 *) ctx->in)[14] = ctx->bits[0];
-	((guint32 *) ctx->in)[15] = ctx->bits[1];
+	tmp = (guint32 *) ctx->in;
+	tmp[14] = ctx->bits[0];
+	tmp[15] = ctx->bits[1];
 
 	MD5Transform (ctx->buf, (guint32 *) ctx->in, ctx->version);
 	byteReverse ((unsigned char *) ctx->buf, 4);
@@ -525,19 +527,19 @@
 #ifdef HAVE_CHECK
 START_TEST(test_dmap_hash_generate_v3_h2)
 {
-	char hash[33] = { 0 };
-	char *url = "test://foo";
+	guchar hash[33] = { 0 };
+	guchar *url = (guchar *) "test://foo";
 	dmap_hash_generate (3, url, 2, hash, 0);
-	fail_unless (! strcmp (hash, "798A9D80B6F08E339603BE83E0FEAD03"));
+	fail_unless (! memcmp (hash, "798A9D80B6F08E339603BE83E0FEAD03", strlen ("798A9D80B6F08E339603BE83E0FEAD03")));
 }
 END_TEST
 
 START_TEST(test_dmap_hash_progressive)
 {
-	char buf[16] = { 0 };
-	char hash1[33] = { 0 };
-	char hash2[33] = { 0 };
-	char *value = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+	guchar buf[16] = { 0 };
+	guchar hash1[33] = { 0 };
+	guchar hash2[33] = { 0 };
+	guchar *value = (guchar *) "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 	DMAPHashContext context;
 
 	dmap_hash_progressive_init   (&context);
@@ -552,7 +554,7 @@
 
 	dmap_hash_generate (3, value, 2, hash2, 0);
 
-	fail_unless (! strcmp (hash1, hash2)); 
+	fail_unless (! memcmp (hash1, hash2, 32));
 }
 END_TEST
 

=== modified file 'libdmapsharing/dmap-mdns-browser.h'
--- libdmapsharing/dmap-mdns-browser.h	2011-08-03 02:16:06 +0000
+++ libdmapsharing/dmap-mdns-browser.h	2014-05-27 20:54:48 +0000
@@ -181,5 +181,13 @@
 DMAPMdnsBrowserServiceType dmap_mdns_browser_get_service_type (DMAPMdnsBrowser
 							       * browser);
 
+/**
+ * DMAPMdnsBrowser::service-added:
+ * @browser: the #DMAPMdnsBrowser which received the signal.
+ * @service: #DMAPMdnsBrowserService
+ *
+ * Emitted each time a service becomes available to @browser
+ */
+
 G_END_DECLS
 #endif

=== modified file 'libdmapsharing/dmap-private-utils.c'
--- libdmapsharing/dmap-private-utils.c	2013-08-29 12:30:01 +0000
+++ libdmapsharing/dmap-private-utils.c	2014-05-27 20:54:48 +0000
@@ -38,7 +38,7 @@
 	if (read_size > 0) {
 		soup_message_body_append (message->response_body,
 					  SOUP_MEMORY_TAKE, chunk, read_size);
-		g_debug ("Read/wrote %d bytes.", read_size);
+		g_debug ("Read/wrote %ld bytes.", read_size);
 	} else {
 		if (error != NULL) {
 			g_warning ("Error reading from input stream: %s",

=== modified file 'libdmapsharing/dmap-record.h'
--- libdmapsharing/dmap-record.h	2013-08-29 12:30:01 +0000
+++ libdmapsharing/dmap-record.h	2014-05-27 20:54:48 +0000
@@ -49,7 +49,7 @@
 #define IS_DMAP_RECORD(o)	     (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
 				      DMAP_TYPE_RECORD))
 /**
- * DAAP_RECORD_GET_INTERFACE:
+ * DMAP_RECORD_GET_INTERFACE:
  * @o: a #DAAPRecord instance.
  *
  * Get the class structure associated to a #DAAPRecord instance.

=== modified file 'libdmapsharing/dmap-share.c'
--- libdmapsharing/dmap-share.c	2011-12-01 10:07:48 +0000
+++ libdmapsharing/dmap-share.c	2014-05-27 20:54:48 +0000
@@ -1295,7 +1295,7 @@
 	gboolean negate;
 	gint parentheses_count;
 	gint quotes_count;
-	FilterDefinition *def;
+	DMAPDbFilterDefinition *def;
 
 	GSList *list = NULL;
 	GSList *filter = NULL;
@@ -1419,11 +1419,11 @@
 		} else if (value != NULL && *next_char != '!') {
 			// If we won't accept this character, we are ending a 
 			// query key or value, so we should save them in a new
-			// FilterDefinition. If is_value is TRUE, we will still
+			// DMAPDbFilterDefinition. If is_value is TRUE, we will still
 			// parse the query value, so we must keep our def around.
 			// Otherwise, save it in the list of filters.
 			if (!def) {
-				def = g_new0 (FilterDefinition, 1);
+				def = g_new0 (DMAPDbFilterDefinition, 1);
 			}
 			if (is_key) {
 				def->key = value->str;
@@ -1468,8 +1468,8 @@
 	for (ptr1 = list; ptr1 != NULL; ptr1 = ptr1->next) {
 		for (ptr2 = ptr1->data; ptr2 != NULL; ptr2 = ptr2->next) {
 			g_debug ("%s = %s",
-				 ((FilterDefinition *) ptr2->data)->key,
-				 ((FilterDefinition *) ptr2->data)->value);
+				 ((DMAPDbFilterDefinition *) ptr2->data)->key,
+				 ((DMAPDbFilterDefinition *) ptr2->data)->value);
 		}
 	}
 
@@ -1483,7 +1483,7 @@
 
 	for (ptr1 = filter; ptr1 != NULL; ptr1 = ptr1->next) {
 		for (ptr2 = ptr1->data; ptr2 != NULL; ptr2 = ptr2->next) {
-			g_free (((FilterDefinition *) ptr2->data)->value);
+			g_free (((DMAPDbFilterDefinition *) ptr2->data)->value);
 			g_free (ptr2->data);
 		}
 	}

=== modified file 'libdmapsharing/dpap-share.c'
--- libdmapsharing/dpap-share.c	2013-06-29 22:28:20 +0000
+++ libdmapsharing/dpap-share.c	2014-05-27 20:54:48 +0000
@@ -191,7 +191,7 @@
 					 SoupMessage * message)
 {
 	soup_message_headers_append (message->response_headers, "DPAP-Server",
-				     "libdmapsharing" VERSION);
+				     "libdmapsharing" "VERSION");
 }
 
 #define DMAP_VERSION 2.0

=== modified file 'm4/Makefile.in'
--- m4/Makefile.in	2013-06-29 22:28:20 +0000
+++ m4/Makefile.in	2014-05-27 20:54:48 +0000
@@ -83,9 +83,10 @@
 am__aclocal_m4_deps = $(top_srcdir)/m4/as-arch.m4 \
 	$(top_srcdir)/m4/as-compiler-flag.m4 \
 	$(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -177,6 +178,14 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDMAPSHARING_MAJORMINOR = @LIBDMAPSHARING_MAJORMINOR@

=== added file 'm4/introspection.m4'
--- m4/introspection.m4	1970-01-01 00:00:00 +0000
+++ m4/introspection.m4	2014-05-27 20:54:48 +0000
@@ -0,0 +1,96 @@
+dnl -*- mode: autoconf -*-
+dnl Copyright 2009 Johan Dahlin
+dnl
+dnl This file is free software; the author(s) gives unlimited
+dnl permission to copy and/or distribute it, with or without
+dnl modifications, as long as this notice is preserved.
+dnl
+
+# serial 1
+
+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
+[
+    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+    AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+    AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
+
+    dnl enable/disable introspection
+    m4_if([$2], [require],
+    [dnl
+        enable_introspection=yes
+    ],[dnl
+        AC_ARG_ENABLE(introspection,
+                  AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
+                                 [Enable introspection for this build]),, 
+                                 [enable_introspection=auto])
+    ])dnl
+
+    AC_MSG_CHECKING([for gobject-introspection])
+
+    dnl presence/version checking
+    AS_CASE([$enable_introspection],
+    [no], [dnl
+        found_introspection="no (disabled, use --enable-introspection to enable)"
+    ],dnl
+    [yes],[dnl
+        PKG_CHECK_EXISTS([gobject-introspection-1.0],,
+                         AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
+        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
+                         found_introspection=yes,
+                         AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
+    ],dnl
+    [auto],[dnl
+        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
+	dnl Canonicalize enable_introspection
+	enable_introspection=$found_introspection
+    ],dnl
+    [dnl	
+        AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
+    ])dnl
+
+    AC_MSG_RESULT([$found_introspection])
+
+    INTROSPECTION_SCANNER=
+    INTROSPECTION_COMPILER=
+    INTROSPECTION_GENERATE=
+    INTROSPECTION_GIRDIR=
+    INTROSPECTION_TYPELIBDIR=
+    if test "x$found_introspection" = "xyes"; then
+       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
+    fi
+    AC_SUBST(INTROSPECTION_SCANNER)
+    AC_SUBST(INTROSPECTION_COMPILER)
+    AC_SUBST(INTROSPECTION_GENERATE)
+    AC_SUBST(INTROSPECTION_GIRDIR)
+    AC_SUBST(INTROSPECTION_TYPELIBDIR)
+    AC_SUBST(INTROSPECTION_CFLAGS)
+    AC_SUBST(INTROSPECTION_LIBS)
+    AC_SUBST(INTROSPECTION_MAKEFILE)
+
+    AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
+])
+
+
+dnl Usage:
+dnl   GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
+
+AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
+[
+  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
+])
+
+dnl Usage:
+dnl   GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
+
+
+AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
+[
+  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
+])

=== modified file 'm4/libtool.m4'
--- m4/libtool.m4	2014-02-22 10:48:55 +0000
+++ m4/libtool.m4	2014-05-27 20:54:48 +0000
@@ -1326,10 +1326,10 @@
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_i386"
 	    ;;
-	  powerpcle-*linux*)
+	  powerpc64le-*linux*)
 	    LD="${LD-ld} -m elf32lppclinux"
 	    ;;
-	  powerpc-*linux*)
+	  powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
 	    ;;
 	  s390x-*linux*)

=== modified file 'media/Makefile.in'
--- media/Makefile.in	2013-06-29 22:28:20 +0000
+++ media/Makefile.in	2014-05-27 20:54:48 +0000
@@ -83,9 +83,10 @@
 am__aclocal_m4_deps = $(top_srcdir)/m4/as-arch.m4 \
 	$(top_srcdir)/m4/as-compiler-flag.m4 \
 	$(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -177,6 +178,14 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDMAPSHARING_MAJORMINOR = @LIBDMAPSHARING_MAJORMINOR@

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2013-05-27 20:02:23 +0000
+++ tests/Makefile.am	2014-05-27 20:54:48 +0000
@@ -52,7 +52,7 @@
 	$(IMAGEMAGICK_LIBS) \
 	$(MDNS_LIBS)
 
-if MAINTAINER_MODE
+if HAVE_VALAC
 BUILT_SOURCES = dacplisten.stamp dpapview.stamp dmapcopy.stamp dmapserve.stamp
 
 dacplisten.stamp: $(dacplisten_VALASOURCES)
@@ -162,15 +162,17 @@
 	test-dpap-record-factory.h
 
 EXTRA_DIST = \
+	$(dacplisten_VALASOURCES) \
+	$(dacplisten_VALABUILTSOURCES) \
 	$(dpapview_VALASOURCES) \
 	$(dpapview_VALABUILTSOURCES) \
-	$(dacplisten_VALASOURCES) \
-	$(dacplisten_VALABUILTSOURCES) \
+	$(dmapcopy_VALASOURCES) \
+	$(dmapcopy_VALABUILTSOURCES) \
 	$(dmapserve_VALASOURCES) \
 	$(dmapserve_VALABUILTSOURCES) \
 	dpapview.ui
 
-if MAINTAINER_MODE
+if HAVE_VALAC
 CLEANFILES = \
 	$(BUILT_SOURCES) \
 	$(dpapview_VALABUILTSOURCES)

=== modified file 'tests/Makefile.in'
--- tests/Makefile.in	2013-06-29 22:28:20 +0000
+++ tests/Makefile.in	2014-05-27 20:54:48 +0000
@@ -92,9 +92,10 @@
 am__aclocal_m4_deps = $(top_srcdir)/m4/as-arch.m4 \
 	$(top_srcdir)/m4/as-compiler-flag.m4 \
 	$(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -288,6 +289,14 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDMAPSHARING_MAJORMINOR = @LIBDMAPSHARING_MAJORMINOR@
@@ -436,7 +445,7 @@
 	$(IMAGEMAGICK_LIBS) \
 	$(MDNS_LIBS)
 
-@MAINTAINER_MODE_TRUE@BUILT_SOURCES = dacplisten.stamp dpapview.stamp dmapcopy.stamp dmapserve.stamp
+@HAVE_VALAC_TRUE@BUILT_SOURCES = dacplisten.stamp dpapview.stamp dmapcopy.stamp dmapserve.stamp
 dacplisten_VALASOURCES = \
 	dacplisten.vala \
 	vala-dmap-db.vala \
@@ -516,17 +525,19 @@
 	test-dpap-record-factory.h
 
 EXTRA_DIST = \
+	$(dacplisten_VALASOURCES) \
+	$(dacplisten_VALABUILTSOURCES) \
 	$(dpapview_VALASOURCES) \
 	$(dpapview_VALABUILTSOURCES) \
-	$(dacplisten_VALASOURCES) \
-	$(dacplisten_VALABUILTSOURCES) \
+	$(dmapcopy_VALASOURCES) \
+	$(dmapcopy_VALABUILTSOURCES) \
 	$(dmapserve_VALASOURCES) \
 	$(dmapserve_VALABUILTSOURCES) \
 	dpapview.ui
 
-@MAINTAINER_MODE_TRUE@CLEANFILES = \
-@MAINTAINER_MODE_TRUE@	$(BUILT_SOURCES) \
-@MAINTAINER_MODE_TRUE@	$(dpapview_VALABUILTSOURCES)
+@HAVE_VALAC_TRUE@CLEANFILES = \
+@HAVE_VALAC_TRUE@	$(BUILT_SOURCES) \
+@HAVE_VALAC_TRUE@	$(dpapview_VALABUILTSOURCES)
 
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -860,21 +871,21 @@
 	tags tags-am uninstall uninstall-am
 
 
-@[e-mail]: $(dacplisten_VALASOURCES)
-@MAINTAINER_MODE_TRUE@	$(VALAC) --vapidir=../vala --pkg gee-0.8 --pkg gstreamer-1.0 --pkg libdmapsharing-3.0 --pkg libsoup-2.4 --pkg glib-2.0 --pkg avahi-gobject  $^ -C
-@MAINTAINER_MODE_TRUE@	touch $@
-
-@[e-mail]: $(dpapview_VALASOURCES)
-@MAINTAINER_MODE_TRUE@	$(VALAC) --vapidir=../vala --pkg gee-0.8 --pkg gtk+-2.0 --pkg gstreamer-1.0 --pkg libdmapsharing-3.0 --pkg libsoup-2.4 --pkg glib-2.0 --pkg avahi-gobject $^ -C
-@MAINTAINER_MODE_TRUE@	touch $@
-
-@[e-mail]: $(dmapcopy_VALASOURCES)
-@MAINTAINER_MODE_TRUE@	$(VALAC) --vapidir=../vala --pkg gee-0.8 --pkg gstreamer-1.0 --pkg libdmapsharing-3.0 --pkg libsoup-2.4 --pkg glib-2.0 --pkg avahi-gobject $^ -C
-@MAINTAINER_MODE_TRUE@	touch $@
-
-@[e-mail]: $(dmapserve_VALASOURCES)
-@MAINTAINER_MODE_TRUE@	$(VALAC) --vapidir=../vala --pkg gee-0.8 --pkg gstreamer-1.0 --pkg libdmapsharing-3.0 --pkg libsoup-2.4 --pkg glib-2.0 --pkg avahi-gobject $^ -C
-@MAINTAINER_MODE_TRUE@	touch $@
+@[e-mail]: $(dacplisten_VALASOURCES)
+@HAVE_VALAC_TRUE@	$(VALAC) --vapidir=../vala --pkg gee-0.8 --pkg gstreamer-1.0 --pkg libdmapsharing-3.0 --pkg libsoup-2.4 --pkg glib-2.0 --pkg avahi-gobject  $^ -C
+@HAVE_VALAC_TRUE@	touch $@
+
+@[e-mail]: $(dpapview_VALASOURCES)
+@HAVE_VALAC_TRUE@	$(VALAC) --vapidir=../vala --pkg gee-0.8 --pkg gtk+-2.0 --pkg gstreamer-1.0 --pkg libdmapsharing-3.0 --pkg libsoup-2.4 --pkg glib-2.0 --pkg avahi-gobject $^ -C
+@HAVE_VALAC_TRUE@	touch $@
+
+@[e-mail]: $(dmapcopy_VALASOURCES)
+@HAVE_VALAC_TRUE@	$(VALAC) --vapidir=../vala --pkg gee-0.8 --pkg gstreamer-1.0 --pkg libdmapsharing-3.0 --pkg libsoup-2.4 --pkg glib-2.0 --pkg avahi-gobject $^ -C
+@HAVE_VALAC_TRUE@	touch $@
+
+@[e-mail]: $(dmapserve_VALASOURCES)
+@HAVE_VALAC_TRUE@	$(VALAC) --vapidir=../vala --pkg gee-0.8 --pkg gstreamer-1.0 --pkg libdmapsharing-3.0 --pkg libsoup-2.4 --pkg glib-2.0 --pkg avahi-gobject $^ -C
+@HAVE_VALAC_TRUE@	touch $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

=== modified file 'tests/dacplisten.c'
--- tests/dacplisten.c	2013-05-27 20:02:23 +0000
+++ tests/dacplisten.c	2014-05-27 20:54:48 +0000
@@ -1,4 +1,4 @@
-/* dacplisten.c generated by valac 0.18.1, the Vala compiler
+/* dacplisten.c generated by valac 0.22.1, the Vala compiler
  * generated from dacplisten.vala, do not modify */
 
 /*   FILE: dacplisten.vala -- Listen to DACP remotes
@@ -110,7 +110,7 @@
 	VALA_DACP_PLAYER_DUMMY_PROPERTY
 };
 static DAAPRecord* vala_dacp_player_real_now_playing_record (DACPPlayer* base);
-static guchar* vala_dacp_player_real_now_playing_artwork (DACPPlayer* base, guint width, guint heigth, int* result_length1);
+static guchar* vala_dacp_player_real_now_playing_artwork (DACPPlayer* base, guint width, guint height, int* result_length1);
 static void vala_dacp_player_real_play_pause (DACPPlayer* base);
 static void vala_dacp_player_real_pause (DACPPlayer* base);
 static void vala_dacp_player_real_next_item (DACPPlayer* base);
@@ -143,7 +143,7 @@
 static DAAPRecord* vala_dacp_player_real_now_playing_record (DACPPlayer* base) {
 	ValaDACPPlayer * self;
 	DAAPRecord* result = NULL;
-	FILE* _tmp0_;
+	FILE* _tmp0_ = NULL;
 	self = (ValaDACPPlayer*) base;
 	_tmp0_ = stdout;
 	fprintf (_tmp0_, "Now playing record request received\n");
@@ -152,12 +152,12 @@
 }
 
 
-static guchar* vala_dacp_player_real_now_playing_artwork (DACPPlayer* base, guint width, guint heigth, int* result_length1) {
+static guchar* vala_dacp_player_real_now_playing_artwork (DACPPlayer* base, guint width, guint height, int* result_length1) {
 	ValaDACPPlayer * self;
 	guchar* result = NULL;
-	FILE* _tmp0_;
-	guchar* _tmp1_;
-	gint _tmp1__length1;
+	FILE* _tmp0_ = NULL;
+	guchar* _tmp1_ = NULL;
+	gint _tmp1__length1 = 0;
 	self = (ValaDACPPlayer*) base;
 	_tmp0_ = stdout;
 	fprintf (_tmp0_, "Now playing artwork request received\n");
@@ -173,7 +173,7 @@
 
 static void vala_dacp_player_real_play_pause (DACPPlayer* base) {
 	ValaDACPPlayer * self;
-	FILE* _tmp0_;
+	FILE* _tmp0_ = NULL;
 	self = (ValaDACPPlayer*) base;
 	_tmp0_ = stdout;
 	fprintf (_tmp0_, "Play/pause request received\n");
@@ -182,7 +182,7 @@
 
 static void vala_dacp_player_real_pause (DACPPlayer* base) {
 	ValaDACPPlayer * self;
-	FILE* _tmp0_;
+	FILE* _tmp0_ = NULL;
 	self = (ValaDACPPlayer*) base;
 	_tmp0_ = stdout;
 	fprintf (_tmp0_, "Pause request received\n");
@@ -191,7 +191,7 @@
 
 static void vala_dacp_player_real_next_item (DACPPlayer* base) {
 	ValaDACPPlayer * self;
-	FILE* _tmp0_;
+	FILE* _tmp0_ = NULL;
 	self = (ValaDACPPlayer*) base;
 	_tmp0_ = stdout;
 	fprintf (_tmp0_, "Next item request received\n");
@@ -200,7 +200,7 @@
 
 static void vala_dacp_player_real_prev_item (DACPPlayer* base) {
 	ValaDACPPlayer * self;
-	FILE* _tmp0_;
+	FILE* _tmp0_ = NULL;
 	self = (ValaDACPPlayer*) base;
 	_tmp0_ = stdout;
 	fprintf (_tmp0_, "Previous item request received\n");
@@ -209,7 +209,7 @@
 
 static void vala_dacp_player_real_cue_clear (DACPPlayer* base) {
 	ValaDACPPlayer * self;
-	FILE* _tmp0_;
+	FILE* _tmp0_ = NULL;
 	self = (ValaDACPPlayer*) base;
 	_tmp0_ = stdout;
 	fprintf (_tmp0_, "Cue clear request received\n");
@@ -218,7 +218,7 @@
 
 static void vala_dacp_player_real_cue_play (DACPPlayer* base, GList* records, guint index) {
 	ValaDACPPlayer * self;
-	FILE* _tmp0_;
+	FILE* _tmp0_ = NULL;
 	self = (ValaDACPPlayer*) base;
 	_tmp0_ = stdout;
 	fprintf (_tmp0_, "Cue play request received\n");
@@ -274,9 +274,9 @@
 
 
 static void __lambda2_ (DACPListener* self, const gchar* service_name, const gchar* display_name) {
-	FILE* _tmp0_;
-	const gchar* _tmp1_;
-	const gchar* _tmp2_;
+	FILE* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
 	g_return_if_fail (service_name != NULL);
 	g_return_if_fail (display_name != NULL);
 	_tmp0_ = stdout;
@@ -292,7 +292,7 @@
 
 
 static void __lambda3_ (DACPListener* self, const gchar* guid) {
-	FILE* _tmp0_;
+	FILE* _tmp0_ = NULL;
 	g_return_if_fail (guid != NULL);
 	_tmp0_ = stdout;
 	fprintf (_tmp0_, "Add GUID request received\n");
@@ -306,16 +306,16 @@
 
 DACPListener* dacp_listener_construct (GType object_type) {
 	DACPListener * self = NULL;
-	ValaDMAPDb* _tmp0_;
-	ValaDMAPContainerDb* _tmp1_;
-	ValaDACPPlayer* _tmp2_;
-	DACPPlayer* _tmp3_;
-	DMAPDb* _tmp4_;
-	DMAPContainerDb* _tmp5_;
-	DACPShare* _tmp6_;
-	DACPShare* _tmp7_;
-	DACPShare* _tmp8_;
-	DACPShare* _tmp9_;
+	ValaDMAPDb* _tmp0_ = NULL;
+	ValaDMAPContainerDb* _tmp1_ = NULL;
+	ValaDACPPlayer* _tmp2_ = NULL;
+	DACPPlayer* _tmp3_ = NULL;
+	DMAPDb* _tmp4_ = NULL;
+	DMAPContainerDb* _tmp5_ = NULL;
+	DACPShare* _tmp6_ = NULL;
+	DACPShare* _tmp7_ = NULL;
+	DACPShare* _tmp8_ = NULL;
+	DACPShare* _tmp9_ = NULL;
 	self = (DACPListener*) g_object_new (object_type, NULL);
 	_tmp0_ = vala_dmap_db_new ();
 	_g_object_unref0 (self->priv->db);
@@ -384,10 +384,10 @@
 
 gint _vala_main (gchar** args, int args_length1) {
 	gint result = 0;
-	GMainLoop* _tmp0_;
-	GMainLoop* loop;
-	DACPListener* _tmp1_;
-	DACPListener* dacplistener;
+	GMainLoop* loop = NULL;
+	GMainLoop* _tmp0_ = NULL;
+	DACPListener* dacplistener = NULL;
+	DACPListener* _tmp1_ = NULL;
 	_tmp0_ = g_main_loop_new (NULL, FALSE);
 	loop = _tmp0_;
 	_tmp1_ = dacp_listener_new ();

=== modified file 'tests/dacplisten.vala'
--- tests/dacplisten.vala	2011-08-03 02:16:06 +0000
+++ tests/dacplisten.vala	2014-05-27 20:54:48 +0000
@@ -27,7 +27,7 @@
 		return null;
 	}
 
-	unowned uchar[] now_playing_artwork (uint width, uint heigth) {
+	unowned uchar[] now_playing_artwork (uint width, uint height) {
 		stdout.printf ("Now playing artwork request received\n");
 		return null;
 	}

=== modified file 'tests/dmapcopy.c'
--- tests/dmapcopy.c	2013-05-27 20:02:23 +0000
+++ tests/dmapcopy.c	2014-05-27 20:54:48 +0000
@@ -1,4 +1,4 @@
-/* dmapcopy.c generated by valac 0.18.1, the Vala compiler
+/* dmapcopy.c generated by valac 0.22.1, the Vala compiler
  * generated from dmapcopy.vala, do not modify */
 
 /*   FILE: dmapcopy.vala -- Copy files from a DMAP server
@@ -137,10 +137,10 @@
 
 
 static void __lambda2_ (DPAPCopy* self, gconstpointer k, gconstpointer v) {
-	FILE* _tmp0_;
-	gconstpointer _tmp1_;
-	const gchar* _tmp2_;
-	const gchar* _tmp3_;
+	FILE* _tmp0_ = NULL;
+	gconstpointer _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
 	_tmp0_ = stdout;
 	_tmp1_ = v;
 	_tmp2_ = vala_dpap_record_get_location (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_VALA_DPAP_RECORD, ValaDPAPRecord));
@@ -156,9 +156,9 @@
 
 static gboolean dpap_copy_connected_cb (DPAPCopy* self, DMAPConnection* connection, gboolean _result_, const gchar* reason) {
 	gboolean result = FALSE;
-	ValaDMAPDb* _tmp0_;
+	ValaDMAPDb* _tmp0_ = NULL;
 	gint64 _tmp1_ = 0LL;
-	ValaDMAPDb* _tmp2_;
+	ValaDMAPDb* _tmp2_ = NULL;
 	g_return_val_if_fail (self != NULL, FALSE);
 	g_return_val_if_fail (connection != NULL, FALSE);
 	_tmp0_ = self->priv->db;
@@ -179,16 +179,16 @@
 
 
 static void dpap_copy_service_added_cb (DPAPCopy* self, DMAPMdnsBrowserService* service) {
-	DMAPMdnsBrowserService* _tmp0_;
-	const gchar* _tmp1_;
-	DMAPMdnsBrowserService* _tmp2_;
-	const gchar* _tmp3_;
-	DMAPMdnsBrowserService* _tmp4_;
-	guint _tmp5_;
-	ValaDMAPDb* _tmp6_;
-	ValaDPAPRecordFactory* _tmp7_;
-	DPAPConnection* _tmp8_;
-	DMAPConnection* _tmp9_;
+	DMAPMdnsBrowserService* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	DMAPMdnsBrowserService* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
+	DMAPMdnsBrowserService* _tmp4_ = NULL;
+	guint _tmp5_ = 0U;
+	ValaDMAPDb* _tmp6_ = NULL;
+	ValaDPAPRecordFactory* _tmp7_ = NULL;
+	DPAPConnection* _tmp8_ = NULL;
+	DMAPConnection* _tmp9_ = NULL;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = service;
 	_tmp1_ = _tmp0_->service_name;
@@ -213,11 +213,11 @@
 
 DPAPCopy* dpap_copy_construct (GType object_type, GError** error) {
 	DPAPCopy* self = NULL;
-	ValaDMAPDb* _tmp0_;
-	ValaDPAPRecordFactory* _tmp1_;
-	DMAPMdnsBrowser* _tmp2_;
-	DMAPMdnsBrowser* _tmp3_;
-	DMAPMdnsBrowser* _tmp4_;
+	ValaDMAPDb* _tmp0_ = NULL;
+	ValaDPAPRecordFactory* _tmp1_ = NULL;
+	DMAPMdnsBrowser* _tmp2_ = NULL;
+	DMAPMdnsBrowser* _tmp3_ = NULL;
+	DMAPMdnsBrowser* _tmp4_ = NULL;
 	GError * _inner_error_ = NULL;
 	self = (DPAPCopy*) g_type_create_instance (object_type);
 	_tmp0_ = vala_dmap_db_new ();
@@ -413,8 +413,8 @@
 
 
 void debug_printf (const gchar* log_domain, GLogLevelFlags log_level, const gchar* message) {
-	FILE* _tmp0_;
-	const gchar* _tmp1_;
+	FILE* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
 	_tmp0_ = stdout;
 	_tmp1_ = message;
 	fprintf (_tmp0_, "%s\n", _tmp1_);
@@ -432,10 +432,10 @@
 
 gint _vala_main (gchar** args, int args_length1) {
 	gint result = 0;
-	GMainLoop* _tmp0_;
-	GMainLoop* loop;
-	DPAPCopy* _tmp1_;
-	DPAPCopy* dmapcopy;
+	GMainLoop* loop = NULL;
+	GMainLoop* _tmp0_ = NULL;
+	DPAPCopy* dmapcopy = NULL;
+	DPAPCopy* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
 	_tmp0_ = g_main_loop_new (NULL, FALSE);
 	loop = _tmp0_;

=== added file 'tests/dmapcopy.vala'
--- tests/dmapcopy.vala	1970-01-01 00:00:00 +0000
+++ tests/dmapcopy.vala	2014-05-27 20:54:48 +0000
@@ -0,0 +1,100 @@
+/*   FILE: dmapcopy.vala -- Copy files from a DMAP server
+ * AUTHOR: W. Michael Petullo <[e-mail]>
+ *   DATE: 20 December 2010 
+ *
+ * Copyright (c) 2010 W. Michael Petullo <[e-mail]>
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+private class DPAPCopy {
+	private DMAP.MdnsBrowser browser;
+	private DMAP.Connection connection;
+	private ValaDMAPDb db;
+	private ValaDPAPRecordFactory factory;
+
+	private bool connected_cb (DMAP.Connection connection, bool result, string? reason) {
+		GLib.debug ("%lld entries\n", db.count ());
+
+		db.foreach ((k, v) => {
+
+			stdout.printf ("%s\n", ((ValaDPAPRecord) v).location);
+
+			/* Uncomment to copy the data:
+			var session = new Soup.SessionAsync ();
+			var message = new Soup.Message ("GET", ((ValaDPAPRecord) v).location);
+			message.request_headers = connection.get_headers (((ValaDPAPRecord) v).location);
+
+			GLib.debug ("GET %s", ((ValaDPAPRecord) v).location);
+			session.send_message (message);
+
+			var file = File.new_for_path (((int) k).to_string ());
+			var file_stream = file.create (FileCreateFlags.NONE);
+
+			// Test for the existence of file
+			if (file.query_exists ()) {
+				stdout.printf ("File successfully created.\n");
+			}
+
+			// Write text data to file
+			var data_stream = new DataOutputStream (file_stream);
+			data_stream.write (message.response_body.data, (size_t) message.response_body.length, null);
+			*/
+		});
+
+		return true;
+	}
+
+	private void service_added_cb (DMAP.MdnsBrowserService *service) {
+		connection = (DMAP.Connection) new DPAP.Connection (service->service_name, service->host, service->port, db, factory);
+		connection.connect (connected_cb);
+	}
+
+	public DPAPCopy () throws GLib.Error {
+		db = new ValaDMAPDb ();
+		factory = new ValaDPAPRecordFactory ();
+
+		browser = new DMAP.MdnsBrowser (DMAP.MdnsBrowserServiceType.DPAP);
+		browser.service_added.connect (service_added_cb);
+		browser.start ();
+	}
+}
+
+void debug_printf (string? log_domain,
+		   GLib.LogLevelFlags log_level,
+		   string? message)
+{
+	stdout.printf ("%s\n", message);
+}
+
+void debug_null (string? log_domain,
+		 GLib.LogLevelFlags log_level,
+		 string? message)
+{
+}
+
+int main (string[] args) {     
+	var loop = new GLib.MainLoop ();
+
+	GLib.Log.set_handler ("libdmapsharing", GLib.LogLevelFlags.LEVEL_DEBUG, debug_null);
+	GLib.Log.set_handler (null, GLib.LogLevelFlags.LEVEL_DEBUG, debug_null);
+
+	var dmapcopy = new DPAPCopy ();
+
+	loop.run ();
+
+	return 0;
+}

=== modified file 'tests/dmapserve.c'
--- tests/dmapserve.c	2013-05-27 20:02:23 +0000
+++ tests/dmapserve.c	2014-05-27 20:54:48 +0000
@@ -1,4 +1,4 @@
-/* dmapserve.c generated by valac 0.18.1, the Vala compiler
+/* dmapserve.c generated by valac 0.22.1, the Vala compiler
  * generated from dmapserve.vala, do not modify */
 
 /*   FILE: dmapserve.vala -- Serve media using DMAP
@@ -133,14 +133,14 @@
 
 DPAPServe* dpap_serve_construct (GType object_type, GError** error) {
 	DPAPServe* self = NULL;
-	ValaDPAPRecord* _tmp0_;
-	ValaDMAPDb* _tmp1_;
-	ValaDMAPDb* _tmp2_;
-	ValaDPAPRecord* _tmp3_;
-	ValaDMAPContainerDb* _tmp4_;
-	ValaDMAPDb* _tmp5_;
-	ValaDMAPContainerDb* _tmp6_;
-	DPAPShare* _tmp7_;
+	ValaDPAPRecord* _tmp0_ = NULL;
+	ValaDMAPDb* _tmp1_ = NULL;
+	ValaDMAPDb* _tmp2_ = NULL;
+	ValaDPAPRecord* _tmp3_ = NULL;
+	ValaDMAPContainerDb* _tmp4_ = NULL;
+	ValaDMAPDb* _tmp5_ = NULL;
+	ValaDMAPContainerDb* _tmp6_ = NULL;
+	DPAPShare* _tmp7_ = NULL;
 	self = (DPAPServe*) g_type_create_instance (object_type);
 	_tmp0_ = vala_dpap_record_new ();
 	_g_object_unref0 (self->priv->record);
@@ -334,8 +334,8 @@
 
 
 void debug_printf (const gchar* log_domain, GLogLevelFlags log_level, const gchar* message) {
-	FILE* _tmp0_;
-	const gchar* _tmp1_;
+	FILE* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
 	_tmp0_ = stdout;
 	_tmp1_ = message;
 	fprintf (_tmp0_, "%s\n", _tmp1_);
@@ -353,10 +353,10 @@
 
 gint _vala_main (gchar** args, int args_length1) {
 	gint result = 0;
-	GMainLoop* _tmp0_;
-	GMainLoop* loop;
-	DPAPServe* _tmp1_;
-	DPAPServe* dmapcopy;
+	GMainLoop* loop = NULL;
+	GMainLoop* _tmp0_ = NULL;
+	DPAPServe* dmapcopy = NULL;
+	DPAPServe* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
 	_tmp0_ = g_main_loop_new (NULL, FALSE);
 	loop = _tmp0_;

=== modified file 'tests/dpapview.c'
--- tests/dpapview.c	2013-05-27 20:02:23 +0000
+++ tests/dpapview.c	2014-05-27 20:54:48 +0000
@@ -1,4 +1,4 @@
-/* dpapview.c generated by valac 0.18.1, the Vala compiler
+/* dpapview.c generated by valac 0.22.1, the Vala compiler
  * generated from dpapview.vala, do not modify */
 
 /*   FILE: dpapviewer.vala -- View DPAP data
@@ -141,19 +141,19 @@
 
 
 static void __lambda2_ (DPAPViewer* self, gconstpointer k, gconstpointer v) {
-	GdkPixbuf* pixbuf;
-	gconstpointer _tmp0_;
-	GByteArray* _tmp1_;
-	GByteArray* _tmp2_;
+	GdkPixbuf* pixbuf = NULL;
+	gconstpointer _tmp0_ = NULL;
+	GByteArray* _tmp1_ = NULL;
+	GByteArray* _tmp2_ = NULL;
 	GtkTreeIter iter = {0};
-	GtkListStore* _tmp15_;
+	GtkListStore* _tmp15_ = NULL;
 	GtkTreeIter _tmp16_ = {0};
-	GtkListStore* _tmp17_;
-	GtkTreeIter _tmp18_;
-	GdkPixbuf* _tmp19_;
-	gconstpointer _tmp20_;
-	const gchar* _tmp21_;
-	const gchar* _tmp22_;
+	GtkListStore* _tmp17_ = NULL;
+	GtkTreeIter _tmp18_ = {0};
+	GdkPixbuf* _tmp19_ = NULL;
+	gconstpointer _tmp20_ = NULL;
+	const gchar* _tmp21_ = NULL;
+	const gchar* _tmp22_ = NULL;
 	GError * _inner_error_ = NULL;
 	pixbuf = NULL;
 	_tmp0_ = v;
@@ -161,20 +161,20 @@
 	_tmp2_ = _tmp1_;
 	if (_tmp2_ != NULL) {
 		gchar* path = NULL;
+		gint fd = 0;
 		gchar* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
-		gint fd;
-		const gchar* _tmp5_;
-		gconstpointer _tmp6_;
-		GByteArray* _tmp7_;
-		GByteArray* _tmp8_;
-		guint8* _tmp9_;
-		gint _tmp9__length1;
-		gint _tmp10_;
-		const gchar* _tmp11_;
-		GdkPixbuf* _tmp12_;
-		GdkPixbuf* _tmp13_;
-		const gchar* _tmp14_;
+		const gchar* _tmp5_ = NULL;
+		gconstpointer _tmp6_ = NULL;
+		GByteArray* _tmp7_ = NULL;
+		GByteArray* _tmp8_ = NULL;
+		guint8* _tmp9_ = NULL;
+		gint _tmp9__length1 = 0;
+		gint _tmp10_ = 0;
+		GdkPixbuf* _tmp11_ = NULL;
+		const gchar* _tmp12_ = NULL;
+		GdkPixbuf* _tmp13_ = NULL;
+		const gchar* _tmp14_ = NULL;
 		_tmp4_ = g_file_open_tmp ("dpapview.XXXXXX", &_tmp3_, &_inner_error_);
 		_g_free0 (path);
 		path = _tmp3_;
@@ -202,9 +202,9 @@
 		}
 		_tmp10_ = fd;
 		close (_tmp10_);
-		_tmp11_ = path;
-		_tmp12_ = gdk_pixbuf_new_from_file (_tmp11_, &_inner_error_);
-		_tmp13_ = _tmp12_;
+		_tmp12_ = path;
+		_tmp13_ = gdk_pixbuf_new_from_file (_tmp12_, &_inner_error_);
+		_tmp11_ = _tmp13_;
 		if (_inner_error_ != NULL) {
 			_g_free0 (path);
 			_g_object_unref0 (pixbuf);
@@ -213,7 +213,7 @@
 			return;
 		}
 		_g_object_unref0 (pixbuf);
-		pixbuf = _tmp13_;
+		pixbuf = _tmp11_;
 		_tmp14_ = path;
 		g_unlink (_tmp14_);
 		_g_free0 (path);
@@ -239,9 +239,9 @@
 
 static gboolean dpap_viewer_connected_cb (DPAPViewer* self, DMAPConnection* connection, gboolean _result_, const gchar* reason) {
 	gboolean result = FALSE;
-	ValaDMAPDb* _tmp0_;
+	ValaDMAPDb* _tmp0_ = NULL;
 	gint64 _tmp1_ = 0LL;
-	ValaDMAPDb* _tmp2_;
+	ValaDMAPDb* _tmp2_ = NULL;
 	g_return_val_if_fail (self != NULL, FALSE);
 	g_return_val_if_fail (connection != NULL, FALSE);
 	_tmp0_ = self->priv->db;
@@ -262,16 +262,16 @@
 
 
 static void dpap_viewer_service_added_cb (DPAPViewer* self, DMAPMdnsBrowserService* service) {
-	DMAPMdnsBrowserService* _tmp0_;
-	const gchar* _tmp1_;
-	DMAPMdnsBrowserService* _tmp2_;
-	const gchar* _tmp3_;
-	DMAPMdnsBrowserService* _tmp4_;
-	guint _tmp5_;
-	ValaDMAPDb* _tmp6_;
-	ValaDPAPRecordFactory* _tmp7_;
-	DPAPConnection* _tmp8_;
-	DMAPConnection* _tmp9_;
+	DMAPMdnsBrowserService* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	DMAPMdnsBrowserService* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
+	DMAPMdnsBrowserService* _tmp4_ = NULL;
+	guint _tmp5_ = 0U;
+	ValaDMAPDb* _tmp6_ = NULL;
+	ValaDPAPRecordFactory* _tmp7_ = NULL;
+	DPAPConnection* _tmp8_ = NULL;
+	DMAPConnection* _tmp9_ = NULL;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = service;
 	_tmp1_ = _tmp0_->service_name;
@@ -301,23 +301,23 @@
 
 DPAPViewer* dpap_viewer_construct (GType object_type, GtkBuilder* builder, GError** error) {
 	DPAPViewer* self = NULL;
-	GtkBuilder* _tmp0_;
-	GtkBuilder* _tmp1_;
+	GtkBuilder* _tmp0_ = NULL;
+	GtkWidget* widget = NULL;
+	GtkBuilder* _tmp1_ = NULL;
 	GObject* _tmp2_ = NULL;
-	GtkWidget* _tmp3_;
-	GtkWidget* widget;
-	GtkBuilder* _tmp4_;
+	GtkWidget* _tmp3_ = NULL;
+	GtkIconView* iconview = NULL;
+	GtkBuilder* _tmp4_ = NULL;
 	GObject* _tmp5_ = NULL;
-	GtkIconView* _tmp6_;
-	GtkIconView* iconview;
-	GtkBuilder* _tmp7_;
+	GtkIconView* _tmp6_ = NULL;
+	GtkBuilder* _tmp7_ = NULL;
 	GObject* _tmp8_ = NULL;
-	GtkListStore* _tmp9_;
-	ValaDMAPDb* _tmp10_;
-	ValaDPAPRecordFactory* _tmp11_;
-	DMAPMdnsBrowser* _tmp12_;
-	DMAPMdnsBrowser* _tmp13_;
-	DMAPMdnsBrowser* _tmp14_;
+	GtkListStore* _tmp9_ = NULL;
+	ValaDMAPDb* _tmp10_ = NULL;
+	ValaDPAPRecordFactory* _tmp11_ = NULL;
+	DMAPMdnsBrowser* _tmp12_ = NULL;
+	DMAPMdnsBrowser* _tmp13_ = NULL;
+	DMAPMdnsBrowser* _tmp14_ = NULL;
 	GError * _inner_error_ = NULL;
 	g_return_val_if_fail (builder != NULL, NULL);
 	self = (DPAPViewer*) g_type_create_instance (object_type);
@@ -541,12 +541,12 @@
 	GError * _inner_error_ = NULL;
 	gtk_init (&args_length1, &args);
 	{
-		GtkBuilder* _tmp0_;
-		GtkBuilder* builder;
-		GtkBuilder* _tmp1_;
-		GtkBuilder* _tmp2_;
-		DPAPViewer* _tmp3_;
-		DPAPViewer* dpapviewer;
+		GtkBuilder* builder = NULL;
+		GtkBuilder* _tmp0_ = NULL;
+		GtkBuilder* _tmp1_ = NULL;
+		DPAPViewer* dpapviewer = NULL;
+		GtkBuilder* _tmp2_ = NULL;
+		DPAPViewer* _tmp3_ = NULL;
 		_tmp0_ = gtk_builder_new ();
 		builder = _tmp0_;
 		_tmp1_ = builder;
@@ -570,9 +570,9 @@
 	__catch0_g_error:
 	{
 		GError* e = NULL;
-		FILE* _tmp4_;
-		GError* _tmp5_;
-		const gchar* _tmp6_;
+		FILE* _tmp4_ = NULL;
+		GError* _tmp5_ = NULL;
+		const gchar* _tmp6_ = NULL;
 		e = _inner_error_;
 		_inner_error_ = NULL;
 		_tmp4_ = stderr;

=== modified file 'tests/test-dmap-server.c'
--- tests/test-dmap-server.c	2013-08-29 12:30:01 +0000
+++ tests/test-dmap-server.c	2014-05-27 20:54:48 +0000
@@ -63,7 +63,7 @@
 					(dmap_container_record));
 	DMAPRecordFactory *factory;
 	DMAPRecord *record;
-	DMAPShare *share;
+	DMAPShare *share = NULL;
 	DMAPDb *db;
 
 	if (conn_type == DAAP) { 
@@ -94,6 +94,8 @@
 						    NULL));
 	}
 
+	g_assert (NULL != share);
+
 	g_free (name);
 }
 

=== modified file 'tests/vala-dmap-container-db.c'
--- tests/vala-dmap-container-db.c	2013-05-27 20:02:23 +0000
+++ tests/vala-dmap-container-db.c	2014-05-27 20:54:48 +0000
@@ -1,4 +1,4 @@
-/* vala-dmap-container-db.c generated by valac 0.18.1, the Vala compiler
+/* vala-dmap-container-db.c generated by valac 0.22.1, the Vala compiler
  * generated from vala-dmap-container-db.vala, do not modify */
 
 /*   FILE: vala-dmap-db.vala -- A DMAPContainerDb implementation in Vala
@@ -75,9 +75,9 @@
 static gint64 vala_dmap_container_db_real_count (DMAPContainerDb* base) {
 	ValaDMAPContainerDb * self;
 	gint64 result = 0LL;
-	GeeArrayList* _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
+	GeeArrayList* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+	gint _tmp2_ = 0;
 	self = (ValaDMAPContainerDb*) base;
 	_tmp0_ = self->priv->db;
 	_tmp1_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp0_);
@@ -92,25 +92,25 @@
 	gint i = 0;
 	self = (ValaDMAPContainerDb*) base;
 	{
-		gboolean _tmp0_;
+		gboolean _tmp0_ = FALSE;
 		i = 0;
 		_tmp0_ = TRUE;
 		while (TRUE) {
-			gboolean _tmp1_;
-			gint _tmp3_;
-			GeeArrayList* _tmp4_;
-			gint _tmp5_;
-			gint _tmp6_;
-			GHFunc _tmp7_;
-			void* _tmp7__target;
-			gint _tmp8_;
+			gboolean _tmp1_ = FALSE;
+			gint _tmp3_ = 0;
+			GeeArrayList* _tmp4_ = NULL;
+			gint _tmp5_ = 0;
+			gint _tmp6_ = 0;
+			GHFunc _tmp7_ = NULL;
+			void* _tmp7__target = NULL;
+			gint _tmp8_ = 0;
 			void* _tmp9_ = NULL;
-			GeeArrayList* _tmp10_;
-			gint _tmp11_;
+			GeeArrayList* _tmp10_ = NULL;
+			gint _tmp11_ = 0;
 			gpointer _tmp12_ = NULL;
 			_tmp1_ = _tmp0_;
 			if (!_tmp1_) {
-				gint _tmp2_;
+				gint _tmp2_ = 0;
 				_tmp2_ = i;
 				i = _tmp2_ + 1;
 			}
@@ -181,7 +181,7 @@
 
 
 static void vala_dmap_container_db_instance_init (ValaDMAPContainerDb * self) {
-	GeeArrayList* _tmp0_;
+	GeeArrayList* _tmp0_ = NULL;
 	self->priv = VALA_DMAP_CONTAINER_DB_GET_PRIVATE (self);
 	_tmp0_ = gee_array_list_new (DMAP_TYPE_RECORD, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
 	self->priv->db = _tmp0_;

=== modified file 'tests/vala-dmap-db.c'
--- tests/vala-dmap-db.c	2013-05-27 20:02:23 +0000
+++ tests/vala-dmap-db.c	2014-05-27 20:54:48 +0000
@@ -1,4 +1,4 @@
-/* vala-dmap-db.c generated by valac 0.18.1, the Vala compiler
+/* vala-dmap-db.c generated by valac 0.22.1, the Vala compiler
  * generated from vala-dmap-db.vala, do not modify */
 
 /*   FILE: vala-dmap-db.vala -- A DMAPDb implementation in Vala
@@ -80,11 +80,11 @@
 static guint vala_dmap_db_real_add (DMAPDb* base, DMAPRecord* record) {
 	ValaDMAPDb * self;
 	guint result = 0U;
-	GeeArrayList* _tmp0_;
-	DMAPRecord* _tmp1_;
-	GeeArrayList* _tmp2_;
-	gint _tmp3_;
-	gint _tmp4_;
+	GeeArrayList* _tmp0_ = NULL;
+	DMAPRecord* _tmp1_ = NULL;
+	GeeArrayList* _tmp2_ = NULL;
+	gint _tmp3_ = 0;
+	gint _tmp4_ = 0;
 	self = (ValaDMAPDb*) base;
 	g_return_val_if_fail (record != NULL, 0U);
 	_tmp0_ = self->priv->db;
@@ -121,9 +121,9 @@
 static gint64 vala_dmap_db_real_count (DMAPDb* base) {
 	ValaDMAPDb * self;
 	gint64 result = 0LL;
-	GeeArrayList* _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
+	GeeArrayList* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+	gint _tmp2_ = 0;
 	self = (ValaDMAPDb*) base;
 	_tmp0_ = self->priv->db;
 	_tmp1_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp0_);
@@ -138,25 +138,25 @@
 	gint i = 0;
 	self = (ValaDMAPDb*) base;
 	{
-		gboolean _tmp0_;
+		gboolean _tmp0_ = FALSE;
 		i = 0;
 		_tmp0_ = TRUE;
 		while (TRUE) {
-			gboolean _tmp1_;
-			gint _tmp3_;
-			GeeArrayList* _tmp4_;
-			gint _tmp5_;
-			gint _tmp6_;
-			GHFunc _tmp7_;
-			void* _tmp7__target;
-			gint _tmp8_;
+			gboolean _tmp1_ = FALSE;
+			gint _tmp3_ = 0;
+			GeeArrayList* _tmp4_ = NULL;
+			gint _tmp5_ = 0;
+			gint _tmp6_ = 0;
+			GHFunc _tmp7_ = NULL;
+			void* _tmp7__target = NULL;
+			gint _tmp8_ = 0;
 			void* _tmp9_ = NULL;
-			GeeArrayList* _tmp10_;
-			gint _tmp11_;
+			GeeArrayList* _tmp10_ = NULL;
+			gint _tmp11_ = 0;
 			gpointer _tmp12_ = NULL;
 			_tmp1_ = _tmp0_;
 			if (!_tmp1_) {
-				gint _tmp2_;
+				gint _tmp2_ = 0;
 				_tmp2_ = i;
 				i = _tmp2_ + 1;
 			}
@@ -184,8 +184,8 @@
 static DMAPRecord* vala_dmap_db_real_lookup_by_id (DMAPDb* base, guint id) {
 	ValaDMAPDb * self;
 	DMAPRecord* result = NULL;
-	GeeArrayList* _tmp0_;
-	guint _tmp1_;
+	GeeArrayList* _tmp0_ = NULL;
+	guint _tmp1_ = 0U;
 	gpointer _tmp2_ = NULL;
 	self = (ValaDMAPDb*) base;
 	_tmp0_ = self->priv->db;
@@ -238,7 +238,7 @@
 
 
 static void vala_dmap_db_instance_init (ValaDMAPDb * self) {
-	GeeArrayList* _tmp0_;
+	GeeArrayList* _tmp0_ = NULL;
 	self->priv = VALA_DMAP_DB_GET_PRIVATE (self);
 	_tmp0_ = gee_array_list_new (DMAP_TYPE_RECORD, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
 	self->priv->db = _tmp0_;

=== modified file 'tests/vala-dpap-record.c'
--- tests/vala-dpap-record.c	2013-05-27 20:02:23 +0000
+++ tests/vala-dpap-record.c	2014-05-27 20:54:48 +0000
@@ -1,4 +1,4 @@
-/* vala-dpap-record.c generated by valac 0.18.1, the Vala compiler
+/* vala-dpap-record.c generated by valac 0.22.1, the Vala compiler
  * generated from vala-dpap-record.vala, do not modify */
 
 /*   FILE: vala-dpap-record.vala -- A DPAPRecord implementation in Vala
@@ -112,7 +112,7 @@
 	VALA_DPAP_RECORD_CREATION_DATE
 };
 static GInputStream* vala_dpap_record_real_read (DPAPRecord* base, GError** error);
-static DMAPRecord* vala_dpap_record_real_set_from_blob (DMAPRecord* base, GByteArray* blob);
+static gboolean vala_dpap_record_real_set_from_blob (DMAPRecord* base, GByteArray* blob);
 static GByteArray* vala_dpap_record_real_to_blob (DMAPRecord* base);
 ValaDPAPRecord* vala_dpap_record_new (void);
 ValaDPAPRecord* vala_dpap_record_construct (GType object_type);
@@ -159,11 +159,11 @@
 }
 
 
-static DMAPRecord* vala_dpap_record_real_set_from_blob (DMAPRecord* base, GByteArray* blob) {
+static gboolean vala_dpap_record_real_set_from_blob (DMAPRecord* base, GByteArray* blob) {
 	ValaDPAPRecord * self;
-	DMAPRecord* result = NULL;
+	gboolean result = FALSE;
 	self = (ValaDPAPRecord*) base;
-	g_return_val_if_fail (blob != NULL, NULL);
+	g_return_val_if_fail (blob != NULL, FALSE);
 	g_error ("vala-dpap-record.vala:99: set_from_blob not implemented");
 	return result;
 }
@@ -181,27 +181,27 @@
 ValaDPAPRecord* vala_dpap_record_construct (GType object_type) {
 	ValaDPAPRecord * self = NULL;
 	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	gchar* _tmp4_;
-	gchar* _tmp5_;
-	const gchar* _tmp6_;
+	gchar* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	gchar* _tmp4_ = NULL;
+	gchar* _tmp5_ = NULL;
+	const gchar* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_;
-	gchar* _tmp9_;
+	gchar* _tmp8_ = NULL;
+	gchar* _tmp9_ = NULL;
+	gchar* path = NULL;
 	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_;
-	gchar* _tmp12_;
-	gchar* _tmp13_;
-	gchar* path;
+	gchar* _tmp11_ = NULL;
+	gchar* _tmp12_ = NULL;
+	gchar* _tmp13_ = NULL;
 	guint8* data = NULL;
 	gint data_length1 = 0;
 	gint _data_size_ = 0;
 	guint8* _tmp14_ = NULL;
 	size_t _tmp15_;
-	GByteArray* _tmp16_;
-	GByteArray* _tmp17_;
+	GByteArray* _tmp16_ = NULL;
+	GByteArray* _tmp17_ = NULL;
 	GError * _inner_error_ = NULL;
 	self = (ValaDPAPRecord*) g_object_new (object_type, NULL);
 	_tmp0_ = g_get_current_dir ();
@@ -267,7 +267,7 @@
 
 const gchar* vala_dpap_record_get_location (ValaDPAPRecord* self) {
 	const gchar* result;
-	const gchar* _tmp0_;
+	const gchar* _tmp0_ = NULL;
 	g_return_val_if_fail (self != NULL, NULL);
 	_tmp0_ = self->priv->_location;
 	result = _tmp0_;
@@ -276,8 +276,8 @@
 
 
 void vala_dpap_record_set_location (ValaDPAPRecord* self, const gchar* value) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = value;
 	_tmp1_ = g_strdup (_tmp0_);
@@ -289,7 +289,7 @@
 
 const gchar* vala_dpap_record_get_filename (ValaDPAPRecord* self) {
 	const gchar* result;
-	const gchar* _tmp0_;
+	const gchar* _tmp0_ = NULL;
 	g_return_val_if_fail (self != NULL, NULL);
 	_tmp0_ = self->priv->_filename;
 	result = _tmp0_;
@@ -298,8 +298,8 @@
 
 
 void vala_dpap_record_set_filename (ValaDPAPRecord* self, const gchar* value) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = value;
 	_tmp1_ = g_strdup (_tmp0_);
@@ -311,7 +311,7 @@
 
 const gchar* vala_dpap_record_get_aspect_ratio (ValaDPAPRecord* self) {
 	const gchar* result;
-	const gchar* _tmp0_;
+	const gchar* _tmp0_ = NULL;
 	g_return_val_if_fail (self != NULL, NULL);
 	_tmp0_ = self->priv->_aspect_ratio;
 	result = _tmp0_;
@@ -320,8 +320,8 @@
 
 
 void vala_dpap_record_set_aspect_ratio (ValaDPAPRecord* self, const gchar* value) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = value;
 	_tmp1_ = g_strdup (_tmp0_);
@@ -333,7 +333,7 @@
 
 const gchar* vala_dpap_record_get_format (ValaDPAPRecord* self) {
 	const gchar* result;
-	const gchar* _tmp0_;
+	const gchar* _tmp0_ = NULL;
 	g_return_val_if_fail (self != NULL, NULL);
 	_tmp0_ = self->priv->_format;
 	result = _tmp0_;
@@ -342,8 +342,8 @@
 
 
 void vala_dpap_record_set_format (ValaDPAPRecord* self, const gchar* value) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = value;
 	_tmp1_ = g_strdup (_tmp0_);
@@ -355,7 +355,7 @@
 
 GByteArray* vala_dpap_record_get_thumbnail (ValaDPAPRecord* self) {
 	GByteArray* result;
-	GByteArray* _tmp0_;
+	GByteArray* _tmp0_ = NULL;
 	g_return_val_if_fail (self != NULL, NULL);
 	_tmp0_ = self->priv->_thumbnail;
 	result = _tmp0_;
@@ -364,11 +364,11 @@
 
 
 void vala_dpap_record_set_thumbnail (ValaDPAPRecord* self, GByteArray* value) {
-	GByteArray* _tmp0_;
-	GByteArray* _tmp1_;
-	GByteArray* _tmp2_;
-	guint8* _tmp3_;
-	gint _tmp3__length1;
+	GByteArray* _tmp0_ = NULL;
+	GByteArray* _tmp1_ = NULL;
+	GByteArray* _tmp2_ = NULL;
+	guint8* _tmp3_ = NULL;
+	gint _tmp3__length1 = 0;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = g_byte_array_new ();
 	_g_byte_array_free0 (self->priv->_thumbnail);
@@ -384,7 +384,7 @@
 
 const gchar* vala_dpap_record_get_comments (ValaDPAPRecord* self) {
 	const gchar* result;
-	const gchar* _tmp0_;
+	const gchar* _tmp0_ = NULL;
 	g_return_val_if_fail (self != NULL, NULL);
 	_tmp0_ = self->priv->_comments;
 	result = _tmp0_;
@@ -393,8 +393,8 @@
 
 
 void vala_dpap_record_set_comments (ValaDPAPRecord* self, const gchar* value) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = value;
 	_tmp1_ = g_strdup (_tmp0_);
@@ -406,7 +406,7 @@
 
 gint vala_dpap_record_get_large_filesize (ValaDPAPRecord* self) {
 	gint result;
-	gint _tmp0_;
+	gint _tmp0_ = 0;
 	g_return_val_if_fail (self != NULL, 0);
 	_tmp0_ = self->priv->_large_filesize;
 	result = _tmp0_;
@@ -415,7 +415,7 @@
 
 
 void vala_dpap_record_set_large_filesize (ValaDPAPRecord* self, gint value) {
-	gint _tmp0_;
+	gint _tmp0_ = 0;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = value;
 	self->priv->_large_filesize = _tmp0_;
@@ -425,7 +425,7 @@
 
 gint vala_dpap_record_get_pixel_height (ValaDPAPRecord* self) {
 	gint result;
-	gint _tmp0_;
+	gint _tmp0_ = 0;
 	g_return_val_if_fail (self != NULL, 0);
 	_tmp0_ = self->priv->_pixel_height;
 	result = _tmp0_;
@@ -434,7 +434,7 @@
 
 
 void vala_dpap_record_set_pixel_height (ValaDPAPRecord* self, gint value) {
-	gint _tmp0_;
+	gint _tmp0_ = 0;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = value;
 	self->priv->_pixel_height = _tmp0_;
@@ -444,7 +444,7 @@
 
 gint vala_dpap_record_get_pixel_width (ValaDPAPRecord* self) {
 	gint result;
-	gint _tmp0_;
+	gint _tmp0_ = 0;
 	g_return_val_if_fail (self != NULL, 0);
 	_tmp0_ = self->priv->_pixel_width;
 	result = _tmp0_;
@@ -453,7 +453,7 @@
 
 
 void vala_dpap_record_set_pixel_width (ValaDPAPRecord* self, gint value) {
-	gint _tmp0_;
+	gint _tmp0_ = 0;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = value;
 	self->priv->_pixel_width = _tmp0_;
@@ -463,7 +463,7 @@
 
 gint vala_dpap_record_get_rating (ValaDPAPRecord* self) {
 	gint result;
-	gint _tmp0_;
+	gint _tmp0_ = 0;
 	g_return_val_if_fail (self != NULL, 0);
 	_tmp0_ = self->priv->_rating;
 	result = _tmp0_;
@@ -472,7 +472,7 @@
 
 
 void vala_dpap_record_set_rating (ValaDPAPRecord* self, gint value) {
-	gint _tmp0_;
+	gint _tmp0_ = 0;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = value;
 	self->priv->_rating = _tmp0_;
@@ -482,7 +482,7 @@
 
 gint vala_dpap_record_get_creation_date (ValaDPAPRecord* self) {
 	gint result;
-	gint _tmp0_;
+	gint _tmp0_ = 0;
 	g_return_val_if_fail (self != NULL, 0);
 	_tmp0_ = self->priv->_creation_date;
 	result = _tmp0_;
@@ -491,7 +491,7 @@
 
 
 void vala_dpap_record_set_creation_date (ValaDPAPRecord* self, gint value) {
-	gint _tmp0_;
+	gint _tmp0_ = 0;
 	g_return_if_fail (self != NULL);
 	_tmp0_ = value;
 	self->priv->_creation_date = _tmp0_;
@@ -521,7 +521,7 @@
 
 static void vala_dpap_record_dmap_record_interface_init (DMAPRecordIface * iface) {
 	vala_dpap_record_dmap_record_parent_iface = g_type_interface_peek_parent (iface);
-	iface->set_from_blob = (DMAPRecord* (*)(DMAPRecord*, GByteArray*)) vala_dpap_record_real_set_from_blob;
+	iface->set_from_blob = (gboolean (*)(DMAPRecord*, GByteArray*)) vala_dpap_record_real_set_from_blob;
 	iface->to_blob = (GByteArray* (*)(DMAPRecord*)) vala_dpap_record_real_to_blob;
 }
 
@@ -657,7 +657,7 @@
 static DMAPRecord* vala_dpap_record_factory_real_create (DMAPRecordFactory* base, void* user_data) {
 	ValaDPAPRecordFactory * self;
 	DMAPRecord* result = NULL;
-	ValaDPAPRecord* _tmp0_;
+	ValaDPAPRecord* _tmp0_ = NULL;
 	self = (ValaDPAPRecordFactory*) base;
 	_tmp0_ = vala_dpap_record_new ();
 	result = (DMAPRecord*) _tmp0_;

=== modified file 'tests/vala-dpap-record.vala'
--- tests/vala-dpap-record.vala	2011-08-03 02:16:06 +0000
+++ tests/vala-dpap-record.vala	2014-05-27 20:54:48 +0000
@@ -95,7 +95,7 @@
 		GLib.error ("read not implemented");
 	}
 
-	public unowned DMAP.Record set_from_blob (GLib.ByteArray blob) {
+	public unowned bool set_from_blob (GLib.ByteArray blob) {
 		GLib.error ("set_from_blob not implemented");
 	}
 

=== modified file 'vala/Makefile.am'
--- vala/Makefile.am	2013-05-27 20:02:23 +0000
+++ vala/Makefile.am	2014-05-27 20:54:48 +0000
@@ -1,4 +1,4 @@
-if MAINTAINER_MODE
+if BUILD_VAPI
 libdmapsharing-@API_VERSION@-daap/libdmapsharing-@API_VERSION@.gi: libdmapsharing-@API_VERSION@-daap/libdmapsharing-@[e-mail] libdmapsharing-@API_VERSION@-daap/libdmapsharing-@[e-mail]
 	PKG_CONFIG_PATH=$(top_builddir):${PKG_CONFIG_PATH} $(VALA_GEN_INTROSPECT) libdmapsharing-@API_VERSION@-uninstalled libdmapsharing-@API_VERSION@-daap
 	@mv libdmapsharing-@API_VERSION@-daap/libdmapsharing-@[e-mail] libdmapsharing-@API_VERSION@-daap/libdmapsharing-@API_VERSION@.gi
@@ -51,6 +51,11 @@
 all: libdmapsharing-@API_VERSION@.vapi
 endif
 
+vapidir = $(datadir)/vala/vapi
+
+dist_vapi_DATA = \
+        libdmapsharing-@API_VERSION@.vapi
+
 EXTRA_DIST = \
 	libdmapsharing-@API_VERSION@.vapi \
 	libdmapsharing-@API_VERSION@-daap/libdmapsharing-@[e-mail] \
@@ -86,7 +91,7 @@
 	libdmapsharing-@API_VERSION@-dmap/libdmapsharing-@[e-mail] \
 	libdmapsharing-@API_VERSION@-dpap/libdmapsharing-@[e-mail]
 
-if MAINTAINER_MODE
+if BUILD_VAPI
 CLEANFILES += \
 	libdmapsharing-@API_VERSION@.vapi
 endif

=== modified file 'vala/Makefile.in'
--- vala/Makefile.in	2013-06-29 22:28:20 +0000
+++ vala/Makefile.in	2014-05-27 20:54:48 +0000
@@ -13,6 +13,7 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+
 VPATH = @srcdir@
 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
 am__make_running_with_option = \
@@ -77,18 +78,20 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@MAINTAINER_MODE_TRUE@am__append_1 = \
-@MAINTAINER_MODE_TRUE@	libdmapsharing-@API_VERSION@.vapi
+@BUILD_VAPI_TRUE@am__append_1 = \
+@BUILD_VAPI_TRUE@	libdmapsharing-@API_VERSION@.vapi
 
 subdir = vala
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(dist_vapi_DATA)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/as-arch.m4 \
 	$(top_srcdir)/m4/as-compiler-flag.m4 \
 	$(top_srcdir)/m4/as-version.m4 $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -114,6 +117,35 @@
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(vapidir)"
+DATA = $(dist_vapi_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -180,6 +212,14 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBDMAPSHARING_MAJORMINOR = @LIBDMAPSHARING_MAJORMINOR@
@@ -286,6 +326,10 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+vapidir = $(datadir)/vala/vapi
+dist_vapi_DATA = \
+        libdmapsharing-@API_VERSION@.vapi
+
 EXTRA_DIST = \
 	libdmapsharing-@API_VERSION@.vapi \
 	libdmapsharing-@API_VERSION@-daap/libdmapsharing-@[e-mail] \
@@ -358,6 +402,27 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
+install-dist_vapiDATA: $(dist_vapi_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_vapi_DATA)'; test -n "$(vapidir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(vapidir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(vapidir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(vapidir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(vapidir)" || exit $$?; \
+	done
+
+uninstall-dist_vapiDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_vapi_DATA)'; test -n "$(vapidir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(vapidir)'; $(am__uninstall_files_from_dir)
 tags TAGS:
 
 ctags CTAGS:
@@ -397,8 +462,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(vapidir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -451,7 +519,7 @@
 
 info-am:
 
-install-data-am:
+install-data-am: install-dist_vapiDATA
 
 install-dvi: install-dvi-am
 
@@ -495,72 +563,73 @@
 
 ps-am:
 
-uninstall-am:
+uninstall-am: uninstall-dist_vapiDATA
 
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	cscopelist-am ctags-am distclean distclean-generic \
 	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags-am uninstall uninstall-am
-
-@MAINTAINER_MODE_TRUE@libdmapsharing-@API_VERSION@-daap/libdmapsharing-@API_VERSION@.gi: libdmapsharing-@API_VERSION@-daap/libdmapsharing-@[e-mail] libdmapsharing-@API_VERSION@-daap/libdmapsharing-@[e-mail]
-@MAINTAINER_MODE_TRUE@	PKG_CONFIG_PATH=$(top_builddir):${PKG_CONFIG_PATH} $(VALA_GEN_INTROSPECT) libdmapsharing-@API_VERSION@-uninstalled libdmapsharing-@API_VERSION@-daap
-@MAINTAINER_MODE_TRUE@	@mv libdmapsharing-@API_VERSION@-daap/libdmapsharing-@[e-mail] libdmapsharing-@API_VERSION@-daap/libdmapsharing-@API_VERSION@.gi
-
-@MAINTAINER_MODE_TRUE@libdmapsharing-@API_VERSION@-dacp/libdmapsharing-@API_VERSION@.gi: libdmapsharing-@API_VERSION@-dacp/libdmapsharing-@[e-mail] libdmapsharing-@API_VERSION@-dacp/libdmapsharing-@[e-mail]
-@MAINTAINER_MODE_TRUE@	PKG_CONFIG_PATH=$(top_builddir):${PKG_CONFIG_PATH} $(VALA_GEN_INTROSPECT) libdmapsharing-@API_VERSION@-uninstalled libdmapsharing-@API_VERSION@-dacp
-@MAINTAINER_MODE_TRUE@	@mv libdmapsharing-@API_VERSION@-dacp/libdmapsharing-@[e-mail] libdmapsharing-@API_VERSION@-dacp/libdmapsharing-@API_VERSION@.gi
-
-@MAINTAINER_MODE_TRUE@libdmapsharing-@API_VERSION@-dmap/libdmapsharing-@API_VERSION@.gi: libdmapsharing-@API_VERSION@-dmap/libdmapsharing-@[e-mail] libdmapsharing-@API_VERSION@-dmap/libdmapsharing-@[e-mail]
-@MAINTAINER_MODE_TRUE@	PKG_CONFIG_PATH=$(top_builddir):${PKG_CONFIG_PATH} $(VALA_GEN_INTROSPECT) libdmapsharing-@API_VERSION@-uninstalled libdmapsharing-@API_VERSION@-dmap
-@MAINTAINER_MODE_TRUE@	@mv libdmapsharing-@API_VERSION@-dmap/libdmapsharing-@[e-mail] libdmapsharing-@API_VERSION@-dmap/libdmapsharing-@API_VERSION@.gi
-
-@MAINTAINER_MODE_TRUE@libdmapsharing-@API_VERSION@-dpap/libdmapsharing-@API_VERSION@.gi: libdmapsharing-@API_VERSION@-dpap/libdmapsharing-@[e-mail] libdmapsharing-@API_VERSION@-dpap/libdmapsharing-@[e-mail]
-@MAINTAINER_MODE_TRUE@	PKG_CONFIG_PATH=$(top_builddir):${PKG_CONFIG_PATH} $(VALA_GEN_INTROSPECT) libdmapsharing-@API_VERSION@-uninstalled libdmapsharing-@API_VERSION@-dpap
-@MAINTAINER_MODE_TRUE@	@mv libdmapsharing-@API_VERSION@-dpap/libdmapsharing-@[e-mail] libdmapsharing-@API_VERSION@-dpap/libdmapsharing-@API_VERSION@.gi
-
-@MAINTAINER_MODE_TRUE@libdmapsharing-@[e-mail]: libdmapsharing-@API_VERSION@-daap/libdmapsharing-@API_VERSION@.gi libdmapsharing-@API_VERSION@-daap/libdmapsharing-@API_VERSION@.metadata
-@MAINTAINER_MODE_TRUE@	$(VAPIGEN) --pkg=avahi-gobject --pkg=libsoup-2.4 --pkg=glib-2.0 --pkg=gio-2.0 --pkg=gstreamer-1.0 --library libdmapsharing-@API_VERSION@-daap libdmapsharing-@API_VERSION@-daap/libdmapsharing-@API_VERSION@.gi
-
-@MAINTAINER_MODE_TRUE@libdmapsharing-@[e-mail]: libdmapsharing-@API_VERSION@-dacp/libdmapsharing-@API_VERSION@.gi libdmapsharing-@API_VERSION@-dacp/libdmapsharing-@API_VERSION@.metadata
-@MAINTAINER_MODE_TRUE@	$(VAPIGEN) --pkg=avahi-gobject --pkg=libsoup-2.4 --pkg=glib-2.0 --pkg=gio-2.0 --pkg=gstreamer-1.0 --library libdmapsharing-@API_VERSION@-dacp libdmapsharing-@API_VERSION@-dacp/libdmapsharing-@API_VERSION@.gi
-
-@MAINTAINER_MODE_TRUE@libdmapsharing-@[e-mail]: libdmapsharing-@API_VERSION@-dmap/libdmapsharing-@API_VERSION@.gi libdmapsharing-@API_VERSION@-dmap/libdmapsharing-@API_VERSION@.metadata
-@MAINTAINER_MODE_TRUE@	$(VAPIGEN) --pkg=avahi-gobject --pkg=libsoup-2.4 --pkg=glib-2.0 --pkg=gio-2.0 --pkg=gstreamer-1.0 --library libdmapsharing-@API_VERSION@-dmap libdmapsharing-@API_VERSION@-dmap/libdmapsharing-@API_VERSION@.gi
-
-@MAINTAINER_MODE_TRUE@libdmapsharing-@[e-mail]: libdmapsharing-@API_VERSION@-dpap/libdmapsharing-@API_VERSION@.gi libdmapsharing-@API_VERSION@-dpap/libdmapsharing-@API_VERSION@.metadata
-@MAINTAINER_MODE_TRUE@	$(VAPIGEN) --pkg=avahi-gobject --pkg=libsoup-2.4 --pkg=glib-2.0 --pkg=gio-2.0 --pkg=gstreamer-1.0 --library libdmapsharing-@API_VERSION@-dpap libdmapsharing-@API_VERSION@-dpap/libdmapsharing-@API_VERSION@.gi
+	install install-am install-data install-data-am \
+	install-dist_vapiDATA install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-dist_vapiDATA
+
+@BUILD_VAPI_TRUE@libdmapsharing-@API_VERSION@-daap/libdmapsharing-@API_VERSION@.gi: libdmapsharing-@API_VERSION@-daap/libdmapsharing-@[e-mail] libdmapsharing-@API_VERSION@-daap/libdmapsharing-@[e-mail]
+@BUILD_VAPI_TRUE@	PKG_CONFIG_PATH=$(top_builddir):${PKG_CONFIG_PATH} $(VALA_GEN_INTROSPECT) libdmapsharing-@API_VERSION@-uninstalled libdmapsharing-@API_VERSION@-daap
+@BUILD_VAPI_TRUE@	@mv libdmapsharing-@API_VERSION@-daap/libdmapsharing-@[e-mail] libdmapsharing-@API_VERSION@-daap/libdmapsharing-@API_VERSION@.gi
+
+@BUILD_VAPI_TRUE@libdmapsharing-@API_VERSION@-dacp/libdmapsharing-@API_VERSION@.gi: libdmapsharing-@API_VERSION@-dacp/libdmapsharing-@[e-mail] libdmapsharing-@API_VERSION@-dacp/libdmapsharing-@[e-mail]
+@BUILD_VAPI_TRUE@	PKG_CONFIG_PATH=$(top_builddir):${PKG_CONFIG_PATH} $(VALA_GEN_INTROSPECT) libdmapsharing-@API_VERSION@-uninstalled libdmapsharing-@API_VERSION@-dacp
+@BUILD_VAPI_TRUE@	@mv libdmapsharing-@API_VERSION@-dacp/libdmapsharing-@[e-mail] libdmapsharing-@API_VERSION@-dacp/libdmapsharing-@API_VERSION@.gi
+
+@BUILD_VAPI_TRUE@libdmapsharing-@API_VERSION@-dmap/libdmapsharing-@API_VERSION@.gi: libdmapsharing-@API_VERSION@-dmap/libdmapsharing-@[e-mail] libdmapsharing-@API_VERSION@-dmap/libdmapsharing-@[e-mail]
+@BUILD_VAPI_TRUE@	PKG_CONFIG_PATH=$(top_builddir):${PKG_CONFIG_PATH} $(VALA_GEN_INTROSPECT) libdmapsharing-@API_VERSION@-uninstalled libdmapsharing-@API_VERSION@-dmap
+@BUILD_VAPI_TRUE@	@mv libdmapsharing-@API_VERSION@-dmap/libdmapsharing-@[e-mail] libdmapsharing-@API_VERSION@-dmap/libdmapsharing-@API_VERSION@.gi
+
+@BUILD_VAPI_TRUE@libdmapsharing-@API_VERSION@-dpap/libdmapsharing-@API_VERSION@.gi: libdmapsharing-@API_VERSION@-dpap/libdmapsharing-@[e-mail] libdmapsharing-@API_VERSION@-dpap/libdmapsharing-@[e-mail]
+@BUILD_VAPI_TRUE@	PKG_CONFIG_PATH=$(top_builddir):${PKG_CONFIG_PATH} $(VALA_GEN_INTROSPECT) libdmapsharing-@API_VERSION@-uninstalled libdmapsharing-@API_VERSION@-dpap
+@BUILD_VAPI_TRUE@	@mv libdmapsharing-@API_VERSION@-dpap/libdmapsharing-@[e-mail] libdmapsharing-@API_VERSION@-dpap/libdmapsharing-@API_VERSION@.gi
+
+@BUILD_VAPI_TRUE@libdmapsharing-@[e-mail]: libdmapsharing-@API_VERSION@-daap/libdmapsharing-@API_VERSION@.gi libdmapsharing-@API_VERSION@-daap/libdmapsharing-@API_VERSION@.metadata
+@BUILD_VAPI_TRUE@	$(VAPIGEN) --pkg=avahi-gobject --pkg=libsoup-2.4 --pkg=glib-2.0 --pkg=gio-2.0 --pkg=gstreamer-1.0 --library libdmapsharing-@API_VERSION@-daap libdmapsharing-@API_VERSION@-daap/libdmapsharing-@API_VERSION@.gi
+
+@BUILD_VAPI_TRUE@libdmapsharing-@[e-mail]: libdmapsharing-@API_VERSION@-dacp/libdmapsharing-@API_VERSION@.gi libdmapsharing-@API_VERSION@-dacp/libdmapsharing-@API_VERSION@.metadata
+@BUILD_VAPI_TRUE@	$(VAPIGEN) --pkg=avahi-gobject --pkg=libsoup-2.4 --pkg=glib-2.0 --pkg=gio-2.0 --pkg=gstreamer-1.0 --library libdmapsharing-@API_VERSION@-dacp libdmapsharing-@API_VERSION@-dacp/libdmapsharing-@API_VERSION@.gi
+
+@BUILD_VAPI_TRUE@libdmapsharing-@[e-mail]: libdmapsharing-@API_VERSION@-dmap/libdmapsharing-@API_VERSION@.gi libdmapsharing-@API_VERSION@-dmap/libdmapsharing-@API_VERSION@.metadata
+@BUILD_VAPI_TRUE@	$(VAPIGEN) --pkg=avahi-gobject --pkg=libsoup-2.4 --pkg=glib-2.0 --pkg=gio-2.0 --pkg=gstreamer-1.0 --library libdmapsharing-@API_VERSION@-dmap libdmapsharing-@API_VERSION@-dmap/libdmapsharing-@API_VERSION@.gi
+
+@BUILD_VAPI_TRUE@libdmapsharing-@[e-mail]: libdmapsharing-@API_VERSION@-dpap/libdmapsharing-@API_VERSION@.gi libdmapsharing-@API_VERSION@-dpap/libdmapsharing-@API_VERSION@.metadata
+@BUILD_VAPI_TRUE@	$(VAPIGEN) --pkg=avahi-gobject --pkg=libsoup-2.4 --pkg=glib-2.0 --pkg=gio-2.0 --pkg=gstreamer-1.0 --library libdmapsharing-@API_VERSION@-dpap libdmapsharing-@API_VERSION@-dpap/libdmapsharing-@API_VERSION@.gi
 
 # NOTE: Sed is used to fix a problem I don't know how to handle in
 # vapigen. I have several namespaces (DMAP, DAAP, ...) in libdmapsharing. In
 # order to support this, I generate four Vala API files and then concatenate
 # them. But, each has its own definition of DMAP.Db, DAAP.DMAPDb, etc. The
 # use of sed fixes this:
-@MAINTAINER_MODE_TRUE@libdmapsharing-@API_VERSION@.vapi: libdmapsharing-@[e-mail] libdmapsharing-@[e-mail] libdmapsharing-@[e-mail] libdmapsharing-@[e-mail]
-@MAINTAINER_MODE_TRUE@	cat libdmapsharing-@[e-mail] libdmapsharing-@[e-mail] libdmapsharing-@[e-mail] libdmapsharing-@[e-mail] > libdmapsharing-@API_VERSION@.vapi
-@MAINTAINER_MODE_TRUE@	cat libdmapsharing-@API_VERSION@.vapi | \
-@MAINTAINER_MODE_TRUE@		sed 's/DAAP\.DMAPDb/DMAP.Db/g' | \
-@MAINTAINER_MODE_TRUE@		sed 's/DPAP\.DMAPDb/DMAP.Db/g' | \
-@MAINTAINER_MODE_TRUE@		sed 's/DACP\.DMAPDb/DMAP.Db/g' | \
-@MAINTAINER_MODE_TRUE@		sed 's/DAAP\.DMAPContainerDb/DMAP.ContainerDb/g' | \
-@MAINTAINER_MODE_TRUE@		sed 's/DPAP\.DMAPContainerDb/DMAP.ContainerDb/g' | \
-@MAINTAINER_MODE_TRUE@		sed 's/DACP\.DMAPContainerDb/DMAP.ContainerDb/g' | \
-@MAINTAINER_MODE_TRUE@		sed 's/DAAP\.DMAPRecordFactory/DMAP.RecordFactory/g' | \
-@MAINTAINER_MODE_TRUE@		sed 's/DPAP\.DMAPRecordFactory/DMAP.RecordFactory/g' | \
-@MAINTAINER_MODE_TRUE@		sed 's/DACP\.DAAPRecord/DAAP.Record/g' | \
-@MAINTAINER_MODE_TRUE@		cat > libdmapsharing-@API_VERSION@.vapi.tmp
-@MAINTAINER_MODE_TRUE@	mv libdmapsharing-@API_VERSION@.vapi.tmp libdmapsharing-@API_VERSION@.vapi
-@MAINTAINER_MODE_TRUE@	rm -f libdmapsharing-@[e-mail] libdmapsharing-@[e-mail] libdmapsharing-@[e-mail] libdmapsharing-@[e-mail]
+@BUILD_VAPI_TRUE@libdmapsharing-@API_VERSION@.vapi: libdmapsharing-@[e-mail] libdmapsharing-@[e-mail] libdmapsharing-@[e-mail] libdmapsharing-@[e-mail]
+@BUILD_VAPI_TRUE@	cat libdmapsharing-@[e-mail] libdmapsharing-@[e-mail] libdmapsharing-@[e-mail] libdmapsharing-@[e-mail] > libdmapsharing-@API_VERSION@.vapi
+@BUILD_VAPI_TRUE@	cat libdmapsharing-@API_VERSION@.vapi | \
+@BUILD_VAPI_TRUE@		sed 's/DAAP\.DMAPDb/DMAP.Db/g' | \
+@BUILD_VAPI_TRUE@		sed 's/DPAP\.DMAPDb/DMAP.Db/g' | \
+@BUILD_VAPI_TRUE@		sed 's/DACP\.DMAPDb/DMAP.Db/g' | \
+@BUILD_VAPI_TRUE@		sed 's/DAAP\.DMAPContainerDb/DMAP.ContainerDb/g' | \
+@BUILD_VAPI_TRUE@		sed 's/DPAP\.DMAPContainerDb/DMAP.ContainerDb/g' | \
+@BUILD_VAPI_TRUE@		sed 's/DACP\.DMAPContainerDb/DMAP.ContainerDb/g' | \
+@BUILD_VAPI_TRUE@		sed 's/DAAP\.DMAPRecordFactory/DMAP.RecordFactory/g' | \
+@BUILD_VAPI_TRUE@		sed 's/DPAP\.DMAPRecordFactory/DMAP.RecordFactory/g' | \
+@BUILD_VAPI_TRUE@		sed 's/DACP\.DAAPRecord/DAAP.Record/g' | \
+@BUILD_VAPI_TRUE@		cat > libdmapsharing-@API_VERSION@.vapi.tmp
+@BUILD_VAPI_TRUE@	mv libdmapsharing-@API_VERSION@.vapi.tmp libdmapsharing-@API_VERSION@.vapi
+@BUILD_VAPI_TRUE@	rm -f libdmapsharing-@[e-mail] libdmapsharing-@[e-mail] libdmapsharing-@[e-mail] libdmapsharing-@[e-mail]
 
-@MAINTAINER_MODE_TRUE@all: libdmapsharing-@API_VERSION@.vapi
+@BUILD_VAPI_TRUE@all: libdmapsharing-@API_VERSION@.vapi
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

=== modified file 'vala/libdmapsharing-3.0.vapi'
--- vala/libdmapsharing-3.0.vapi	2012-04-19 20:50:13 +0000
+++ vala/libdmapsharing-3.0.vapi	2014-05-27 20:54:48 +0000
@@ -81,6 +81,13 @@
 		public DAAP.DMAPType type;
 	}
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
+	[Compact]
+	public class DMAPDbFilterDefinition {
+		public weak string key;
+		public bool negate;
+		public weak string value;
+	}
+	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	public class DMAPGstInputStream : GLib.InputStream, GLib.Seekable {
 		[CCode (cname = "dmap_gst_input_stream_new", has_construct_function = false, type = "GInputStream*")]
 		public DMAPGstInputStream (string transcode_mimetype, GLib.InputStream src_stream);
@@ -93,11 +100,27 @@
 		public DMAPGstMP3InputStream (GLib.InputStream stream);
 	}
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
+	public class DMAPGstQtInputStream : DAAP.DMAPGstInputStream, GLib.Seekable {
+		[CCode (cname = "dmap_gst_qt_input_stream_new", has_construct_function = false, type = "GInputStream*")]
+		public DMAPGstQtInputStream (GLib.InputStream stream);
+	}
+	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	public class DMAPGstWAVInputStream : DAAP.DMAPGstInputStream, GLib.Seekable {
 		[CCode (cname = "dmap_gst_wav_input_stream_new", has_construct_function = false, type = "GInputStream*")]
 		public DMAPGstWAVInputStream (GLib.InputStream stream);
 	}
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
+	[Compact]
+	public class DMAPHashContext {
+		[CCode (array_length = false)]
+		public weak uint32[] bits;
+		[CCode (array_length = false)]
+		public weak uint32[] buf;
+		[CCode (array_length = false)]
+		public weak uint[] @in;
+		public int version;
+	}
+	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	public class DMAPMdnsBrowser : GLib.Object {
 		[CCode (cname = "dmap_mdns_browser_new", has_construct_function = false, type = "DMAPMdnsBrowser*")]
 		public DMAPMdnsBrowser (DAAP.DMAPMdnsBrowserServiceType type);
@@ -219,13 +242,6 @@
 		public uint32 size;
 	}
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
-	[Compact]
-	public class FilterDefinition {
-		public weak string key;
-		public bool negate;
-		public weak string value;
-	}
-	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	public class Share : DAAP.DMAPShare {
 		[CCode (has_construct_function = false)]
 		public Share (string name, string password, DMAP.Db db, DMAP.ContainerDb container_db, string transcode_mimetype);
@@ -278,7 +294,7 @@
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	public interface DMAPRecord : GLib.Object {
 		[CCode (cname = "dmap_record_set_from_blob")]
-		public abstract unowned DAAP.DMAPRecord set_from_blob (DAAP.DMAPRecord record, GLib.ByteArray blob);
+		public abstract bool set_from_blob (DAAP.DMAPRecord record, GLib.ByteArray blob);
 		[CCode (cname = "dmap_record_to_blob")]
 		public abstract unowned GLib.ByteArray to_blob (DAAP.DMAPRecord record);
 	}
@@ -526,6 +542,8 @@
 	[CCode (cheader_filename = "libdmapsharing/dmap.h", has_target = false)]
 	public delegate unowned string RecordGetValueFunc (DAAP.DMAPRecord record);
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
+	public const int DMAP_HASH_SIZE;
+	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	public const int DMAP_HAVE_UNALIGNED_ACCESS;
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	public const int DMAP_STATUS_OK;
@@ -545,6 +563,14 @@
 	public static unowned DAAP.DMAPContentCodeDefinition dmap_content_codes (uint number);
 	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_hash_generate")]
 	public static void dmap_hash_generate (short version_major, uchar[] url, uchar hash_select, uchar[] @out, int request_id);
+	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_hash_progressive_final")]
+	public static void dmap_hash_progressive_final (DAAP.DMAPHashContext context, uint[] digest);
+	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_hash_progressive_init")]
+	public static void dmap_hash_progressive_init (DAAP.DMAPHashContext context);
+	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_hash_progressive_to_string")]
+	public static void dmap_hash_progressive_to_string (uint digest, string str);
+	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_hash_progressive_update")]
+	public static void dmap_hash_progressive_update (DAAP.DMAPHashContext context, uint buffer, uint length);
 	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_BOOLEAN__STRING")]
 	public static void dmap_marshal_BOOLEAN__STRING (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
 	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_STRING__STRING")]
@@ -565,6 +591,8 @@
 	public static unowned Avahi.Client dmap_mdns_avahi_get_client ();
 	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_mdns_avahi_set_entry_group")]
 	public static void dmap_mdns_avahi_set_entry_group (Avahi.EntryGroup group);
+	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_mime_to_format")]
+	public static unowned string dmap_mime_to_format (string transcode_mimetype);
 	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_structure_add")]
 	public static unowned GLib.Node dmap_structure_add (GLib.Node parent, DAAP.DMAPContentCode cc);
 	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_structure_destroy")]
@@ -683,6 +711,13 @@
 		public DACP.DMAPType type;
 	}
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
+	[Compact]
+	public class DMAPDbFilterDefinition {
+		public weak string key;
+		public bool negate;
+		public weak string value;
+	}
+	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	public class DMAPGstInputStream : GLib.InputStream, GLib.Seekable {
 		[CCode (cname = "dmap_gst_input_stream_new", has_construct_function = false, type = "GInputStream*")]
 		public DMAPGstInputStream (string transcode_mimetype, GLib.InputStream src_stream);
@@ -695,11 +730,27 @@
 		public DMAPGstMP3InputStream (GLib.InputStream stream);
 	}
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
+	public class DMAPGstQtInputStream : DACP.DMAPGstInputStream, GLib.Seekable {
+		[CCode (cname = "dmap_gst_qt_input_stream_new", has_construct_function = false, type = "GInputStream*")]
+		public DMAPGstQtInputStream (GLib.InputStream stream);
+	}
+	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	public class DMAPGstWAVInputStream : DACP.DMAPGstInputStream, GLib.Seekable {
 		[CCode (cname = "dmap_gst_wav_input_stream_new", has_construct_function = false, type = "GInputStream*")]
 		public DMAPGstWAVInputStream (GLib.InputStream stream);
 	}
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
+	[Compact]
+	public class DMAPHashContext {
+		[CCode (array_length = false)]
+		public weak uint32[] bits;
+		[CCode (array_length = false)]
+		public weak uint32[] buf;
+		[CCode (array_length = false)]
+		public weak uint[] @in;
+		public int version;
+	}
+	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	public class DMAPMdnsBrowser : GLib.Object {
 		[CCode (cname = "dmap_mdns_browser_new", has_construct_function = false, type = "DMAPMdnsBrowser*")]
 		public DMAPMdnsBrowser (DACP.DMAPMdnsBrowserServiceType type);
@@ -821,13 +872,6 @@
 		public uint32 size;
 	}
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
-	[Compact]
-	public class FilterDefinition {
-		public weak string key;
-		public bool negate;
-		public weak string value;
-	}
-	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	public class Share : DACP.DAAPShare {
 		[CCode (has_construct_function = false)]
 		public Share (string library_name, DACP.Player player, DMAP.Db db, DMAP.ContainerDb container_db);
@@ -902,7 +946,7 @@
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	public interface DMAPRecord : GLib.Object {
 		[CCode (cname = "dmap_record_set_from_blob")]
-		public abstract unowned DACP.DMAPRecord set_from_blob (DACP.DMAPRecord record, GLib.ByteArray blob);
+		public abstract bool set_from_blob (DACP.DMAPRecord record, GLib.ByteArray blob);
 		[CCode (cname = "dmap_record_to_blob")]
 		public abstract unowned GLib.ByteArray to_blob (DACP.DMAPRecord record);
 	}
@@ -1165,6 +1209,8 @@
 	[CCode (cheader_filename = "libdmapsharing/dmap.h", has_target = false)]
 	public delegate unowned string RecordGetValueFunc (DACP.DMAPRecord record);
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
+	public const int DMAP_HASH_SIZE;
+	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	public const int DMAP_HAVE_UNALIGNED_ACCESS;
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	public const int DMAP_STATUS_OK;
@@ -1184,6 +1230,14 @@
 	public static unowned DACP.DMAPContentCodeDefinition dmap_content_codes (uint number);
 	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_hash_generate")]
 	public static void dmap_hash_generate (short version_major, uchar[] url, uchar hash_select, uchar[] @out, int request_id);
+	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_hash_progressive_final")]
+	public static void dmap_hash_progressive_final (DACP.DMAPHashContext context, uint[] digest);
+	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_hash_progressive_init")]
+	public static void dmap_hash_progressive_init (DACP.DMAPHashContext context);
+	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_hash_progressive_to_string")]
+	public static void dmap_hash_progressive_to_string (uint digest, string str);
+	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_hash_progressive_update")]
+	public static void dmap_hash_progressive_update (DACP.DMAPHashContext context, uint buffer, uint length);
 	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_BOOLEAN__STRING")]
 	public static void dmap_marshal_BOOLEAN__STRING (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
 	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_STRING__STRING")]
@@ -1204,6 +1258,8 @@
 	public static unowned Avahi.Client dmap_mdns_avahi_get_client ();
 	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_mdns_avahi_set_entry_group")]
 	public static void dmap_mdns_avahi_set_entry_group (Avahi.EntryGroup group);
+	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_mime_to_format")]
+	public static unowned string dmap_mime_to_format (string transcode_mimetype);
 	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_structure_add")]
 	public static unowned GLib.Node dmap_structure_add (GLib.Node parent, DACP.DMAPContentCode cc);
 	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_structure_destroy")]
@@ -1299,7 +1355,7 @@
 	}
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	[Compact]
-	public class FilterDefinition {
+	public class DbFilterDefinition {
 		public weak string key;
 		public bool negate;
 		public weak string value;
@@ -1317,11 +1373,27 @@
 		public GstMP3InputStream (GLib.InputStream stream);
 	}
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
+	public class GstQtInputStream : DMAP.GstInputStream, GLib.Seekable {
+		[CCode (has_construct_function = false, type = "GInputStream*")]
+		public GstQtInputStream (GLib.InputStream stream);
+	}
+	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	public class GstWAVInputStream : DMAP.GstInputStream, GLib.Seekable {
 		[CCode (has_construct_function = false, type = "GInputStream*")]
 		public GstWAVInputStream (GLib.InputStream stream);
 	}
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
+	[Compact]
+	public class HashContext {
+		[CCode (array_length = false)]
+		public weak uint32[] bits;
+		[CCode (array_length = false)]
+		public weak uint32[] buf;
+		[CCode (array_length = false)]
+		public weak uint[] @in;
+		public int version;
+	}
+	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	public class MdnsBrowser : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public MdnsBrowser (DMAP.MdnsBrowserServiceType type);
@@ -1463,7 +1535,7 @@
 	}
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	public interface Record : GLib.Object {
-		public abstract unowned DMAP.Record set_from_blob (GLib.ByteArray blob);
+		public abstract bool set_from_blob (GLib.ByteArray blob);
 		public abstract unowned GLib.ByteArray to_blob ();
 	}
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
@@ -1703,6 +1775,8 @@
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	public delegate void ResponseHandler (DMAP.Connection connection, uint status, GLib.Node structure);
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
+	public const int HASH_SIZE;
+	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	public const int HAVE_UNALIGNED_ACCESS;
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	public const int STATUS_OK;
@@ -1725,6 +1799,14 @@
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	public static void hash_generate (short version_major, uchar[] url, uchar hash_select, uchar[] @out, int request_id);
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
+	public static void hash_progressive_final (DMAP.HashContext context, uint[] digest);
+	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
+	public static void hash_progressive_init (DMAP.HashContext context);
+	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
+	public static void hash_progressive_to_string (uint digest, string str);
+	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
+	public static void hash_progressive_update (DMAP.HashContext context, uint buffer, uint length);
+	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	public static void marshal_BOOLEAN__STRING (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	public static void marshal_STRING__STRING (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
@@ -1744,6 +1826,8 @@
 	public static unowned Avahi.Client mdns_avahi_get_client ();
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	public static void mdns_avahi_set_entry_group (Avahi.EntryGroup group);
+	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
+	public static unowned string mime_to_format (string transcode_mimetype);
 	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "pads_compatible")]
 	public static bool pads_compatible (Gst.Pad pad1, Gst.Pad pad2);
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
@@ -1850,6 +1934,13 @@
 		public DPAP.DMAPType type;
 	}
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
+	[Compact]
+	public class DMAPDbFilterDefinition {
+		public weak string key;
+		public bool negate;
+		public weak string value;
+	}
+	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	public class DMAPGstInputStream : GLib.InputStream, GLib.Seekable {
 		[CCode (cname = "dmap_gst_input_stream_new", has_construct_function = false, type = "GInputStream*")]
 		public DMAPGstInputStream (string transcode_mimetype, GLib.InputStream src_stream);
@@ -1862,11 +1953,27 @@
 		public DMAPGstMP3InputStream (GLib.InputStream stream);
 	}
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
+	public class DMAPGstQtInputStream : DPAP.DMAPGstInputStream, GLib.Seekable {
+		[CCode (cname = "dmap_gst_qt_input_stream_new", has_construct_function = false, type = "GInputStream*")]
+		public DMAPGstQtInputStream (GLib.InputStream stream);
+	}
+	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	public class DMAPGstWAVInputStream : DPAP.DMAPGstInputStream, GLib.Seekable {
 		[CCode (cname = "dmap_gst_wav_input_stream_new", has_construct_function = false, type = "GInputStream*")]
 		public DMAPGstWAVInputStream (GLib.InputStream stream);
 	}
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
+	[Compact]
+	public class DMAPHashContext {
+		[CCode (array_length = false)]
+		public weak uint32[] bits;
+		[CCode (array_length = false)]
+		public weak uint32[] buf;
+		[CCode (array_length = false)]
+		public weak uint[] @in;
+		public int version;
+	}
+	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	public class DMAPMdnsBrowser : GLib.Object {
 		[CCode (cname = "dmap_mdns_browser_new", has_construct_function = false, type = "DMAPMdnsBrowser*")]
 		public DMAPMdnsBrowser (DPAP.DMAPMdnsBrowserServiceType type);
@@ -1988,13 +2095,6 @@
 		public uint32 size;
 	}
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
-	[Compact]
-	public class FilterDefinition {
-		public weak string key;
-		public bool negate;
-		public weak string value;
-	}
-	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	public class Share : DPAP.DMAPShare {
 		[CCode (has_construct_function = false)]
 		public Share (string name, string password, void* db, void* container_db, string transcode_mimetype);
@@ -2047,7 +2147,7 @@
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	public interface DMAPRecord : GLib.Object {
 		[CCode (cname = "dmap_record_set_from_blob")]
-		public abstract unowned DPAP.DMAPRecord set_from_blob (DPAP.DMAPRecord record, GLib.ByteArray blob);
+		public abstract bool set_from_blob (DPAP.DMAPRecord record, GLib.ByteArray blob);
 		[CCode (cname = "dmap_record_to_blob")]
 		public abstract unowned GLib.ByteArray to_blob (DPAP.DMAPRecord record);
 	}
@@ -2293,6 +2393,8 @@
 	[CCode (cheader_filename = "libdmapsharing/dmap.h", has_target = false)]
 	public delegate unowned string RecordGetValueFunc (DPAP.DMAPRecord record);
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
+	public const int DMAP_HASH_SIZE;
+	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	public const int DMAP_HAVE_UNALIGNED_ACCESS;
 	[CCode (cheader_filename = "libdmapsharing/dmap.h")]
 	public const int DMAP_STATUS_OK;
@@ -2312,6 +2414,14 @@
 	public static unowned DPAP.DMAPContentCodeDefinition dmap_content_codes (uint number);
 	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_hash_generate")]
 	public static void dmap_hash_generate (short version_major, uchar[] url, uchar hash_select, uchar[] @out, int request_id);
+	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_hash_progressive_final")]
+	public static void dmap_hash_progressive_final (DPAP.DMAPHashContext context, uint[] digest);
+	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_hash_progressive_init")]
+	public static void dmap_hash_progressive_init (DPAP.DMAPHashContext context);
+	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_hash_progressive_to_string")]
+	public static void dmap_hash_progressive_to_string (uint digest, string str);
+	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_hash_progressive_update")]
+	public static void dmap_hash_progressive_update (DPAP.DMAPHashContext context, uint buffer, uint length);
 	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_BOOLEAN__STRING")]
 	public static void dmap_marshal_BOOLEAN__STRING (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
 	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_marshal_STRING__STRING")]
@@ -2332,6 +2442,8 @@
 	public static unowned Avahi.Client dmap_mdns_avahi_get_client ();
 	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_mdns_avahi_set_entry_group")]
 	public static void dmap_mdns_avahi_set_entry_group (Avahi.EntryGroup group);
+	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_mime_to_format")]
+	public static unowned string dmap_mime_to_format (string transcode_mimetype);
 	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_structure_add")]
 	public static unowned GLib.Node dmap_structure_add (GLib.Node parent, DPAP.DMAPContentCode cc);
 	[CCode (cheader_filename = "libdmapsharing/dmap.h", cname = "dmap_structure_destroy")]