From c538852849865837c38a6603dcd4bf17124b03be Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Mon, 13 May 2002 16:15:29 +0000 Subject: Add a "char **appended_uid" argument, for the caller to optionally pass in * camel-folder.c (camel_folder_append_message): Add a "char **appended_uid" argument, for the caller to optionally pass in a variable to receive the UID of the appended message (if the provider knows it). (camel_folder_transfer_messages_to): Likewise, add "GPtrArray **transferred_uids" (transfer_messages_to): Update default implementation to handle transferred_uids. * camel-disco-folder.c (disco_append_message, disco_transfer_messages_to): Update for API changes. * camel-disco-diary.c (camel_disco_diary_replay): Update the diary's temporary uid->real uid map when replaying appends and transfers. * providers/imap/camel-imap-folder.c (imap_append_offline, imap_append_online, imap_transfer_offline): Pass back the new UIDs, when requested and available. (imap_append_resyncing): Pass back the new UIDs when requested and available. Remove the diary uidmap managing code since CamelDiscoDiary can handle that itself now. (imap_transfer_online, imap_transfer_resyncing): Update for new APIs, but don't actually pass back the new UIDs yet. (It's tricky since the COPYUID response may not be in the same order as the input uids.) * providers/local/camel-maildir-folder.c (maildir_append_message): Pass back the new UID if requested. * providers/local/camel-mbox-folder.c (mbox_append_message): Likewise. * providers/local/camel-mh-folder.c (mh_append_message): Likewise. * providers/local/camel-spool-folder.c (spool_append_message): Likewise. * camel-digest-folder.c (digest_append_message, digest_transfer_messages_to): Update for API changes. * camel-filter-driver.c (camel_filter_driver_filter_message, do_copy, do_move): Update for API changes. * camel-vee-folder.c (vee_append_message, vee_transfer_messages_to): Likewise. * camel-vtrash-folder.c (vtrash_append_message, vtrash_transfer_messages_to): Likewise. svn path=/trunk/; revision=16765 --- camel/camel-disco-folder.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) (limited to 'camel/camel-disco-folder.c') diff --git a/camel/camel-disco-folder.c b/camel/camel-disco-folder.c index d7c385c60b..965ceb0864 100644 --- a/camel/camel-disco-folder.c +++ b/camel/camel-disco-folder.c @@ -39,9 +39,10 @@ static void disco_sync (CamelFolder *folder, gboolean expunge, CamelException *e static void disco_expunge (CamelFolder *folder, CamelException *ex); static void disco_append_message (CamelFolder *folder, CamelMimeMessage *message, - const CamelMessageInfo *info, CamelException *ex); + const CamelMessageInfo *info, char **appended_uid, CamelException *ex); static void disco_transfer_messages_to (CamelFolder *source, GPtrArray *uids, CamelFolder *destination, + GPtrArray **transferred_uids, gboolean delete_originals, CamelException *ex); @@ -169,45 +170,52 @@ disco_expunge (CamelFolder *folder, CamelException *ex) static void disco_append_message (CamelFolder *folder, CamelMimeMessage *message, - const CamelMessageInfo *info, CamelException *ex) + const CamelMessageInfo *info, char **appended_uid, + CamelException *ex) { CamelDiscoStore *disco = CAMEL_DISCO_STORE (folder->parent_store); switch (camel_disco_store_status (disco)) { case CAMEL_DISCO_STORE_ONLINE: - CDF_CLASS (folder)->append_online (folder, message, info, ex); + CDF_CLASS (folder)->append_online (folder, message, info, + appended_uid, ex); break; case CAMEL_DISCO_STORE_OFFLINE: - CDF_CLASS (folder)->append_offline (folder, message, info, ex); + CDF_CLASS (folder)->append_offline (folder, message, info, + appended_uid, ex); break; case CAMEL_DISCO_STORE_RESYNCING: - CDF_CLASS (folder)->append_resyncing (folder, message, info, ex); + CDF_CLASS (folder)->append_resyncing (folder, message, info, + appended_uid, ex); break; } } static void disco_transfer_messages_to (CamelFolder *source, GPtrArray *uids, - CamelFolder *destination, + CamelFolder *dest, GPtrArray **transferred_uids, gboolean delete_originals, CamelException *ex) { CamelDiscoStore *disco = CAMEL_DISCO_STORE (source->parent_store); switch (camel_disco_store_status (disco)) { case CAMEL_DISCO_STORE_ONLINE: - CDF_CLASS (source)->transfer_online (source, uids, destination, + CDF_CLASS (source)->transfer_online (source, uids, + dest, transferred_uids, delete_originals, ex); break; case CAMEL_DISCO_STORE_OFFLINE: - CDF_CLASS (source)->transfer_offline (source, uids, destination, + CDF_CLASS (source)->transfer_offline (source, uids, + dest, transferred_uids, delete_originals, ex); break; case CAMEL_DISCO_STORE_RESYNCING: - CDF_CLASS (source)->transfer_resyncing (source, uids, destination, + CDF_CLASS (source)->transfer_resyncing (source, uids, + dest, transferred_uids, delete_originals, ex); break; } -- cgit v1.2.3