[evolution/webkit] Bug #223838 - Do not share global Sent folder view with regular folders

[Dan VrÃtil <dvratil src gnome org>]

commit b309a916e65506b6c0ca39dbbe0f69c421648409
Author: Milan Crha <mcrha redhat com>
Date:   Thu Mar 10 14:27:39 2011 +0100

    Bug #223838 - Do not share global Sent folder view with regular folders

 mail/e-mail-paned-view.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c
index 9be44e0..715d2ee 100644
--- a/mail/e-mail-paned-view.c
+++ b/mail/e-mail-paned-view.c
@@ -769,8 +769,13 @@ mail_paned_view_update_view_instance (EMailView *view)
 	view_id = g_strdup (folder_uri);
 	e_filename_make_safe (view_id);
 
+	outgoing_folder =
+		em_utils_folder_is_drafts (folder, folder_uri) ||
+		em_utils_folder_is_outbox (folder, folder_uri) ||
+		em_utils_folder_is_sent (folder, folder_uri);
+
 	if (e_shell_settings_get_boolean (shell_settings, "mail-global-view-setting"))
-		view_instance = e_shell_view_new_view_instance (shell_view, "global_view_setting");
+		view_instance = e_shell_view_new_view_instance (shell_view, outgoing_folder ? "global_view_sent_setting" : "global_view_setting");
 	else
 		view_instance = e_shell_view_new_view_instance (shell_view, view_id);
 
@@ -812,11 +817,6 @@ mail_paned_view_update_view_instance (EMailView *view)
 
 	g_free (view_id);
 
-	outgoing_folder =
-		em_utils_folder_is_drafts (folder, folder_uri) ||
-		em_utils_folder_is_outbox (folder, folder_uri) ||
-		em_utils_folder_is_sent (folder, folder_uri);
-
 	if (outgoing_folder) {
 		if (show_vertical_view)
 			gal_view_instance_set_default_view (