evolution r35312 - trunk/mail

[mcrha svn gnome org]

Author: mcrha
Date: Wed Apr  2 14:33:11 2008
New Revision: 35312
URL: http://svn.gnome.org/viewvc/evolution?rev=35312&view=rev

Log:
2008-04-02  Milan Crha  <mcrha redhat com>

	** Fix for bug #271863

	* mail-component.c: (view_changed):
	Do not count deleted junked messages to total number of messages
	with unchecked "Hide Deleted Messages" option.



Modified:
   trunk/mail/ChangeLog
   trunk/mail/mail-component.c

Modified: trunk/mail/mail-component.c
==============================================================================
--- trunk/mail/mail-component.c	(original)
+++ trunk/mail/mail-component.c	Wed Apr  2 14:33:11 2008
@@ -518,7 +518,7 @@
 	if (emfv->folder) {
 		char *name, *title;
 		const char *use_name; /* will contain localized name, if necessary */
-		guint32 visible, unread, deleted, junked;
+		guint32 visible, unread, deleted, junked, junked_not_deleted;
 		GPtrArray *selected;
 		GString *tmp = g_string_new("");
 
@@ -527,6 +527,7 @@
 				 CAMEL_FOLDER_DELETED, &deleted,
 				 CAMEL_FOLDER_VISIBLE, &visible,
 				 CAMEL_FOLDER_JUNKED, &junked,
+				 CAMEL_FOLDER_JUNKED_NOT_DELETED, &junked_not_deleted,
 				 CAMEL_FOLDER_UNREAD, &unread, NULL);
 
 		selected = message_list_get_selected(emfv->list);
@@ -552,7 +553,7 @@
 			/* HACK: hardcoded inbox or maildir '.' folder */
 		} else {
 			if (!emfv->hide_deleted)
-				visible += deleted;
+				visible += deleted - junked + junked_not_deleted;
 			if (unread && selected->len <= 1)
 				g_string_append_printf(tmp, ngettext ("%d unread, ", "%d unread, ", unread), unread);
 			g_string_append_printf(tmp, ngettext ("%d total", "%d total", visible), visible);