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

4 files changed, 20 insertions, 8 deletions

diff --git a/camel/providers/local/camel-maildir-folder.c b/camel/providers/local/camel-maildir-folder.c
index 7bf998bff9..05fdd70e10 100644
--- a/camel/providers/local/camel-maildir-folder.c
+++ b/camel/providers/local/camel-maildir-folder.c
@@ -52,7 +52,7 @@ static CamelLocalFolderClass *parent_class = NULL;
 
 static CamelLocalSummary *maildir_create_summary(const char *path, const char *folder, CamelIndex *index);
 
-static void maildir_append_message(CamelFolder * folder, CamelMimeMessage * message, const CamelMessageInfo *info, CamelException * ex);
+static void maildir_append_message(CamelFolder * folder, CamelMimeMessage * message, const CamelMessageInfo *info, char **appended_uid, CamelException * ex);
 static CamelMimeMessage *maildir_get_message(CamelFolder * folder, const gchar * uid, CamelException * ex);
 
 static void maildir_finalize(CamelObject * object);
@@ -126,7 +126,7 @@ static CamelLocalSummary *maildir_create_summary(const char *path, const char *f
 }
 
 static void
-maildir_append_message (CamelFolder *folder, CamelMimeMessage *message, const CamelMessageInfo *info, CamelException *ex)
+maildir_append_message (CamelFolder *folder, CamelMimeMessage *message, const CamelMessageInfo *info, char **appended_uid, CamelException *ex)
 {
 	CamelMaildirFolder *maildir_folder = (CamelMaildirFolder *)folder;
 	CamelLocalFolder *lf = (CamelLocalFolder *)folder;
@@ -168,6 +168,9 @@ maildir_append_message (CamelFolder *folder, CamelMimeMessage *message, const Ca
 				    ((CamelLocalFolder *)maildir_folder)->changes);
 	camel_folder_change_info_clear (((CamelLocalFolder *)maildir_folder)->changes);
 	
+	if (appended_uid)
+		*appended_uid = g_strdup(camel_message_info_uid(mi));
+
 	return;
 	
  fail_write:
diff --git a/camel/providers/local/camel-mbox-folder.c b/camel/providers/local/camel-mbox-folder.c
index bef6b64436..0d4a61739d 100644
--- a/camel/providers/local/camel-mbox-folder.c
+++ b/camel/providers/local/camel-mbox-folder.c
@@ -58,7 +58,7 @@ static void mbox_unlock(CamelLocalFolder *lf);
 static void mbox_set_message_user_flag(CamelFolder *folder, const char *uid, const char *name, gboolean value);
 static void mbox_set_message_user_tag(CamelFolder *folder, const char *uid, const char *name, const char *value);
 
-static void mbox_append_message(CamelFolder *folder, CamelMimeMessage * message, const CamelMessageInfo * info,	CamelException *ex);
+static void mbox_append_message(CamelFolder *folder, CamelMimeMessage * message, const CamelMessageInfo * info,	char **appended_uid, CamelException *ex);
 static CamelMimeMessage *mbox_get_message(CamelFolder *folder, const gchar * uid, CamelException *ex);
 static CamelLocalSummary *mbox_create_summary(const char *path, const char *folder, CamelIndex *index);
 
@@ -172,7 +172,7 @@ static void mbox_unlock(CamelLocalFolder *lf)
 }
 
 static void
