aboutsummaryrefslogtreecommitdiffstats
path: root/modules/mail
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-11-14 09:21:29 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-11-14 09:21:29 +0800
commite3768ee53411f6c0e933c670fe9c67c93d558e32 (patch)
tree0fba66184e3c832ab610571ddb008523cb32cf7f /modules/mail
parent47b9eab312da9039d2bf3c6f5ab66755d7424225 (diff)
downloadgsoc2013-evolution-e3768ee53411f6c0e933c670fe9c67c93d558e32.tar
gsoc2013-evolution-e3768ee53411f6c0e933c670fe9c67c93d558e32.tar.gz
gsoc2013-evolution-e3768ee53411f6c0e933c670fe9c67c93d558e32.tar.bz2
gsoc2013-evolution-e3768ee53411f6c0e933c670fe9c67c93d558e32.tar.lz
gsoc2013-evolution-e3768ee53411f6c0e933c670fe9c67c93d558e32.tar.xz
gsoc2013-evolution-e3768ee53411f6c0e933c670fe9c67c93d558e32.tar.zst
gsoc2013-evolution-e3768ee53411f6c0e933c670fe9c67c93d558e32.zip
BugĀ 600933 - Empty Trash missing for real trash folders
Diffstat (limited to 'modules/mail')
-rw-r--r--modules/mail/e-mail-shell-sidebar.c9
1 files changed, 9 insertions, 0 deletions
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. */