tracker r3112 - in trunk: . src/tracker-indexer/modules

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Fri Mar 20 14:34:45 2009
New Revision: 3112
URL: http://svn.gnome.org/viewvc/tracker?rev=3112&view=rev

Log:
2009-03-20  Philip Van Hoof  <philip codeminded be>

        * src/tracker-indexer/modules/evolution.c:
        * src/tracker-indexer/modules/Makefile.am:
        * configure.ac:
        * src/tracker-indexer/modules/evolution-imap-db.h:
        * src/tracker-indexer/modules/evolution-imap-db.c:


        Removed support for the sqlite based pull indexer module for
        Evolution

        Enabled by defualt the support for the push indexing module for
        Evolution (Evolution pushes data into Tracker's storage)

        This fixes https://qa.mandriva.com/show_bug.cgi?id=48977



Removed:
   trunk/src/tracker-indexer/modules/evolution-imap-db.c
   trunk/src/tracker-indexer/modules/evolution-imap-db.h
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/tracker-indexer/modules/Makefile.am
   trunk/src/tracker-indexer/modules/evolution.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Mar 20 14:34:45 2009
@@ -616,14 +616,14 @@
 AC_ARG_ENABLE([evolution_push_module],
               AS_HELP_STRING([--enable-evolution-push-module],
                              [enable support for Evolution push mechanism (default=no)]),,
-              [enable_evolution_push_module=no])
+              [enable_evolution_push_module=yes])
 
 AM_CONDITIONAL(USING_EVOLUTION_PUSH_MODULE, test "x$enable_evolution_push_module" = "xyes")
 
 AC_ARG_ENABLE([kmail_push_module],
               AS_HELP_STRING([--enable-kmail-push-module],
                              [enable support for KMail push mechanism (default=no)]),,
-              [enable_kmail_push_module=no])
+              [enable_kmail_push_module=yes])
 
 AM_CONDITIONAL(USING_KMAIL_PUSH_MODULE, test "x$enable_kmail_push_module" = "xyes")
 

Modified: trunk/src/tracker-indexer/modules/Makefile.am
==============================================================================
--- trunk/src/tracker-indexer/modules/Makefile.am	(original)
+++ trunk/src/tracker-indexer/modules/Makefile.am	Fri Mar 20 14:34:45 2009
@@ -62,8 +62,6 @@
 libtracker_module_evolution_la_SOURCES =				\
 	evolution-common.c						\
 	evolution-common.h						\
-	evolution-imap-db.c						\
-	evolution-imap-db.h						\
 	evolution-imap.c						\
 	evolution-imap.h						\
 	evolution-pop.c							\

Modified: trunk/src/tracker-indexer/modules/evolution.c
==============================================================================
--- trunk/src/tracker-indexer/modules/evolution.c	(original)
+++ trunk/src/tracker-indexer/modules/evolution.c	Fri Mar 20 14:34:45 2009
@@ -27,19 +27,12 @@
 #include "evolution-pop.h"
 #include "evolution-imap.h"
 
-#ifndef HAVE_EVOLUTION_PLUGIN
-#include "evolution-imap-db.h"
-#endif
-
 typedef enum MailStorageType MailStorageType;
 
 enum MailStorageType {
 	MAIL_STORAGE_NONE,
 	MAIL_STORAGE_LOCAL,
 	MAIL_STORAGE_IMAP,
-#ifndef HAVE_EVOLUTION_PLUGIN
-	MAIL_STORAGE_IMAP_DB
-#endif
 };
 
 static gchar *local_dir = NULL;
@@ -82,11 +75,6 @@
 		if (strcmp (basenam, "summary") == 0) {
 			type = MAIL_STORAGE_IMAP;
 		}
-#ifndef HAVE_EVOLUTION_PLUGIN
-		else if (strcmp (basenam, "folders.db") == 0) {
-			type = MAIL_STORAGE_IMAP_DB;
-		}
-#endif
 	}
 
 	/* Exclude non wanted folders */
@@ -119,11 +107,6 @@
         } else if (type == MAIL_STORAGE_IMAP) {
                 return tracker_evolution_imap_file_new (file);
         }
-#ifndef HAVE_EVOLUTION_PLUGIN
-	else if (type == MAIL_STORAGE_IMAP_DB) {
-		return tracker_evolution_imap_db_file_new (file);
-	}
-#endif
 
         return NULL;
 }