GNOME.org
 

tracker r2444 - in branches/libtracker-data: . src src/libtracker-data src/tracker-indexer src/tracker-indexer/modules src/trackerd tests/tracker-indexer

Author: juergbi
Date: Tue Nov  4 13:50:31 2008
New Revision: 2444
URL: http://svn.gnome.org/viewvc/tracker?rev=2444&view=rev

Log:
2008-11-04  JÃrg Billeter  <j bitron ch>

	* configure.ac:
	* src/Makefile.am:
	* src/libtracker-data/Makefile.am:
	* src/libtracker-data/tracker-data-manager.c:
	* src/libtracker-data/tracker-data-manager.h:
	* src/libtracker-data/tracker-data-metadata.c:
	* src/libtracker-data/tracker-data-metadata.h:
	* src/libtracker-data/tracker-data-update.c:
	* src/libtracker-data/tracker-data-update.h:
	* src/libtracker-data/tracker-query-tree.c:
	* src/libtracker-data/tracker-rdf-query.c:
	* src/libtracker-data/tracker-xesam-query.c:
	* src/tracker-indexer/Makefile.am:
	* src/tracker-indexer/modules/applications.c:
	* src/tracker-indexer/modules/dummy.c:
	* src/tracker-indexer/modules/evolution.c:
	* src/tracker-indexer/tracker-indexer-db.c:
	* src/tracker-indexer/tracker-indexer-db.h:
	* src/tracker-indexer/tracker-indexer-module.h:
	* src/tracker-indexer/tracker-indexer.c:
	* src/tracker-indexer/tracker-main.c:
	* src/tracker-indexer/tracker-metadata-utils.h:
	* src/tracker-indexer/tracker-metadata.c:
	* src/tracker-indexer/tracker-metadata.h:
	* src/tracker-indexer/tracker-module.h:
	* src/trackerd/Makefile.am:
	* src/trackerd/tracker-daemon.c:
	* src/trackerd/tracker-db.c:
	* src/trackerd/tracker-db.h:
	* src/trackerd/tracker-dbus.c:
	* src/trackerd/tracker-files.c:
	* src/trackerd/tracker-keywords.c:
	* src/trackerd/tracker-metadata.c:
	* src/trackerd/tracker-query-tree.c:
	* src/trackerd/tracker-query-tree.h:
	* src/trackerd/tracker-rdf-query.c:
	* src/trackerd/tracker-rdf-query.h:
	* src/trackerd/tracker-search.c:
	* src/trackerd/tracker-xesam-live-search.c:
	* src/trackerd/tracker-xesam-query.c:
	* src/trackerd/tracker-xesam-query.h:
	* src/trackerd/tracker-xesam.c:
	* src/trackerd/tracker-xesam.h:
	* tests/tracker-indexer/Makefile.am:

	Add libtracker-data library, move tracker-db, tracker-query-tree,
	tracker-rdf-query, and tracker-xesam-query from src/trackerd to
	src/libtracker-data, and move tracker-indexer-db and tracker-metadata
	from src/tracker-indexer to src/libtracker-data.


Added:
   branches/libtracker-data/src/libtracker-data/
   branches/libtracker-data/src/libtracker-data/Makefile.am
   branches/libtracker-data/src/libtracker-data/tracker-data-manager.c   (contents, props changed)
      - copied, changed from r2442, /branches/libtracker-data/src/trackerd/tracker-db.c
   branches/libtracker-data/src/libtracker-data/tracker-data-manager.h   (contents, props changed)
      - copied, changed from r2442, /branches/libtracker-data/src/trackerd/tracker-db.h
   branches/libtracker-data/src/libtracker-data/tracker-data-metadata.c   (contents, props changed)
      - copied, changed from r2442, /branches/libtracker-data/src/tracker-indexer/tracker-metadata.c
   branches/libtracker-data/src/libtracker-data/tracker-data-metadata.h   (contents, props changed)
      - copied, changed from r2442, /branches/libtracker-data/src/tracker-indexer/tracker-metadata.h
   branches/libtracker-data/src/libtracker-data/tracker-data-update.c   (contents, props changed)
      - copied, changed from r2442, /branches/libtracker-data/src/tracker-indexer/tracker-indexer-db.c
   branches/libtracker-data/src/libtracker-data/tracker-data-update.h   (contents, props changed)
      - copied, changed from r2442, /branches/libtracker-data/src/tracker-indexer/tracker-indexer-db.h
   branches/libtracker-data/src/libtracker-data/tracker-query-tree.c   (contents, props changed)
      - copied, changed from r2442, /branches/libtracker-data/src/trackerd/tracker-query-tree.c
   branches/libtracker-data/src/libtracker-data/tracker-query-tree.h   (props changed)
      - copied unchanged from r2442, /branches/libtracker-data/src/trackerd/tracker-query-tree.h
   branches/libtracker-data/src/libtracker-data/tracker-rdf-query.c   (contents, props changed)
      - copied, changed from r2442, /branches/libtracker-data/src/trackerd/tracker-rdf-query.c
   branches/libtracker-data/src/libtracker-data/tracker-rdf-query.h   (props changed)
      - copied unchanged from r2442, /branches/libtracker-data/src/trackerd/tracker-rdf-query.h
   branches/libtracker-data/src/libtracker-data/tracker-xesam-query.c   (contents, props changed)
      - copied, changed from r2442, /branches/libtracker-data/src/trackerd/tracker-xesam-query.c
   branches/libtracker-data/src/libtracker-data/tracker-xesam-query.h   (props changed)
      - copied unchanged from r2442, /branches/libtracker-data/src/trackerd/tracker-xesam-query.h
