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



Author: mr
Date: Thu May  8 10:38:22 2008
New Revision: 1369
URL: http://svn.gnome.org/viewvc/tracker?rev=1369&view=rev

Log:
	* src/trackerd/Makefile.am:
	* src/trackerd/tracker-db-sqlite.c:
	* src/trackerd/tracker-dbus-daemon.h:
	* src/trackerd/tracker-email-evolution.c:
	* src/trackerd/tracker-email-thunderbird.c:
	* src/trackerd/tracker-email.c:
	* src/trackerd/tracker-metadata.c:
	* src/trackerd/tracker-parser.c:
	* src/trackerd/tracker-process-files.h:
	* src/trackerd/tracker-utils.c:
	* src/trackerd/tracker-xesam.c:
	* src/trackerd/trackerd.[ch]: Renamed trackerd.[ch] to tracker-main.[ch].


Added:
   branches/indexer-split/src/trackerd/tracker-main.c
      - copied unchanged from r1367, /branches/indexer-split/src/trackerd/trackerd.c
   branches/indexer-split/src/trackerd/tracker-main.h
      - copied unchanged from r1367, /branches/indexer-split/src/trackerd/trackerd.h
Removed:
   branches/indexer-split/src/trackerd/trackerd.c
   branches/indexer-split/src/trackerd/trackerd.h
Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/configure.ac
   branches/indexer-split/src/trackerd/Makefile.am
   branches/indexer-split/src/trackerd/tracker-db-sqlite.c
   branches/indexer-split/src/trackerd/tracker-dbus-daemon.h
   branches/indexer-split/src/trackerd/tracker-email-evolution.c
   branches/indexer-split/src/trackerd/tracker-email-thunderbird.c
   branches/indexer-split/src/trackerd/tracker-email.c
   branches/indexer-split/src/trackerd/tracker-metadata.c
   branches/indexer-split/src/trackerd/tracker-parser.c
   branches/indexer-split/src/trackerd/tracker-process-files.h
   branches/indexer-split/src/trackerd/tracker-utils.c
   branches/indexer-split/src/trackerd/tracker-xesam.c

Modified: branches/indexer-split/configure.ac
==============================================================================
--- branches/indexer-split/configure.ac	(original)
+++ branches/indexer-split/configure.ac	Thu May  8 10:38:22 2008
@@ -384,7 +384,7 @@
 #  SQLite check
 ####################################################################
 
-SQLITE_REQUIRED=3.5
+SQLITE_REQUIRED=3.4
 
 PKG_CHECK_MODULES(SQLITE3, [ sqlite3 >= $SQLITE_REQUIRED ])
 

Modified: branches/indexer-split/src/trackerd/Makefile.am
==============================================================================
--- branches/indexer-split/src/trackerd/Makefile.am	(original)
+++ branches/indexer-split/src/trackerd/Makefile.am	Thu May  8 10:38:22 2008
@@ -84,8 +84,6 @@
 	$(unix_sources)							\
 	$(hal_sources)							\
 	$(db_sources)							\
-	trackerd.c							\
-	trackerd.h							\
 	tracker-apps.c							\
 	tracker-apps.h							\
 	tracker-db.c							\
@@ -108,9 +106,11 @@
 	tracker-email.h							\
 	tracker-email-utils.c						\
 	tracker-email-utils.h						\
+	tracker-main.c							\
+	tracker-main.h							\
+	tracker-marshal-main.c						\
 	tracker-metadata.c						\
 	tracker-metadata.h						\
-	tracker-marshal-main.c						\
 	tracker-process-files.c						\
 	tracker-process-files.h						\
 	tracker-query-tree.c						\

Modified: branches/indexer-split/src/trackerd/tracker-db-sqlite.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-db-sqlite.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-db-sqlite.c	Thu May  8 10:38:22 2008
@@ -61,7 +61,7 @@
 #include "tracker-service-manager.h"
 #include "tracker-query-tree.h"
 #include "tracker-xesam.h"
