diff options
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/mail-component.c | 7 |
2 files changed, 13 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index de3868d9b9..ad3e53eed3 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +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. + 2008-04-03 Milan Crha <mcrha@redhat.com> ** Fix for bug #350308 diff --git a/mail/mail-component.c b/mail/mail-component.c index 34fcd26dc3..3a1bfc39f4 100644 --- a/mail/mail-component.c +++ b/mail/mail-component.c @@ -542,7 +542,12 @@ view_changed(EMFolderView *emfv, EComponentView *component_view) 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); |