From f5165c618ae2defb310a0ed4eab06dac7346a2b0 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Sat, 3 Oct 2009 12:15:17 +0300 Subject: Bug 597151 - [regression] Folder doesn't get deleted properly --- modules/mail/e-mail-shell-sidebar.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'modules') diff --git a/modules/mail/e-mail-shell-sidebar.c b/modules/mail/e-mail-shell-sidebar.c index b0e53c2d49..3db9bd674e 100644 --- a/modules/mail/e-mail-shell-sidebar.c +++ b/modules/mail/e-mail-shell-sidebar.c @@ -549,8 +549,10 @@ mail_shell_sidebar_check_state (EShellSidebar *shell_sidebar) (strcmp (full_name, "Sent") != 0) && (strcmp (full_name, "Templates") != 0); - folder = em_folder_tree_get_selected_folder (folder_tree); - is_outbox = em_utils_folder_is_outbox (folder, NULL); + if (!(folder_flags & CAMEL_FOLDER_HAS_BEEN_DELETED)) { + folder = em_folder_tree_get_selected_folder (folder_tree); + is_outbox = em_utils_folder_is_outbox (folder, NULL); + } can_delete &= !(folder_flags & CAMEL_FOLDER_SYSTEM); } -- cgit v1.2.3