-#include "trackerd.h"
+#include "tracker-main.h"
 
 #define MAX_TEXT_BUFFER     65567
 #define MAX_COMPRESS_BUFFER 65565

Modified: branches/indexer-split/src/trackerd/tracker-dbus-daemon.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-dbus-daemon.h	(original)
+++ branches/indexer-split/src/trackerd/tracker-dbus-daemon.h	Thu May  8 10:38:22 2008
@@ -29,7 +29,7 @@
 #include <libtracker-common/tracker-config.h>
 
 #include "tracker-db-sqlite.h"
-#include "trackerd.h"
+#include "tracker-main.h"
 
 #define TRACKER_DBUS_DAEMON_SERVICE         "org.freedesktop.Tracker"
 #define TRACKER_DBUS_DAEMON_PATH            "/org/freedesktop/Tracker"

Modified: branches/indexer-split/src/trackerd/tracker-email-evolution.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-email-evolution.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-email-evolution.c	Thu May  8 10:38:22 2008
@@ -47,7 +47,7 @@
 #include "tracker-watch.h"
 #include "tracker-status.h"
 #include "tracker-utils.h"
-#include "trackerd.h"
+#include "tracker-main.h"
 
 #define EVOLUTION_MAIL_DIR_S ".evolution/mail"
 

Modified: branches/indexer-split/src/trackerd/tracker-email-thunderbird.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-email-thunderbird.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-email-thunderbird.c	Thu May  8 10:38:22 2008
@@ -29,7 +29,7 @@
 
 #include "tracker-db-email.h"
 #include "tracker-watch.h"
-#include "trackerd.h"
+#include "tracker-main.h"
 
 typedef enum
 {

Modified: branches/indexer-split/src/trackerd/tracker-email.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-email.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-email.c	Thu May  8 10:38:22 2008
@@ -26,7 +26,7 @@
 
 #include "tracker-email.h"
 #include "tracker-email-utils.h"
-#include "trackerd.h"
+#include "tracker-main.h"
 
 extern Tracker *tracker;
 

Modified: branches/indexer-split/src/trackerd/tracker-metadata.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-metadata.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-metadata.c	Thu May  8 10:38:22 2008
@@ -37,7 +37,7 @@
 #include "tracker-metadata.h"
 #include "tracker-utils.h"
 #include "tracker-service-manager.h"
-#include "trackerd.h"
+#include "tracker-main.h"
 
 extern Tracker *tracker;
 

Modified: branches/indexer-split/src/trackerd/tracker-parser.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-parser.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-parser.c	Thu May  8 10:38:22 2008
@@ -33,7 +33,7 @@
 
 #include "tracker-parser.h"
 #include "tracker-utils.h"
-#include "trackerd.h"
+#include "tracker-main.h"
 
 extern Tracker *tracker;
 

Modified: branches/indexer-split/src/trackerd/tracker-process-files.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-process-files.h	(original)
+++ branches/indexer-split/src/trackerd/tracker-process-files.h	Thu May  8 10:38:22 2008
@@ -27,7 +27,7 @@
 #include <libtracker-db/tracker-db-file-info.h>
 
 #include "tracker-utils.h"
-#include "trackerd.h"
+#include "tracker-main.h"
 
 G_BEGIN_DECLS
 

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 May  8 10:38:22 2008
@@ -27,7 +27,7 @@
 #include <libtracker-common/tracker-config.h>
 
 #include "tracker-utils.h"
-#include "trackerd.h"
+#include "tracker-main.h"
 
 extern Tracker *tracker;
 

Modified: branches/indexer-split/src/trackerd/tracker-xesam.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-xesam.c	Thu May  8 10:38:22 2008
@@ -25,7 +25,7 @@
 #include <libtracker-common/tracker-config.h>
 
 #include "tracker-xesam.h"
-#include "trackerd.h"
+#include "tracker-main.h"
 
 extern Tracker *tracker;
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]