X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=001d4ae34caf599362ed17ba717b97d0e5a11b1a;hp=126e4a357dfddedbc9c498f497d5d223de98c559;hb=e58bba828bffa06364fd5c014ce02f5763328325;hpb=34fde15dc10aa5e4eae67789e7cb4c4ba8569fc6 diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c index 126e4a3..001d4ae 100644 --- a/src/modest-mail-operation.c +++ b/src/modest-mail-operation.c @@ -60,6 +60,7 @@ #include #include #include "modest-utils.h" +#include "modest-debug.h" #define KB 1024 @@ -101,6 +102,11 @@ static guint compute_message_array_size (GPtrArray *headers); static int compare_headers_by_date (gconstpointer a, gconstpointer b); +static void sync_folder_finish_callback (TnyFolder *self, + gboolean cancelled, + GError *err, + gpointer user_data); + enum _ModestMailOperationSignals { PROGRESS_CHANGED_SIGNAL, @@ -615,6 +621,10 @@ modest_mail_operation_send_mail (ModestMailOperation *self, send_queue = TNY_SEND_QUEUE (modest_runtime_get_send_queue (transport_account)); if (!TNY_IS_SEND_QUEUE(send_queue)) { + if (priv->error) { + g_error_free (priv->error); + priv->error = NULL; + } g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND, "modest: could not find send queue for account\n"); @@ -628,7 +638,11 @@ modest_mail_operation_send_mail (ModestMailOperation *self, tny_send_queue_add_async (send_queue, msg, NULL, NULL, NULL); modest_tny_send_queue_set_requested_send_receive (MODEST_TNY_SEND_QUEUE (send_queue), FALSE); - priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; + if (priv->error) { + priv->status = MODEST_MAIL_OPERATION_STATUS_FINISHED_WITH_ERRORS; + } else { + priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; + } modest_mail_operation_notify_end (self); } @@ -666,12 +680,14 @@ create_msg_thread (gpointer thread_data) if (info->html_body == NULL) { new_msg = modest_tny_msg_new (info->to, info->from, info->cc, info->bcc, info->subject, info->plain_body, - info->attachments_list); + info->attachments_list, + &(priv->error)); } else { new_msg = modest_tny_msg_new_html_plain (info->to, info->from, info->cc, info->bcc, info->subject, info->html_body, info->plain_body, info->attachments_list, - info->images_list); + info->images_list, + &(priv->error)); } if (new_msg) { @@ -688,9 +704,10 @@ create_msg_thread (gpointer thread_data) g_object_unref (G_OBJECT(header)); } else { priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; - g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, - MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED, - "modest: failed to create a new msg\n"); + if (!priv->error) + g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, + MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED, + "modest: failed to create a new msg\n"); } @@ -777,15 +794,16 @@ modest_mail_operation_send_new_mail_cb (ModestMailOperation *self, TnyFolder *draft_folder = NULL; TnyFolder *outbox_folder = NULL; TnyHeader *header = NULL; - GError *err = NULL; + + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); if (!msg) { + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + modest_mail_operation_notify_end (self); goto end; } - priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); - - if (priv->error) { + if (priv->error && priv->error->code != MODEST_MAIL_OPERATION_ERROR_FILE_IO) { priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; modest_mail_operation_notify_end (self); goto end; @@ -795,6 +813,7 @@ modest_mail_operation_send_new_mail_cb (ModestMailOperation *self, modest_mail_operation_send_mail (self, info->transport_account, msg); if (info->draft_msg != NULL) { + TnyList *tmp_headers = NULL; TnyFolder *folder = NULL; TnyFolder *src_folder = NULL; TnyFolderType folder_type; @@ -838,11 +857,12 @@ modest_mail_operation_send_new_mail_cb (ModestMailOperation *self, src_folder = draft_folder; /* Note: This can fail (with a warning) if the message is not really already in a folder, - * because this function requires it to have a UID. */ - tny_folder_remove_msg (src_folder, header, NULL); - - tny_folder_sync (folder, TRUE, &err); /* FALSE --> don't expunge */ -/* tny_folder_sync_async (src_folder, TRUE, NULL, NULL, NULL); /\* expunge *\/ */ + * because this function requires it to have a UID. */ + tmp_headers = tny_simple_list_new (); + tny_list_append (tmp_headers, (GObject*) header); + tny_folder_remove_msgs_async (src_folder, tmp_headers, NULL, NULL, NULL); + g_object_unref (tmp_headers); + tny_folder_sync_async (src_folder, TRUE, NULL, NULL, NULL); /* expunge */ g_object_unref (folder); } @@ -850,8 +870,6 @@ modest_mail_operation_send_new_mail_cb (ModestMailOperation *self, end: if (header) g_object_unref (header); - if (err != NULL) - g_error_free(err); if (info->draft_msg) g_object_unref (info->draft_msg); if (draft_folder) @@ -930,9 +948,14 @@ modest_mail_operation_save_to_drafts_add_msg_cb(TnyFolder *self, { ModestMailOperationPrivate *priv = NULL; SaveToDraftsAddMsgInfo *info = (SaveToDraftsAddMsgInfo *) userdata; + GError *io_error = NULL; priv = MODEST_MAIL_OPERATION_GET_PRIVATE(info->mailop); + if (priv->error && priv->error->code == MODEST_MAIL_OPERATION_ERROR_FILE_IO) { + io_error = priv->error; + priv->error = NULL; + } if (priv->error) { g_warning ("%s: priv->error != NULL", __FUNCTION__); g_error_free(priv->error); @@ -955,10 +978,18 @@ modest_mail_operation_save_to_drafts_add_msg_cb(TnyFolder *self, g_object_unref (G_OBJECT(src_folder)); } - if (!priv->error) - priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; - else + if (priv->error) { priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + if (io_error) { + g_error_free (io_error); + io_error = NULL; + } + } else if (io_error) { + priv->error = io_error; + priv->status = MODEST_MAIL_OPERATION_STATUS_FINISHED_WITH_ERRORS; + } else { + priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; + } /* Call the user callback */ if (info->callback) @@ -1013,7 +1044,7 @@ modest_mail_operation_save_to_drafts_cb (ModestMailOperation *self, } } - if (!priv->error) { + if (!priv->error || priv->error->code == MODEST_MAIL_OPERATION_ERROR_FILE_IO) { SaveToDraftsAddMsgInfo *cb_info = g_slice_new(SaveToDraftsAddMsgInfo); cb_info->transport_account = g_object_ref(info->transport_account); cb_info->draft_msg = info->draft_msg ? g_object_ref(info->draft_msg) : NULL; @@ -1245,7 +1276,7 @@ inbox_refreshed_cb (TnyFolder *inbox, ModestAccountMgr *mgr; ModestAccountRetrieveType retrieve_type; TnyList *new_headers = NULL; - gboolean headers_only, ignore_limit, succeeded; + gboolean headers_only, ignore_limit; TnyTransportAccount *transport_account = NULL; info = (UpdateAccountInfo *) user_data; @@ -1300,8 +1331,6 @@ inbox_refreshed_cb (TnyFolder *inbox, /* Update the last updated key, even if we don't have to get new headers */ modest_account_mgr_set_last_updated (mgr, tny_account_get_id (priv->account), time (NULL)); - if (!canceled && !err) - modest_account_mgr_set_server_account_username_has_succeeded (mgr, tny_account_get_id (priv->account), TRUE); if (new_headers_array->len == 0) goto send_mail; @@ -1371,13 +1400,6 @@ inbox_refreshed_cb (TnyFolder *inbox, g_ptr_array_foreach (new_headers_array, (GFunc) g_object_unref, NULL); g_ptr_array_free (new_headers_array, FALSE); - if (priv->error) - succeeded = FALSE; - else - succeeded = TRUE; - modest_account_mgr_set_server_account_username_has_succeeded (modest_runtime_get_account_mgr (), - tny_account_get_name (priv->account), - succeeded); send_mail: /* Get the transport account */ transport_account = (TnyTransportAccount *) @@ -1446,29 +1468,31 @@ recurse_folders_async_cb (TnyFolderStore *folder_store, MODEST_MAIL_OPERATION_ERROR_OPERATION_CANCELED, "canceled"); } - } else if (info->poke_all) { + } else { /* We're not getting INBOX children if we don't want to poke all */ TnyIterator *iter = tny_list_create_iterator (list); while (!tny_iterator_is_done (iter)) { TnyFolderStore *folder = (TnyFolderStore*) tny_iterator_get_current (iter); - TnyList *folders = tny_simple_list_new (); /* Add to the list of all folders */ tny_list_append (info->folders, (GObject *) folder); - /* Add pending call */ - info->pending_calls++; - - tny_folder_store_get_folders_async (folder, folders, NULL, - recurse_folders_async_cb, - NULL, info); + if (info->poke_all) { + TnyList *folders = tny_simple_list_new (); + /* Add pending call */ + info->pending_calls++; + + tny_folder_store_get_folders_async (folder, folders, NULL, + recurse_folders_async_cb, + NULL, info); + g_object_unref (folders); + } g_object_unref (G_OBJECT (folder)); tny_iterator_next (iter); } g_object_unref (G_OBJECT (iter)); - g_object_unref (G_OBJECT (list)); } /* Remove my own pending call */ @@ -1575,6 +1599,11 @@ modest_mail_operation_update_account (ModestMailOperation *self, return; } + + /* We have once seen priv->account getting finalized during this code, + * therefore adding a reference (bug #82296) */ + + g_object_ref (priv->account); /* Create the helper object */ info = g_slice_new0 (UpdateAccountInfo); @@ -1607,6 +1636,10 @@ modest_mail_operation_update_account (ModestMailOperation *self, folders, NULL, recurse_folders_async_cb, NULL, info); + g_object_unref (folders); + + g_object_unref (priv->account); + } /* @@ -1839,7 +1872,10 @@ transfer_folder_status_cb (GObject *obj, XFerFolderAsyncHelper *helper; g_return_if_fail (status != NULL); - g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_COPY_FOLDER); + + /* Show only the status information we want */ + if (status->code != TNY_FOLDER_STATUS_CODE_COPY_FOLDER) + return; helper = (XFerFolderAsyncHelper *) user_data; g_return_if_fail (helper != NULL); @@ -2099,10 +2135,11 @@ modest_mail_operation_rename_folder (ModestMailOperation *self, transfer_folder_cb, transfer_folder_status_cb, helper); + g_object_unref (into); } else { + g_object_unref (into); goto error; } - g_object_unref (into); return; } @@ -2163,6 +2200,7 @@ modest_mail_operation_get_msg (ModestMailOperation *self, helper->last_total_bytes = 0; helper->sum_total_bytes = 0; helper->total_bytes = tny_header_get_message_size (header); + helper->more_msgs = NULL; modest_mail_operation_notify_start (self); @@ -2187,7 +2225,10 @@ get_msg_status_cb (GObject *obj, GetMsgInfo *helper = NULL; g_return_if_fail (status != NULL); - g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_GET_MSG); + + /* Show only the status information we want */ + if (status->code != TNY_FOLDER_STATUS_CODE_GET_MSG) + return; helper = (GetMsgInfo *) user_data; g_return_if_fail (helper != NULL); @@ -2221,9 +2262,10 @@ get_msg_async_cb (TnyFolder *folder, } /* If canceled by the user, ignore the error given by Tinymail */ - if (priv->status == MODEST_MAIL_OPERATION_STATUS_CANCELED || canceled) { + if (canceled) { canceled = TRUE; finished = TRUE; + priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED; } else if (err) { priv->status = MODEST_MAIL_OPERATION_STATUS_FINISHED_WITH_ERRORS; if (err) { @@ -2368,81 +2410,64 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self, } -void -modest_mail_operation_remove_msg (ModestMailOperation *self, - TnyHeader *header, - gboolean remove_to_trash /*ignored*/) -{ - TnyFolder *folder; +static void +remove_msgs_async_cb (TnyFolder *folder, + gboolean canceled, + GError *err, + gpointer user_data) +{ + gboolean expunge, leave_on_server; + const gchar *account_name; + const gchar *proto; + TnyAccount *account; + ModestTransportStoreProtocol account_proto = MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN; + ModestMailOperation *self; ModestMailOperationPrivate *priv; - g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); - g_return_if_fail (TNY_IS_HEADER (header)); - - if (remove_to_trash) - g_warning ("remove to trash is not implemented"); - + self = (ModestMailOperation *) user_data; priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); - folder = tny_header_get_folder (header); - - /* Get account and set it into mail_operation */ - priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder)); - priv->op_type = MODEST_MAIL_OPERATION_TYPE_DELETE; - priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; - - /* remove message from folder */ - tny_folder_remove_msg (folder, header, &(priv->error)); - if (!priv->error) { - gboolean expunge, leave_on_server; - const gchar *account_name; - TnyAccount *account; - ModestTransportStoreProtocol account_proto; - - tny_header_set_flag (header, TNY_HEADER_FLAG_DELETED); - tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN); - - modest_mail_operation_notify_start (self); - - /* Get leave on server setting */ - account = tny_folder_get_account (folder); - account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account); - leave_on_server = - modest_account_mgr_get_leave_on_server (modest_runtime_get_account_mgr (), - account_name); - - account_proto = modest_protocol_info_get_transport_store_protocol (tny_account_get_proto (account)); - if (((account_proto == MODEST_PROTOCOL_STORE_POP) && !leave_on_server) || - modest_tny_folder_is_remote_folder (folder) == FALSE) - expunge = TRUE; - else - expunge = FALSE; + if (canceled || err) { + /* If canceled by the user, ignore the error given by Tinymail */ + if (canceled) { + priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED; + } else if (err) { + priv->status = MODEST_MAIL_OPERATION_STATUS_FINISHED_WITH_ERRORS; + priv->error = g_error_copy ((const GError *) err); + priv->error->domain = MODEST_MAIL_OPERATION_ERROR; + } + /* Exit */ + modest_mail_operation_notify_end (self); + g_object_unref (self); + return; + } - /* Sync folder */ - tny_folder_sync_async(folder, expunge, NULL, NULL, NULL); + account = tny_folder_get_account (folder); + account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account); + leave_on_server = + modest_account_mgr_get_leave_on_server (modest_runtime_get_account_mgr (), + account_name); + proto = tny_account_get_proto (account); + g_object_unref (account); - /* Unref */ - g_object_unref (account); - } - + if (proto) + account_proto = modest_protocol_info_get_transport_store_protocol (proto); - /* Set status */ - if (!priv->error) - priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; + if (((account_proto == MODEST_PROTOCOL_STORE_POP) && !leave_on_server) || + modest_tny_folder_is_remote_folder (folder) == FALSE) + expunge = TRUE; else - priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; - - /* Free */ - g_object_unref (G_OBJECT (folder)); - - /* Notify about operation end */ - modest_mail_operation_notify_end (self); + expunge = FALSE; + + /* Sync folder */ + tny_folder_sync_async(folder, expunge, sync_folder_finish_callback, + NULL, self); } void modest_mail_operation_remove_msgs (ModestMailOperation *self, TnyList *headers, - gboolean remove_to_trash /*ignored*/) + gboolean remove_to_trash /*ignored*/) { TnyFolder *folder = NULL; ModestMailOperationPrivate *priv; @@ -2513,46 +2538,9 @@ modest_mail_operation_remove_msgs (ModestMailOperation *self, /* remove message from folder */ modest_mail_operation_notify_start (self); + tny_folder_remove_msgs_async (folder, remove_headers, remove_msgs_async_cb, + NULL, g_object_ref (self)); - tny_folder_remove_msgs (folder, remove_headers, &(priv->error)); - if (!priv->error) { - gboolean expunge, leave_on_server; - const gchar *account_name; - const gchar *proto; - TnyAccount *account; - ModestTransportStoreProtocol account_proto = MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN; - - account = tny_folder_get_account (folder); - account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account); - leave_on_server = - modest_account_mgr_get_leave_on_server (modest_runtime_get_account_mgr (), - account_name); - - proto = tny_account_get_proto (account); - if (proto) { - account_proto = modest_protocol_info_get_transport_store_protocol (proto); - } - - if (((account_proto == MODEST_PROTOCOL_STORE_POP) && !leave_on_server) || - modest_tny_folder_is_remote_folder (folder) == FALSE) - expunge = TRUE; - else - expunge = FALSE; - - /* Sync folder */ - tny_folder_sync_async(folder, expunge, NULL, NULL, NULL); - - g_object_unref (account); - } - - - /* Set status */ - if (!priv->error) - priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; - else - priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; - - /* Free */ cleanup: if (remove_headers) g_object_unref (remove_headers); @@ -2562,9 +2550,6 @@ cleanup: g_object_unref (iter); if (folder) g_object_unref (folder); - - /* Notify about operation end */ - modest_mail_operation_notify_end (self); } static void @@ -2627,7 +2612,10 @@ transfer_msgs_status_cb (GObject *obj, XFerMsgsAsyncHelper *helper; g_return_if_fail (status != NULL); - g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_XFER_MSGS); + + /* Show only the status information we want */ + if (status->code != TNY_FOLDER_STATUS_CODE_XFER_MSGS) + return; helper = (XFerMsgsAsyncHelper *) user_data; g_return_if_fail (helper != NULL); @@ -2651,16 +2639,12 @@ transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError *err, gpointer u priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); - if (err) { + if (cancelled) { + priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED; + } else if (err) { priv->error = g_error_copy (err); priv->done = 0; priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; - } else 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)); } else if (priv->status != MODEST_MAIL_OPERATION_STATUS_CANCELED) { if (helper->more_msgs) { /* We'll transfer the next message in the list */ @@ -2675,7 +2659,6 @@ transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError *err, gpointer u finished = FALSE; } } - if (finished) { priv->done = 1; priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; @@ -2955,7 +2938,10 @@ on_refresh_folder_status_update (GObject *obj, g_return_if_fail (user_data != NULL); g_return_if_fail (status != NULL); - g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_REFRESH); + + /* Show only the status information we want */ + if (status->code != TNY_FOLDER_STATUS_CODE_REFRESH) + return; helper = (RefreshAsyncHelper *) user_data; self = helper->mail_op; @@ -3052,19 +3038,35 @@ modest_mail_operation_run_queue (ModestMailOperation *self, } static void -sync_folder_finish_callback (TnyFolder *self, gboolean cancelled, GError *err, ModestMailOperation *mail_op) +sync_folder_finish_callback (TnyFolder *self, + gboolean cancelled, + GError *err, + gpointer user_data) + { + ModestMailOperation *mail_op; ModestMailOperationPrivate *priv; + mail_op = (ModestMailOperation *) user_data; priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_op); - if (err != NULL) { - g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, - MODEST_MAIL_OPERATION_ERROR_OPERATION_CANCELED, - err->message); - priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + + /* If canceled by the user, ignore the error given by Tinymail */ + if (cancelled) { + priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED; + } else if (err) { + /* If the operation was a sync then the status is + failed, but if it's part of another operation then + just set it as finished with errors */ + if (priv->op_type == MODEST_MAIL_OPERATION_TYPE_SYNC_FOLDER) + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + else + priv->status = MODEST_MAIL_OPERATION_STATUS_FINISHED_WITH_ERRORS; + priv->error = g_error_copy ((const GError *) err); + priv->error->domain = MODEST_MAIL_OPERATION_ERROR; } else { priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; } + modest_mail_operation_notify_end (mail_op); g_object_unref (mail_op); } @@ -3085,7 +3087,9 @@ modest_mail_operation_sync_folder (ModestMailOperation *self, modest_mail_operation_notify_start (self); g_object_ref (self); - tny_folder_sync_async (folder, expunge, (TnyFolderCallback) sync_folder_finish_callback, NULL, self); + tny_folder_sync_async (folder, expunge, + (TnyFolderCallback) sync_folder_finish_callback, + NULL, self); } static void