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

1 files changed, 21 insertions, 5 deletions

diff --git a/camel/camel-disco-diary.c b/camel/camel-disco-diary.c
index 198ec607c8..8c41f2a098 100644
--- a/camel/camel-disco-diary.c
+++ b/camel/camel-disco-diary.c
@@ -307,7 +307,7 @@ camel_disco_diary_replay (CamelDiscoDiary *diary, CamelException *ex)
 		case CAMEL_DISCO_DIARY_FOLDER_APPEND:
 		{
 			CamelFolder *folder;
-			char *uid;
+			char *uid, *ret_uid;
 			CamelMimeMessage *message;
 			CamelMessageInfo *info;
 
@@ -328,18 +328,24 @@ camel_disco_diary_replay (CamelDiscoDiary *diary, CamelException *ex)
 			}
 			info = camel_folder_get_message_info (folder, uid);
 
-			camel_folder_append_message (folder, message, info, ex);
-			g_free (uid);
+			camel_folder_append_message (folder, message, info, &ret_uid, ex);
 			camel_folder_free_message_info (folder, info);
 
+			if (ret_uid) {
+				camel_disco_diary_uidmap_add (diary, uid, ret_uid);
+				g_free (ret_uid);
+			}
+			g_free (uid);
+
 			break;
 		}
 
 		case CAMEL_DISCO_DIARY_FOLDER_TRANSFER:
 		{
 			CamelFolder *source, *destination;
-			GPtrArray *uids;
+			GPtrArray *uids, *ret_uids;
 			guint32 delete_originals;
+			int i;
 
 			source = diary_decode_folder (diary);
 			destination = diary_decode_folder (diary);
@@ -354,7 +360,17 @@ camel_disco_diary_replay (CamelDiscoDiary *diary, CamelException *ex)
 				continue;
 			}
 
-			camel_folder_transfer_messages_to (source, uids, destination, delete_originals, ex);
+			camel_folder_transfer_messages_to (source, uids, destination, &ret_uids, delete_originals, ex);
+
+			if (ret_uids) {
+				for (i = 0; i < uids->len; i++) {
+					if (!ret_uids->pdata[i])
+						continue;
+					camel_disco_diary_uidmap_add (diary, uids->pdata[i], ret_uids->pdata[i]);
+					g_free (ret_uids->pdata[i]);
+				}
+				g_ptr_array_free (ret_uids, TRUE);
+			}
 			free_uids (uids);
 			break;
 		}