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, 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)