GNOME.org
 

tracker r2786 - in trunk: . src/libtracker-common src/libtracker-data src/trackerd

Author: juergbi
Date: Tue Jan 13 11:50:54 2009
New Revision: 2786
URL: http://svn.gnome.org/viewvc/tracker?rev=2786&view=rev

Log:
2009-01-13  JÃrg Billeter  <j bitron ch>

	* src/libtracker-common/Makefile.am:
	* src/libtracker-common/tracker-common.h:
	* src/libtracker-data/Makefile.am:
	* src/libtracker-data/tracker-data-manager.h:
	* src/libtracker-data/tracker-data-query.h:
	* src/libtracker-data/tracker-data-schema.h:
	* src/libtracker-data/tracker-data-search.h:
	* src/libtracker-data/tracker-field-data.c:
	* src/libtracker-data/tracker-field-data.h:
	* src/libtracker-data/tracker-rdf-query.c:
	* src/libtracker-data/tracker-xesam-query.c:
	* src/trackerd/tracker-metadata.c:

	Move tracker-field-data.[ch] from libtracker-common to
	libtracker-data as TrackerFieldData contains data specific to the
	storage backend


Added:
   trunk/src/libtracker-data/tracker-field-data.c   (props changed)
      - copied unchanged from r2785, /trunk/src/libtracker-common/tracker-field-data.c
   trunk/src/libtracker-data/tracker-field-data.h   (contents, props changed)
      - copied, changed from r2785, /trunk/src/libtracker-common/tracker-field-data.h
Removed:
   trunk/src/libtracker-common/tracker-field-data.c
   trunk/src/libtracker-common/tracker-field-data.h
Modified:
   trunk/ChangeLog
   trunk/src/libtracker-common/Makefile.am
   trunk/src/libtracker-common/tracker-common.h
   trunk/src/libtracker-data/Makefile.am
   trunk/src/libtracker-data/tracker-data-manager.h
   trunk/src/libtracker-data/tracker-data-query.h
   trunk/src/libtracker-data/tracker-data-schema.h
   trunk/src/libtracker-data/tracker-data-search.h
   trunk/src/libtracker-data/tracker-rdf-query.c
   trunk/src/libtracker-data/tracker-xesam-query.c
   trunk/src/trackerd/tracker-metadata.c

Modified: trunk/src/libtracker-common/Makefile.am
==============================================================================
--- trunk/src/libtracker-common/Makefile.am	(original)
+++ trunk/src/libtracker-common/Makefile.am	Tue Jan 13 11:50:54 2009
@@ -36,7 +36,6 @@
 	tracker-config.c 				\
 	tracker-dbus.c	 				\
 	tracker-field.c					\
-	tracker-field-data.c				\
 	tracker-file-utils.c				\
 	tracker-ioprio.c				\
 	tracker-language.c				\
@@ -54,7 +53,6 @@
 noinst_HEADERS =					\
 	$(hal_headers)					\
 	tracker-dbus.h					\
-	tracker-field-data.h				\
 	tracker-ioprio.h				\
 	tracker-log.h					\
 	tracker-nfs-lock.h				\

Modified: trunk/src/libtracker-common/tracker-common.h
==============================================================================
--- trunk/src/libtracker-common/tracker-common.h	(original)
+++ trunk/src/libtracker-common/tracker-common.h	Tue Jan 13 11:50:54 2009
@@ -34,7 +34,6 @@
 
 #include "tracker-config.h"
 #include "tracker-field.h"
-#include "tracker-field-data.h"
 #include "tracker-file-utils.h"
 #include "tracker-hal.h"
 #include "tracker-language.h"

Modified: trunk/src/libtracker-data/Makefile.am
==============================================================================
--- trunk/src/libtracker-data/Makefile.am	(original)
+++ trunk/src/libtracker-data/Makefile.am	Tue Jan 13 11:50:54 2009
@@ -21,6 +21,7 @@
 	tracker-data-schema.c						\
 	tracker-data-search.c						\
 	tracker-data-update.c						\
+	tracker-field-data.c						\
 	tracker-query-tree.c						\
 	tracker-rdf-query.c						\
 	tracker-turtle.c						\
@@ -34,6 +35,7 @@
 	tracker-data-schema.h						\
 	tracker-data-search.h						\
 	tracker-data-update.h						\
+	tracker-field-data.h						\
 	tracker-query-tree.h						\
 	tracker-rdf-query.h						\
 	tracker-turtle.h						\

Modified: trunk/src/libtracker-data/tracker-data-manager.h
==============================================================================
--- trunk/src/libtracker-data/tracker-data-manager.h	(original)
+++ trunk/src/libtracker-data/tracker-data-manager.h	Tue Jan 13 11:50:54 2009
@@ -28,7 +28,6 @@
 
 #include <libtracker-common/tracker-config.h>
 #include <libtracker-common/tracker-field.h>
-#include <libtracker-common/tracker-field-data.h>
 #include <libtracker-common/tracker-language.h>
 #include <libtracker-common/tracker-ontology.h>
 

Modified: trunk/src/libtracker-data/tracker-data-query.h
==============================================================================
--- trunk/src/libtracker-data/tracker-data-query.h	(original)
+++ trunk/src/libtracker-data/tracker-data-query.h	Tue Jan 13 11:50:54 2009
@@ -28,7 +28,6 @@
 
 #include <libtracker-common/tracker-config.h>
 #include <libtracker-common/tracker-field.h>
-#include <libtracker-common/tracker-field-data.h>
 #include <libtracker-common/tracker-language.h>
 #include <libtracker-common/tracker-ontology.h>
 
@@ -37,6 +36,7 @@
 #include <libtracker-db/tracker-db-index.h>
 
 #include "tracker-data-metadata.h"
+#include "tracker-field-data.h"
 
 G_BEGIN_DECLS
 

Modified: trunk/src/libtracker-data/tracker-data-schema.h
==============================================================================
--- trunk/src/libtracker-data/tracker-data-schema.h	(original)
+++ trunk/src/libtracker-data/tracker-data-schema.h	Tue Jan 13 11:50:54 2009
@@ -28,7 +28,6 @@
 
 #include <libtracker-common/tracker-config.h>
 #include <libtracker-common/tracker-field.h>
-#include <libtracker-common/tracker-field-data.h>
 #include <libtracker-common/tracker-language.h>
 #include <libtracker-common/tracker-ontology.h>
 
@@ -36,6 +35,8 @@
 #include <libtracker-db/tracker-db-file-info.h>
 #include <libtracker-db/tracker-db-index.h>
 
+#include "tracker-field-data.h"
+
 G_BEGIN_DECLS
 
 GArray *            tracker_data_schema_create_service_array             (const gchar        *service,

Modified: trunk/src/libtracker-data/tracker-data-search.h
==============================================================================
--- trunk/src/libtracker-data/tracker-data-search.h	(original)
+++ trunk/src/libtracker-data/tracker-data-search.h	Tue Jan 13 11:50:54 2009
@@ -27,7 +27,6 @@
 #include <glib.h>
 
 #include <libtracker-common/tracker-field.h>
-#include <libtracker-common/tracker-field-data.h>
 #include <libtracker-common/tracker-language.h>
 #include <libtracker-common/tracker-ontology.h>
 
@@ -35,6 +34,8 @@
 #include <libtracker-db/tracker-db-file-info.h>
 #include <libtracker-db/tracker-db-index.h>
 
+#include "tracker-field-data.h"
+
 G_BEGIN_DECLS
 
 /* Search API */

Copied: trunk/src/libtracker-data/tracker-field-data.h (from r2785, /trunk/src/libtracker-common/tracker-field-data.h)
==============================================================================
--- /trunk/src/libtracker-common/tracker-field-data.h	(original)
+++ trunk/src/libtracker-data/tracker-field-data.h	Tue Jan 13 11:50:54 2009
@@ -24,14 +24,10 @@
 
 #include <glib-object.h>
 
-#include "tracker-field.h"
+#include <libtracker-common/tracker-field.h>
 
 G_BEGIN_DECLS
 
-#if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-common/tracker-common.h> must be included directly."
-#endif
-
 #define TRACKER_TYPE_FIELD_DATA		(tracker_field_data_get_type ())
 #define TRACKER_FIELD_DATA(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_FIELD_DATA, TrackerFieldData))
 #define TRACKER_FIELD_DATA_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_FIELD_DATA, TrackerFieldDataClass))

Modified: trunk/src/libtracker-data/tracker-rdf-query.c
==============================================================================
--- trunk/src/libtracker-data/tracker-rdf-query.c	(original)
+++ trunk/src/libtracker-data/tracker-rdf-query.c	Tue Jan 13 11:50:54 2009
@@ -21,7 +21,6 @@
 #include <string.h>
 #include <glib.h>
 
-#include <libtracker-common/tracker-field-data.h>
 #include <libtracker-common/tracker-log.h>
 #include <libtracker-common/tracker-ontology.h>
 #include <libtracker-common/tracker-type-utils.h>
@@ -29,6 +28,7 @@
 
 #include "tracker-data-manager.h"
 #include "tracker-data-schema.h"
+#include "tracker-field-data.h"
 #include "tracker-rdf-query.h"
 
 /* RDF Query Condition

Modified: trunk/src/libtracker-data/tracker-xesam-query.c
==============================================================================
--- trunk/src/libtracker-data/tracker-xesam-query.c	(original)
+++ trunk/src/libtracker-data/tracker-xesam-query.c	Tue Jan 13 11:50:54 2009
@@ -43,12 +43,12 @@
 #include <string.h>
 
 #include <libtracker-common/tracker-log.h>
-#include <libtracker-common/tracker-field-data.h>
 #include <libtracker-common/tracker-type-utils.h>
 #include <libtracker-common/tracker-utils.h>
 
 #include "tracker-data-manager.h"
 #include "tracker-data-schema.h"
+#include "tracker-field-data.h"
 #include "tracker-xesam-query.h"
 
 /* XESAM Query Condition

Modified: trunk/src/trackerd/tracker-metadata.c
==============================================================================
--- trunk/src/trackerd/tracker-metadata.c	(original)
+++ trunk/src/trackerd/tracker-metadata.c	Tue Jan 13 11:50:54 2009
@@ -25,7 +25,6 @@
 
 #include <libtracker-common/tracker-dbus.h>
 #include <libtracker-common/tracker-log.h>
-#include <libtracker-common/tracker-field-data.h>
 #include <libtracker-common/tracker-utils.h>
 #include <libtracker-common/tracker-type-utils.h>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]