If the original message is deleted, reset the deleted flag when we're

2002-09-23  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-folder.c (transfer_message_to): If the original message is
	deleted, reset the deleted flag when we're done. Fixes bug #30876.

svn path=/trunk/; revision=18181
This commit is contained in:
Jeffrey Stedfast
2002-09-23 20:48:50 +00:00
committed by Jeffrey Stedfast
parent 7c9d24b12e
commit eb2fce3e48
2 changed files with 8 additions and 3 deletions

View File

@ -1,5 +1,8 @@
2002-09-23 Jeffrey Stedfast <fejj@ximian.com>
* camel-folder.c (transfer_message_to): If the original message is
deleted, reset the deleted flag when we're done. Fixes bug #30876.
* providers/imap/camel-imap-folder.c (add_message_from_data):
Decode the INTERNALDATE if we've got one.
(imap_update_summary): Instead of requesting a list of specific

View File

@ -1281,15 +1281,17 @@ transfer_message_to (CamelFolder *source, const char *uid, CamelFolder *dest,
info = camel_message_info_new_from_header (((CamelMimePart *)msg)->headers);
/* we don't want to retain the deleted flag */
if (info && info->flags & CAMEL_MESSAGE_DELETED)
if (info && info->flags & CAMEL_MESSAGE_DELETED) {
info->flags = info->flags & ~CAMEL_MESSAGE_DELETED;
delete_original = TRUE;
}
camel_folder_append_message (dest, msg, info, transferred_uid, ex);
camel_object_unref (CAMEL_OBJECT (msg));
if (delete_original && !camel_exception_is_set (ex))
camel_folder_set_message_flags (source, uid, CAMEL_MESSAGE_DELETED|CAMEL_MESSAGE_SEEN, ~0);
if (info) {
if (source->folder_flags & CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY)
CF_CLASS (source)->free_message_info (source, info);