Commit eaabadd5 authored by Philip Van Hoof's avatar Philip Van Hoof Committed by Philip Van Hoof

Removed support for the sqlite based pull indexer module for Evolution

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


svn path=/trunk/; revision=3112
parent 04455018
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
2009-03-20 Philip Van Hoof <philip@codeminded.be>
* src/libtracker-common/tracker-thumbnailer.c: Using an int instead of
......
......@@ -616,14 +616,14 @@ AM_CONDITIONAL(HAVE_UNAC, test "x$have_unac" = "xyes")
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")
......
......@@ -62,8 +62,6 @@ indexer_modules_LTLIBRARIES += \
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 \
......
This diff is collapsed.
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2006, Mr Jamie McCracken (jamiemcc@gnome.org)
* Copyright (C) 2008, Nokia
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef __TRACKER_EVOLUTION_IMAP_DB_H__
#define __TRACKER_EVOLUTION_IMAP_DB_H__
#include <stdlib.h>
#include <fcntl.h>
#include <glib.h>
#include <glib/gstdio.h>
#include <sqlite3.h>
#include <tracker-indexer/tracker-module-file.h>
G_BEGIN_DECLS
#define TRACKER_TYPE_EVOLUTION_IMAP_DB_FILE (tracker_evolution_imap_db_file_get_type())
#define TRACKER_EVOLUTION_IMAP_DB_FILE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_EVOLUTION_IMAP_DB_FILE, TrackerEvolutionImapDbFile))
#define TRACKER_EVOLUTION_IMAP_DB_FILE_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), TRACKER_TYPE_EVOLUTION_IMAP_DB_FILE, TrackerEvolutionImapDbFileClass))
#define TRACKER_IS_EVOLUTION_IMAP_DB_FILE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_EVOLUTION_IMAP_DB_FILE))
#define TRACKER_IS_EVOLUTION_IMAP_DB_FILE_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), TRACKER_TYPE_EVOLUTION_IMAP_DB_FILE))
#define TRACKER_EVOLUTION_IMAP_DB_FILE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_EVOLUTION_IMAP_DB_FILE, TrackerEvolutionImapDbFileClass))
typedef struct TrackerEvolutionImapDbFile TrackerEvolutionImapDbFile;
typedef struct TrackerEvolutionImapDbFileClass TrackerEvolutionImapDbFileClass;
struct TrackerEvolutionImapDbFile {
TrackerModuleFile parent_instance;
gchar *imap_dir;
sqlite3 *db;
sqlite3_stmt *stmt;
GList *folders;
GList *current_folder;
guint total_n_messages;
guint n_messages;
guint cur_message;
gchar *cur_message_uid;
GList *mime_parts;
GList *current_mime_part;
};
struct TrackerEvolutionImapDbFileClass {
TrackerModuleFileClass parent_class;
};
GType tracker_evolution_imap_db_file_get_type (void) G_GNUC_CONST;
void tracker_evolution_imap_db_file_register (GTypeModule *module);
TrackerModuleFile * tracker_evolution_imap_db_file_new (GFile *file);
G_END_DECLS
#endif /* __TRACKER_EVOLUTION_IMAP_DB_H__ */
......@@ -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 @@ get_mail_storage_type_from_path (const gchar *path)
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 @@ indexer_module_create_file (GFile *file)
} 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;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment