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

[carlosg svn gnome org]

Author: carlosg
Date: Thu Jan  8 16:25:12 2009
New Revision: 2775
URL: http://svn.gnome.org/viewvc/tracker?rev=2775&view=rev

Log:
2009-01-08  Carlos Garnacho  <carlos imendio com>

        * src/tracker-indexer/modules/evolution-imap-db.c: Handle databases
        with no parseable folders.

Modified:
   trunk/ChangeLog
   trunk/src/tracker-indexer/modules/evolution-imap-db.c

Modified: trunk/src/tracker-indexer/modules/evolution-imap-db.c
==============================================================================
--- trunk/src/tracker-indexer/modules/evolution-imap-db.c	(original)
+++ trunk/src/tracker-indexer/modules/evolution-imap-db.c	Thu Jan  8 16:25:12 2009
@@ -370,9 +370,11 @@
 	} while (result != SQLITE_DONE);
 
 	self->current_folder = self->folders;
-
         ensure_imap_accounts ();
-	prepare_folder_info (self, (const gchar *) self->current_folder->data);
+
+	if (self->current_folder) {
+		prepare_folder_info (self, (const gchar *) self->current_folder->data);
+	}
 
 	sqlite3_finalize (stmt);
 }
@@ -679,6 +681,11 @@
 		return NULL;
 	}
 
+	if (!self->stmt) {
+		/* No folder opened */
+		return NULL;
+	}
+
 	message_path = get_message_path (file, self->cur_message_uid);
 
 #if defined(__linux__)
@@ -832,6 +839,11 @@
 
         self = TRACKER_EVOLUTION_IMAP_DB_FILE (file);
 
+	if (!self->stmt) {
+		/* No folder opened */
+		return NULL;
+	}
+
 	if (self->cur_message > self->n_messages) {
 		return NULL;
 	}
@@ -857,6 +869,11 @@
 	gchar *message_path;
 	GList *mime_parts = NULL;
 
+	if (!self->stmt) {
+		/* No folder opened */
+		return NULL;
+	}
+
 	message_path = get_message_path (TRACKER_MODULE_FILE (self),
                                          self->cur_message_uid);
 
@@ -914,6 +931,10 @@
 		return TRUE;
 	}
 
+	if (!self->current_folder) {
+		return FALSE;
+	}
+
 	self->current_folder = self->current_folder->next;
 
 	if (self->current_folder) {