Removed:
   branches/libtracker-data/src/tracker-indexer/tracker-indexer-db.c
   branches/libtracker-data/src/tracker-indexer/tracker-indexer-db.h
   branches/libtracker-data/src/tracker-indexer/tracker-metadata.c
   branches/libtracker-data/src/tracker-indexer/tracker-metadata.h
   branches/libtracker-data/src/trackerd/tracker-db.c
   branches/libtracker-data/src/trackerd/tracker-db.h
   branches/libtracker-data/src/trackerd/tracker-query-tree.c
   branches/libtracker-data/src/trackerd/tracker-query-tree.h
   branches/libtracker-data/src/trackerd/tracker-rdf-query.c
   branches/libtracker-data/src/trackerd/tracker-rdf-query.h
   branches/libtracker-data/src/trackerd/tracker-xesam-query.c
   branches/libtracker-data/src/trackerd/tracker-xesam-query.h
Modified:
   branches/libtracker-data/ChangeLog
   branches/libtracker-data/configure.ac
   branches/libtracker-data/src/Makefile.am
   branches/libtracker-data/src/tracker-indexer/Makefile.am
   branches/libtracker-data/src/tracker-indexer/modules/applications.c
   branches/libtracker-data/src/tracker-indexer/modules/dummy.c
   branches/libtracker-data/src/tracker-indexer/modules/evolution.c
   branches/libtracker-data/src/tracker-indexer/tracker-indexer-module.h
   branches/libtracker-data/src/tracker-indexer/tracker-indexer.c
   branches/libtracker-data/src/tracker-indexer/tracker-main.c
   branches/libtracker-data/src/tracker-indexer/tracker-metadata-utils.h
   branches/libtracker-data/src/tracker-indexer/tracker-module.h
   branches/libtracker-data/src/trackerd/Makefile.am
   branches/libtracker-data/src/trackerd/tracker-daemon.c
   branches/libtracker-data/src/trackerd/tracker-dbus.c
   branches/libtracker-data/src/trackerd/tracker-files.c
   branches/libtracker-data/src/trackerd/tracker-keywords.c
   branches/libtracker-data/src/trackerd/tracker-metadata.c
   branches/libtracker-data/src/trackerd/tracker-search.c
   branches/libtracker-data/src/trackerd/tracker-xesam-live-search.c
   branches/libtracker-data/src/trackerd/tracker-xesam.c
   branches/libtracker-data/src/trackerd/tracker-xesam.h
   branches/libtracker-data/tests/tracker-indexer/Makefile.am

Modified: branches/libtracker-data/configure.ac
==============================================================================
--- branches/libtracker-data/configure.ac	(original)
+++ branches/libtracker-data/configure.ac	Tue Nov  4 13:50:31 2008
@@ -1048,13 +1048,9 @@
                 tests/tracker-indexer/tracker-dbus.h:src/tracker-indexer/tracker-dbus.h
                 tests/tracker-indexer/tracker-indexer.c:src/tracker-indexer/tracker-indexer.c
                 tests/tracker-indexer/tracker-indexer.h:src/tracker-indexer/tracker-indexer.h
-                tests/tracker-indexer/tracker-indexer-db.c:src/tracker-indexer/tracker-indexer-db.c
-                tests/tracker-indexer/tracker-indexer-db.h:src/tracker-indexer/tracker-indexer-db.h
                 tests/tracker-indexer/tracker-indexer-module.c:src/tracker-indexer/tracker-indexer-module.c
                 tests/tracker-indexer/tracker-indexer-module.h:src/tracker-indexer/tracker-indexer-module.h
                 tests/tracker-indexer/tracker-marshal-main.c:src/tracker-indexer/tracker-marshal-main.c
-		tests/tracker-indexer/tracker-metadata.c:src/tracker-indexer/tracker-metadata.c 
-                tests/tracker-indexer/tracker-metadata.h:src/tracker-indexer/tracker-metadata.h
                 tests/tracker-indexer/tracker-metadata-utils.c:src/tracker-indexer/tracker-metadata-utils.c
                 tests/tracker-indexer/tracker-metadata-utils.h:src/tracker-indexer/tracker-metadata-utils.h
                 tests/tracker-indexer/tracker-module.h:src/tracker-indexer/tracker-module.h
@@ -1138,6 +1134,7 @@
 	src/libinotify/Makefile
 	src/libstemmer/Makefile
 	src/libtracker-common/Makefile
+	src/libtracker-data/Makefile
 	src/libtracker-db/Makefile
 	src/libtracker-gtk/Makefile
 	src/libtracker/Makefile

Modified: branches/libtracker-data/src/Makefile.am
==============================================================================
--- branches/libtracker-data/src/Makefile.am	(original)
+++ branches/libtracker-data/src/Makefile.am	Tue Nov  4 13:50:31 2008
@@ -34,6 +34,7 @@
 	$(build_libinotify)			\
 	libtracker-common 			\
 	libtracker-db				\
+	libtracker-data				\
 	libtracker				\
 	$(build_sqlite_fts)			\
 	trackerd				\
@@ -52,6 +53,7 @@
 	libinotify				\
 	libtracker-common 			\
 	libtracker-db				\
+	libtracker-data				\
 	libtracker				\
 	tracker-fts				\
 	trackerd				\

Added: branches/libtracker-data/src/libtracker-data/Makefile.am
==============================================================================
--- (empty file)
+++ branches/libtracker-data/src/libtracker-data/Makefile.am	Tue Nov  4 13:50:31 2008
@@ -0,0 +1,34 @@
+include $(top_srcdir)/Makefile.decl
+
+INCLUDES =								\
+	-DSHAREDIR=\""$(datadir)"\"					\
+	-DG_LOG_DOMAIN=\"Tracker\"					\
+	-DTRACKER_COMPILATION						\
+	-I$(top_srcdir)/src						\
+	$(GLIB2_CFLAGS)
+
+libtracker_datadir = $(libdir)/tracker
+libtracker_data_LTLIBRARIES = libtracker-data.la
+
+libtracker_data_la_SOURCES = 						\
+	tracker-data-manager.c						\
+	tracker-data-metadata.c						\
+	tracker-data-update.c						\
+	tracker-query-tree.c						\
+	tracker-rdf-query.c						\
+	tracker-xesam-query.c
+
+noinst_HEADERS =							\
+	tracker-data-manager.h						\
+	tracker-data-metadata.h						\
+	tracker-data-update.h						\
+	tracker-query-tree.h						\
+	tracker-rdf-query.h						\
+	tracker-xesam-query.h
+
+libtracker_data_la_LDFLAGS = -version-info 0:0:0
+libtracker_data_la_LIBADD = 						\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
+	$(top_builddir)/src/libtracker-db/libtracker-db.la		\
+	$(GLIB2_LIBS)							\
+	-lz

Copied: branches/libtracker-data/src/libtracker-data/tracker-data-manager.c (from r2442, /branches/libtracker-data/src/trackerd/tracker-db.c)
==============================================================================
--- /branches/libtracker-data/src/trackerd/tracker-db.c	(original)
+++ branches/libtracker-data/src/libtracker-data/tracker-data-manager.c	Tue Nov  4 13:50:31 2008
@@ -41,11 +41,8 @@
 #include <libtracker-db/tracker-db-index-manager.h>
 #include <libtracker-db/tracker-db-manager.h>
 
-#include "tracker-db.h"
+#include "tracker-data-manager.h"
 #include "tracker-query-tree.h"
-#include "tracker-monitor.h"
-#include "tracker-xesam-manager.h"
-#include "tracker-main.h"
 
 #define ZLIBBUFSIZ 8192
 

