diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 3 | ||||
| -rw-r--r-- | mail/message-list.c | 21 |
2 files changed, 14 insertions, 10 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index e03e667e17..a0fffd755d 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,8 @@ 2001-05-23 Jeffrey Stedfast <fejj@ximian.com> + * message-list.c (message_list_set_folder): Make the message-list + respect the "hide deleted messages" setting. Fixes bug #2248. + * component-factory.c (xfer_folder): New function that the shell component calls to copy/move a folder. (component_fn): Set the xfer_folder_fn argument. diff --git a/mail/message-list.c b/mail/message-list.c index 9d87ad65ae..15f843aaf3 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -1994,19 +1994,20 @@ message_list_set_folder (MessageList *message_list, CamelFolder *camel_folder, g if (camel_folder) { /* build the etree suitable for this folder */ - message_list_setup_etree(message_list, outgoing); + message_list_setup_etree (message_list, outgoing); - camel_object_hook_event(CAMEL_OBJECT (camel_folder), "folder_changed", - folder_changed, message_list); - camel_object_hook_event(CAMEL_OBJECT (camel_folder), "message_changed", - message_changed, message_list); + camel_object_hook_event (CAMEL_OBJECT (camel_folder), "folder_changed", + folder_changed, message_list); + camel_object_hook_event (CAMEL_OBJECT (camel_folder), "message_changed", + message_changed, message_list); camel_object_ref (CAMEL_OBJECT (camel_folder)); - - message_list->hidedeleted = !(CAMEL_IS_VTRASH_FOLDER(camel_folder)); - - hide_load_state(message_list); - mail_regen_list(message_list, message_list->search, NULL, NULL); + + message_list->hidedeleted = mail_config_get_hide_deleted () && + !(CAMEL_IS_VTRASH_FOLDER (camel_folder)); + + hide_load_state (message_list); + mail_regen_list (message_list, message_list->search, NULL, NULL); } } |