-mbox_append_message(CamelFolder *folder, CamelMimeMessage * message, const CamelMessageInfo * info, CamelException *ex)
+mbox_append_message(CamelFolder *folder, CamelMimeMessage * message, const CamelMessageInfo * info, char **appended_uid, CamelException *ex)
 {
 	CamelLocalFolder *lf = (CamelLocalFolder *)folder;
 	CamelStream *output_stream = NULL, *filter_stream = NULL;
@@ -257,6 +257,9 @@ mbox_append_message(CamelFolder *folder, CamelMimeMessage * message, const Camel
 		camel_folder_change_info_clear(lf->changes);
 	}
 
+	if (appended_uid)
+		*appended_uid = g_strdup(camel_message_info_uid(mi));
+
 	return;
 
 fail_write:
diff --git a/camel/providers/local/camel-mh-folder.c b/camel/providers/local/camel-mh-folder.c
index 3d08bdb60a..396435da0e 100644
--- a/camel/providers/local/camel-mh-folder.c
+++ b/camel/providers/local/camel-mh-folder.c
@@ -52,7 +52,7 @@ static CamelLocalFolderClass *parent_class = NULL;
 
 static CamelLocalSummary *mh_create_summary(const char *path, const char *folder, CamelIndex *index);
 
-static void mh_append_message(CamelFolder * folder, CamelMimeMessage * message, const CamelMessageInfo *info, CamelException * ex);
+static void mh_append_message(CamelFolder * folder, CamelMimeMessage * message, const CamelMessageInfo *info, char **appended_uid, CamelException * ex);
 static CamelMimeMessage *mh_get_message(CamelFolder * folder, const gchar * uid, CamelException * ex);
 
 static void mh_finalize(CamelObject * object);
@@ -121,7 +121,7 @@ static CamelLocalSummary *mh_create_summary(const char *path, const char *folder
 }
 
 static void
-mh_append_message (CamelFolder *folder, CamelMimeMessage *message, const CamelMessageInfo *info, CamelException *ex)
+mh_append_message (CamelFolder *folder, CamelMimeMessage *message, const CamelMessageInfo *info, char **appended_uid, CamelException *ex)
 {
 	CamelMhFolder *mh_folder = (CamelMhFolder *)folder;
 	CamelLocalFolder *lf = (CamelLocalFolder *)folder;
@@ -159,6 +159,9 @@ mh_append_message (CamelFolder *folder, CamelMimeMessage *message, const CamelMe
 				    ((CamelLocalFolder *)mh_folder)->changes);
 	camel_folder_change_info_clear (((CamelLocalFolder *)mh_folder)->changes);
 	
+	if (appended_uid)
+		*appended_uid = g_strdup(camel_message_info_uid(mi));
+
 	return;
 	
  fail_write:
diff --git a/camel/providers/local/camel-spool-folder.c b/camel/providers/local/camel-spool-folder.c
index 3728b26fa2..a519c58683 100644
--- a/camel/providers/local/camel-spool-folder.c
+++ b/camel/providers/local/camel-spool-folder.c
@@ -66,7 +66,7 @@ static GPtrArray *spool_search_by_expression(CamelFolder *folder, const char *ex
 static GPtrArray *spool_search_by_uids(CamelFolder *folder, const char *expression, GPtrArray *uids, CamelException *ex);
 static void spool_search_free(CamelFolder *folder, GPtrArray * result);
 
-static void spool_append_message(CamelFolder *folder, CamelMimeMessage * message, const CamelMessageInfo * info, CamelException *ex);
+static void spool_append_message(CamelFolder *folder, CamelMimeMessage * message, const CamelMessageInfo * info, char **appended_uid, CamelException *ex);
 static CamelMimeMessage *spool_get_message(CamelFolder *folder, const gchar * uid, CamelException *ex);
 static void spool_set_message_user_flag(CamelFolder *folder, const char *uid, const char *name, gboolean value);
 static void spool_set_message_user_tag(CamelFolder *folder, const char *uid, const char *name, const char *value);
@@ -423,7 +423,7 @@ spool_search_free(CamelFolder *folder, GPtrArray * result)
 }
 
 static void
-spool_append_message(CamelFolder *folder, CamelMimeMessage * message, const CamelMessageInfo * info, CamelException *ex)
+spool_append_message(CamelFolder *folder, CamelMimeMessage * message, const CamelMessageInfo * info, char **appended_uid, CamelException *ex)
 {
 	CamelSpoolFolder *lf = (CamelSpoolFolder *)folder;
 	CamelStream *output_stream = NULL, *filter_stream = NULL;
@@ -508,6 +508,9 @@ spool_append_message(CamelFolder *folder, CamelMimeMessage * message, const Came
 		camel_folder_change_info_clear(lf->changes);
 	}
 
+	if (appended_uid)
+		*appended_uid = g_strdup(camel_message_info_uid(mi));
+
 	return;
 
 fail_write: