evolution-data-server r9423 - trunk/camel

[sragavan svn gnome org]

Author: sragavan
Date: Thu Aug 21 12:37:33 2008
New Revision: 9423
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9423&view=rev

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

	* camel/camel-vee-folder.c: Make counts work even better.


Modified:
   trunk/camel/ChangeLog
   trunk/camel/camel-vee-folder.c

Modified: trunk/camel/camel-vee-folder.c
==============================================================================
--- trunk/camel/camel-vee-folder.c	(original)
+++ trunk/camel/camel-vee-folder.c	Thu Aug 21 12:37:33 2008
@@ -594,11 +594,14 @@
 
 		node = node->next;
 	}
-	
+#if 0
+	/* Seems like we are doing something wrong with this, as folder_changed happens after this, the counts are misleading.
+	 * Anyways we do a force sync on exit, it should be all fine.
+	  */
 	record = summary_header_to_db (folder->summary, ex);
 	camel_db_write_folder_info_record (folder->parent_store->cdb, record, ex);
 	g_free (record);
-	
+#endif	
 	if (node == NULL) {
 		CAMEL_VEE_FOLDER_LOCK(vf, changed_lock);
 		g_list_free(p->folders_changed);
@@ -1335,8 +1338,7 @@
 
 	vinfo = (CamelVeeMessageInfo *) camel_folder_summary_uid (((CamelFolder *) vf)->summary, vuid);
 	if (vinfo) {
-		if (!(vf->flags & CAMEL_STORE_VEE_FOLDER_SPECIAL_DELETE))
-			update_summary (vinfo, vinfo->old_flags, 0, FALSE);
+		update_summary (vinfo, vinfo->old_flags, 0, FALSE);
 		camel_message_info_free((CamelMessageInfo *)vinfo);
 	}
 	camel_folder_change_info_remove_uid(vf->changes, vuid);