GNOME.org
 

[tracker] Moved tracker-sparql-builder to libtracker-client

commit 213f68f06e78fdd14f86db84ea3549108b9af0c0
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Feb 11 18:39:19 2010 +0100

    Moved tracker-sparql-builder to libtracker-client

 configure.ac                                       |    1 +
 .../libtracker-client/libtracker-client-docs.sgml  |    7 ++
 .../libtracker-client-sections.txt                 |   60 ++++++++++++++++++++
 .../libtracker-common/libtracker-common-docs.sgml  |    2 -
 .../libtracker-common-sections.txt                 |   58 +-------------------
 src/Makefile.am                                    |    3 +-
 src/libtracker-client/Makefile.am                  |   42 ++++++++++++--
 .../tracker-sparql-builder.vala                    |    0
 .../tracker-statement-list.h                       |    8 +--
 src/libtracker-common/Makefile.am                  |   16 ++---
 src/libtracker-common/tracker-common.h             |    2 -
 src/libtracker-data/Makefile.am                    |    9 +++-
 src/libtracker-extract/tracker-extract.h           |    2 +-
 src/libtracker-extract/tracker-xmp.h               |    2 +-
 src/libtracker-miner/tracker-miner-fs.h            |   38 ++++++------
 src/plugins/evolution/tracker-evolution-plugin.c   |    3 +-
 src/plugins/kmail/tracker-kmail-registrar.c        |    3 +
 src/tracker-control/Makefile.am                    |    2 +-
 src/tracker-extract/Makefile.am                    |    1 +
 src/tracker-extract/tracker-extract-text.c         |    1 +
 src/tracker-extract/tracker-extract.c              |    2 +
 src/tracker-extract/tracker-extract.h              |    4 +-
 src/vapi/Makefile.am                               |    6 ++
 .../glib-2.0-fixes.vapi                            |    0
 src/{libtracker-common => vapi}/posix.vapi         |    0
 25 files changed, 163 insertions(+), 109 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 69c8df9..04603e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1652,6 +1652,7 @@ AC_CONFIG_FILES([
 	src/plugins/evolution/Makefile
 	src/plugins/kmail/Makefile
 	src/plugins/nautilus/Makefile
+	src/vapi/Makefile
 	tests/common/Makefile
 	tests/libtracker-common/Makefile
 	tests/libtracker-data/Makefile
diff --git a/docs/reference/libtracker-client/libtracker-client-docs.sgml b/docs/reference/libtracker-client/libtracker-client-docs.sgml
index d12377d..c3ebffc 100644
--- a/docs/reference/libtracker-client/libtracker-client-docs.sgml
+++ b/docs/reference/libtracker-client/libtracker-client-docs.sgml
@@ -7,6 +7,8 @@
 <!ENTITY tracker-statistics SYSTEM "xml/tracker_statistics.xml">
 <!ENTITY tracker-resources SYSTEM "xml/tracker_resources.xml">
 <!ENTITY tracker-search SYSTEM "xml/tracker_search.xml">
+<!ENTITY tracker-sparql-builder SYSTEM "xml/tracker-sparql-builder.xml">
+<!ENTITY tracker-statement-list SYSTEM "xml/tracker-statement-list.xml">
 <!ENTITY version SYSTEM "version.xml">
 ]>
 <book id="index">
@@ -41,4 +43,9 @@
       &tracker-resources;
       &tracker-search;
     </chapter>
+    <chapter>
+      <title>Building Queries</title>
+      &tracker-sparql-builder;
+      &tracker-statement-list;
+    </chapter>
 </book>
diff --git a/docs/reference/libtracker-client/libtracker-client-sections.txt b/docs/reference/libtracker-client/libtracker-client-sections.txt
index f05d679..f00e447 100644
--- a/docs/reference/libtracker-client/libtracker-client-sections.txt
+++ b/docs/reference/libtracker-client/libtracker-client-sections.txt
@@ -71,3 +71,63 @@ tracker_search_metadata_by_text_and_mime_async
 tracker_search_metadata_by_text_and_mime_and_location_async
 </SECTION>
 
+<SECTION>
+<FILE>tracker-sparql-builder</FILE>
+<TITLE>TrackerSparqlBuilder</TITLE>
+TrackerSparqlBuilder
+TrackerSparqlBuilderClass
+TrackerSparqlBuilderPrivate
+tracker_sparql_builder_new
+tracker_sparql_builder_new_embedded_insert
+tracker_sparql_builder_new_update
+tracker_sparql_builder_construct
+tracker_sparql_builder_construct_embedded_insert
+tracker_sparql_builder_construct_update
+tracker_sparql_builder_get_result
+tracker_sparql_builder_get_length
+tracker_sparql_builder_append
+tracker_sparql_builder_prepend
+tracker_sparql_builder_insert_open
+tracker_sparql_builder_insert_close
+tracker_sparql_builder_where_open
+tracker_sparql_builder_where_close
+tracker_sparql_builder_delete_open
+tracker_sparql_builder_delete_close
+tracker_sparql_builder_drop_graph
+tracker_sparql_builder_subject_variable
+tracker_sparql_builder_subject_iri
+tracker_sparql_builder_subject
+tracker_sparql_builder_predicate_iri
+tracker_sparql_builder_predicate
+tracker_sparql_builder_object_iri
+tracker_sparql_builder_object
+tracker_sparql_builder_object_string
+tracker_sparql_builder_object_boolean
+tracker_sparql_builder_object_int64
+tracker_sparql_builder_object_date
+tracker_sparql_builder_object_double
+tracker_sparql_builder_object_variable
+tracker_sparql_builder_object_blank_open
+tracker_sparql_builder_object_blank_close
+tracker_sparql_builder_object_unvalidated
+<SUBSECTION Standard>
+TRACKER_SPARQL_BUILDER
+TRACKER_IS_SPARQL_BUILDER
+TRACKER_TYPE_SPARQL_BUILDER
+tracker_sparql_builder_get_type
+TRACKER_SPARQL_BUILDER_CLASS
+TRACKER_IS_SPARQL_BUILDER_CLASS
+TRACKER_SPARQL_BUILDER_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>tracker-statement-list</FILE>
+SHOULD_VALIDATE_UTF8
+tracker_statement_list_insert
+tracker_statement_list_insert_with_double
+tracker_statement_list_insert_with_float
+tracker_statement_list_insert_with_int
+tracker_statement_list_insert_with_int64
+tracker_statement_list_insert_with_uint
+</SECTION>
+
diff --git a/docs/reference/libtracker-common/libtracker-common-docs.sgml b/docs/reference/libtracker-common/libtracker-common-docs.sgml
index 9ecf8d7..41e2554 100644
--- a/docs/reference/libtracker-common/libtracker-common-docs.sgml
+++ b/docs/reference/libtracker-common/libtracker-common-docs.sgml
@@ -15,8 +15,6 @@
 <!ENTITY tracker-os-dependant SYSTEM "xml/tracker-os-dependant.xml">
 <!ENTITY tracker-power SYSTEM "xml/tracker-power.xml">
 <!ENTITY tracker-property SYSTEM "xml/tracker-property.xml">
-<!ENTITY tracker-sparql-builder SYSTEM "xml/tracker-sparql-builder.xml">
-<!ENTITY tracker-statement-list SYSTEM "xml/tracker-statement-list.xml">
 <!ENTITY tracker-storage SYSTEM "xml/tracker-storage.xml">
 <!ENTITY tracker-type-utils SYSTEM "xml/tracker-type-utils.xml">
 <!ENTITY tracker-utils SYSTEM "xml/tracker-utils.xml">
diff --git a/docs/reference/libtracker-common/libtracker-common-sections.txt b/docs/reference/libtracker-common/libtracker-common-sections.txt
index 867623b..597bf04 100644
--- a/docs/reference/libtracker-common/libtracker-common-sections.txt
+++ b/docs/reference/libtracker-common/libtracker-common-sections.txt
@@ -103,7 +103,7 @@ TRACKER_NAMESPACE_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>tracker-sparql-builder</FILE>
+<FILE>tracker-turtle-writer</FILE>
 TRACKER_TYPE_TURTLE_WRITER
 TRACKER_TURTLE_WRITER
 TRACKER_TURTLE_WRITER_CLASS
@@ -111,45 +111,9 @@ TRACKER_IS_TURTLE_WRITER
 TRACKER_IS_TURTLE_WRITER_CLASS
 TRACKER_TURTLE_WRITER_GET_CLASS
 TrackerTurtleWriterPrivate
-<TITLE>TrackerSparqlBuilder</TITLE>
-TrackerSparqlBuilder
-TrackerSparqlBuilderClass
-TrackerSparqlBuilderPrivate
 <TITLE>TrackerTurtleWriter</TITLE>
 TrackerTurtleWriter
 TrackerTurtleWriterClass
-tracker_sparql_builder_new
-tracker_sparql_builder_new_embedded_insert
-tracker_sparql_builder_new_update
-tracker_sparql_builder_construct
-tracker_sparql_builder_construct_embedded_insert
-tracker_sparql_builder_construct_update
-tracker_sparql_builder_get_result
-tracker_sparql_builder_get_length
-tracker_sparql_builder_append
-tracker_sparql_builder_prepend
-tracker_sparql_builder_insert_open
-tracker_sparql_builder_insert_close
-tracker_sparql_builder_where_open
-tracker_sparql_builder_where_close
-tracker_sparql_builder_delete_open
-tracker_sparql_builder_delete_close
-tracker_sparql_builder_drop_graph
-tracker_sparql_builder_subject_variable
-tracker_sparql_builder_subject_iri
-tracker_sparql_builder_subject
-tracker_sparql_builder_predicate_iri
-tracker_sparql_builder_predicate
-tracker_sparql_builder_object_iri
-tracker_sparql_builder_object
-tracker_sparql_builder_object_string
-tracker_sparql_builder_object_boolean
-tracker_sparql_builder_object_int64
-tracker_sparql_builder_object_date
-tracker_sparql_builder_object_double
-tracker_sparql_builder_object_variable
-tracker_sparql_builder_object_blank_open
-tracker_sparql_builder_object_blank_close
 tracker_turtle_writer_get_type
 tracker_turtle_writer_new
 tracker_turtle_writer_construct
@@ -166,14 +130,6 @@ tracker_turtle_writer_object_date
 tracker_turtle_writer_object_blank_open
 tracker_turtle_writer_object_blank_close
 tracker_turtle_writer_close
-<SUBSECTION Standard>
-TRACKER_SPARQL_BUILDER
-TRACKER_IS_SPARQL_BUILDER
-TRACKER_TYPE_SPARQL_BUILDER
-tracker_sparql_builder_get_type
-TRACKER_SPARQL_BUILDER_CLASS
-TRACKER_IS_SPARQL_BUILDER_CLASS
-TRACKER_SPARQL_BUILDER_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -354,18 +310,6 @@ tracker_dbus_request_unblock_hooks
 </SECTION>
 
 <SECTION>
-<FILE>tracker-statement-list</FILE>
-SHOULD_VALIDATE_UTF8
-tracker_sparql_builder_object_unvalidated
-tracker_statement_list_insert
-tracker_statement_list_insert_with_int
-tracker_statement_list_insert_with_int64
-tracker_statement_list_insert_with_uint
-tracker_statement_list_insert_with_double
-tracker_statement_list_insert_with_float
-</SECTION>
-
-<SECTION>
 <FILE>tracker-os-dependant</FILE>
 tracker_spawn
 tracker_spawn_async_with_channels
diff --git a/src/Makefile.am b/src/Makefile.am
index f7a0576..16246be 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,7 +16,8 @@ SUBDIRS = 					\
 	tracker-utils				\
 	tracker-extract				\
 	tracker-miner-fs			\
-	tracker-writeback
+	tracker-writeback			\
+	vapi
 
 if HAVE_TRACKER_PREFERENCES
 SUBDIRS += tracker-preferences
diff --git a/src/libtracker-client/Makefile.am b/src/libtracker-client/Makefile.am
index 7af28f6..1392d5d 100644
--- a/src/libtracker-client/Makefile.am
+++ b/src/libtracker-client/Makefile.am
@@ -11,9 +11,17 @@ INCLUDES = 					\
 
 lib_LTLIBRARIES = libtracker-client- TRACKER_API_VERSION@.la
 
-libtracker_clientincdir = $(includedir)/tracker-$(TRACKER_API_VERSION)/libtracker-client
+libtracker_clientincludedir = $(includedir)/tracker-$(TRACKER_API_VERSION)/libtracker-client
 
-libtracker_client_ TRACKER_API_VERSION@_la_SOURCES = tracker.c
+libtracker_client_ TRACKER_API_VERSION@_la_VALASOURCES = \
+	tracker-sparql-builder.vala
+
+libtracker_client_ TRACKER_API_VERSION@_la_SOURCES = 	\
+	tracker.c					\
+	tracker-sparql-builder.c			\
+	tracker-sparql-builder.h			\
+	libtracker-client.vala.stamp			\
+	$(libtracker_client_ TRACKER_API_VERSION@_la_VALASOURCES:.vala=.c)
 
 libtracker_client_ TRACKER_API_VERSION@_la_LDFLAGS = 	\
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
@@ -25,8 +33,12 @@ libtracker_client_ TRACKER_API_VERSION@_la_LIBADD =	\
 	$(GCOV_LIBS)					\
 	$(GOBJECT_LIBS)
 
-libtracker_clientinc_HEADERS = 				\
-	tracker.h
+libtracker_clientinclude_HEADERS = 			\
+	tracker.h					\
+	tracker-sparql-builder.h
+
+noinst_HEADERS =					\
+	tracker-statement-list.h
 
 # Generate DBus files from XML data.
 dbus_sources = 						\
@@ -36,6 +48,26 @@ dbus_sources = 						\
 %-glue.h: $(top_srcdir)/data/dbus/%.xml
 	$(AM_V_GEN)$(DBUSBINDINGTOOL) --mode=glib-client --output=$@ --prefix=$(subst -,_,$*) $^
 
-BUILT_SOURCES = $(dbus_sources)
+vapi_sources =						\
+	$(top_srcdir)/src/vapi/posix.vapi		\
+	$(top_srcdir)/src/vapi/glib-2.0-fixes.vapi
+
+libtracker-client.vala.stamp: $(libtracker_client_ TRACKER_API_VERSION@_la_VALASOURCES) $(vapi_sources)
+	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 -H tracker-sparql-builder.h $^
+	$(AM_V_GEN)touch $@
+
+BUILT_SOURCES = 					\
+	$(dbus_sources)					\
+	libtracker-client.vala.stamp
 
 CLEANFILES = $(BUILT_SOURCES)
+
+MAINTAINERCLEANFILES =					\
+	libtracker-client.vala.stamp			\
+	$(libtracker_client_ TRACKER_API_VERSION@_la_VALASOURCES:.vala=.c) \
+	tracker-sparql-builder.h
+
+EXTRA_DIST = 						\
+	$(libtracker_client_ TRACKER_API_VERSION@_la_VALASOURCES) \
+	libtracker-client.vala.stamp
+
diff --git a/src/libtracker-common/tracker-sparql-builder.vala b/src/libtracker-client/tracker-sparql-builder.vala
similarity index 100%
rename from src/libtracker-common/tracker-sparql-builder.vala
rename to src/libtracker-client/tracker-sparql-builder.vala
diff --git a/src/libtracker-common/tracker-statement-list.h b/src/libtracker-client/tracker-statement-list.h
similarity index 92%
rename from src/libtracker-common/tracker-statement-list.h
rename to src/libtracker-client/tracker-statement-list.h
index eb475e4..adf54c8 100644
--- a/src/libtracker-common/tracker-statement-list.h
+++ b/src/libtracker-client/tracker-statement-list.h
@@ -17,8 +17,8 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#ifndef __LIBTRACKER_COMMON_STATEMENT_H__
-#define __LIBTRACKER_COMMON_STATEMENT_H__
+#ifndef __LIBTRACKER_CLIENT_STATEMENT_H__
+#define __LIBTRACKER_CLIENT_STATEMENT_H__
 
 #include <glib.h>
 
@@ -26,10 +26,6 @@
 
 G_BEGIN_DECLS
 
-#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-common/tracker-common.h> must be included directly."
-#endif
-
 #define SHOULD_VALIDATE_UTF8
 
 void tracker_statement_list_insert             (TrackerSparqlBuilder *statements,
diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am
index 972d358..19a28cf 100644
--- a/src/libtracker-common/Makefile.am
+++ b/src/libtracker-common/Makefile.am
@@ -51,7 +51,6 @@ endif
 endif
 
 libtracker_common_la_VALASOURCES =			\
-	tracker-sparql-builder.vala			\
 	tracker-turtle-writer.vala
 
 libtracker_common_la_SOURCES =	 			\
@@ -70,7 +69,6 @@ libtracker_common_la_SOURCES =	 			\
 	tracker-namespace.c				\
 	tracker-ontology.c				\
 	tracker-property.c				\
-	tracker-statement-list.c			\
 	tracker-type-utils.c				\
 	tracker-utils.c					\
 	tracker-crc32.c					\
@@ -95,13 +93,15 @@ libtracker_commoninclude_HEADERS =			\
 	tracker-namespace.h				\
 	tracker-ontology.h				\
 	tracker-property.h				\
-	tracker-sparql-builder.h			\
-	tracker-statement-list.h			\
 	tracker-type-utils.h				\
 	tracker-utils.h					\
 	tracker-crc32.h
 
-libtracker-common.vala.stamp: $(libtracker_common_la_VALASOURCES) posix.vapi glib-2.0-fixes.vapi
+vapi_sources =						\
+	$(top_srcdir)/src/vapi/posix.vapi		\
+	$(top_srcdir)/src/vapi/glib-2.0-fixes.vapi
+
+libtracker-common.vala.stamp: $(libtracker_common_la_VALASOURCES) $(vapi_sources)
 	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 -H tracker-sparql-builder.h $^
 	$(AM_V_GEN)touch $@
 
@@ -139,15 +139,11 @@ CLEANFILES = $(marshal_sources)
 
 MAINTAINERCLEANFILES =					\
 	libtracker-common.vala.stamp			\
-	$(libtracker_common_la_VALASOURCES:.vala=.c)	\
-	tracker-sparql-builder.h			\
-	$(NULL)
+	$(libtracker_common_la_VALASOURCES:.vala=.c)
 
 EXTRA_DIST = 						\
 	tracker-marshal.list				\
 	$(libtracker_common_la_VALASOURCES)		\
 	libtracker-common.vala.stamp			\
-	posix.vapi					\
-	glib-2.0-fixes.vapi					\
 	libtracker-common.vapi
 
diff --git a/src/libtracker-common/tracker-common.h b/src/libtracker-common/tracker-common.h
index 3d8d317..5e17683 100644
--- a/src/libtracker-common/tracker-common.h
+++ b/src/libtracker-common/tracker-common.h
@@ -49,8 +49,6 @@ G_BEGIN_DECLS
 #include "tracker-namespace.h"
 #include "tracker-ontology.h"
 #include "tracker-property.h"
-#include "tracker-sparql-builder.h"
-#include "tracker-statement-list.h"
 #include "tracker-type-utils.h"
 #include "tracker-utils.h"
 
diff --git a/src/libtracker-data/Makefile.am b/src/libtracker-data/Makefile.am
index c17fb33..4688d19 100644
--- a/src/libtracker-data/Makefile.am
+++ b/src/libtracker-data/Makefile.am
@@ -38,7 +38,14 @@ noinst_HEADERS =							\
 	tracker-data-update.h						\
 	tracker-sparql-query.h
 
-libtracker-data.vala.stamp: $(libtracker_data_la_VALASOURCES) ../libtracker-common/posix.vapi ../libtracker-common/libtracker-common.vapi libtracker-data.vapi ../libtracker-db/libtracker-db.vapi
+vapi_sources =								\
+	$(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-db/libtracker-db.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 $^
 	touch $@
 
diff --git a/src/libtracker-extract/tracker-extract.h b/src/libtracker-extract/tracker-extract.h
index 6d24e78..236398a 100644
--- a/src/libtracker-extract/tracker-extract.h
+++ b/src/libtracker-extract/tracker-extract.h
@@ -22,7 +22,7 @@
 
 #include <glib.h>
 
-#include <libtracker-common/tracker-sparql-builder.h>
+#include <libtracker-client/tracker-sparql-builder.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/libtracker-extract/tracker-xmp.h b/src/libtracker-extract/tracker-xmp.h
index 116c56b..b42e44b 100644
--- a/src/libtracker-extract/tracker-xmp.h
+++ b/src/libtracker-extract/tracker-xmp.h
@@ -23,7 +23,7 @@
 
 #include <glib.h>
 
-#include <libtracker-common/tracker-sparql-builder.h>
+#include <libtracker-client/tracker-sparql-builder.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/libtracker-miner/tracker-miner-fs.h b/src/libtracker-miner/tracker-miner-fs.h
index f212173..fd2682d 100644
--- a/src/libtracker-miner/tracker-miner-fs.h
+++ b/src/libtracker-miner/tracker-miner-fs.h
@@ -23,7 +23,7 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
-#include <libtracker-common/tracker-sparql-builder.h>
+#include <libtracker-client/tracker-sparql-builder.h>
 
 #include "tracker-miner.h"
 
@@ -68,24 +68,24 @@ struct TrackerMinerFS {
 typedef struct {
 	TrackerMinerClass parent;
 
-	gboolean (* check_file)            (TrackerMinerFS       *fs,
-	                                    GFile                *file);
-	gboolean (* check_directory)       (TrackerMinerFS       *fs,
-	                                    GFile                *file);
-	gboolean (* check_directory_contents) (TrackerMinerFS    *fs,
-	                                       GFile             *parent,
-	                                       GList             *children);
-	gboolean (* process_file)          (TrackerMinerFS       *fs,
-	                                    GFile                *file,
-	                                    TrackerSparqlBuilder *builder,
-	                                    GCancellable         *cancellable);
-	gboolean (* ignore_next_update_file) (TrackerMinerFS       *fs,
-	                                      GFile                *file,
-	                                      TrackerSparqlBuilder *builder,
-	                                      GCancellable         *cancellable);
-	gboolean (* monitor_directory)     (TrackerMinerFS       *fs,
-	                                    GFile                *file);
-	void     (* finished)              (TrackerMinerFS       *fs);
+	gboolean (* check_file)               (TrackerMinerFS       *fs,
+                                               GFile                *file);
+	gboolean (* check_directory)          (TrackerMinerFS       *fs,
+                                               GFile                *file);
+	gboolean (* check_directory_contents) (TrackerMinerFS       *fs,
+	                                       GFile                *parent,
+	                                       GList                *children);
+	gboolean (* process_file)             (TrackerMinerFS       *fs,
+                                               GFile                *file,
+                                               TrackerSparqlBuilder *builder,
+                                               GCancellable         *cancellable);
+	gboolean (* ignore_next_update_file)  (TrackerMinerFS       *fs,
+                                               GFile                *file,
+                                               TrackerSparqlBuilder *builder,
+                                               GCancellable         *cancellable);
+	gboolean (* monitor_directory)        (TrackerMinerFS       *fs,
+                                               GFile                *file);
+	void     (* finished)                 (TrackerMinerFS       *fs);
 } TrackerMinerFSClass;
 
 GType    tracker_miner_fs_get_type         (void) G_GNUC_CONST;
diff --git a/src/plugins/evolution/tracker-evolution-plugin.c b/src/plugins/evolution/tracker-evolution-plugin.c
index ee97f40..c465eca 100644
--- a/src/plugins/evolution/tracker-evolution-plugin.c
+++ b/src/plugins/evolution/tracker-evolution-plugin.c
@@ -72,7 +72,8 @@
 #include <libedataserver/e-account-list.h>
 
 #include <libtracker-client/tracker.h>
-#include <libtracker-common/tracker-sparql-builder.h>
+#include <libtracker-client/tracker-sparql-builder.h>
+
 #include <libtracker-common/tracker-ontology.h>
 #include <libtracker-common/tracker-utils.h>
 #include <libtracker-common/tracker-type-utils.h>
diff --git a/src/plugins/kmail/tracker-kmail-registrar.c b/src/plugins/kmail/tracker-kmail-registrar.c
index c8bc685..8291ea7 100644
--- a/src/plugins/kmail/tracker-kmail-registrar.c
+++ b/src/plugins/kmail/tracker-kmail-registrar.c
@@ -28,6 +28,9 @@
 #include <dbus/dbus-glib-bindings.h>
 
 #include <libtracker-data/tracker-data-manager.h>
+
+#include <libtracker-client/tracker-sparql-builder.h>
+
 #include <libtracker-common/tracker-dbus.h>
 
 #include <tracker-store/tracker-push-registrar.h>
diff --git a/src/tracker-control/Makefile.am b/src/tracker-control/Makefile.am
index 44b1245..5593a3c 100644
--- a/src/tracker-control/Makefile.am
+++ b/src/tracker-control/Makefile.am
@@ -13,8 +13,8 @@ INCLUDES =								\
 	$(GLIB2_CFLAGS)
 
 libs = 									\
-	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la	\
+	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-db/libtracker-db.la		\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
 	$(DBUS_LIBS)							\
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index 240566f..8772d78 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -312,6 +312,7 @@ tracker_extract_SOURCES = 						\
 	tracker-albumart-generic.h
 
 tracker_extract_LDADD = 						\
+	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
 	$(DBUS_LIBS)							\
 	$(GMODULE_LIBS)							\
diff --git a/src/tracker-extract/tracker-extract-text.c b/src/tracker-extract/tracker-extract-text.c
index 6550ca5..71ddeed 100644
--- a/src/tracker-extract/tracker-extract-text.c
+++ b/src/tracker-extract/tracker-extract-text.c
@@ -22,6 +22,7 @@
 #include <string.h>
 
 #include <glib.h>
+#include <gio/gio.h>
 
 #include <libtracker-extract/tracker-extract.h>
 
diff --git a/src/tracker-extract/tracker-extract.c b/src/tracker-extract/tracker-extract.c
index a74684e..3aa29c1 100644
--- a/src/tracker-extract/tracker-extract.c
+++ b/src/tracker-extract/tracker-extract.c
@@ -28,6 +28,8 @@
 #include <libtracker-common/tracker-dbus.h>
 #include <libtracker-common/tracker-log.h>
 
+#include <libtracker-client/tracker-sparql-builder.h>
+
 #include <libtracker-extract/tracker-extract.h>
 
 #include "tracker-dbus.h"
diff --git a/src/tracker-extract/tracker-extract.h b/src/tracker-extract/tracker-extract.h
index 13aa8aa..597421a 100644
--- a/src/tracker-extract/tracker-extract.h
+++ b/src/tracker-extract/tracker-extract.h
@@ -24,14 +24,14 @@
 
 #include <dbus/dbus-glib-bindings.h>
 
-#define TRACKER_EXTRACT_SERVICE                "org.freedesktop.Tracker1.Extract"
+#define TRACKER_EXTRACT_SERVICE        "org.freedesktop.Tracker1.Extract"
 #define TRACKER_EXTRACT_PATH           "/org/freedesktop/Tracker1/Extract"
 #define TRACKER_EXTRACT_INTERFACE      "org.freedesktop.Tracker1.Extract"
 
 G_BEGIN_DECLS
 
 #define TRACKER_TYPE_EXTRACT           (tracker_extract_get_type ())
-#define TRACKER_EXTRACT(object)                (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_EXTRACT, TrackerExtract))
+#define TRACKER_EXTRACT(object)        (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_EXTRACT, TrackerExtract))
 #define TRACKER_EXTRACT_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_EXTRACT, TrackerExtractClass))
 #define TRACKER_IS_EXTRACT(object)     (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_EXTRACT))
 #define TRACKER_IS_EXTRACT_CLASS(klass)(G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_EXTRACT))
diff --git a/src/vapi/Makefile.am b/src/vapi/Makefile.am
new file mode 100644
index 0000000..d31f770
--- /dev/null
+++ b/src/vapi/Makefile.am
@@ -0,0 +1,6 @@
+include $(top_srcdir)/Makefile.decl
+
+EXTRA_DIST = 						\
+	posix.vapi					\
+	glib-2.0-fixes.vapi
+
diff --git a/src/libtracker-common/glib-2.0-fixes.vapi b/src/vapi/glib-2.0-fixes.vapi
similarity index 100%
rename from src/libtracker-common/glib-2.0-fixes.vapi
rename to src/vapi/glib-2.0-fixes.vapi
diff --git a/src/libtracker-common/posix.vapi b/src/vapi/posix.vapi
similarity index 100%
rename from src/libtracker-common/posix.vapi
rename to src/vapi/posix.vapi
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]