evolution r35317 - trunk/mail

[mcrha svn gnome org]

Author: mcrha
Date: Thu Apr  3 15:14:20 2008
New Revision: 35317
URL: http://svn.gnome.org/viewvc/evolution?rev=35317&view=rev

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

	** Fix for bug #264456

	* mail-component.c: (view_changed):
	Do not count deleted junk messages when doesn't show deleted messages.



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	Thu Apr  3 15:14:20 2008
@@ -542,7 +542,12 @@
 			if (((CamelVTrashFolder *)emfv->folder)->type == CAMEL_VTRASH_FOLDER_TRASH) {
 				g_string_append_printf(tmp, ngettext ("%d deleted", "%d deleted", deleted), deleted);
 			} else {
-				g_string_append_printf(tmp, ngettext ("%d junk", "%d junk", junked), junked);
+				guint32 num = junked_not_deleted;
+
+				if (!emfv->hide_deleted)
+					num = junked;
+
+				g_string_append_printf (tmp, ngettext ("%d junk", "%d junk", num), num);
 			}
 		} else if (em_utils_folder_is_drafts(emfv->folder, emfv->folder_uri)) {
 			g_string_append_printf(tmp, ngettext ("%d draft", "%d drafts", visible), visible);