Prevent folders from appearing to have -1 new messages. Prevent nonactive

2001-07-03  Peter Williams  <peterw@ximian.com>

	Prevent folders from appearing to have -1 new messages. Prevent
	nonactive folders from updating the title bar. Make the title
	bar update when switching to an already-opened folder.

	* mail-folder-cache.c (update_message_counts): Ignore the value for
	'unread' if it is -1.
	(get_mail_info_receive): Same
	(mail_folder_cache_note_folderinfo): Same.
	(get_folder_info): Initialize 'fb' to NULL.
	(mail_folder_info): Add 'fb' member.
	(mail_folder_cache_note_fb): Change note_message_list to this.
	(update_idle): Only update the ShellView if the active folder browser
	is the same as the one that the MFI references.
	(mail_folder_cache_set_folder_browser): New function. Use it to set
	the active folder browser. NULL is okay.
	(check_for_fb_match): Called from the above. If the MFI has the
	new folder browser as its view, queue an update.

	* mail-folder-cache.h: Fix prototypes.

	* mail-callbacks.c (create_folders): Check if fi->url is nonnull.

	* folder-browser.c (got_folder): Change to use note_fb instead of
	note_messge_list.

	* folder-browser-factory.c (control_activate): Set the folder browser
	(control_deactivate): Clear it here.
	(fb_get_svi): Kill some inappropriately cut-n-pasted code.

svn path=/trunk/; revision=10755

1 files changed, 2 insertions, 1 deletions

diff --git a/mail/mail-folder-cache.h b/mail/mail-folder-cache.h
index dbb4be7fd6..f31593956e 100644
--- a/mail/mail-folder-cache.h
+++ b/mail/mail-folder-cache.h
@@ -48,12 +48,13 @@ void mail_folder_cache_set_update_lstorage (const gchar *uri,
 /*void mail_folder_cache_set_update_shellview (const gchar *uri);*/
 
 void mail_folder_cache_note_folder         (const gchar *uri, CamelFolder *folder);
-void mail_folder_cache_note_message_list   (const gchar *uri, MessageList *ml);
+void mail_folder_cache_note_fb             (const gchar *uri, FolderBrowser *fb);
 void mail_folder_cache_note_folderinfo     (const gchar *uri, CamelFolderInfo *fi);
 void mail_folder_cache_note_name           (const gchar *uri, const gchar *name);
 
 CamelFolder *mail_folder_cache_try_folder  (const gchar *uri);
 
 void mail_folder_cache_set_shell_view      (GNOME_Evolution_ShellView sv);
+void mail_folder_cache_set_folder_browser  (FolderBrowser *fb);
 
 #endif