From e3768ee53411f6c0e933c670fe9c67c93d558e32 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 13 Nov 2009 20:21:29 -0500 Subject: =?UTF-8?q?Bug=C2=A0600933=20-=20Empty=20Trash=20missing=20for=20r?= =?UTF-8?q?eal=20trash=20folders?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mail/e-mail-shell-sidebar.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'modules/mail') diff --git a/modules/mail/e-mail-shell-sidebar.c b/modules/mail/e-mail-shell-sidebar.c index 91d0a47072..d182f98426 100644 --- a/modules/mail/e-mail-shell-sidebar.c +++ b/modules/mail/e-mail-shell-sidebar.c @@ -560,8 +560,17 @@ mail_shell_sidebar_check_state (EShellSidebar *shell_sidebar) COL_STRING_URI, &uri, -1); if (!is_store && full_name != NULL) { + guint32 folder_type; + + /* Is this a virtual junk or trash folder? */ is_junk = (strcmp (full_name, CAMEL_VJUNK_NAME) == 0); is_trash = (strcmp (full_name, CAMEL_VTRASH_NAME) == 0); + + /* Is this is a real trash folder? */ + /* Used by Exchange and GroupWise accounts. */ + folder_type = (folder_flags & CAMEL_FOLDER_TYPE_MASK); + is_trash |= (folder_type == CAMEL_FOLDER_TYPE_TRASH); + allows_children = !(is_junk || is_trash); /* Don't allow deletion of special local folders. */ -- cgit v1.2.3