From 831d6dca44ecaa272b4ef5e1cfc29578e7ba5435 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sat, 30 Oct 2010 14:23:01 -0400
Subject: Kill mail_append_mail().

Use e_mail_folder_append_message() instead.
---
 mail/em-composer-utils.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'mail/em-composer-utils.c')

diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index f084155362..02eb039916 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -1665,15 +1665,13 @@ em_utils_handle_receipt (EMailSession *session,
 
 static void
 em_utils_receipt_done (CamelFolder *folder,
-                       CamelMimeMessage *msg,
-                       CamelMessageInfo *info,
-                       gint queued,
-                       const gchar *appended_uid,
-                       gpointer data)
+                       GAsyncResult *result,
+                       EMailSession *session)
 {
-	EMailSession *session = E_MAIL_SESSION (data);
+	/* FIXME Poor error handling. */
+	if (!e_mail_folder_append_message_finish (folder, result, NULL, NULL))
+		return;
 
-	camel_message_info_free (info);
 	mail_send (session);
 }
 
@@ -1812,8 +1810,13 @@ em_utils_send_receipt (EMailSession *session,
 	out_folder = e_mail_local_get_folder (E_MAIL_LOCAL_FOLDER_OUTBOX);
 	camel_message_info_set_flags (
 		info, CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN);
-	mail_append_mail (
-		out_folder, receipt, info, em_utils_receipt_done, session);
+
+	/* FIXME Pass a GCancellable. */
+	e_mail_folder_append_message (
+		out_folder, receipt, info, G_PRIORITY_DEFAULT, NULL,
+		(GAsyncReadyCallback) em_utils_receipt_done, session);
+
+	camel_message_info_free (info);
 }
 
 /* Replying to messages... */
-- 
cgit