tracker r1767 - in branches/indexer-split: . src/tracker-indexer src/trackerd

[mr svn gnome org]

Author: mr
Date: Thu Jun 26 09:01:46 2008
New Revision: 1767
URL: http://svn.gnome.org/viewvc/tracker?rev=1767&view=rev

Log:
	* src/tracker-indexer/tracker-indexer.c: Cleaned up some code.

	* src/trackerd/Makefile.am:
	* src/trackerd/tracker-db.c:
	* src/trackerd/tracker-email-kmail.c:
	* src/trackerd/tracker-indexer.c:
	* src/trackerd/tracker-main.c:
	* src/trackerd/tracker-process-files.c:
	* src/trackerd/tracker-process-files.h:
	* src/trackerd/tracker-process.c:
	* src/trackerd/tracker-utils.c: Renamed tracker-process-files.[ch]
	to tracker-process.[ch] since this module will be stripped and
	used to process all categories of data not just files.


Added:
   branches/indexer-split/src/trackerd/tracker-process.c
      - copied, changed from r1766, /branches/indexer-split/src/trackerd/tracker-process-files.c
   branches/indexer-split/src/trackerd/tracker-process.h
      - copied unchanged from r1766, /branches/indexer-split/src/trackerd/tracker-process-files.h
Removed:
   branches/indexer-split/src/trackerd/tracker-process-files.c
   branches/indexer-split/src/trackerd/tracker-process-files.h
Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/tracker-indexer/tracker-indexer.c
   branches/indexer-split/src/trackerd/Makefile.am
   branches/indexer-split/src/trackerd/tracker-db.c
   branches/indexer-split/src/trackerd/tracker-email-kmail.c
   branches/indexer-split/src/trackerd/tracker-indexer.c
   branches/indexer-split/src/trackerd/tracker-main.c
   branches/indexer-split/src/trackerd/tracker-utils.c

Modified: branches/indexer-split/src/tracker-indexer/tracker-indexer.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-indexer.c	(original)
+++ branches/indexer-split/src/tracker-indexer/tracker-indexer.c	Thu Jun 26 09:01:46 2008
@@ -343,7 +343,10 @@
 
 	priv->cache = tracker_db_manager_get_db_interface (TRACKER_DB_CACHE);
 	priv->common = tracker_db_manager_get_db_interface (TRACKER_DB_COMMON);
-	priv->metadata = tracker_db_manager_get_db_interfaces (3, TRACKER_DB_COMMON, TRACKER_DB_CACHE, TRACKER_DB_FILE_METADATA);
+	priv->metadata = tracker_db_manager_get_db_interfaces (3, 
+							       TRACKER_DB_COMMON,
+							       TRACKER_DB_CACHE, 
+							       TRACKER_DB_FILE_METADATA);
 	priv->contents = tracker_db_manager_get_db_interface (TRACKER_DB_FILE_CONTENTS);
 
 	priv->timer = g_timer_new ();

Modified: branches/indexer-split/src/trackerd/Makefile.am
==============================================================================
--- branches/indexer-split/src/trackerd/Makefile.am	(original)
+++ branches/indexer-split/src/trackerd/Makefile.am	Thu Jun 26 09:01:46 2008
@@ -74,8 +74,8 @@
 	tracker-keywords.h						\
 	tracker-indexer.c						\
 	tracker-indexer.h						\
-	tracker-process-files.c						\
-	tracker-process-files.h						\
+	tracker-process.c						\
+	tracker-process.h						\
 	tracker-main.c							\
 	tracker-main.h							\
 	tracker-marshal-main.c						\

Modified: branches/indexer-split/src/trackerd/tracker-db.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-db.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-db.c	Thu Jun 26 09:01:46 2008
@@ -38,7 +38,7 @@
 #include <libtracker-db/tracker-db-manager.h>
 
 #include "tracker-db.h"
-#include "tracker-process-files.h"
+#include "tracker-process.h"
 #include "tracker-query-tree.h"
 #include "tracker-monitor.h"
 #include "tracker-xesam-manager.h"

Modified: branches/indexer-split/src/trackerd/tracker-email-kmail.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-email-kmail.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-email-kmail.c	Thu Jun 26 09:01:46 2008
@@ -35,7 +35,7 @@
 #include "tracker-db-email.h"
 #include "tracker-main.h"
 #include "tracker-monitor.h"
-#include "tracker-process-files.h"
+#include "tracker-process.h"
 
 typedef struct {
         gchar            *imap_path;

Modified: branches/indexer-split/src/trackerd/tracker-indexer.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-indexer.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-indexer.c	Thu Jun 26 09:01:46 2008
@@ -52,7 +52,7 @@
 #include "tracker-indexer.h"
 #include "tracker-dbus.h"
 #include "tracker-daemon.h"
-#include "tracker-process-files.h"
+#include "tracker-process.h"
 #include "tracker-query-tree.h"
 #include "tracker-main.h"
 #include "tracker-status.h"

Modified: branches/indexer-split/src/trackerd/tracker-main.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-main.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-main.c	Thu Jun 26 09:01:46 2008
@@ -51,7 +51,7 @@
 #include "tracker-indexer.h"
 #include "tracker-indexer-client.h"
 #include "tracker-monitor.h"
-#include "tracker-process-files.h"
+#include "tracker-process.h"
 #include "tracker-status.h"
 #include "tracker-xesam-manager.h"
 

Copied: branches/indexer-split/src/trackerd/tracker-process.c (from r1766, /branches/indexer-split/src/trackerd/tracker-process-files.c)
==============================================================================
--- /branches/indexer-split/src/trackerd/tracker-process-files.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-process.c	Thu Jun 26 09:01:46 2008
@@ -50,7 +50,7 @@
 #include "tracker-indexer.h"
 #include "tracker-monitor.h"
 #include "tracker-status.h"
-#include "tracker-process-files.h"
+#include "tracker-process.h"
 
 static TrackerHal     *hal;
 static TrackerConfig  *config;

Modified: branches/indexer-split/src/trackerd/tracker-utils.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-utils.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-utils.c	Thu Jun 26 09:01:46 2008
@@ -28,7 +28,7 @@
 
 #include "tracker-utils.h"
 #include "tracker-main.h"
-#include "tracker-process-files.h"
+#include "tracker-process.h"
 #include "tracker-xesam-manager.h"
 
 extern Tracker *tracker;