From 5989073e50a8b995de12aec72fca5528a9c22f9c Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 10 Mar 2011 14:27:39 +0100 Subject: Bug #223838 - Do not share global Sent folder view with regular folders --- mail/e-mail-paned-view.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'mail') diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c index 2f98ebf61e..f1d5cf1509 100644 --- a/mail/e-mail-paned-view.c +++ b/mail/e-mail-paned-view.c @@ -767,8 +767,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); @@ -810,11 +815,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 ( -- cgit