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

[mr svn gnome org]

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

Log:
	* src/trackerd/Makefile.am:
	* src/trackerd/tracker-db-email.c:
	* src/trackerd/tracker-db-email.h:
	* src/trackerd/tracker-email-evolution.c:
	* src/trackerd/tracker-email-kmail.c:
	* src/trackerd/tracker-email-modest.c:
	* src/trackerd/tracker-email-plugin.h:
	* src/trackerd/tracker-email-thunderbird.c:
	* src/trackerd/tracker-email-utils.c:
	* src/trackerd/tracker-email-utils.h:
	* src/trackerd/tracker-email.c:
	* src/trackerd/tracker-email.h:
	* src/trackerd/tracker-main.c: 
	* src/trackerd/tracker-process.c: Remove all email modules here,
	this code is all done in the indexer now or is in the process of
	being moved over. It is redundant in the daemon.


Removed:
   branches/indexer-split/src/trackerd/tracker-db-email.c
   branches/indexer-split/src/trackerd/tracker-db-email.h
   branches/indexer-split/src/trackerd/tracker-email-evolution.c
   branches/indexer-split/src/trackerd/tracker-email-kmail.c
   branches/indexer-split/src/trackerd/tracker-email-modest.c
   branches/indexer-split/src/trackerd/tracker-email-modest.h
   branches/indexer-split/src/trackerd/tracker-email-plugin.h
   branches/indexer-split/src/trackerd/tracker-email-thunderbird.c
   branches/indexer-split/src/trackerd/tracker-email-utils.c
   branches/indexer-split/src/trackerd/tracker-email-utils.h
   branches/indexer-split/src/trackerd/tracker-email.c
   branches/indexer-split/src/trackerd/tracker-email.h
Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/trackerd/Makefile.am
   branches/indexer-split/src/trackerd/tracker-main.c
   branches/indexer-split/src/trackerd/tracker-process.c

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:15:21 2008
@@ -19,35 +19,6 @@
 
 
 #
-# Mail sources
-#
-mail_modulesdir = $(libdir)/tracker/mail-modules
-mail_modules_LTLIBRARIES = \
-	libemail-evolution.la \
-	libemail-thunderbird.la \
-	libemail-kmail.la \
-	libemail-modest.la
-
-module_flags = -module -avoid-version -no-undefined
-
-libemail_modest_la_SOURCES = tracker-email-modest.c tracker-email-modest.h
-libemail_modest_la_LDFLAGS = $(module_flags)
-libemail_modest_la_LIBADD = $(GLIB2_LIBS)
-
-libemail_evolution_la_SOURCES = tracker-email-evolution.c
-libemail_evolution_la_LDFLAGS = $(module_flags)
-libemail_evolution_la_LIBADD = $(GLIB2_LIBS)
-
-libemail_thunderbird_la_SOURCES = tracker-email-thunderbird.c
-libemail_thunderbird_la_LDFLAGS = $(module_flags)
-libemail_thunderbird_la_LIBADD = $(GLIB2_LIBS)
-
-libemail_kmail_la_SOURCES = tracker-email-kmail.c
-libemail_kmail_la_LDFLAGS = $(module_flags)
-libemail_kmail_la_LIBADD = $(GLIB2_LIBS)
-
-
-#
 # Daemon sources
 #
 bin_PROGRAMS = trackerd
@@ -59,15 +30,8 @@
 	tracker-daemon.h						\
 	tracker-db.c							\
 	tracker-db.h							\
-	tracker-db-email.c						\
-	tracker-db-email.h						\
 	tracker-dbus.c							\
 	tracker-dbus.h							\
-	tracker-email.c							\
-	tracker-email.h							\
-	tracker-email-utils.c						\
-	tracker-email-utils.h						\
-	tracker-email-plugin.h						\
 	tracker-files.c							\
 	tracker-files.h							\
 	tracker-keywords.c						\

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:15:21 2008
@@ -45,7 +45,6 @@
 
 #include <libtracker-db/tracker-db-manager.h>
 
-#include "tracker-email.h"
 #include "tracker-crawler.h"
 #include "tracker-dbus.h"
 #include "tracker-indexer.h"
@@ -612,8 +611,6 @@
 	tracker_indexer_close (tracker->file_index);
 	tracker_indexer_close (tracker->file_update_index);
 	tracker_indexer_close (tracker->email_index);
-
-	tracker_email_end_email_watching ();
 }
 
 static void
@@ -812,7 +809,6 @@
 	tracker_db_manager_init (flags, &tracker->first_time_index);
 	tracker_db_init ();
 	tracker_xesam_manager_init ();
-	tracker_email_start_email_watching (tracker_config_get_email_client (tracker->config));
 
 	tracker->crawler = tracker_crawler_new ();
 
@@ -887,7 +883,6 @@
 	shutdown_directories ();
 
 	/* Shutdown major subsystems */
-	tracker_email_end_email_watching ();
 	tracker_dbus_shutdown ();
 	tracker_xesam_manager_shutdown ();
 	tracker_db_manager_shutdown (TRUE);

Modified: branches/indexer-split/src/trackerd/tracker-process.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-process.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-process.c	Thu Jun 26 09:15:21 2008
@@ -46,7 +46,6 @@
 #include "tracker-db.h"
 #include "tracker-dbus.h"
 #include "tracker-daemon.h"
-#include "tracker-email.h"
 #include "tracker-indexer.h"
 #include "tracker-monitor.h"
 #include "tracker-status.h"