diff options
| author | Dan Winship <danw@src.gnome.org> | 2001-10-09 11:08:29 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2001-10-09 11:08:29 +0800 |
| commit | eb6606cf3fdf33198a5ab5d9b388155c012f5da5 (patch) | |
| tree | f2399da09111128c2a6d2d79fc918f1b5e329127 /mail/message-list.c | |
| parent | 5931b31034fb4d19482e517f6d8e5508fa1da908 (diff) | |
| download | gsoc2013-evolution-eb6606cf3fdf33198a5ab5d9b388155c012f5da5.tar.gz gsoc2013-evolution-eb6606cf3fdf33198a5ab5d9b388155c012f5da5.tar.zst gsoc2013-evolution-eb6606cf3fdf33198a5ab5d9b388155c012f5da5.zip | |
Update for folder_flags.
* mail-local.c (mlf_set_folder, mlf_unset_folder): Update for
folder_flags.
* folder-browser-ui.c (folder_browser_ui_add_list): Check
CAMEL_FOLDER_IS_TRASH flag rather than checking
CAMEL_IS_VTRASH_FOLDER.
* folder-browser.c (folder_browser_toggle_hide_deleted): Likewise
* message-list.c (message_list_set_folder): Likewise.
(message_list_set_hidedeleted): Remove redundant trash check.
svn path=/trunk/; revision=13510
Diffstat (limited to 'mail/message-list.c')
| -rw-r--r-- | mail/message-list.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/mail/message-list.c b/mail/message-list.c index 695e1b7f17..fdb6e912c7 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -34,7 +34,6 @@ #include <camel/camel-file-utils.h> #include <camel/camel-folder.h> #include <camel/camel-folder-thread.h> -#include <camel/camel-vtrash-folder.h> #include <e-util/ename/e-name-western.h> #include <e-util/e-memory.h> @@ -1937,8 +1936,8 @@ message_list_set_folder (MessageList *message_list, CamelFolder *camel_folder, g } if (camel_folder) { - /* Setup the strikeout effect for non-vtrash folders */ - if (!CAMEL_IS_VTRASH_FOLDER (camel_folder)) { + /* Setup the strikeout effect for non-trash folders */ + if (!(camel_folder->folder_flags & CAMEL_FOLDER_IS_TRASH)) { ECell *cell; cell = e_table_extras_get_cell (message_list->extras, "render_date"); @@ -1968,7 +1967,7 @@ message_list_set_folder (MessageList *message_list, CamelFolder *camel_folder, g camel_object_ref (CAMEL_OBJECT (camel_folder)); message_list->hidedeleted = mail_config_get_hide_deleted () && - !(CAMEL_IS_VTRASH_FOLDER (camel_folder)); + !(camel_folder->folder_flags & CAMEL_FOLDER_IS_TRASH); hide_load_state (message_list); mail_regen_list (message_list, message_list->search, NULL, NULL); @@ -2106,9 +2105,6 @@ message_list_set_threaded (MessageList *ml, gboolean threaded) void message_list_set_hidedeleted (MessageList *ml, gboolean hidedeleted) { - if (ml->folder && CAMEL_IS_VTRASH_FOLDER (ml->folder)) - hidedeleted = FALSE; - if (ml->hidedeleted != hidedeleted) { ml->hidedeleted = hidedeleted; |