aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucian Langa <lucilanga@gnome.org>2009-10-03 17:15:17 +0800
committerLucian Langa <lucilanga@gnome.org>2009-10-03 17:15:48 +0800
commitf5165c618ae2defb310a0ed4eab06dac7346a2b0 (patch)
treeff6d9e9412485b3a65a62192ace3bc0e23530654
parent6fced70ee07656daf73bf13cab658bf4c2a6baac (diff)
downloadgsoc2013-evolution-f5165c618ae2defb310a0ed4eab06dac7346a2b0.tar
gsoc2013-evolution-f5165c618ae2defb310a0ed4eab06dac7346a2b0.tar.gz
gsoc2013-evolution-f5165c618ae2defb310a0ed4eab06dac7346a2b0.tar.bz2
gsoc2013-evolution-f5165c618ae2defb310a0ed4eab06dac7346a2b0.tar.lz
gsoc2013-evolution-f5165c618ae2defb310a0ed4eab06dac7346a2b0.tar.xz
gsoc2013-evolution-f5165c618ae2defb310a0ed4eab06dac7346a2b0.tar.zst
gsoc2013-evolution-f5165c618ae2defb310a0ed4eab06dac7346a2b0.zip
Bug 597151 - [regression] Folder doesn't get deleted properly
-rw-r--r--modules/mail/e-mail-shell-sidebar.c6
1 files changed, 4 insertions, 2 deletions
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);
}