Copied: branches/libtracker-data/src/libtracker-data/tracker-data-manager.h (from r2442, /branches/libtracker-data/src/trackerd/tracker-db.h)
==============================================================================
--- /branches/libtracker-data/src/trackerd/tracker-db.h	(original)
+++ branches/libtracker-data/src/libtracker-data/tracker-data-manager.h	Tue Nov  4 13:50:31 2008
@@ -21,8 +21,8 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#ifndef __TRACKERD_DB_H__
-#define __TRACKERD_DB_H__
+#ifndef __TRACKER_DATA_MANAGER_H__
+#define __TRACKER_DATA_MANAGER_H__
 
 #include <glib.h>
 
@@ -36,8 +36,6 @@
 #include <libtracker-db/tracker-db-file-info.h>
 #include <libtracker-db/tracker-db-index.h>
 
-#include "tracker-utils.h"
-
 G_BEGIN_DECLS
 
 void		    tracker_db_init				 (TrackerConfig       *config,
@@ -174,4 +172,4 @@
 								const char	    *name);
 G_END_DECLS
 
-#endif /* __TRACKERD_DB_H__ */
+#endif /* __TRACKER_DATA_MANAGER_H__ */

Copied: branches/libtracker-data/src/libtracker-data/tracker-data-metadata.c (from r2442, /branches/libtracker-data/src/tracker-indexer/tracker-metadata.c)
==============================================================================
--- /branches/libtracker-data/src/tracker-indexer/tracker-metadata.c	(original)
+++ branches/libtracker-data/src/libtracker-data/tracker-data-metadata.c	Tue Nov  4 13:50:31 2008
@@ -21,7 +21,7 @@
 
 #include <glib.h>
 #include <libtracker-common/tracker-ontology.h>
