X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=59d35091c3d24c961a7eb2f6df4b49594e016fb6;hp=eef2204ec57a23fbc63a348061bef7d20deb028e;hb=b94b783d9801be57422fdf478ae5bdafbc7200a7;hpb=1416623aa871e3a9dca89bdd2aaf6a9ffaf71f3e diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c index eef2204..59d3509 100644 --- a/src/modest-mail-operation.c +++ b/src/modest-mail-operation.c @@ -35,16 +35,13 @@ #include #include #include -#include -#include #include -#include #include #include #include - +#include #include "modest-text-utils.h" -#include "modest-tny-msg-actions.h" +#include "modest-tny-msg.h" #include "modest-tny-platform-factory.h" #include "modest-marshal.h" #include "modest-formatter.h" @@ -78,19 +75,15 @@ static TnyMimePart * add_body_part (TnyMsg *msg, gboolean has_attachments); -static void modest_mail_operation_xfer_folder (ModestMailOperation *mail_op, - TnyFolder *folder, - TnyFolderStore *parent, - gboolean delete_original); - -static void modest_mail_operation_xfer_msg (ModestMailOperation *mail_op, - TnyHeader *header, - TnyFolder *folder, - gboolean delete_original); - -static TnyFolder * modest_mail_operation_find_trash_folder (ModestMailOperation *mail_op, - TnyStoreAccount *store_account); +static void modest_mail_operation_xfer_folder (ModestMailOperation *self, + TnyFolder *folder, + TnyFolderStore *parent, + gboolean delete_original); +static gboolean modest_mail_operation_xfer_msg (ModestMailOperation *self, + TnyHeader *header, + TnyFolder *folder, + gboolean delete_original); enum _ModestMailOperationSignals { @@ -216,18 +209,18 @@ modest_mail_operation_new (void) void -modest_mail_operation_send_mail (ModestMailOperation *mail_op, +modest_mail_operation_send_mail (ModestMailOperation *self, TnyTransportAccount *transport_account, TnyMsg* msg) { - g_return_if_fail (MODEST_IS_MAIL_OPERATION (mail_op)); + g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account)); tny_transport_account_send (transport_account, msg, NULL); /* FIXME */ } void -modest_mail_operation_send_new_mail (ModestMailOperation *mail_op, +modest_mail_operation_send_new_mail (ModestMailOperation *self, TnyTransportAccount *transport_account, const gchar *from, const gchar *to, @@ -237,15 +230,16 @@ modest_mail_operation_send_new_mail (ModestMailOperation *mail_op, const gchar *body, const GList *attachments_list) { + TnyPlatformFactory *fact; TnyMsg *new_msg; TnyHeader *header; gchar *content_type; ModestMailOperationPrivate *priv = NULL; - g_return_if_fail (MODEST_IS_MAIL_OPERATION (mail_op)); + g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account)); - priv = MODEST_MAIL_OPERATION_GET_PRIVATE(mail_op); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); /* Check parametters */ if (to == NULL) { @@ -256,8 +250,9 @@ modest_mail_operation_send_new_mail (ModestMailOperation *mail_op, } /* Create new msg */ - new_msg = TNY_MSG (tny_camel_msg_new ()); - header = TNY_HEADER (tny_camel_header_new ()); + fact = modest_tny_platform_factory_get_instance (); + new_msg = tny_platform_factory_new_msg (fact); + header = tny_platform_factory_new_header (fact); /* WARNING: set the header before assign values to it */ tny_msg_set_header (new_msg, header); @@ -303,15 +298,17 @@ add_if_attachment (gpointer data, gpointer user_data) static TnyMsg * create_reply_forward_mail (TnyMsg *msg, const gchar *from, gboolean is_reply, guint type) { + TnyPlatformFactory *fact; TnyMsg *new_msg; TnyHeader *new_header, *header; gchar *new_subject; TnyMimePart *body; ModestFormatter *formatter; - /* Get body from original msg */ + /* Get body from original msg. Always look for the text/plain + part of the message to create the reply/forwarded mail */ header = tny_msg_get_header (msg); - body = modest_tny_msg_actions_find_body_part (msg, TRUE); + body = modest_tny_msg_find_body_part (msg, FALSE); /* TODO: select the formatter from account prefs */ formatter = modest_formatter_new ("text/plain"); @@ -338,17 +335,20 @@ create_reply_forward_mail (TnyMsg *msg, const gchar *from, gboolean is_reply, gu break; } } - g_object_unref (G_OBJECT (formatter)); - + g_object_unref (G_OBJECT(formatter)); + g_object_unref (G_OBJECT(body)); + /* Fill the header */ - new_header = TNY_HEADER (tny_camel_header_new ()); - tny_msg_set_header (new_msg, new_header); + fact = modest_tny_platform_factory_get_instance (); + new_header = TNY_HEADER (tny_platform_factory_new_header (fact)); + tny_msg_set_header (new_msg, new_header); tny_header_set_from (new_header, from); tny_header_set_replyto (new_header, from); /* Change the subject */ - new_subject = (gchar *) modest_text_utils_derived_subject (tny_header_get_subject(header), - (is_reply) ? _("Re:") : _("Fwd:")); + new_subject = + (gchar *) modest_text_utils_derived_subject (tny_header_get_subject(header), + (is_reply) ? _("Re:") : _("Fwd:")); tny_header_set_subject (new_header, (const gchar *) new_subject); g_free (new_subject); @@ -389,9 +389,12 @@ modest_mail_operation_create_reply_mail (TnyMsg *msg, ModestMailOperationReplyType reply_type, ModestMailOperationReplyMode reply_mode) { - TnyMsg *new_msg; + TnyMsg *new_msg = NULL; TnyHeader *new_header, *header; const gchar* reply_to; + gchar *new_cc = NULL; + const gchar *cc = NULL, *bcc = NULL; + GString *tmp = NULL; new_msg = create_reply_forward_mail (msg, from, TRUE, reply_type); @@ -399,16 +402,13 @@ modest_mail_operation_create_reply_mail (TnyMsg *msg, header = tny_msg_get_header (msg); new_header = tny_msg_get_header (new_msg); reply_to = tny_header_get_replyto (header); + if (reply_to) tny_header_set_to (new_header, reply_to); else tny_header_set_to (new_header, tny_header_get_from (header)); switch (reply_mode) { - gchar *new_cc = NULL; - const gchar *cc = NULL, *bcc = NULL; - GString *tmp = NULL; - case MODEST_MAIL_OPERATION_REPLY_MODE_SENDER: /* Do not fill neither cc nor bcc */ break; @@ -427,8 +427,8 @@ modest_mail_operation_create_reply_mail (TnyMsg *msg, /* Remove my own address from the cc list. TODO: remove also the To: of the new message, needed due to the new reply_to feature */ - new_cc = (gchar *) - modest_text_utils_remove_address ((const gchar *) tmp->str, + new_cc = (gchar *) + modest_text_utils_remove_address ((const gchar *) tmp->str, from); /* FIXME: remove also the mails from the new To: */ tny_header_set_cc (new_header, new_cc); @@ -455,13 +455,13 @@ status_update_cb (TnyFolder *folder, const gchar *what, gint status, gint oftota static void folder_refresh_cb (TnyFolder *folder, gboolean canceled, GError **err, gpointer user_data) { - ModestMailOperation *mail_op = NULL; + ModestMailOperation *self = NULL; ModestMailOperationPrivate *priv = NULL; RefreshFolderAsyncHelper *helper; helper = (RefreshFolderAsyncHelper *) user_data; - mail_op = MODEST_MAIL_OPERATION (helper->mail_op); - priv = MODEST_MAIL_OPERATION_GET_PRIVATE(mail_op); + self = MODEST_MAIL_OPERATION (helper->mail_op); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); if ((canceled && *err) || *err) { priv->error = g_error_copy (*err); @@ -478,14 +478,14 @@ folder_refresh_cb (TnyFolder *folder, gboolean canceled, GError **err, gpointer if (priv->done == priv->total) priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; - else if ((priv->done + helper->canceled + helper->failed) == priv->total) + else if ((priv->done + helper->canceled + helper->failed) == priv->total) { if (helper->failed == priv->total) priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; else if (helper->failed == priv->total) priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED; else priv->status = MODEST_MAIL_OPERATION_STATUS_FINISHED_WITH_ERRORS; - + } tny_iterator_next (helper->iter); if (tny_iterator_is_done (helper->iter)) { TnyList *list; @@ -494,25 +494,26 @@ folder_refresh_cb (TnyFolder *folder, gboolean canceled, GError **err, gpointer g_object_unref (G_OBJECT (list)); g_slice_free (RefreshFolderAsyncHelper, helper); } else { - tny_folder_refresh_async (TNY_FOLDER (tny_iterator_get_current (helper->iter)), - folder_refresh_cb, + TnyFolder *folder = TNY_FOLDER (tny_iterator_get_current (helper->iter)); + tny_folder_refresh_async (folder, folder_refresh_cb, status_update_cb, helper); + g_object_unref (G_OBJECT(folder)); } - g_signal_emit (G_OBJECT (mail_op), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL); + g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL); } static void -update_folders_cb (TnyFolderStore *self, TnyList *list, GError **err, gpointer user_data) +update_folders_cb (TnyFolderStore *folder_store, TnyList *list, GError **err, gpointer user_data) { - ModestMailOperation *mail_op; + ModestMailOperation *self; ModestMailOperationPrivate *priv; - TnyList *folders; RefreshFolderAsyncHelper *helper; - - mail_op = MODEST_MAIL_OPERATION (user_data); - priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_op); + TnyFolder *folder; + + self = MODEST_MAIL_OPERATION (user_data); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); if (*err) { priv->error = g_error_copy (*err); @@ -525,64 +526,64 @@ update_folders_cb (TnyFolderStore *self, TnyList *list, GError **err, gpointer u priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; helper = g_slice_new0 (RefreshFolderAsyncHelper); - helper->mail_op = mail_op; + helper->mail_op = self; helper->iter = tny_list_create_iterator (list); helper->failed = 0; helper->canceled = 0; /* Async refresh folders */ - tny_folder_refresh_async (TNY_FOLDER (tny_iterator_get_current (helper->iter)), - folder_refresh_cb, - status_update_cb, - helper); + folder = TNY_FOLDER (tny_iterator_get_current (helper->iter)); + tny_folder_refresh_async (folder, folder_refresh_cb, + status_update_cb, helper); + g_object_unref (G_OBJECT(folder)); } gboolean -modest_mail_operation_update_account (ModestMailOperation *mail_op, +modest_mail_operation_update_account (ModestMailOperation *self, TnyStoreAccount *store_account) { ModestMailOperationPrivate *priv; TnyList *folders; TnyFolderStoreQuery *query; - g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (mail_op), FALSE); + g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), FALSE); g_return_val_if_fail (TNY_IS_STORE_ACCOUNT(store_account), FALSE); - priv = MODEST_MAIL_OPERATION_GET_PRIVATE(mail_op); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); /* Get subscribed folders & refresh them */ folders = TNY_LIST (tny_simple_list_new ()); query = tny_folder_store_query_new (); tny_folder_store_query_add_item (query, NULL, TNY_FOLDER_STORE_QUERY_OPTION_SUBSCRIBED); tny_folder_store_get_folders_async (TNY_FOLDER_STORE (store_account), - folders, update_folders_cb, query, mail_op); + folders, update_folders_cb, query, self); g_object_unref (query); return TRUE; } ModestMailOperationStatus -modest_mail_operation_get_status (ModestMailOperation *mail_op) +modest_mail_operation_get_status (ModestMailOperation *self) { ModestMailOperationPrivate *priv; - g_return_val_if_fail (mail_op, MODEST_MAIL_OPERATION_STATUS_INVALID); - g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (mail_op), + g_return_val_if_fail (self, MODEST_MAIL_OPERATION_STATUS_INVALID); + g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), MODEST_MAIL_OPERATION_STATUS_INVALID); - priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_op); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); return priv->status; } const GError * -modest_mail_operation_get_error (ModestMailOperation *mail_op) +modest_mail_operation_get_error (ModestMailOperation *self) { ModestMailOperationPrivate *priv; - g_return_val_if_fail (mail_op, NULL); - g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (mail_op), NULL); + g_return_val_if_fail (self, NULL); + g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), NULL); - priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_op); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); return priv->error; } @@ -594,39 +595,39 @@ modest_mail_operation_cancel (ModestMailOperation *self) } guint -modest_mail_operation_get_task_done (ModestMailOperation *mail_op) +modest_mail_operation_get_task_done (ModestMailOperation *self) { ModestMailOperationPrivate *priv; - g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (mail_op), 0); + g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), 0); - priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_op); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); return priv->done; } guint -modest_mail_operation_get_task_total (ModestMailOperation *mail_op) +modest_mail_operation_get_task_total (ModestMailOperation *self) { ModestMailOperationPrivate *priv; - g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (mail_op), 0); + g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), 0); - priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_op); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); return priv->total; } gboolean -modest_mail_operation_is_finished (ModestMailOperation *mail_op) +modest_mail_operation_is_finished (ModestMailOperation *self) { ModestMailOperationPrivate *priv; gboolean retval = FALSE; - if (!MODEST_IS_MAIL_OPERATION (mail_op)) { + if (!MODEST_IS_MAIL_OPERATION (self)) { g_warning ("%s: invalid parametter", G_GNUC_FUNCTION); return retval; } - priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_op); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); if (priv->status == MODEST_MAIL_OPERATION_STATUS_SUCCESS || priv->status == MODEST_MAIL_OPERATION_STATUS_FAILED || @@ -646,7 +647,7 @@ modest_mail_operation_is_finished (ModestMailOperation *mail_op) TnyFolder * -modest_mail_operation_create_folder (ModestMailOperation *mail_op, +modest_mail_operation_create_folder (ModestMailOperation *self, TnyFolderStore *parent, const gchar *name) { @@ -672,7 +673,7 @@ modest_mail_operation_create_folder (ModestMailOperation *mail_op, } void -modest_mail_operation_remove_folder (ModestMailOperation *mail_op, +modest_mail_operation_remove_folder (ModestMailOperation *self, TnyFolder *folder, gboolean remove_to_trash) { @@ -686,13 +687,10 @@ modest_mail_operation_remove_folder (ModestMailOperation *mail_op, /* Delete folder or move to trash */ if (remove_to_trash) { TnyFolder *trash_folder; - - trash_folder = modest_mail_operation_find_trash_folder (mail_op, - TNY_STORE_ACCOUNT (folder_store)); - + trash_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT(folder_store), + TNY_FOLDER_TYPE_TRASH); /* TODO: error_handling */ - modest_mail_operation_move_folder (mail_op, - folder, + modest_mail_operation_move_folder (self, folder, TNY_FOLDER_STORE (trash_folder)); } else { tny_folder_store_remove_folder (folder_store, folder, NULL); /* FIXME */ @@ -704,11 +702,11 @@ modest_mail_operation_remove_folder (ModestMailOperation *mail_op, } void -modest_mail_operation_rename_folder (ModestMailOperation *mail_op, +modest_mail_operation_rename_folder (ModestMailOperation *self, TnyFolder *folder, const gchar *name) { - g_return_if_fail (MODEST_IS_MAIL_OPERATION (mail_op)); + g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); g_return_if_fail (TNY_IS_FOLDER_STORE (folder)); g_return_if_fail (name); @@ -721,31 +719,31 @@ modest_mail_operation_rename_folder (ModestMailOperation *mail_op, } void -modest_mail_operation_move_folder (ModestMailOperation *mail_op, +modest_mail_operation_move_folder (ModestMailOperation *self, TnyFolder *folder, TnyFolderStore *parent) { - g_return_if_fail (MODEST_IS_MAIL_OPERATION (mail_op)); + g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); g_return_if_fail (TNY_IS_FOLDER_STORE (parent)); g_return_if_fail (TNY_IS_FOLDER (folder)); - modest_mail_operation_xfer_folder (mail_op, folder, parent, TRUE); + modest_mail_operation_xfer_folder (self, folder, parent, TRUE); } void -modest_mail_operation_copy_folder (ModestMailOperation *mail_op, +modest_mail_operation_copy_folder (ModestMailOperation *self, TnyFolder *folder, TnyFolderStore *parent) { - g_return_if_fail (MODEST_IS_MAIL_OPERATION (mail_op)); + g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); g_return_if_fail (TNY_IS_FOLDER_STORE (parent)); g_return_if_fail (TNY_IS_FOLDER (folder)); - modest_mail_operation_xfer_folder (mail_op, folder, parent, FALSE); + modest_mail_operation_xfer_folder (self, folder, parent, FALSE); } static void -modest_mail_operation_xfer_folder (ModestMailOperation *mail_op, +modest_mail_operation_xfer_folder (ModestMailOperation *self, TnyFolder *folder, TnyFolderStore *parent, gboolean delete_original) @@ -760,8 +758,7 @@ modest_mail_operation_xfer_folder (ModestMailOperation *mail_op, /* Create the destination folder */ folder_name = tny_folder_get_name (folder); - dest_folder = modest_mail_operation_create_folder (mail_op, - parent, folder_name); + dest_folder = modest_mail_operation_create_folder (self, parent, folder_name); /* Transfer messages */ headers = TNY_LIST (tny_simple_list_new ()); @@ -774,17 +771,16 @@ modest_mail_operation_xfer_folder (ModestMailOperation *mail_op, iter = tny_list_create_iterator (folders); while (!tny_iterator_is_done (iter)) { - child = TNY_FOLDER (tny_iterator_get_current (iter)); - modest_mail_operation_xfer_folder (mail_op, child, - TNY_FOLDER_STORE (dest_folder), + modest_mail_operation_xfer_folder (self, child, TNY_FOLDER_STORE (dest_folder), delete_original); tny_iterator_next (iter); + g_object_unref (G_OBJECT(child)); } /* Delete source folder (if needed) */ if (delete_original) - modest_mail_operation_remove_folder (mail_op, folder, FALSE); + modest_mail_operation_remove_folder (self, folder, FALSE); /* Clean up */ g_object_unref (G_OBJECT (dest_folder)); @@ -794,73 +790,34 @@ modest_mail_operation_xfer_folder (ModestMailOperation *mail_op, } -/* FIXME: this method should be rewritten when the policy for the - Trash folder becomes clearer */ -static TnyFolder * -modest_mail_operation_find_trash_folder (ModestMailOperation *mail_op, - TnyStoreAccount *store_account) -{ - TnyList *folders; - TnyIterator *iter; - gboolean found; - /*TnyFolderStoreQuery *query;*/ - TnyFolder *trash_folder; - - /* Look for Trash folder */ - folders = TNY_LIST (tny_simple_list_new ()); - tny_folder_store_get_folders (TNY_FOLDER_STORE (store_account), - folders, NULL, NULL); /* FIXME */ - iter = tny_list_create_iterator (folders); - - found = FALSE; - while (!tny_iterator_is_done (iter) && !found) { - - trash_folder = TNY_FOLDER (tny_iterator_get_current (iter)); - if (tny_folder_get_folder_type (trash_folder) == TNY_FOLDER_TYPE_TRASH) - found = TRUE; - else - tny_iterator_next (iter); - } - - /* Clean up */ - g_object_unref (G_OBJECT (folders)); - g_object_unref (G_OBJECT (iter)); - - /* TODO: better error handling management */ - if (!found) - return NULL; - else - return trash_folder; -} - /* ******************************************************************* */ /* ************************** MSG ACTIONS ************************* */ /* ******************************************************************* */ -void -modest_mail_operation_copy_msg (ModestMailOperation *mail_op, +gboolean +modest_mail_operation_copy_msg (ModestMailOperation *self, TnyHeader *header, TnyFolder *folder) { - g_return_if_fail (TNY_IS_HEADER (header)); - g_return_if_fail (TNY_IS_FOLDER (folder)); + g_return_val_if_fail (TNY_IS_HEADER (header), FALSE); + g_return_val_if_fail (TNY_IS_FOLDER (folder), FALSE); - modest_mail_operation_xfer_msg (mail_op, header, folder, FALSE); + return modest_mail_operation_xfer_msg (self, header, folder, FALSE); } -void -modest_mail_operation_move_msg (ModestMailOperation *mail_op, +gboolean +modest_mail_operation_move_msg (ModestMailOperation *self, TnyHeader *header, TnyFolder *folder) { - g_return_if_fail (TNY_IS_HEADER (header)); - g_return_if_fail (TNY_IS_FOLDER (folder)); + g_return_val_if_fail (TNY_IS_HEADER (header), FALSE); + g_return_val_if_fail (TNY_IS_FOLDER (folder), FALSE); - modest_mail_operation_xfer_msg (mail_op, header, folder, TRUE); + return modest_mail_operation_xfer_msg (self, header, folder, TRUE); } void -modest_mail_operation_remove_msg (ModestMailOperation *mail_op, +modest_mail_operation_remove_msg (ModestMailOperation *self, TnyHeader *header, gboolean remove_to_trash) { @@ -876,14 +833,26 @@ modest_mail_operation_remove_msg (ModestMailOperation *mail_op, TnyStoreAccount *store_account; store_account = TNY_STORE_ACCOUNT (tny_folder_get_account (folder)); - trash_folder = modest_mail_operation_find_trash_folder (mail_op, store_account); + trash_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT(store_account), + TNY_FOLDER_TYPE_TRASH); + if (trash_folder) { + modest_mail_operation_move_msg (self, header, trash_folder); +/* g_object_unref (trash_folder); */ + } else { + ModestMailOperationPrivate *priv; - modest_mail_operation_move_msg (mail_op, header, trash_folder); + /* Set status failed and set an error */ + priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, + MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND, + _("Error trying to delete a message. Trash folder not found")); + } g_object_unref (G_OBJECT (store_account)); } else { tny_folder_remove_msg (folder, header, NULL); /* FIXME */ - tny_folder_expunge (folder, NULL); /* FIXME */ + tny_folder_sync(folder, TRUE, NULL); /* FIXME */ } /* Free */ @@ -891,24 +860,44 @@ modest_mail_operation_remove_msg (ModestMailOperation *mail_op, } static void -modest_mail_operation_xfer_msg (ModestMailOperation *mail_op, +transfer_msgs_cb (TnyFolder *folder, GError **err, gpointer user_data) +{ + ModestMailOperationPrivate *priv; + + priv = MODEST_MAIL_OPERATION_GET_PRIVATE(user_data); + priv->done = 1; + priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; + + g_signal_emit (G_OBJECT (user_data), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL); +} + +static gboolean +modest_mail_operation_xfer_msg (ModestMailOperation *self, TnyHeader *header, TnyFolder *folder, gboolean delete_original) { + ModestMailOperationPrivate *priv; TnyFolder *src_folder; TnyList *headers; src_folder = tny_header_get_folder (header); headers = tny_simple_list_new (); - /* Move */ + priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); + priv->total = 1; + priv->done = 0; + priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; + tny_list_prepend (headers, G_OBJECT (header)); - tny_folder_transfer_msgs (src_folder, headers, folder, delete_original, NULL); /* FIXME */ + tny_folder_transfer_msgs_async (src_folder, headers, folder, + delete_original, transfer_msgs_cb, self); /* Free */ g_object_unref (headers); g_object_unref (folder); + + return TRUE; } @@ -944,17 +933,6 @@ get_content_type(const gchar *s) return g_string_free(type, FALSE); } -static GQuark -modest_error_quark (void) -{ - static GQuark err_q = 0; - - if (err_q == 0) - err_q = g_quark_from_static_string ("modest-error-quark"); - - return err_q; -} - static void add_attachments (TnyMsg *msg, GList *attachments_list) { @@ -963,13 +941,15 @@ add_attachments (TnyMsg *msg, GList *attachments_list) const gchar *attachment_content_type; const gchar *attachment_filename; TnyStream *attachment_stream; + TnyPlatformFactory *fact; + fact = modest_tny_platform_factory_get_instance (); for (pos = (GList *)attachments_list; pos; pos = pos->next) { old_attachment = pos->data; attachment_filename = tny_mime_part_get_filename (old_attachment); attachment_stream = tny_mime_part_get_stream (old_attachment); - attachment_part = TNY_MIME_PART (tny_camel_mime_part_new (camel_mime_part_new())); + attachment_part = tny_platform_factory_new_mime_part (fact); attachment_content_type = tny_mime_part_get_content_type (old_attachment); @@ -994,6 +974,9 @@ add_body_part (TnyMsg *msg, { TnyMimePart *text_body_part = NULL; TnyStream *text_body_stream; + TnyPlatformFactory *fact; + + fact = modest_tny_platform_factory_get_instance (); /* Create the stream */ text_body_stream = TNY_STREAM (tny_camel_stream_new @@ -1002,8 +985,7 @@ add_body_part (TnyMsg *msg, /* Create body part if needed */ if (has_attachments) - text_body_part = - TNY_MIME_PART (tny_camel_mime_part_new (camel_mime_part_new())); + text_body_part = tny_platform_factory_new_mime_part (fact); else text_body_part = TNY_MIME_PART(msg);