X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=0caffc3a6c9381d9b2f2481373b78a6d979bdfe4;hp=6f7d2abd5050c8c30867f85735c6098e1dca53ff;hb=a38f50af4c0747976ed5d869e50cb46f29e3bb8a;hpb=5944929fea7239bff03a13ff76a663c3cbda0121 diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c index 6f7d2ab..0caffc3 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, @@ -777,7 +783,6 @@ modest_mail_operation_send_new_mail_cb (ModestMailOperation *self, TnyFolder *draft_folder = NULL; TnyFolder *outbox_folder = NULL; TnyHeader *header = NULL; - GError *err = NULL; if (!msg) { goto end; @@ -795,6 +800,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 +844,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 +857,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) @@ -1211,6 +1216,27 @@ update_account_get_msg_async_cb (TnyFolder *folder, } static void +update_account_notify_user_and_free (UpdateAccountInfo *info, + TnyList *new_headers) +{ + /* Set the account back to not busy */ + modest_account_mgr_set_account_busy (modest_runtime_get_account_mgr (), + info->account_name, FALSE); + + /* User callback */ + if (info->callback) + info->callback (info->mail_op, new_headers, info->user_data); + + /* Mail operation end */ + modest_mail_operation_notify_end (info->mail_op); + + /* Frees */ + if (new_headers) + g_object_unref (new_headers); + destroy_update_account_info (info); +} + +static void inbox_refreshed_cb (TnyFolder *inbox, gboolean canceled, GError *err, @@ -1224,14 +1250,27 @@ 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; priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op); mgr = modest_runtime_get_account_mgr (); - if (canceled || err || !inbox) { + if (canceled || err) { + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + if (err) + priv->error = g_error_copy (err); + else + g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, + MODEST_MAIL_OPERATION_ERROR_OPERATION_CANCELED, + "canceled"); + /* Notify the user about the error and then exit */ + update_account_notify_user_and_free (info, NULL); + return; + } + + if (!inbox) { /* Try to send anyway */ goto send_mail; } @@ -1266,8 +1305,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; @@ -1337,13 +1374,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 *) @@ -1383,20 +1413,8 @@ inbox_refreshed_cb (TnyFolder *inbox, if (!priv->error) priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; - /* Set the account back to not busy */ - modest_account_mgr_set_account_busy (mgr, info->account_name, FALSE); - - /* Call the user callback */ - if (info->callback) - info->callback (info->mail_op, new_headers, info->user_data); - - /* Notify about operation end */ - modest_mail_operation_notify_end (info->mail_op); - - /* Frees */ - if (new_headers) - g_object_unref (new_headers); - destroy_update_account_info (info); + /* Call the user callback and free */ + update_account_notify_user_and_free (info, new_headers); } static void @@ -1413,30 +1431,42 @@ recurse_folders_async_cb (TnyFolderStore *folder_store, priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op); if (err || canceled) { - /* Try to continue anyway */ - } else if (info->poke_all) { + /* If the error was previosly set by another callback + don't set it again */ + if (!priv->error) { + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + if (err) + priv->error = g_error_copy (err); + else + g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, + MODEST_MAIL_OPERATION_ERROR_OPERATION_CANCELED, + "canceled"); + } + } 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 */ @@ -1447,6 +1477,12 @@ recurse_folders_async_cb (TnyFolderStore *folder_store, TnyIterator *iter_all_folders; TnyFolder *inbox = NULL; + /* If there was any error do not continue */ + if (priv->error) { + update_account_notify_user_and_free (info, NULL); + return; + } + iter_all_folders = tny_list_create_iterator (info->folders); /* Do a poke status over all folders */ @@ -1537,6 +1573,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); @@ -1569,6 +1610,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); + } /* @@ -1801,7 +1846,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); @@ -2061,10 +2109,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; } @@ -2149,7 +2198,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); @@ -2183,10 +2235,11 @@ 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) { + if (canceled) { canceled = TRUE; finished = TRUE; - } else if (canceled || err) { + priv->status == MODEST_MAIL_OPERATION_STATUS_CANCELED; + } else if (err) { priv->status = MODEST_MAIL_OPERATION_STATUS_FINISHED_WITH_ERRORS; if (err) { priv->error = g_error_copy ((const GError *) err); @@ -2330,81 +2383,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; @@ -2475,46 +2511,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); @@ -2524,9 +2523,6 @@ cleanup: g_object_unref (iter); if (folder) g_object_unref (folder); - - /* Notify about operation end */ - modest_mail_operation_notify_end (self); } static void @@ -2589,7 +2585,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); @@ -2613,16 +2612,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 */ @@ -2637,7 +2632,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; @@ -2917,7 +2911,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; @@ -3014,19 +3011,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); } @@ -3047,7 +3060,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