[evolution] Bug 600933 - Empty Trash missing for real trash folders
- From: Matthew Barnes <mbarnes src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evolution] Bug 600933 - Empty Trash missing for real trash folders
- Date: Sat, 14 Nov 2009 01:22:24 +0000 (UTC)
commit e3768ee53411f6c0e933c670fe9c67c93d558e32
Author: Matthew Barnes <mbarnes redhat com>
Date: Fri Nov 13 20:21:29 2009 -0500
Bug 600933 - Empty Trash missing for real trash folders
modules/mail/e-mail-shell-sidebar.c | 9 +++++++++
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 91d0a47..d182f98 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. */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]