aboutsummaryrefslogtreecommitdiffstats
path: root/mail/e-mail-paned-view.c
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2011-03-10 21:27:39 +0800
committerMilan Crha <mcrha@redhat.com>2011-03-10 21:27:39 +0800
commit5989073e50a8b995de12aec72fca5528a9c22f9c (patch)
tree94918f8d57a7e6cddb2b81beb6ebed8e4fe41ba6 /mail/e-mail-paned-view.c
parentac59607b758a024e0d9308a3a2ef71de57436311 (diff)
downloadgsoc2013-evolution-5989073e50a8b995de12aec72fca5528a9c22f9c.tar.gz
gsoc2013-evolution-5989073e50a8b995de12aec72fca5528a9c22f9c.tar.zst
gsoc2013-evolution-5989073e50a8b995de12aec72fca5528a9c22f9c.zip
Bug #223838 - Do not share global Sent folder view with regular folders
Diffstat (limited to 'mail/e-mail-paned-view.c')
-rw-r--r--mail/e-mail-paned-view.c12
1 files changed, 6 insertions, 6 deletions
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 (