From d0196161ec51f0878bede0fa2163dc1c8ddf8990 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 11 Sep 2001 19:29:13 +0000 Subject: Don't set the folderinfo's unread count to 0 when camel reports -1, since * mail-folder-cache.c (mail_folder_cache_note_folderinfo): Don't set the folderinfo's unread count to 0 when camel reports -1, since that may overwrite a valid unread count from before. (get_folder_info): Do it here instead when first creating a new folderinfo structure. Should fix bug #1756. svn path=/trunk/; revision=12768 --- mail/ChangeLog | 13 +++++++++---- mail/mail-folder-cache.c | 3 +-- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index e9e5a842b2..e723733753 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,12 @@ +2001-09-11 Dan Winship + + * mail-folder-cache.c (mail_folder_cache_note_folderinfo): Don't + set the folderinfo's unread count to 0 when camel reports -1, + since that may overwrite a valid unread count from before. + (get_folder_info): Do it here instead when first creating a new + folderinfo structure. + Should fix bug #1756. + 2001-09-11 Larry Ewing * mail-account-gui.c (menu_file_save_cb): call menu_file_save_error @@ -38,7 +47,6 @@ 2001-09-10 Jeffrey Stedfast ->>>>>>> 1.1671 * mail-account-gui.c (mail_account_gui_new): Hide the S/MIME frame if we don't support S/MIME. @@ -63,7 +71,6 @@ mistake in previous commit that made it *always* complain you had invalid recipients. ->>>>>>> 1.1665 2001-09-09 Jon Trowbridge * mail-callbacks.c (composer_get_message): Complain if we are @@ -268,7 +275,6 @@ * mail-send-recv.c (build_dialogue): Fix capitalization. Fixes bug #7486. -======= 2001-09-04 Peter Williams * mail-local.c (mlf_init): Remove accidentally left-in "choke on @@ -311,7 +317,6 @@ (folder_browser_set_uri): Same. (got_folder): Same. ->>>>>>> 1.1642.2.4 2001-08-31 Zbigniew Chyla * mail-vfolder.c (vfolder_create_storage): Marked string for diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c index 10f0aeaf5b..a4174fa477 100644 --- a/mail/mail-folder-cache.c +++ b/mail/mail-folder-cache.c @@ -126,6 +126,7 @@ get_folder_info (const gchar *uri) mfi->update_info.es = NULL; mfi->timeout_id = 0; mfi->mail_info_id = 0; + mfi->unread = 0; g_hash_table_insert (folders, mfi->uri, mfi); } else @@ -830,8 +831,6 @@ mail_folder_cache_note_folderinfo (const gchar *uri, CamelFolderInfo *fi) if (fi->unread_message_count != -1) { mfi->unread = fi->unread_message_count; mfi->flags |= MAIL_FIF_UNREAD_VALID; - } else { - mfi->unread = 0; } if (!(mfi->flags & MAIL_FIF_NAME_VALID)) { -- cgit v1.2.3