aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/mail-ops.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 19362691ab..4635e70c9d 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,4 +1,10 @@
+2001-07-03 Dan Winship <danw@ximian.com>
+
+ * mail-ops.c (filter_folder_filter): Don't pass a dirty exception
+ to camel_folder_sync. Fixes an IMAP filtering crash.
+
2001-07-02 Sam Creasey <sammy@oh.verio.com>
+
* mail-account-editor-news.c: Added an MailAccountEditorNews, for
NNTP configuratuion. Based on MailAccountEditor, but stripped.
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 43c83f78e4..5f6dd7f2e2 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -114,7 +114,7 @@ filter_folder_filter(struct _mail_msg *mm)
camel_folder_free_uids (folder, folder_uids);
/* sync and expunge */
- camel_folder_sync (folder, TRUE, &mm->ex);
+ camel_folder_sync (folder, TRUE, camel_exception_is_set (&mm->ex) ? NULL : &mm->ex);
camel_folder_thaw (folder);
if (m->destination)