From 6952dcb7c0821d705fad562ff5b96613b7c7b248 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Fri, 10 May 2002 16:44:36 +0000 Subject: Replace copy_messages_to and move_messages_to with a single function that * camel-folder.c (camel_folder_transfer_messages_to): Replace copy_messages_to and move_messages_to with a single function that just takes a "delete_originals" flag. Also, use the vtrash implementation if *either* folder is a vtrash. (transfer_messages_to): Make this use camel_operation_progress (previously move_messages_to did but copy_messages_to didn't), and freeze/thaw the folder(s) if doing multiple messages. * camel-vtrash-folder.c (vtrash_transfer_messages_to): Update for move/copy merge. Move the "move messages into vtrash" code here from mail-ops.c. Now all of the vtrash move/copy special casing is in camel instead of half of it being here and half in mail/. (This should also make it so that "Move to Trash" will work in filter rules.) * camel-vee-folder.c (vee_transfer_messages_to): Make this just return an exception, since it will only be called when trying to move/copy messages from one vfolder to another. (vee_append_message): Add this too so we get a nicer error message than the default "unimplemented" one in camel-folder.c. * camel-digest-folder.c: Replace copy_messages_to and move_messages_to with transfer_messages_to. * camel-disco-folder.c: Likewise * camel-disco-diary.c (camel_disco_diary_log, camel_disco_diary_replay): replace MOVE/COPY with TRANSFER. * providers/imap/camel-imap-folder.c (imap_transfer_offline, imap_transfer_online, imap_transfer_resyncing): Update for changes. (This ends up being a bit more complicated than it was before for now, but later disconnected operation changes should resimplify it.) * camel-filter-driver.c (camel_filter_driver_filter_message, do_copy, do_move): Use transfer_messages_to instead of copy. svn path=/trunk/; revision=16744 --- camel/camel-folder.h | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'camel/camel-folder.h') diff --git a/camel/camel-folder.h b/camel/camel-folder.h index fb987922c6..f2f6e59347 100644 --- a/camel/camel-folder.h +++ b/camel/camel-folder.h @@ -144,15 +144,11 @@ typedef struct { void (*ref_message_info) (CamelFolder *, CamelMessageInfo *); void (*free_message_info) (CamelFolder *, CamelMessageInfo *); - void (*copy_messages_to) (CamelFolder *source, - GPtrArray *uids, - CamelFolder *destination, - CamelException *ex); - - void (*move_messages_to) (CamelFolder *source, - GPtrArray *uids, - CamelFolder *destination, - CamelException *ex); + void (*transfer_messages_to) (CamelFolder *source, + GPtrArray *uids, + CamelFolder *destination, + gboolean delete_originals, + CamelException *ex); void (*delete) (CamelFolder *folder); void (*rename) (CamelFolder *folder, const char *newname); @@ -262,14 +258,10 @@ CamelMessageInfo *camel_folder_get_message_info (CamelFolder *folder, const cha void camel_folder_free_message_info (CamelFolder *folder, CamelMessageInfo *info); void camel_folder_ref_message_info (CamelFolder *folder, CamelMessageInfo *info); -void camel_folder_copy_messages_to (CamelFolder *source, - GPtrArray *uids, - CamelFolder *dest, - CamelException *ex); - -void camel_folder_move_messages_to (CamelFolder *source, +void camel_folder_transfer_messages_to (CamelFolder *source, GPtrArray *uids, CamelFolder *dest, + gboolean delete_originals, CamelException *ex); void camel_folder_delete (CamelFolder *folder); -- cgit