diff options
| author | Milan Crha <mcrha@redhat.com> | 2010-06-15 22:10:03 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2010-06-15 22:10:03 +0800 |
| commit | 3acb21484e8b93916641dcd0a9b13fed2488a1ef (patch) | |
| tree | 8bf948e3ba013f66eed7260e914f5744d643300c /mail/message-list.c | |
| parent | da4b198ffa205cafc5de986085e77e1b8cc47408 (diff) | |
| download | gsoc2013-evolution-3acb21484e8b93916641dcd0a9b13fed2488a1ef.tar gsoc2013-evolution-3acb21484e8b93916641dcd0a9b13fed2488a1ef.tar.gz gsoc2013-evolution-3acb21484e8b93916641dcd0a9b13fed2488a1ef.tar.bz2 gsoc2013-evolution-3acb21484e8b93916641dcd0a9b13fed2488a1ef.tar.lz gsoc2013-evolution-3acb21484e8b93916641dcd0a9b13fed2488a1ef.tar.xz gsoc2013-evolution-3acb21484e8b93916641dcd0a9b13fed2488a1ef.tar.zst gsoc2013-evolution-3acb21484e8b93916641dcd0a9b13fed2488a1ef.zip | |
Bug #206061 - Allow normal, non-vFolder, Trash and Junk folder
Diffstat (limited to 'mail/message-list.c')
| -rw-r--r-- | mail/message-list.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mail/message-list.c b/mail/message-list.c index 28cffc1352..29776a221f 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -3581,6 +3581,7 @@ message_list_set_folder (MessageList *message_list, CamelFolder *folder, const g ETreeModel *etm = message_list->model; gboolean hide_deleted; GConfClient *gconf; + CamelStore *folder_store; CamelException ex; g_return_if_fail (IS_MESSAGE_LIST (message_list)); @@ -3645,8 +3646,11 @@ message_list_set_folder (MessageList *message_list, CamelFolder *folder, const g message_list->folder = folder; message_list->just_set_folder = TRUE; + /* hide deleted messages also when the store has a real trash */ + folder_store = camel_folder_get_parent_store (folder); + /* Setup the strikeout effect for non-trash folders */ - if (!(folder->folder_flags & CAMEL_FOLDER_IS_TRASH)) + if (!(folder->folder_flags & CAMEL_FOLDER_IS_TRASH) || !(folder_store->flags & CAMEL_STORE_VTRASH)) strikeout_col = COL_DELETED; cell = e_table_extras_get_cell (message_list->extras, "render_date"); @@ -3673,7 +3677,7 @@ message_list_set_folder (MessageList *message_list, CamelFolder *folder, const g gconf = mail_config_get_gconf_client (); hide_deleted = !gconf_client_get_bool (gconf, "/apps/evolution/mail/display/show_deleted", NULL); - message_list->hidedeleted = hide_deleted && !(folder->folder_flags & CAMEL_FOLDER_IS_TRASH); + message_list->hidedeleted = hide_deleted && (!(folder->folder_flags & CAMEL_FOLDER_IS_TRASH) || !(folder_store->flags & CAMEL_STORE_VTRASH)); message_list->hidejunk = folder_store_supports_vjunk_folder (message_list->folder) && !(folder->folder_flags & CAMEL_FOLDER_IS_JUNK) && !(folder->folder_flags & CAMEL_FOLDER_IS_TRASH); if (message_list->frozen == 0) |