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, 4 insertions, 5 deletions

diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index a3ad7f2fbe..a52f3cd28e 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -64,11 +64,7 @@ fb_get_svi (BonoboControl *control)
 							      &ev);
 	CORBA_exception_free (&ev);
 
-	if (shell_view_interface != CORBA_OBJECT_NIL)
-		gtk_object_set_data (GTK_OBJECT (control),
-				     "mail_threads_shell_view_interface",
-				     shell_view_interface);
-	else
+	if (shell_view_interface == CORBA_OBJECT_NIL)
 		g_warning ("Control frame doesn't have Evolution/ShellView.");
 
 	return shell_view_interface;
@@ -97,6 +93,7 @@ control_activate (BonoboControl     *control,
 	folder_browser_ui_add_message (fb);
 
 	mail_folder_cache_set_shell_view (fb_get_svi (control));
+	mail_folder_cache_set_folder_browser (fb);
 
 	if (fb->folder)
 		mail_refresh_folder (fb->folder, NULL, NULL);
@@ -107,6 +104,8 @@ control_deactivate (BonoboControl     *control,
 		    BonoboUIComponent *uic,
 		    FolderBrowser     *fb)
 {
+	mail_folder_cache_set_folder_browser (NULL);
+
 	folder_browser_ui_rm_list (fb);
 	folder_browser_ui_rm_all (fb);