From 59f095bfb5b92f8bd0205238f91fc3a2277de76c Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 27 Apr 2009 12:29:26 +0200 Subject: Hide last junked message too from the non-junk folder ** Fix for bug #579635 --- mail/message-list.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'mail/message-list.c') diff --git a/mail/message-list.c b/mail/message-list.c index c98ce04ace..3027fcf3e8 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -4056,7 +4056,8 @@ regen_list_exec (struct _regen_list_msg *m) CamelMessageInfo *looking_info = camel_folder_get_message_info (m->folder, looking_for); if (looking_info) { - gboolean was_deleted = (camel_message_info_flags (looking_info) & CAMEL_MESSAGE_DELETED) != 0; + gboolean is_deleted = (camel_message_info_flags (looking_info) & CAMEL_MESSAGE_DELETED) != 0; + gboolean is_junk = (camel_message_info_flags (looking_info) & CAMEL_MESSAGE_JUNK) != 0; /* I would really like to check for CAMEL_MESSAGE_FOLDER_FLAGGED on a message, so I would know whether it was changed locally, and then just check the changes @@ -4064,7 +4065,7 @@ regen_list_exec (struct _regen_list_msg *m) matter. So here just check whether the file was deleted and we show it based on the flag whether we can view deleted messages or not. */ - if (!was_deleted || (was_deleted && !m->hidedel)) + if ((!is_deleted || (is_deleted && !m->hidedel)) && (!is_junk || (is_junk && !m->hidejunk))) g_ptr_array_add (uids, (gpointer) camel_pstring_strdup (looking_for)); camel_folder_free_message_info (m->folder, looking_info); -- cgit