aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog13
-rw-r--r--mail/mail-folder-cache.c3
2 files changed, 10 insertions, 6 deletions
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 <danw@ximian.com>
+
+ * 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 <lewing@ximian.com>
* mail-account-gui.c (menu_file_save_cb): call menu_file_save_error
@@ -38,7 +47,6 @@
2001-09-10 Jeffrey Stedfast <fejj@ximian.com>
->>>>>>> 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 <trow@ximian.com>
* 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 <peterw@ximian.com>
* 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 <cyba@gnome.pl>
* 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)) {