aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog3
-rw-r--r--mail/mail-folder-cache.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 1aaa80d696..9b12997db6 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,8 @@
2001-07-24 Peter Williams <peterw@ximian.com>
+ * mail-folder-cache.c (make_folder_name): Don't display "(0 unsent)" if
+ the outbox is empty.
+
* mail-local.c (init_trash): Set up the local trash in the folder cache.
* mail-folder-cache.c (update_idle): Make the error reporting a little
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index d31441dabe..5c002af9d5 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -142,8 +142,8 @@ make_folder_name (mail_folder_info *mfi)
/* the way the logic is now, an outbox folder simply doesn't have
* its unread count displayed. Makes sense to me at the moment. */
- if (mfi->flags & MAIL_FIF_FOLDER_VALID && mfi->folder == outbox_folder) {
- if (mfi->flags & MAIL_FIF_TOTAL_VALID)
+ if (mfi->flags & MAIL_FIF_FOLDER_VALID && mfi->folder == outbox_folder &&
+ mfi->flags & MAIL_FIF_TOTAL_VALID && mfi->total) {
g_string_sprintfa (work, " (%d unsent)", mfi->total);
} else if (mfi->flags & MAIL_FIF_UNREAD_VALID && mfi->unread)
g_string_sprintfa (work, " (%d)", mfi->unread);