[tracker/direct-access: 6/39] libtracker-direct: Fix build

[Jürg Billeter <juergbi src gnome org>]

commit 57f8bf8a142ed18ac1f50c84d5ee736d17c87671
Author: Jürg Billeter <j bitron ch>
Date:   Tue Jul 6 13:47:09 2010 +0200

    libtracker-direct: Fix build

 src/libtracker-data/Makefile.am               |    6 ++++--
 src/libtracker-data/libtracker-data.vapi      |    2 +-
 src/libtracker-direct/Makefile.am             |    5 +++--
 src/libtracker-direct/tracker-connection.vala |    2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/src/libtracker-data/Makefile.am b/src/libtracker-data/Makefile.am
index 55111af..b691983 100644
--- a/src/libtracker-data/Makefile.am
+++ b/src/libtracker-data/Makefile.am
@@ -67,11 +67,12 @@ noinst_HEADERS =							\
 vapi_sources =								\
 	$(top_srcdir)/src/vapi/posix.vapi				\
 	$(top_srcdir)/src/vapi/glib-2.0-fixes.vapi			\
+	$(top_srcdir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi	\
 	$(top_srcdir)/src/libtracker-common/libtracker-common.vapi	\
 	libtracker-data.vapi
 
 libtracker-data.vala.stamp: $(libtracker_data_la_VALASOURCES) $(vapi_sources)
-	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) -H tracker-sparql-query.h --pkg gio-2.0 $^
+	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) -H tracker-sparql-query.h --vapi tracker-sparql-query.vapi --pkg gio-2.0 $^
 	touch $@
 
 libtracker_data_la_LDFLAGS =						\
@@ -101,5 +102,6 @@ MAINTAINERCLEANFILES =							\
 
 EXTRA_DIST = $(libtracker_data_la_VALASOURCES)				\
 	libtracker-data.vala.stamp					\
-	libtracker-data.vapi
+	libtracker-data.vapi						\
+	tracker-sparql-query.vapi
 
diff --git a/src/libtracker-data/libtracker-data.vapi b/src/libtracker-data/libtracker-data.vapi
index b017199..903680c 100644
--- a/src/libtracker-data/libtracker-data.vapi
+++ b/src/libtracker-data/libtracker-data.vapi
@@ -52,7 +52,7 @@ namespace Tracker {
 	}
 
 	[CCode (cheader_filename = "libtracker-data/tracker-db-interface.h")]
-	public class DBCursor : GLib.Object {
+	public class DBCursor : Sparql.Cursor {
 	}
 
 	[CCode (cheader_filename = "libtracker-data/tracker-db-interface.h")]
diff --git a/src/libtracker-direct/Makefile.am b/src/libtracker-direct/Makefile.am
index 2393898..edecc7a 100644
--- a/src/libtracker-direct/Makefile.am
+++ b/src/libtracker-direct/Makefile.am
@@ -23,8 +23,9 @@ libtracker_directinclude_HEADERS = 			\
 # Vala sources
 vapi_sources =						\
 	$(top_srcdir)/src/libtracker-sparql/tracker-sparql-$(TRACKER_API_VERSION).vapi	\
-	$(top_srcdir)/src/vapi/posix.vapi		\
-	$(top_srcdir)/src/vapi/glib-2.0-fixes.vapi
+	$(top_srcdir)/src/libtracker-common/libtracker-common.vapi	\
+	$(top_srcdir)/src/libtracker-data/libtracker-data.vapi	\
+	$(top_srcdir)/src/libtracker-data/tracker-sparql-query.vapi
 
 libtracker-direct.vala.stamp: $(libtracker_direct_ TRACKER_API_VERSION@_la_VALASOURCES) $(vapi_sources)
 	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 -H tracker-connection.h $^
diff --git a/src/libtracker-direct/tracker-connection.vala b/src/libtracker-direct/tracker-connection.vala
index c443646..b8a68eb 100644
--- a/src/libtracker-direct/tracker-connection.vala
+++ b/src/libtracker-direct/tracker-connection.vala
@@ -26,7 +26,7 @@ public class Tracker.Direct.Connection : Tracker.Sparql.Connection {
 		// Clean up connection
 	}
 
-	public Cursor query (string sparql) throws GLib.Error {
+	public override Sparql.Cursor query (string sparql) throws GLib.Error {
 		var query_object = new Sparql.Query (sparql);
 		return query_object.execute_cursor ();
 	}