aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/mail-callbacks.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 9972633b9f..4e403e8c70 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-17 <NotZed@Ximian.com>
+
+ * mail-callbacks.c (empty_trash): Only empty trash on enabled
+ accounts, fixes #12821.
+
2001-10-17 Dan Winship <danw@ximian.com>
* mail-format.c (write_default_header): Make Reply-To bold too
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index b5cbe6c19e..48a3275692 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -2340,7 +2340,7 @@ empty_trash (BonoboUIComponent *uih, void *user_data, const char *path)
account = accounts->data;
/* make sure this is a valid source */
- if (account->source && account->source->url) {
+ if (account->source && account->source->enabled && account->source->url) {
provider = camel_session_get_provider (session, account->source->url, &ex);
if (provider) {
/* make sure this store is a remote store */