diff options
Diffstat (limited to 'camel/camel-vtrash-folder.c')
| -rw-r--r-- | camel/camel-vtrash-folder.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/camel/camel-vtrash-folder.c b/camel/camel-vtrash-folder.c index 5b09047abb..5c6e993c4f 100644 --- a/camel/camel-vtrash-folder.c +++ b/camel/camel-vtrash-folder.c @@ -36,8 +36,11 @@ static CamelVeeFolderClass *camel_vtrash_folder_parent; static void vtrash_append_message (CamelFolder *folder, CamelMimeMessage *message, - const CamelMessageInfo *info, CamelException *ex); -static void vtrash_transfer_messages_to (CamelFolder *folder, GPtrArray *uids, CamelFolder *dest, gboolean delete_originals, CamelException *ex); + const CamelMessageInfo *info, char **appended_uid, + CamelException *ex); +static void vtrash_transfer_messages_to (CamelFolder *folder, GPtrArray *uids, + CamelFolder *dest, GPtrArray **transferred_uids, + gboolean delete_originals, CamelException *ex); static void camel_vtrash_folder_class_init (CamelVTrashFolderClass *klass) @@ -102,7 +105,9 @@ camel_vtrash_folder_new (CamelStore *parent_store, const char *name) } static void -vtrash_append_message (CamelFolder *folder, CamelMimeMessage *message, const CamelMessageInfo *info, CamelException *ex) +vtrash_append_message (CamelFolder *folder, CamelMimeMessage *message, + const CamelMessageInfo *info, char **appended_uid, + CamelException *ex) { /* no-op */ } @@ -120,7 +125,7 @@ transfer_messages(CamelFolder *folder, struct _transfer_data *md, CamelException int i; if (!camel_exception_is_set (ex)) - camel_folder_transfer_messages_to(md->folder, md->uids, md->dest, md->delete, ex); + camel_folder_transfer_messages_to(md->folder, md->uids, md->dest, NULL, md->delete, ex); for (i=0;i<md->uids->len;i++) g_free(md->uids->pdata[i]); @@ -130,7 +135,9 @@ transfer_messages(CamelFolder *folder, struct _transfer_data *md, CamelException } static void -vtrash_transfer_messages_to (CamelFolder *source, GPtrArray *uids, CamelFolder *dest, gboolean delete_originals, CamelException *ex) +vtrash_transfer_messages_to (CamelFolder *source, GPtrArray *uids, + CamelFolder *dest, GPtrArray **transferred_uids, + gboolean delete_originals, CamelException *ex) { CamelVeeMessageInfo *mi; int i; @@ -143,6 +150,9 @@ vtrash_transfer_messages_to (CamelFolder *source, GPtrArray *uids, CamelFolder * * since a store should never have more than one). */ + if (transferred_uids) + *transferred_uids = NULL; + if (CAMEL_IS_VTRASH_FOLDER (dest)) { /* Copy to trash is meaningless. */ if (!delete_originals) |