-#include "tracker-metadata.h"
+#include "tracker-data-metadata.h"
 
 struct TrackerMetadata {
 	GHashTable *table;

Copied: branches/libtracker-data/src/libtracker-data/tracker-data-metadata.h (from r2442, /branches/libtracker-data/src/tracker-indexer/tracker-metadata.h)
==============================================================================
--- /branches/libtracker-data/src/tracker-indexer/tracker-metadata.h	(original)
+++ branches/libtracker-data/src/libtracker-data/tracker-data-metadata.h	Tue Nov  4 13:50:31 2008
@@ -19,8 +19,8 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#ifndef __TRACKER_METADATA_H__
-#define __TRACKER_METADATA_H__
+#ifndef __TRACKER_DATA_METADATA_H__
+#define __TRACKER_DATA_METADATA_H__
 
 #include <glib.h>
 #include <libtracker-common/tracker-common.h>
@@ -52,4 +52,4 @@
 
 G_END_DECLS
 
-#endif /* __TRACKER_METADATA_H__*/
+#endif /* __TRACKER_DATA_METADATA_H__*/

Copied: branches/libtracker-data/src/libtracker-data/tracker-data-update.c (from r2442, /branches/libtracker-data/src/tracker-indexer/tracker-indexer-db.c)
==============================================================================
--- /branches/libtracker-data/src/tracker-indexer/tracker-indexer-db.c	(original)
+++ branches/libtracker-data/src/libtracker-data/tracker-data-update.c	Tue Nov  4 13:50:31 2008
@@ -29,7 +29,7 @@
 #include <libtracker-db/tracker-db-manager.h>
 #include <libtracker-db/tracker-db-dbus.h>
 
-#include "tracker-indexer-db.h"
+#include "tracker-data-update.h"
 
 guint32
 tracker_db_get_new_service_id (TrackerDBInterface *iface)

Copied: branches/libtracker-data/src/libtracker-data/tracker-data-update.h (from r2442, /branches/libtracker-data/src/tracker-indexer/tracker-indexer-db.h)
==============================================================================
--- /branches/libtracker-data/src/tracker-indexer/tracker-indexer-db.h	(original)
+++ branches/libtracker-data/src/libtracker-data/tracker-data-update.h	Tue Nov  4 13:50:31 2008
@@ -19,12 +19,12 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#ifndef __TRACKER_INDEXER_DB_H__
-#define __TRACKER_INDEXER_DB_H__
+#ifndef __TRACKER_DATA_UPDATE_H__
+#define __TRACKER_DATA_UPDATE_H__
 
 #include <libtracker-common/tracker-ontology.h>
 #include <libtracker-db/tracker-db-interface.h>
-#include "tracker-metadata.h"
+#include "tracker-data-metadata.h"
 
 G_BEGIN_DECLS
 
@@ -96,4 +96,4 @@
 
 G_END_DECLS
 
-#endif /* __TRACKER_INDEXER_DB_H__ */
+#endif /* __TRACKER_DATA_UPDATE_H__ */

Copied: branches/libtracker-data/src/libtracker-data/tracker-query-tree.c (from r2442, /branches/libtracker-data/src/trackerd/tracker-query-tree.c)
==============================================================================
--- /branches/libtracker-data/src/trackerd/tracker-query-tree.c	(original)
+++ branches/libtracker-data/src/libtracker-data/tracker-query-tree.c	Tue Nov  4 13:50:31 2008
@@ -29,7 +29,6 @@
 
 #include <string.h>
 #include <math.h>
-#include <depot.h>
 
 #include <glib-object.h>
 
@@ -41,7 +40,6 @@
 #include <libtracker-db/tracker-db-index-manager.h>
 
 #include "tracker-query-tree.h"
-#include "tracker-utils.h"
 
 #define TRACKER_QUERY_TREE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRACKER_TYPE_QUERY_TREE, TrackerQueryTreePrivate))
 

Copied: branches/libtracker-data/src/libtracker-data/tracker-rdf-query.c (from r2442, /branches/libtracker-data/src/trackerd/tracker-rdf-query.c)
==============================================================================
--- /branches/libtracker-data/src/trackerd/tracker-rdf-query.c	(original)
+++ branches/libtracker-data/src/libtracker-data/tracker-rdf-query.c	Tue Nov  4 13:50:31 2008
@@ -26,7 +26,7 @@
 #include <libtracker-common/tracker-utils.h>
 
 #include "tracker-rdf-query.h"
-#include "tracker-db.h"
+#include "tracker-data-manager.h"
 
 /* RDF Query Condition
  * <rdfq:Condition>

Copied: branches/libtracker-data/src/libtracker-data/tracker-xesam-query.c (from r2442, /branches/libtracker-data/src/trackerd/tracker-xesam-query.c)
==============================================================================
--- /branches/libtracker-data/src/trackerd/tracker-xesam-query.c	(original)
+++ branches/libtracker-data/src/libtracker-data/tracker-xesam-query.c	Tue Nov  4 13:50:31 2008
@@ -48,7 +48,7 @@
 #include <libtracker-common/tracker-utils.h>
 
 #include "tracker-xesam-query.h"
-#include "tracker-db.h"
+#include "tracker-data-manager.h"
 
 /* XESAM Query Condition
  * <query>

Modified: branches/libtracker-data/src/tracker-indexer/Makefile.am
==============================================================================
--- branches/libtracker-data/src/tracker-indexer/Makefile.am	(original)
+++ branches/libtracker-data/src/tracker-indexer/Makefile.am	Tue Nov  4 13:50:31 2008
@@ -20,11 +20,9 @@
 libtracker_indexer_LTLIBRARIES = libtracker-indexer.la
 
 libtracker_indexer_la_SOURCES =	 					\
-	tracker-metadata.c						\
 	tracker-metadata-utils.c
 
 libtracker_indexerinclude_HEADERS =					\
-	tracker-metadata.h						\
 	tracker-metadata-utils.h					\
 	tracker-module.h
 
@@ -36,8 +34,6 @@
 	tracker-dbus.h							\
 	tracker-indexer.c						\
 	tracker-indexer.h						\
-	tracker-indexer-db.c						\
-	tracker-indexer-db.h						\
 	tracker-indexer-module.c					\
 	tracker-indexer-module.h					\
 	tracker-main.c							\
@@ -45,6 +41,7 @@
 
 tracker_indexer_LDADD =							\
 	libtracker-indexer.la						\
+	$(top_builddir)/src/libtracker-data/libtracker-data.la		\
 	$(top_builddir)/src/libtracker-db/libtracker-db.la 		\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 	$(top_builddir)/src/libstemmer/libstemmer.la	 		\

Modified: branches/libtracker-data/src/tracker-indexer/modules/applications.c
==============================================================================
--- branches/libtracker-data/src/tracker-indexer/modules/applications.c	(original)
+++ branches/libtracker-data/src/tracker-indexer/modules/applications.c	Tue Nov  4 13:50:31 2008
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <glib.h>
 #include <tracker-indexer/tracker-module.h>
-#include <tracker-indexer/tracker-metadata.h>
+#include <libtracker-data/tracker-data-metadata.h>
 
 #define GROUP_DESKTOP_ENTRY "Desktop Entry"
 #define KEY_TYPE	    "Type"

Modified: branches/libtracker-data/src/tracker-indexer/modules/dummy.c
==============================================================================
--- branches/libtracker-data/src/tracker-indexer/modules/dummy.c	(original)
+++ branches/libtracker-data/src/tracker-indexer/modules/dummy.c	Tue Nov  4 13:50:31 2008
@@ -18,7 +18,7 @@
  */
 
 #include <glib.h>
-#include <tracker-indexer/tracker-metadata.h>
+#include <libtracker-data/tracker-data-metadata.h>
 
 void
 tracker_module_init (void)

Modified: branches/libtracker-data/src/tracker-indexer/modules/evolution.c
==============================================================================
--- branches/libtracker-data/src/tracker-indexer/modules/evolution.c	(original)
+++ branches/libtracker-data/src/tracker-indexer/modules/evolution.c	Tue Nov  4 13:50:31 2008
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <gconf/gconf-client.h>
 #include <tracker-indexer/tracker-module.h>
-#include <tracker-indexer/tracker-metadata.h>
+#include <libtracker-data/tracker-data-metadata.h>
 #include <tracker-indexer/tracker-metadata-utils.h>
 #include <libtracker-common/tracker-utils.h>
 #include <libtracker-common/tracker-file-utils.h>

Modified: branches/libtracker-data/src/tracker-indexer/tracker-indexer-module.h
==============================================================================
--- branches/libtracker-data/src/tracker-indexer/tracker-indexer-module.h	(original)
+++ branches/libtracker-data/src/tracker-indexer/tracker-indexer-module.h	Tue Nov  4 13:50:31 2008
@@ -24,7 +24,7 @@
 
 #include <glib.h>
 #include "tracker-module.h"
-#include "tracker-metadata.h"
+#include <libtracker-data/tracker-data-metadata.h>
 
 G_BEGIN_DECLS
 

Modified: branches/libtracker-data/src/tracker-indexer/tracker-indexer.c
==============================================================================
--- branches/libtracker-data/src/tracker-indexer/tracker-indexer.c	(original)
+++ branches/libtracker-data/src/tracker-indexer/tracker-indexer.c	Tue Nov  4 13:50:31 2008
@@ -70,7 +70,7 @@
 
 #include "tracker-indexer.h"
 #include "tracker-indexer-module.h"
-#include "tracker-indexer-db.h"
+#include <libtracker-data/tracker-data-update.h>
 #include "tracker-marshal.h"
 #include "tracker-module.h"
 

Modified: branches/libtracker-data/src/tracker-indexer/tracker-main.c
==============================================================================
--- branches/libtracker-data/src/tracker-indexer/tracker-main.c	(original)
+++ branches/libtracker-data/src/tracker-indexer/tracker-main.c	Tue Nov  4 13:50:31 2008
@@ -43,7 +43,7 @@
 
 #include "tracker-dbus.h"
 #include "tracker-indexer.h"
-#include "tracker-indexer-db.h"
+#include <libtracker-data/tracker-data-update.h>
 
 #define ABOUT								  \
 	"Tracker " PACKAGE_VERSION "\n"					  \

Modified: branches/libtracker-data/src/tracker-indexer/tracker-metadata-utils.h
==============================================================================
--- branches/libtracker-data/src/tracker-indexer/tracker-metadata-utils.h	(original)
+++ branches/libtracker-data/src/tracker-indexer/tracker-metadata-utils.h	Tue Nov  4 13:50:31 2008
@@ -22,7 +22,7 @@
 #ifndef __TRACKER_METADATA_UTILS_H__
 #define __TRACKER_METADATA_UTILS_H__
 
-#include "tracker-metadata.h"
+#include <libtracker-data/tracker-data-metadata.h>
 
 G_BEGIN_DECLS
 

Modified: branches/libtracker-data/src/tracker-indexer/tracker-module.h
==============================================================================
--- branches/libtracker-data/src/tracker-indexer/tracker-module.h	(original)
+++ branches/libtracker-data/src/tracker-indexer/tracker-module.h	Tue Nov  4 13:50:31 2008
@@ -25,7 +25,7 @@
 G_BEGIN_DECLS
 
 #include <glib.h>
-#include "tracker-metadata.h"
+#include <libtracker-data/tracker-data-metadata.h>
 
 typedef struct TrackerFile TrackerFile;
 

Modified: branches/libtracker-data/src/trackerd/Makefile.am
==============================================================================
--- branches/libtracker-data/src/trackerd/Makefile.am	(original)
+++ branches/libtracker-data/src/trackerd/Makefile.am	Tue Nov  4 13:50:31 2008
@@ -33,8 +33,6 @@
 	tracker-crawler.h						\
 	tracker-daemon.c						\
 	tracker-daemon.h						\
-	tracker-db.c							\
-	tracker-db.h							\
 	tracker-dbus.c							\
 	tracker-dbus.h							\
 	tracker-files.c							\
@@ -50,10 +48,6 @@
 	tracker-metadata.h						\
 	tracker-monitor.c						\
 	tracker-monitor.h						\
-	tracker-query-tree.c						\
-	tracker-query-tree.h						\
-	tracker-rdf-query.c						\
-	tracker-rdf-query.h						\
 	tracker-search.c						\
 	tracker-search.h						\
 	tracker-status.c						\
@@ -64,8 +58,6 @@
 	tracker-xesam.h							\
 	tracker-xesam-manager.c						\
 	tracker-xesam-manager.h						\
-	tracker-xesam-query.c						\
-	tracker-xesam-query.h						\
 	tracker-xesam-session.c						\
 	tracker-xesam-session.h						\
 	tracker-xesam-live-search.c					\
@@ -76,6 +68,7 @@
 endif
 
 trackerd_LDADD =							\
+	$(top_builddir)/src/libtracker-data/libtracker-data.la		\
 	$(top_builddir)/src/libtracker-db/libtracker-db.la 		\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 	$(top_builddir)/src/libstemmer/libstemmer.la	 		\

Modified: branches/libtracker-data/src/trackerd/tracker-daemon.c
==============================================================================
--- branches/libtracker-data/src/trackerd/tracker-daemon.c	(original)
+++ branches/libtracker-data/src/trackerd/tracker-daemon.c	Tue Nov  4 13:50:31 2008
@@ -35,7 +35,7 @@
 
 #include "tracker-dbus.h"
 #include "tracker-daemon.h"
-#include "tracker-db.h"
+#include <libtracker-data/tracker-data-manager.h>
 #include "tracker-indexer-client.h"
 #include "tracker-main.h"
 #include "tracker-status.h"

Modified: branches/libtracker-data/src/trackerd/tracker-dbus.c
==============================================================================
--- branches/libtracker-data/src/trackerd/tracker-dbus.c	(original)
+++ branches/libtracker-data/src/trackerd/tracker-dbus.c	Tue Nov  4 13:50:31 2008
@@ -26,7 +26,7 @@
 
 #include <libtracker-db/tracker-db-manager.h>
 
-#include "tracker-db.h"
+#include <libtracker-data/tracker-data-manager.h>
 #include "tracker-dbus.h"
 #include "tracker-daemon.h"
 #include "tracker-daemon-glue.h"

Modified: branches/libtracker-data/src/trackerd/tracker-files.c
==============================================================================
--- branches/libtracker-data/src/trackerd/tracker-files.c	(original)
+++ branches/libtracker-data/src/trackerd/tracker-files.c	Tue Nov  4 13:50:31 2008
@@ -35,7 +35,7 @@
 
 #include "tracker-dbus.h"
 #include "tracker-files.h"
-#include "tracker-db.h"
+#include <libtracker-data/tracker-data-manager.h>
 #include "tracker-marshal.h"
 #include "tracker-indexer-client.h"
 

Modified: branches/libtracker-data/src/trackerd/tracker-keywords.c
==============================================================================
--- branches/libtracker-data/src/trackerd/tracker-keywords.c	(original)
+++ branches/libtracker-data/src/trackerd/tracker-keywords.c	Tue Nov  4 13:50:31 2008
@@ -31,7 +31,7 @@
 
 #include "tracker-dbus.h"
 #include "tracker-keywords.h"
-#include "tracker-db.h"
+#include <libtracker-data/tracker-data-manager.h>
 #include "tracker-marshal.h"
 #include "tracker-indexer-client.h"
 

Modified: branches/libtracker-data/src/trackerd/tracker-metadata.c
==============================================================================
--- branches/libtracker-data/src/trackerd/tracker-metadata.c	(original)
+++ branches/libtracker-data/src/trackerd/tracker-metadata.c	Tue Nov  4 13:50:31 2008
@@ -36,10 +36,10 @@
 #include "tracker-indexer-client.h"
 #include "tracker-dbus.h"
 #include "tracker-metadata.h"
-#include "tracker-db.h"
+#include <libtracker-data/tracker-data-manager.h>
 #include "tracker-marshal.h"
 
-#include "tracker-rdf-query.h"
+#include <libtracker-data/tracker-rdf-query.h>
 
 #define DEFAULT_METADATA_MAX_HITS 1024
 

Modified: branches/libtracker-data/src/trackerd/tracker-search.c
==============================================================================
--- branches/libtracker-data/src/trackerd/tracker-search.c	(original)
+++ branches/libtracker-data/src/trackerd/tracker-search.c	Tue Nov  4 13:50:31 2008
@@ -35,11 +35,11 @@
 #include <libtracker-db/tracker-db-index.h>
 #include <libtracker-db/tracker-db-manager.h>
 
-#include "tracker-db.h"
+#include <libtracker-data/tracker-data-manager.h>
 #include "tracker-dbus.h"
 #include "tracker-search.h"
-#include "tracker-rdf-query.h"
-#include "tracker-query-tree.h"
+#include <libtracker-data/tracker-rdf-query.h>
+#include <libtracker-data/tracker-query-tree.h>
 #include "tracker-marshal.h"
 
 #define TRACKER_SEARCH_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_SEARCH, TrackerSearchPrivate))

Modified: branches/libtracker-data/src/trackerd/tracker-xesam-live-search.c
==============================================================================
--- branches/libtracker-data/src/trackerd/tracker-xesam-live-search.c	(original)
+++ branches/libtracker-data/src/trackerd/tracker-xesam-live-search.c	Tue Nov  4 13:50:31 2008
@@ -26,9 +26,9 @@
 #include "tracker-xesam-live-search.h"
 #include "tracker-xesam.h"
 #include "tracker-xesam-manager.h"
-#include "tracker-xesam-query.h"
+#include <libtracker-data/tracker-xesam-query.h>
 #include "tracker-dbus.h"
-#include "tracker-db.h"
+#include <libtracker-data/tracker-data-manager.h>
 
 struct _TrackerXesamLiveSearchPriv {
 	TrackerXesamSession *session;

Modified: branches/libtracker-data/src/trackerd/tracker-xesam.c
==============================================================================
--- branches/libtracker-data/src/trackerd/tracker-xesam.c	(original)
+++ branches/libtracker-data/src/trackerd/tracker-xesam.c	Tue Nov  4 13:50:31 2008
@@ -36,8 +36,8 @@
 #include "tracker-xesam.h"
 #include "tracker-status.h"
 #include "tracker-xesam-manager.h"
-#include "tracker-rdf-query.h"
-#include "tracker-query-tree.h"
+#include <libtracker-data/tracker-rdf-query.h>
+#include <libtracker-data/tracker-query-tree.h>
 #include "tracker-marshal.h"
 
 enum {

Modified: branches/libtracker-data/src/trackerd/tracker-xesam.h
==============================================================================
--- branches/libtracker-data/src/trackerd/tracker-xesam.h	(original)
+++ branches/libtracker-data/src/trackerd/tracker-xesam.h	Tue Nov  4 13:50:31 2008
@@ -28,7 +28,7 @@
 
 #include <libtracker-db/tracker-db-index.h>
 
-#include "tracker-db.h"
+#include <libtracker-data/tracker-data-manager.h>
 
 #define TRACKER_XESAM_SERVICE	      "org.freedesktop.xesam.searcher"
 #define TRACKER_XESAM_PATH	      "/org/freedesktop/xesam/searcher/main"

Modified: branches/libtracker-data/tests/tracker-indexer/Makefile.am
==============================================================================
--- branches/libtracker-data/tests/tracker-indexer/Makefile.am	(original)
+++ branches/libtracker-data/tests/tracker-indexer/Makefile.am	Tue Nov  4 13:50:31 2008
@@ -25,19 +25,16 @@
 	tracker-dbus.h							\
 	tracker-indexer.c						\
 	tracker-indexer.h						\
-	tracker-indexer-db.c						\
-	tracker-indexer-db.h						\
 	tracker-indexer-module.c					\
 	tracker-indexer-module.h					\
 	tracker-marshal-main.c						\
-	tracker-metadata.c						\
-	tracker-metadata.h						\
 	tracker-metadata-utils.c 					\
 	tracker-metadata-utils.h 					\
 	tracker-metadata-utils-test.c 					\
 	tracker-module.h
 
 tracker_metadata_utils_LDADD =	                                        \
+	$(top_builddir)/src/libtracker-data/libtracker-data.la 		\
 	$(top_builddir)/src/libtracker-db/libtracker-db.la 		\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 	$(top_builddir)/tests/common/libtracker-testcommon.la           \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]