tracker r2032 - in branches/indexer-split: . src/tracker-indexer/modules

[carlosg svn gnome org]

Author: carlosg
Date: Thu Aug  7 15:18:21 2008
New Revision: 2032
URL: http://svn.gnome.org/viewvc/tracker?rev=2032&view=rev

Log:
2008-08-07  Carlos Garnacho  <carlos imendio com>

        * src/tracker-indexer/modules/evolution.c (get_metadata_for_imap):
        Ensure we parse the whole message if it was deleted/junk, so we keep
        parsing from the correct position for the next message.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/tracker-indexer/modules/evolution.c

Modified: branches/indexer-split/src/tracker-indexer/modules/evolution.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/modules/evolution.c	(original)
+++ branches/indexer-split/src/tracker-indexer/modules/evolution.c	Thu Aug  7 15:18:21 2008
@@ -1121,7 +1121,6 @@
                 return get_metadata_for_imap_attachment (file, data->current_mime_part->data);
         }
 
-
         uid = NULL;
 
         if (!read_summary (data->summary,
@@ -1132,12 +1131,6 @@
                 return NULL;
         }
 
-        if (flags & EVOLUTION_MESSAGE_JUNK ||
-            flags & EVOLUTION_MESSAGE_DELETED) {
-                g_free (uid);
-                return NULL;
-        }
-
         subject = NULL;
         from = NULL;
         to = NULL;
@@ -1246,6 +1239,12 @@
 
         skip_content_info (data->summary);
 
+        if (flags & EVOLUTION_MESSAGE_JUNK ||
+            flags & EVOLUTION_MESSAGE_DELETED) {
+                tracker_metadata_free (metadata);
+                return NULL;
+        }
+
         return metadata;
 
 corruption: