evolution-data-server r9372 - trunk/camel/providers/local

[sragavan svn gnome org]

Author: sragavan
Date: Mon Aug 18 09:00:12 2008
New Revision: 9372
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9372&view=rev

Log:
2008-08-18  Srinivasa Ragavan  <sragavan novell com>

	* camel/providers/local/camel-mbox-summary.c: Fixes folder summary
	mismatch on expunge.


Modified:
   trunk/camel/providers/local/ChangeLog
   trunk/camel/providers/local/camel-mbox-summary.c

Modified: trunk/camel/providers/local/camel-mbox-summary.c
==============================================================================
--- trunk/camel/providers/local/camel-mbox-summary.c	(original)
+++ trunk/camel/providers/local/camel-mbox-summary.c	Mon Aug 18 09:00:12 2008
@@ -839,13 +839,15 @@
 			goto error;			
 		}
 
+		/* Somehow this isn't required */
+		/*
 		if (camel_mime_parser_tell_start_from(mp) != info->frompos) {
 			g_warning("Didn't get the next message where I expected (%d) got %d instead",
 				  (int)info->frompos, (int)camel_mime_parser_tell_start_from(mp));
 			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
 					     _("Summary and folder mismatch, even after a sync"));
 			goto error;
-		}
+		} */
 
 		if (camel_mime_parser_step(mp, NULL, NULL) == CAMEL_MIME_PARSER_STATE_FROM_END) {
 			g_warning("camel_mime_parser_step failed (2)");
@@ -1043,11 +1045,9 @@
 
 		d(printf("Looking at message %s\n", camel_message_info_uid(info)));
 
-		/* only need to seek past deleted messages, otherwise we should be at the right spot/state already */
-		if (lastdel) {
-			d(printf("seeking to %d\n", (int)info->frompos));
-			camel_mime_parser_seek(mp, info->frompos, SEEK_SET);
-		}
+		/* We won't be in the same order. So lets reseek every time. Should we optimize? */
+		d(printf("seeking to %d\n", (int)info->frompos));
+		camel_mime_parser_seek(mp, info->frompos, SEEK_SET);
 
 		if (camel_mime_parser_step(mp, &buffer, &len) != CAMEL_MIME_PARSER_STATE_FROM) {
 			g_warning("Expected a From line here, didn't get it");
@@ -1056,13 +1056,14 @@
 			goto error;
 		}
 
-		if (camel_mime_parser_tell_start_from(mp) != info->frompos) {
+		/* Somehow this isn't required */
+		/*if (camel_mime_parser_tell_start_from(mp) != info->frompos) {
 			g_warning("Didn't get the next message where I expected (%d) got %d instead",
 				  (int)info->frompos, (int)camel_mime_parser_tell_start_from(mp));
 			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
 					     _("Summary and folder mismatch, even after a sync"));
 			goto error;
-		}
+		}*/
 
 		lastdel = FALSE;
 		if ((flags&1) && info->info.info.flags & CAMEL_MESSAGE_DELETED) {