X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=c7399b5ffedfae4759218b3cce47e2cbeed93e3f;hp=79d9c47c755dff185757d2c8638a1bf7c22c1e9e;hb=04691c42117fd68177b047f77e321321aa5e1260;hpb=a928ea9cd483356e9bbb31a11609a380b5954f94 diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c index 79d9c47..c7399b5 100644 --- a/src/modest-mail-operation.c +++ b/src/modest-mail-operation.c @@ -63,6 +63,9 @@ #include #include "modest-utils.h" #include "modest-debug.h" +#ifdef MODEST_USE_LIBTIME +#include +#endif #define KB 1024 @@ -231,6 +234,7 @@ static void modest_mail_operation_create_msg (ModestMailOperation *self const gchar *html_body, const GList *attachments_list, const GList *images_list, TnyHeaderFlags priority_flags, + const gchar *references, const gchar *in_reply_to, ModestMailOperationCreateMsgCallback callback, gpointer userdata); @@ -243,6 +247,8 @@ typedef struct gchar *cc; gchar *bcc; gchar *subject; + gchar *references; + gchar *in_reply_to; gchar *plain_body; gchar *html_body; GList *attachments_list; @@ -659,7 +665,7 @@ send_mail_on_sync_async_cb (TnyFolder *folder, self = helper->mail_op; priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); - if (cancelled || err) + if (cancelled) goto end; if (err) { @@ -744,7 +750,7 @@ send_mail_on_added_to_outbox (TnySendQueue *send_queue, self = helper->mail_op; priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); - if (cancelled || err) + if (cancelled) goto end; if (err) { @@ -762,35 +768,39 @@ send_mail_on_added_to_outbox (TnySendQueue *send_queue, ModestTnySendQueue *queue; trans_account = (TnyTransportAccount *) modest_mail_operation_get_account (self); - queue = modest_runtime_get_send_queue (trans_account, TRUE); - if (queue) { - RunQueueHelper *helper; - - /* Create the helper */ - helper = g_slice_new0 (RunQueueHelper); - helper->queue = g_object_ref (queue); - helper->self = g_object_ref (self); - - /* if sending is ongoing wait for the queue to - stop. Otherwise wait for the queue-start - signal. It could happen that the queue - could not start, then check also the error - happened signal */ - if (modest_tny_send_queue_sending_in_progress (queue)) { - run_queue_start (TNY_SEND_QUEUE (queue), helper); + if (trans_account) { + queue = modest_runtime_get_send_queue (trans_account, TRUE); + if (queue) { + RunQueueHelper *helper; + + /* Create the helper */ + helper = g_slice_new0 (RunQueueHelper); + helper->queue = g_object_ref (queue); + helper->self = g_object_ref (self); + + /* if sending is ongoing wait for the queue to + stop. Otherwise wait for the queue-start + signal. It could happen that the queue + could not start, then check also the error + happened signal */ + if (modest_tny_send_queue_sending_in_progress (queue)) { + run_queue_start (TNY_SEND_QUEUE (queue), helper); + } else { + helper->start_handler = g_signal_connect (queue, "queue-start", + G_CALLBACK (run_queue_start), + helper); + helper->error_handler = g_signal_connect (queue, "error-happened", + G_CALLBACK (run_queue_error_happened), + helper); + } } else { - helper->start_handler = g_signal_connect (queue, "queue-start", - G_CALLBACK (run_queue_start), - helper); - helper->error_handler = g_signal_connect (queue, "error-happened", - G_CALLBACK (run_queue_error_happened), - helper); + /* Finalize this mail operation */ + modest_mail_operation_notify_end (self); } + g_object_unref (trans_account); } else { - /* Finalize this mail operation */ - modest_mail_operation_notify_end (self); + g_warning ("No transport account for the operation"); } - g_object_unref (trans_account); } g_object_unref (helper->mail_op); @@ -828,12 +838,16 @@ create_msg_thread (gpointer thread_data) priv = MODEST_MAIL_OPERATION_GET_PRIVATE(info->mail_op); 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->bcc, info->subject, + info->references, info->in_reply_to, + info->plain_body, info->attachments_list, &attached, &(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->bcc, info->subject, + info->references, info->in_reply_to, + info->html_body, info->plain_body, info->attachments_list, info->images_list, &attached, &(priv->error)); @@ -867,6 +881,8 @@ create_msg_thread (gpointer thread_data) g_free (info->plain_body); g_free (info->html_body); g_free (info->subject); + g_free (info->references); + g_free (info->in_reply_to); g_list_foreach (info->attachments_list, (GFunc) g_object_unref, NULL); g_list_free (info->attachments_list); g_list_foreach (info->images_list, (GFunc) g_object_unref, NULL); @@ -900,6 +916,8 @@ modest_mail_operation_create_msg (ModestMailOperation *self, const GList *attachments_list, const GList *images_list, TnyHeaderFlags priority_flags, + const gchar *references, + const gchar *in_reply_to, ModestMailOperationCreateMsgCallback callback, gpointer userdata) { @@ -915,6 +933,8 @@ modest_mail_operation_create_msg (ModestMailOperation *self, info->subject = g_strdup (subject); info->plain_body = g_strdup (plain_body); info->html_body = g_strdup (html_body); + info->references = g_strdup (references); + info->in_reply_to = g_strdup (in_reply_to); info->attachments_list = g_list_copy ((GList *) attachments_list); g_list_foreach (info->attachments_list, (GFunc) g_object_ref, NULL); info->images_list = g_list_copy ((GList *) images_list); @@ -1074,6 +1094,8 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self, const gchar *html_body, const GList *attachments_list, const GList *images_list, + const gchar *references, + const gchar *in_reply_to, TnyHeaderFlags priority_flags) { ModestMailOperationPrivate *priv = NULL; @@ -1110,6 +1132,7 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self, modest_mail_operation_create_msg (self, from, to, cc, bcc, subject, plain_body, html_body, attachments_list, images_list, priority_flags, + references, in_reply_to, modest_mail_operation_send_new_mail_cb, info); } @@ -1272,6 +1295,8 @@ modest_mail_operation_save_to_drafts (ModestMailOperation *self, const GList *attachments_list, const GList *images_list, TnyHeaderFlags priority_flags, + const gchar *references, + const gchar *in_reply_to, SaveToDraftstCallback callback, gpointer user_data) { @@ -1297,6 +1322,7 @@ modest_mail_operation_save_to_drafts (ModestMailOperation *self, modest_mail_operation_notify_start (self); modest_mail_operation_create_msg (self, from, to, cc, bcc, subject, plain_body, html_body, attachments_list, images_list, priority_flags, + references, in_reply_to, modest_mail_operation_save_to_drafts_cb, info); } @@ -1547,6 +1573,7 @@ inbox_refreshed_cb (TnyFolder *inbox, ModestAccountRetrieveType retrieve_type; TnyList *new_headers = NULL; gboolean headers_only, ignore_limit; + time_t time_to_store; info = (UpdateAccountInfo *) user_data; priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op); @@ -1577,7 +1604,14 @@ inbox_refreshed_cb (TnyFolder *inbox, } /* Set the last updated as the current time */ - modest_account_mgr_set_last_updated (mgr, tny_account_get_id (priv->account), time (NULL)); +#ifdef MODEST_USE_LIBTIME + struct tm utc_tm; + time_get_utc (&utc_tm); + time_to_store = time_mktime (&utc_tm, "GMT"); +#else + time_to_store = time (NULL); +#endif + modest_account_mgr_set_last_updated (mgr, tny_account_get_id (priv->account), time_to_store); /* Get the message max size */ max_size = modest_conf_get_int (modest_runtime_get_conf (), @@ -2063,7 +2097,7 @@ modest_mail_operation_create_folder (ModestMailOperation *self, } } - if (!strcmp (name, " ") || strchr (name, '/')) { + if (!priv->error && (!strcmp (name, " ") || strchr (name, '/'))) { priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES, @@ -2580,11 +2614,10 @@ get_msg_async_cb (TnyFolder *folder, 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); + priv->error = g_error_copy ((const GError *) err); + if (priv->error) { priv->error->domain = MODEST_MAIL_OPERATION_ERROR; - } - if (!priv->error) { + } else { g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND, err->message); @@ -2777,7 +2810,7 @@ remove_msgs_async_cb (TnyFolder *folder, return; } - account = tny_folder_get_account (folder); + account = modest_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 (), @@ -2808,6 +2841,7 @@ modest_mail_operation_remove_msgs (ModestMailOperation *self, TnyHeader *header = NULL; TnyList *remove_headers = NULL; TnyFolderType folder_type = TNY_FOLDER_TYPE_UNKNOWN; + ModestTnyAccountStore *accstore = modest_runtime_get_account_store(); g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); g_return_if_fail (TNY_IS_LIST (headers)); @@ -2819,52 +2853,67 @@ modest_mail_operation_remove_msgs (ModestMailOperation *self, g_warning ("%s: list of headers is empty\n", __FUNCTION__); goto cleanup; /* nothing to do */ } - + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); - remove_headers = g_object_ref(headers); /* Get folder from first header and sync it */ - iter = tny_list_create_iterator (headers); + iter = tny_list_create_iterator (headers); header = TNY_HEADER (tny_iterator_get_current (iter)); + g_object_unref (iter); - folder = tny_header_get_folder (header); + folder = tny_header_get_folder (header); if (!TNY_IS_FOLDER(folder)) { g_warning ("%s: could not get folder for header\n", __FUNCTION__); goto cleanup; } - /* Don't remove messages that are being sent */ + /* Use the merged folder if we're removing messages from outbox */ if (modest_tny_folder_is_local_folder (folder)) { + ModestTnyLocalFoldersAccount *local_account; + + local_account = (ModestTnyLocalFoldersAccount *) + modest_tny_account_store_get_local_folders_account (accstore); folder_type = modest_tny_folder_get_local_or_mmc_folder_type (folder); + if (folder_type == TNY_FOLDER_TYPE_OUTBOX) { + g_object_unref (folder); + folder = modest_tny_local_folders_account_get_merged_outbox (local_account); + } + g_object_unref (local_account); } + if (folder_type == TNY_FOLDER_TYPE_OUTBOX) { - TnyTransportAccount *traccount = NULL; - ModestTnyAccountStore *accstore = modest_runtime_get_account_store(); - traccount = modest_tny_account_store_get_transport_account_from_outbox_header(accstore, header); - if (traccount) { - ModestTnySendQueueStatus status; - ModestTnySendQueue *send_queue = modest_runtime_get_send_queue(traccount, TRUE); - - if (TNY_IS_SEND_QUEUE (send_queue)) { - TnyIterator *iter = tny_list_create_iterator(headers); - g_object_unref(remove_headers); - remove_headers = TNY_LIST(tny_simple_list_new()); - while (!tny_iterator_is_done(iter)) { + TnyIterator *headers_iter = tny_list_create_iterator (headers); + + while (!tny_iterator_is_done (headers_iter)) { + TnyTransportAccount *traccount = NULL; + TnyHeader *hdr = NULL; + + hdr = TNY_HEADER (tny_iterator_get_current (headers_iter)); + traccount = modest_tny_account_store_get_transport_account_from_outbox_header (accstore, + header); + if (traccount) { + ModestTnySendQueueStatus status; + ModestTnySendQueue *send_queue; + + send_queue = modest_runtime_get_send_queue(traccount, TRUE); + if (TNY_IS_SEND_QUEUE (send_queue)) { char *msg_id; - TnyHeader *hdr = TNY_HEADER(tny_iterator_get_current(iter)); + msg_id = modest_tny_send_queue_get_msg_id (hdr); status = modest_tny_send_queue_get_msg_status(send_queue, msg_id); if (status != MODEST_TNY_SEND_QUEUE_SENDING) { + if (G_UNLIKELY (remove_headers == NULL)) + remove_headers = tny_simple_list_new (); tny_list_append(remove_headers, G_OBJECT(hdr)); } - g_object_unref(hdr); g_free(msg_id); - tny_iterator_next(iter); } - g_object_unref(iter); + g_object_unref(traccount); } - g_object_unref(traccount); + g_object_unref(hdr); + tny_iterator_next (headers_iter); } + g_object_unref(headers_iter); } /* Get account and set it into mail_operation */ @@ -2872,6 +2921,9 @@ modest_mail_operation_remove_msgs (ModestMailOperation *self, priv->op_type = MODEST_MAIL_OPERATION_TYPE_DELETE; priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; + if (!remove_headers) + remove_headers = g_object_ref (headers); + /* remove message from folder */ modest_mail_operation_notify_start (self); tny_folder_remove_msgs_async (folder, remove_headers, remove_msgs_async_cb, @@ -2882,8 +2934,6 @@ cleanup: g_object_unref (remove_headers); if (header) g_object_unref (header); - if (iter) - g_object_unref (iter); if (folder) g_object_unref (folder); }