evolution-data-server r9419 - trunk/camel

[sragavan svn gnome org]

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

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

	* camel/camel-vee-folder.c: Fix junk/trash counts.


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:36:22 2008
@@ -44,6 +44,7 @@
 #include "camel-vee-store.h"	/* for open flags */
 #include "camel-vee-summary.h"
 #include "camel-string-utils.h"
+#include "camel-vee-folder.h"
 
 #define d(x) 
 #define dd(x) (camel_debug("vfolder")?(x):0)
@@ -613,7 +614,9 @@
 static void
 vee_expunge (CamelFolder *folder, CamelException *ex)
 {
+	/* Force it to rebuild the counts, when some folders were expunged. */
 	folder->summary->unread_count = 0;
+	folder->summary->visible_count = 0;
 	((CamelFolderClass *)((CamelObject *)folder)->klass)->sync(folder, TRUE, ex);
 }
 
@@ -1332,7 +1335,8 @@
 
 	vinfo = (CamelVeeMessageInfo *) camel_folder_summary_uid (((CamelFolder *) vf)->summary, vuid);
 	if (vinfo) {
-		update_summary (vinfo, vinfo->old_flags, 0, FALSE);
+		if (!(vf->flags & CAMEL_STORE_VEE_FOLDER_SPECIAL_DELETE))
+			update_summary (vinfo, vinfo->old_flags, 0, FALSE);
 		camel_message_info_free((CamelMessageInfo *)vinfo);
 	}
 	camel_folder_change_info_remove_uid(vf->changes, vuid);