X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=f57bd80d4d7368f6bd8e6010e7bc1281e88ecea6;hb=9124eea7df5bf875cdf3243ad74a83a5af437dd3;hp=ba4e00c7effdf33f429ede302435a19e21b756c6;hpb=da1af70d58a7dc930648d1d591779fad52f5cb8d;p=modest diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c index ba4e00c..f57bd80 100644 --- a/src/modest-mail-operation.c +++ b/src/modest-mail-operation.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -46,7 +47,6 @@ #include "modest-tny-msg.h" #include "modest-tny-platform-factory.h" #include "modest-marshal.h" -#include "modest-formatter.h" #include "modest-error.h" /* 'private'/'protected' functions */ @@ -54,31 +54,10 @@ static void modest_mail_operation_class_init (ModestMailOperationClass *klass); static void modest_mail_operation_init (ModestMailOperation *obj); static void modest_mail_operation_finalize (GObject *obj); -static void status_update_cb (TnyFolder *folder, - const gchar *what, - gint status, - gint oftotal, - gpointer user_data); -static void folder_refresh_cb (TnyFolder *folder, - gboolean canceled, - GError **err, - gpointer user_data); static void update_folders_cb (TnyFolderStore *self, TnyList *list, GError **err, gpointer user_data); -static void add_attachments (TnyMsg *msg, - GList *attachments_list); - -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 { @@ -113,6 +92,15 @@ typedef struct _RefreshFolderAsyncHelper } RefreshFolderAsyncHelper; +typedef struct _XFerMsgAsyncHelper +{ + ModestMailOperation *mail_op; + TnyList *headers; + TnyFolder *dest_folder; + +} XFerMsgAsyncHelper; + + /* globals */ static GObjectClass *parent_class = NULL; @@ -161,7 +149,7 @@ modest_mail_operation_class_init (ModestMailOperationClass *klass) * Emitted when the progress of a mail operation changes */ signals[PROGRESS_CHANGED_SIGNAL] = - g_signal_new ("progress_changed", + g_signal_new ("progress-changed", G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (ModestMailOperationClass, progress_changed), @@ -214,7 +202,8 @@ modest_mail_operation_send_mail (ModestMailOperation *self, g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account)); - + g_return_if_fail (TNY_IS_MSG (msg)); + send_queue = TNY_SEND_QUEUE (modest_runtime_get_send_queue (transport_account)); if (!TNY_IS_SEND_QUEUE(send_queue)) g_printerr ("modest: could not find send queue for account\n"); @@ -225,8 +214,12 @@ modest_mail_operation_send_mail (ModestMailOperation *self, g_printerr ("modest: error adding msg to send queue: %s\n", err->message); g_error_free (err); - } + } else + g_message ("modest: message added to send queue"); } + + /* Notify the queue */ + modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self); } void @@ -234,11 +227,13 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self, TnyTransportAccount *transport_account, const gchar *from, const gchar *to, const gchar *cc, const gchar *bcc, - const gchar *subject, const gchar *body, + const gchar *subject, const gchar *plain_body, + const gchar *html_body, const GList *attachments_list) { TnyMsg *new_msg; ModestMailOperationPrivate *priv = NULL; + /* GList *node = NULL; */ g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account)); @@ -253,248 +248,55 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self, return; } - new_msg = modest_tny_msg_new (to, from, cc, bcc, subject, body, NULL); /* FIXME: attachments */ + if (html_body == NULL) { + new_msg = modest_tny_msg_new (to, from, cc, bcc, subject, plain_body, (GSList *) attachments_list); /* FIXME: attachments */ + } else { + new_msg = modest_tny_msg_new_html_plain (to, from, cc, bcc, subject, html_body, plain_body, (GSList *) attachments_list); + } if (!new_msg) { g_printerr ("modest: failed to create a new msg\n"); return; } - + + /* Call mail operation */ modest_mail_operation_send_mail (self, transport_account, new_msg); - g_object_unref (G_OBJECT(new_msg)); + /* Free */ + g_object_unref (G_OBJECT (new_msg)); } static void -add_if_attachment (gpointer data, gpointer user_data) -{ - TnyMimePart *part; - GList *attachments_list; - - part = TNY_MIME_PART (data); - attachments_list = (GList *) user_data; - - if (tny_mime_part_is_attachment (part)) - attachments_list = g_list_prepend (attachments_list, part); -} - - -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. 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_find_body_part (msg, FALSE); - - /* TODO: select the formatter from account prefs */ - formatter = modest_formatter_new ("text/plain"); - - /* Format message body */ - if (is_reply) { - switch (type) { - case MODEST_MAIL_OPERATION_REPLY_TYPE_CITE: - default: - new_msg = modest_formatter_cite (formatter, body, header); - break; - case MODEST_MAIL_OPERATION_REPLY_TYPE_QUOTE: - new_msg = modest_formatter_quote (formatter, body, header); - break; - } - } else { - switch (type) { - case MODEST_MAIL_OPERATION_FORWARD_TYPE_INLINE: - default: - new_msg = modest_formatter_inline (formatter, body, header); - break; - case MODEST_MAIL_OPERATION_FORWARD_TYPE_ATTACHMENT: - new_msg = modest_formatter_attach (formatter, body, header); - break; - } - } - g_object_unref (G_OBJECT(formatter)); - g_object_unref (G_OBJECT(body)); - - /* Fill the 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:")); - tny_header_set_subject (new_header, (const gchar *) new_subject); - g_free (new_subject); - - /* Clean */ - g_object_unref (G_OBJECT (new_header)); - g_object_unref (G_OBJECT (header)); - - return new_msg; -} - -TnyMsg* -modest_mail_operation_create_forward_mail (TnyMsg *msg, - const gchar *from, - ModestMailOperationForwardType forward_type) +recurse_folders (TnyFolderStore *store, TnyFolderStoreQuery *query, TnyList *all_folders) { - TnyMsg *new_msg; - TnyList *parts = NULL; - GList *attachments_list = NULL; - - new_msg = create_reply_forward_mail (msg, from, FALSE, forward_type); - - /* Add attachments */ - parts = TNY_LIST (tny_simple_list_new()); - tny_mime_part_get_parts (TNY_MIME_PART (msg), parts); - tny_list_foreach (parts, add_if_attachment, attachments_list); - add_attachments (new_msg, attachments_list); - - /* Clean */ - if (attachments_list) - g_list_free (attachments_list); - g_object_unref (G_OBJECT (parts)); - - return new_msg; -} - -TnyMsg* -modest_mail_operation_create_reply_mail (TnyMsg *msg, - const gchar *from, - ModestMailOperationReplyType reply_type, - ModestMailOperationReplyMode reply_mode) -{ - 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); - - /* Fill the header */ - 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) { - case MODEST_MAIL_OPERATION_REPLY_MODE_SENDER: - /* Do not fill neither cc nor bcc */ - break; - case MODEST_MAIL_OPERATION_REPLY_MODE_LIST: - /* TODO */ - break; - case MODEST_MAIL_OPERATION_REPLY_MODE_ALL: - /* Concatenate to, cc and bcc */ - cc = tny_header_get_cc (header); - bcc = tny_header_get_bcc (header); - - tmp = g_string_new (tny_header_get_to (header)); - if (cc) g_string_append_printf (tmp, ",%s",cc); - if (bcc) g_string_append_printf (tmp, ",%s",bcc); - - /* 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, - from); - /* FIXME: remove also the mails from the new To: */ - tny_header_set_cc (new_header, new_cc); - - /* Clean */ - g_string_free (tmp, TRUE); - g_free (new_cc); - break; - } - - /* Clean */ - g_object_unref (G_OBJECT (new_header)); - g_object_unref (G_OBJECT (header)); + TnyIterator *iter; + TnyList *folders = tny_simple_list_new (); - return new_msg; -} + tny_folder_store_get_folders (store, folders, query, NULL); + iter = tny_list_create_iterator (folders); -static void -status_update_cb (TnyFolder *folder, const gchar *what, gint status, gint oftotal, gpointer user_data) -{ - g_print ("%s status: %d, of total %d\n", what, status, oftotal); -} + while (!tny_iterator_is_done (iter)) { -static void -folder_refresh_cb (TnyFolder *folder, gboolean canceled, GError **err, gpointer user_data) -{ - ModestMailOperation *self = NULL; - ModestMailOperationPrivate *priv = NULL; - RefreshFolderAsyncHelper *helper; + TnyFolderStore *folder = (TnyFolderStore*) tny_iterator_get_current (iter); - helper = (RefreshFolderAsyncHelper *) user_data; - self = MODEST_MAIL_OPERATION (helper->mail_op); - priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); + tny_list_prepend (all_folders, G_OBJECT (folder)); - if ((canceled && *err) || *err) { - priv->error = g_error_copy (*err); - helper->failed++; - } else if (canceled) { - helper->canceled++; - g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, - MODEST_MAIL_OPERATION_ERROR_OPERATION_CANCELED, - _("Error trying to refresh folder %s. Operation canceled"), - tny_folder_get_name (folder)); - } else { - priv->done++; - } + recurse_folders (folder, query, all_folders); + + g_object_unref (G_OBJECT (folder)); - if (priv->done == priv->total) - priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; - 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; - list = tny_iterator_get_list (helper->iter); - g_object_unref (G_OBJECT (helper->iter)); - g_object_unref (G_OBJECT (list)); - g_slice_free (RefreshFolderAsyncHelper, helper); - } else { - 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)); + tny_iterator_next (iter); } - g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL); + g_object_unref (G_OBJECT (iter)); + g_object_unref (G_OBJECT (folders)); } - static void update_folders_cb (TnyFolderStore *folder_store, TnyList *list, GError **err, gpointer user_data) { ModestMailOperation *self; ModestMailOperationPrivate *priv; - RefreshFolderAsyncHelper *helper; - TnyFolder *folder; + TnyIterator *iter; + TnyList *all_folders; self = MODEST_MAIL_OPERATION (user_data); priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); @@ -502,24 +304,58 @@ update_folders_cb (TnyFolderStore *folder_store, TnyList *list, GError **err, gp if (*err) { priv->error = g_error_copy (*err); priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; - return; + goto out; } - priv->total = tny_list_get_length (list); - priv->done = 0; - priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; + /* Get all the folders We can do it synchronously because + we're already running in a different thread than the UI */ + all_folders = tny_list_copy (list); + iter = tny_list_create_iterator (all_folders); + while (!tny_iterator_is_done (iter)) { + TnyFolderStore *folder = TNY_FOLDER_STORE (tny_iterator_get_current (iter)); - helper = g_slice_new0 (RefreshFolderAsyncHelper); - helper->mail_op = self; - helper->iter = tny_list_create_iterator (list); - helper->failed = 0; - helper->canceled = 0; - - /* Async refresh folders */ - 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)); + recurse_folders (folder, NULL, all_folders); + tny_iterator_next (iter); + } + g_object_unref (G_OBJECT (iter)); + + /* Refresh folders */ + iter = tny_list_create_iterator (all_folders); + priv->total = tny_list_get_length (all_folders); + + while (!tny_iterator_is_done (iter) && !priv->error) { + + TnyFolderStore *folder = TNY_FOLDER_STORE (tny_iterator_get_current (iter)); + + /* Refresh the folder */ + tny_folder_refresh (TNY_FOLDER (folder), &(priv->error)); + + if (priv->error) { + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + } else { + /* Update status and notify */ + priv->done++; + g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL); + } + + g_object_unref (G_OBJECT (folder)); + + tny_iterator_next (iter); + } + + g_object_unref (G_OBJECT (iter)); + out: + g_object_unref (G_OBJECT (list)); + + /* Check if the operation was a success */ + if (priv->done == priv->total && !priv->error) + priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; + + /* Free */ + g_object_unref (G_OBJECT (folder_store)); + + /* Notify the queue */ + modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self); } gboolean @@ -528,21 +364,25 @@ modest_mail_operation_update_account (ModestMailOperation *self, { ModestMailOperationPrivate *priv; TnyList *folders; - TnyFolderStoreQuery *query; g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), FALSE); g_return_val_if_fail (TNY_IS_STORE_ACCOUNT(store_account), FALSE); + /* Pick async call reference */ + g_object_ref (store_account); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); + priv->total = 0; + priv->done = 0; + priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; + /* 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, self); - g_object_unref (query); + tny_folder_store_get_folders_async (TNY_FOLDER_STORE (store_account), + folders, update_folders_cb, NULL, self); + return TRUE; } @@ -637,7 +477,6 @@ modest_mail_operation_create_folder (ModestMailOperation *self, { ModestMailOperationPrivate *priv; TnyFolder *new_folder = NULL; - TnyStoreAccount *store_account; g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent), NULL); g_return_val_if_fail (name, NULL); @@ -648,22 +487,19 @@ modest_mail_operation_create_folder (ModestMailOperation *self, new_folder = tny_folder_store_create_folder (parent, name, &(priv->error)); CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED, return NULL); - /* Subscribe to folder */ - if (!tny_folder_is_subscribed (new_folder)) { - store_account = TNY_STORE_ACCOUNT (tny_folder_get_account (TNY_FOLDER (parent))); - tny_store_account_subscribe (store_account, new_folder); - g_object_unref (G_OBJECT (store_account)); - } + /* Notify the queue */ + modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self); return new_folder; } void modest_mail_operation_remove_folder (ModestMailOperation *self, - TnyFolder *folder, - gboolean remove_to_trash) + TnyFolder *folder, + gboolean remove_to_trash) { - TnyFolderStore *folder_store; + TnyFolderStore *parent; + TnyAccount *account; ModestMailOperationPrivate *priv; g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); @@ -671,26 +507,31 @@ modest_mail_operation_remove_folder (ModestMailOperation *self, priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); - /* Get folder store */ - folder_store = TNY_FOLDER_STORE (tny_folder_get_account (folder)); + /* Get the account */ + account = tny_folder_get_account (folder); /* Delete folder or move to trash */ if (remove_to_trash) { - TnyFolder *trash_folder; - trash_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT(folder_store), + TnyFolder *trash_folder, *new_folder; + trash_folder = modest_tny_account_get_special_folder (account, TNY_FOLDER_TYPE_TRASH); /* TODO: error_handling */ - modest_mail_operation_move_folder (self, folder, - TNY_FOLDER_STORE (trash_folder)); + new_folder = modest_mail_operation_xfer_folder (self, folder, + TNY_FOLDER_STORE (trash_folder), TRUE); + g_object_unref (G_OBJECT (new_folder)); } else { - tny_folder_store_remove_folder (folder_store, folder, &(priv->error)); + parent = tny_folder_get_folder_store (folder); + + tny_folder_store_remove_folder (parent, folder, &(priv->error)); CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED, ); - g_object_unref (G_OBJECT (folder)); + if (parent) + g_object_unref (G_OBJECT (parent)); } + g_object_unref (G_OBJECT (account)); - /* Free instances */ - g_object_unref (G_OBJECT (folder_store)); + /* Notify the queue */ + modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self); } void @@ -708,95 +549,42 @@ modest_mail_operation_rename_folder (ModestMailOperation *self, /* FIXME: better error handling */ if (strrchr (name, '/') != NULL) - return; + goto out; /* Rename. Camel handles folder subscription/unsubscription */ tny_folder_set_name (folder, name, &(priv->error)); - CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED, return); - } - -void -modest_mail_operation_move_folder (ModestMailOperation *self, - TnyFolder *folder, - TnyFolderStore *parent) -{ - 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 (self, folder, parent, TRUE); -} - -void -modest_mail_operation_copy_folder (ModestMailOperation *self, - TnyFolder *folder, - TnyFolderStore *parent) -{ - 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)); + CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED, goto out); - modest_mail_operation_xfer_folder (self, folder, parent, FALSE); -} + out: + /* Notify the queue */ + modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self); + } -static void +TnyFolder * modest_mail_operation_xfer_folder (ModestMailOperation *self, TnyFolder *folder, TnyFolderStore *parent, gboolean delete_original) { ModestMailOperationPrivate *priv; - const gchar *folder_name; - TnyFolder *dest_folder = NULL, *child = NULL; - TnyIterator *iter = NULL; - TnyList *folders = NULL, *headers = NULL; + TnyFolder *new_folder; - g_return_if_fail (TNY_IS_FOLDER (folder)); - g_return_if_fail (TNY_IS_FOLDER_STORE (parent)); + g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), NULL); + g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent), NULL); + g_return_val_if_fail (TNY_IS_FOLDER (folder), NULL); priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); - /* Create the destination folder */ - folder_name = tny_folder_get_name (folder); - dest_folder = modest_mail_operation_create_folder (self, parent, folder_name); - CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED, goto clean); - - /* Transfer messages */ - headers = TNY_LIST (tny_simple_list_new ()); - tny_folder_get_headers (folder, headers, FALSE, &(priv->error)); - CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED, goto clean); + new_folder = tny_folder_copy (folder, + parent, + tny_folder_get_name (folder), + delete_original, + &(priv->error)); - tny_folder_transfer_msgs (folder, headers, dest_folder, delete_original, &(priv->error)); - CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED, goto clean); + /* Notify the queue */ + modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self); - /* Recurse children */ - folders = TNY_LIST (tny_simple_list_new ()); - tny_folder_store_get_folders (TNY_FOLDER_STORE (folder), folders, NULL, &(priv->error)); - CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED, goto clean); - - 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 (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 (self, folder, FALSE); - - /* Clean up */ - clean: - if (dest_folder) - g_object_unref (G_OBJECT (dest_folder)); - if (headers) - g_object_unref (G_OBJECT (headers)); - if (folders) - g_object_unref (G_OBJECT (folders)); - if (iter) - g_object_unref (G_OBJECT (iter)); + return new_folder; } @@ -804,39 +592,22 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self, /* ************************** MSG ACTIONS ************************* */ /* ******************************************************************* */ -gboolean -modest_mail_operation_copy_msg (ModestMailOperation *self, - TnyHeader *header, - TnyFolder *folder) -{ - g_return_val_if_fail (TNY_IS_HEADER (header), FALSE); - g_return_val_if_fail (TNY_IS_FOLDER (folder), FALSE); - - return modest_mail_operation_xfer_msg (self, header, folder, FALSE); -} - -gboolean -modest_mail_operation_move_msg (ModestMailOperation *self, - TnyHeader *header, - TnyFolder *folder) -{ - g_return_val_if_fail (TNY_IS_HEADER (header), FALSE); - g_return_val_if_fail (TNY_IS_FOLDER (folder), FALSE); - - return modest_mail_operation_xfer_msg (self, header, folder, TRUE); -} - void modest_mail_operation_remove_msg (ModestMailOperation *self, TnyHeader *header, gboolean remove_to_trash) { TnyFolder *folder; + ModestMailOperationPrivate *priv; + g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); g_return_if_fail (TNY_IS_HEADER (header)); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); folder = tny_header_get_folder (header); + priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; + /* Delete or move to trash */ if (remove_to_trash) { TnyFolder *trash_folder; @@ -846,7 +617,7 @@ modest_mail_operation_remove_msg (ModestMailOperation *self, 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); + modest_mail_operation_xfer_msg (self, header, trash_folder, TRUE); /* g_object_unref (trash_folder); */ } else { ModestMailOperationPrivate *priv; @@ -861,27 +632,55 @@ modest_mail_operation_remove_msg (ModestMailOperation *self, g_object_unref (G_OBJECT (store_account)); } else { - tny_folder_remove_msg (folder, header, NULL); /* FIXME */ - tny_folder_sync(folder, TRUE, NULL); /* FIXME */ + tny_folder_remove_msg (folder, header, &(priv->error)); + if (!priv->error) + tny_folder_sync(folder, TRUE, &(priv->error)); } + /* Set status */ + if (!priv->error) + priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; + else + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + /* Free */ - g_object_unref (folder); + g_object_unref (G_OBJECT (folder)); + + /* Notify the queue */ + modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self); } static void transfer_msgs_cb (TnyFolder *folder, GError **err, gpointer user_data) { + XFerMsgAsyncHelper *helper; + ModestMailOperation *self; ModestMailOperationPrivate *priv; - priv = MODEST_MAIL_OPERATION_GET_PRIVATE(user_data); - priv->done = 1; - priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; + helper = (XFerMsgAsyncHelper *) user_data; + self = helper->mail_op; + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); + + if (*err) { + priv->error = g_error_copy (*err); + priv->done = 0; + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + } else { + priv->done = 1; + priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; + } + + /* Free */ + g_object_unref (helper->headers); + g_object_unref (helper->dest_folder); + g_object_unref (folder); + g_free (helper); - g_signal_emit (G_OBJECT (user_data), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL); + /* Notify the queue */ + modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self); } -static gboolean +void modest_mail_operation_xfer_msg (ModestMailOperation *self, TnyHeader *header, TnyFolder *folder, @@ -890,60 +689,122 @@ modest_mail_operation_xfer_msg (ModestMailOperation *self, ModestMailOperationPrivate *priv; TnyFolder *src_folder; TnyList *headers; + XFerMsgAsyncHelper *helper; + + g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); + g_return_if_fail (TNY_IS_HEADER (header)); + g_return_if_fail (TNY_IS_FOLDER (folder)); + + /* Pick references for async calls */ + g_object_ref (folder); - src_folder = tny_header_get_folder (header); headers = tny_simple_list_new (); + tny_list_prepend (headers, G_OBJECT (header)); 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_async (src_folder, headers, folder, - delete_original, transfer_msgs_cb, self); + /* Create the helper */ + helper = g_malloc0 (sizeof (XFerMsgAsyncHelper)); + helper->mail_op = self; + helper->dest_folder = folder; + helper->headers = headers; + + src_folder = tny_header_get_folder (header); + tny_folder_transfer_msgs_async (src_folder, + headers, + folder, + delete_original, + transfer_msgs_cb, + helper); +} + +static void +on_refresh_folder (TnyFolder *folder, + gboolean cancelled, + GError **error, + gpointer user_data) +{ + ModestMailOperation *self; + ModestMailOperationPrivate *priv; + + self = MODEST_MAIL_OPERATION (user_data); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); + + if (*error) { + priv->error = g_error_copy (*error); + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + goto out; + } + + if (cancelled) { + priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED; + g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, + MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND, + _("Error trying to refresh the contents of %s"), + tny_folder_get_name (folder)); + goto out; + } + + priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; + out: /* Free */ - g_object_unref (headers); g_object_unref (folder); - return TRUE; + /* Notify the queue */ + modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self); } +static void +on_refresh_folder_status_update (TnyFolder *folder, const gchar *msg, + gint num, gint total, gpointer user_data) +{ + ModestMailOperation *self; + ModestMailOperationPrivate *priv; -/* ******************************************************************* */ -/* ************************* UTILIY FUNCTIONS ************************ */ -/* ******************************************************************* */ + /* TODO: if tinymail issues a status update before the + callback call then this could happen. If this is true the + we must review the design */ + if (!G_IS_OBJECT (user_data)) + return; -static void -add_attachments (TnyMsg *msg, GList *attachments_list) + self = MODEST_MAIL_OPERATION (user_data); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); + + priv->done = num; + priv->total = total; + + if (num == 1 && total == 100) + return; + + g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL); +} + +void +modest_mail_operation_refresh_folder (ModestMailOperation *self, + TnyFolder *folder) { - GList *pos; - TnyMimePart *attachment_part, *old_attachment; - 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_platform_factory_new_mime_part (fact); - - attachment_content_type = tny_mime_part_get_content_type (old_attachment); - - tny_mime_part_construct_from_stream (attachment_part, - attachment_stream, - attachment_content_type); - tny_stream_reset (attachment_stream); - - tny_mime_part_set_filename (attachment_part, attachment_filename); - - tny_mime_part_add_part (TNY_MIME_PART (msg), attachment_part); -/* g_object_unref (attachment_part); */ - } + ModestMailOperationPrivate *priv; + + priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); + + /* Pick a reference */ + g_object_ref (folder); + + priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; + + /* Refresh the folder */ + tny_folder_refresh_async (folder, + on_refresh_folder, + on_refresh_folder_status_update, + self); } +void +_modest_mail_operation_notify_end (ModestMailOperation *self) +{ + g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL); +}