evolution-data-server r9998 - trunk/camel

[sragavan svn gnome org]

Author: sragavan
Date: Fri Jan 30 05:51:55 2009
New Revision: 9998
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9998&view=rev

Log:
2009-01-30  Srinivasa Ragavan  <sragavan novell com>

	* camel-vee-folder.c: (vf_getv): Some more fix for counting.




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	Fri Jan 30 05:51:55 2009
@@ -2014,7 +2014,10 @@
 
 			switch (tag & CAMEL_ARG_TAG) {
 			case CAMEL_FOLDER_ARG_UNREAD:
-				count = unread == -1 ? 0 : unread;
+				if (vf->priv->unread_vfolder == 1)
+					count = unread == -1 ? 0 : unread - junked_not_deleted;
+				else
+					count = unread == -1 ? 0 : unread;
 				break;
 			case CAMEL_FOLDER_ARG_DELETED:
 				count = deleted == -1 ? 0 : deleted;
@@ -2027,7 +2030,7 @@
 				break;				
 			case CAMEL_FOLDER_ARG_VISIBLE:
 				if (vf->priv->unread_vfolder == 1)
-					count = unread == -1 ? 0 : unread;
+					count = unread == -1 ? 0 : unread - deleted - junked_not_deleted;
 				else
 					count = visible == -1 ? 0 : visible;