diff options
| -rw-r--r-- | camel/ChangeLog | 7 | ||||
| -rw-r--r-- | camel/camel-filter-driver.c | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index a2791753e7..e83fcc93c5 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,5 +1,12 @@ 2001-07-12 Jeffrey Stedfast <fejj@ximian.com> + * camel-filter-driver.c (camel_filter_driver_filter_message): + Okay, I've decided that that user is just on crack. We don't want + to allow filtering of deleted messages or we could get some + unexpected behavior. + +2001-07-12 Jeffrey Stedfast <fejj@ximian.com> + * camel-filter-driver.c (do_move): Only set p->copied and p->deleted if the messages are copied without an exception. (do_copy): Same - but obviously we don't set the p->deleted here diff --git a/camel/camel-filter-driver.c b/camel/camel-filter-driver.c index 06a0bc0824..adda54e27d 100644 --- a/camel/camel-filter-driver.c +++ b/camel/camel-filter-driver.c @@ -1,7 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * Copyright (C) 2000 Ximian Inc. - * Copyright (C) 2001 Ximian Inc. * * Authors: Michael Zucchi <notzed@ximian.com> * Jeffrey Stedfast <fejj@ximian.com> @@ -852,6 +851,9 @@ camel_filter_driver_filter_message (CamelFilterDriver *driver, CamelMimeMessage info = camel_message_info_new_from_header (h); freeinfo = TRUE; + } else { + if (info->flags & CAMEL_MESSAGE_DELETED) + return 0; } p->ex = ex; @@ -863,9 +865,6 @@ camel_filter_driver_filter_message (CamelFilterDriver *driver, CamelMimeMessage p->uid = uid; p->source = source; - if (info->flags & CAMEL_MESSAGE_DELETED) - p->deleted = TRUE; - if (original_source_url && camel_mime_message_get_source (message) == NULL) camel_mime_message_set_source (message, original_source_url); |