[libdmapsharing] Fixes required by Vala API work Signed-off-by: W. Michael Petullo <mike flyn org>

[W. Michael Petullo <wmpetullo src gnome org>]

commit 3bd4fcb61294d7c76f62c243f0af6cc53a2a17b3
Author: W. Michael Petullo <mike flyn org>
Date:   Wed Dec 15 16:48:22 2010 -0600

    Fixes required by Vala API work
    Signed-off-by: W. Michael Petullo <mike flyn org>

 tests/dpapview.vala |    4 ++--
 vala/Makefile.am    |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/tests/dpapview.vala b/tests/dpapview.vala
index 5695ec5..f211160 100644
--- a/tests/dpapview.vala
+++ b/tests/dpapview.vala
@@ -139,7 +139,7 @@ private class ViewerDPAPRecord : GLib.Object, DMAP.Record, DPAP.Record {
 		set { _creation_date = value; }
 	}
 
-	public unowned GLib.InputStream read (DPAP.Record record) throws GLib.Error {
+	public unowned GLib.InputStream read () throws GLib.Error {
 		GLib.error ("read not implemented");
 	}
 
@@ -182,7 +182,7 @@ private class DPAPViewer {
 		/* FIXME: fix void * argument, see libdmapsharing TODO: */
 		DMAP.MdnsBrowserService *FIXME = service;
 		/* FIXME: fix int cast: should not be requried: */
-		connection = new DPAP.Connection (FIXME->service_name, FIXME->host, (int) FIXME->port, false, db, factory);
+		connection = (DMAP.Connection) new DPAP.Connection (FIXME->service_name, FIXME->host, (int) FIXME->port, false, db, factory);
 		connection.connect (connected_cb);
 	}
 
diff --git a/vala/Makefile.am b/vala/Makefile.am
index 8fd5230..a73497f 100644
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -24,7 +24,7 @@ libdmapsharing- API_VERSION@-dpap.vapi: libdmapsharing- API_VERSION@-dpap/libdma
 	$(VAPIGEN) --pkg=libsoup-2.4 --pkg=glib-2.0 --library libdmapsharing- API_VERSION@-dpap libdmapsharing- API_VERSION@-dpap/libdmapsharing- API_VERSION@.gi
 
 libdmapsharing- API_VERSION@.vapi: libdmapsharing- API_VERSION@-daap.vapi libdmapsharing- API_VERSION@-dacp.vapi libdmapsharing- API_VERSION@-dmap.vapi libdmapsharing- API_VERSION@-dpap.vapi
-	cat libdmapsharing- API_VERSION@-daap.vapi libdmapsharing- API_VERSION@-dpap.vapi libdmapsharing- API_VERSION@-dmap.vapi libdmapsharing- API_VERSION@-dpap.vapi > libdmapsharing- API_VERSION@.vapi
+	cat libdmapsharing- API_VERSION@-daap.vapi libdmapsharing- API_VERSION@-dacp.vapi libdmapsharing- API_VERSION@-dmap.vapi libdmapsharing- API_VERSION@-dpap.vapi > libdmapsharing- API_VERSION@.vapi
 	rm -f libdmapsharing- API_VERSION@-daap.vapi libdmapsharing- API_VERSION@-dacp.vapi libdmapsharing- API_VERSION@-dmap.vapi libdmapsharing- API_VERSION@-dpap.vapi
 	
 all: libdmapsharing- API_VERSION@.vapi