X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=20f58fc8e509da6ab02d4a321228fce185242ecc;hp=30f1a57e7c36a9b067447974358c3f5dba1b8689;hb=be172e3b32ddcd4e647b4a179179853fb131f4b3;hpb=f34695cc046a41df511b47a38e043679560893f4 diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c index 30f1a57..20f58fc 100644 --- a/src/modest-mail-operation.c +++ b/src/modest-mail-operation.c @@ -45,6 +45,7 @@ #include #include #include +#include #include "modest-platform.h" #include "modest-account-mgr-helpers.h" #include @@ -62,6 +63,12 @@ #include #include "modest-utils.h" #include "modest-debug.h" +#ifdef MODEST_USE_LIBTIME +#include +#endif +#include "modest-account-protocol.h" +#include +#include #define KB 1024 @@ -131,9 +138,9 @@ typedef struct gint pending_calls; gboolean poke_all; TnyFolderObserver *inbox_observer; - RetrieveAllCallback retrieve_all_cb; gboolean interactive; gboolean msg_readed; + gboolean update_folder_counts; } UpdateAccountInfo; static void destroy_update_account_info (UpdateAccountInfo *info); @@ -190,6 +197,8 @@ typedef struct { gint last_total_bytes; gint sum_total_bytes; gint total_bytes; + TnyIterator *get_parts; + TnyMsg *msg; } GetMsgInfo; typedef struct _RefreshAsyncHelper { @@ -219,6 +228,12 @@ typedef struct _XFerFolderAsyncHelper gpointer user_data; } XFerFolderAsyncHelper; +typedef struct _SyncFolderHelper { + ModestMailOperation *mail_op; + SyncFolderCallback user_callback; + gpointer user_data; +} SyncFolderHelper; + typedef void (*ModestMailOperationCreateMsgCallback) (ModestMailOperation *mail_op, TnyMsg *msg, gpointer userdata); @@ -230,6 +245,8 @@ 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, + TnyList *header_pairs, ModestMailOperationCreateMsgCallback callback, gpointer userdata); @@ -242,11 +259,14 @@ typedef struct gchar *cc; gchar *bcc; gchar *subject; + gchar *references; + gchar *in_reply_to; gchar *plain_body; gchar *html_body; GList *attachments_list; GList *images_list; TnyHeaderFlags priority_flags; + TnyList *header_pairs; ModestMailOperationCreateMsgCallback callback; gpointer userdata; } CreateMsgInfo; @@ -658,7 +678,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) { @@ -743,7 +763,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) { @@ -761,35 +781,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); @@ -827,23 +851,29 @@ 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, + info->header_pairs, &(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, + info->header_pairs, &(priv->error)); } if (new_msg) { - TnyHeader *header; + TnyHeader *header = tny_msg_get_header (new_msg); /* Set priority flags in message */ - header = tny_msg_get_header (new_msg); - tny_header_set_flag (header, info->priority_flags); + if (info->priority_flags != TNY_HEADER_FLAG_NORMAL_PRIORITY) + tny_header_set_flag (header, info->priority_flags); /* Set attachment flags in message */ if (info->attachments_list != NULL && attached > 0) @@ -866,10 +896,13 @@ 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); g_list_free (info->images_list); + g_object_unref (info->header_pairs); if (info->callback) { CreateMsgIdleInfo *idle_info; @@ -899,6 +932,9 @@ 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, + TnyList *header_pairs, ModestMailOperationCreateMsgCallback callback, gpointer userdata) { @@ -914,11 +950,14 @@ 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); g_list_foreach (info->images_list, (GFunc) g_object_ref, NULL); - info->priority_flags = priority_flags; + info->priority_flags = 0 | priority_flags; + info->header_pairs = tny_list_copy (header_pairs); info->callback = callback; info->userdata = userdata; @@ -1064,6 +1103,56 @@ end: } void +modest_mail_operation_send_mail (ModestMailOperation *self, + TnyTransportAccount *transport_account, + TnyMsg *msg) +{ + TnySendQueue *send_queue = NULL; + ModestMailOperationPrivate *priv = NULL; + + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); + + if (!msg) { + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + modest_mail_operation_notify_end (self); + return; + } + + 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); + return; + } + + /* Add message to send queue */ + send_queue = TNY_SEND_QUEUE (modest_runtime_get_send_queue (transport_account, TRUE)); + 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"); + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + modest_mail_operation_notify_end (self); + return; + } else { + SendNewMailHelper *helper = g_slice_new (SendNewMailHelper); + helper->mail_op = g_object_ref (self); + helper->notify = TRUE; + + /* Add the msg to the queue. The callback will free + the helper */ + modest_tny_send_queue_set_requested_send_receive (MODEST_TNY_SEND_QUEUE (send_queue), + FALSE); + tny_send_queue_add_async (send_queue, msg, send_mail_on_added_to_outbox, + NULL, helper); + } + +} + +void modest_mail_operation_send_new_mail (ModestMailOperation *self, TnyTransportAccount *transport_account, TnyMsg *draft_msg, @@ -1073,7 +1162,10 @@ modest_mail_operation_send_new_mail (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, + TnyHeaderFlags priority_flags, + TnyList *header_pairs) { ModestMailOperationPrivate *priv = NULL; SendNewMailInfo *info; @@ -1109,12 +1201,54 @@ 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, + header_pairs, modest_mail_operation_send_new_mail_cb, info); } typedef struct { + ModestMailOperation *mailop; + TnyMsg *msg; + SaveToDraftstCallback callback; + gpointer userdata; +} FinishSaveRemoteDraftInfo; + +static void +finish_save_remote_draft (ModestAccountProtocol *protocol, + GError *err, + const gchar *account_id, + TnyMsg *new_remote_msg, + TnyMsg *new_msg, + TnyMsg *old_msg, + gpointer userdata) +{ + FinishSaveRemoteDraftInfo *info = (FinishSaveRemoteDraftInfo *) userdata; + ModestMailOperationPrivate *priv = NULL; + + priv = MODEST_MAIL_OPERATION_GET_PRIVATE(info->mailop); + + if (!priv->error && err != NULL) { + /* Priority for errors in save to local stage */ + priv->error = g_error_copy (err); + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + } + + if (info->callback) + info->callback (info->mailop, info->msg, info->userdata); + + if (info->msg) + g_object_unref (info->msg); + + modest_mail_operation_notify_end (info->mailop); + g_object_unref (info->mailop); + + g_slice_free (FinishSaveRemoteDraftInfo, info); +} + +typedef struct +{ TnyTransportAccount *transport_account; TnyMsg *draft_msg; SaveToDraftstCallback callback; @@ -1133,6 +1267,7 @@ modest_mail_operation_save_to_drafts_add_msg_cb(TnyFolder *self, ModestMailOperationPrivate *priv = NULL; SaveToDraftsAddMsgInfo *info = (SaveToDraftsAddMsgInfo *) userdata; GError *io_error = NULL; + gboolean callback_called = FALSE; priv = MODEST_MAIL_OPERATION_GET_PRIVATE(info->mailop); @@ -1177,8 +1312,32 @@ modest_mail_operation_save_to_drafts_add_msg_cb(TnyFolder *self, priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; } + if (info->transport_account) { + ModestProtocolType transport_protocol_type; + ModestProtocol *transport_protocol; + + transport_protocol_type = modest_tny_account_get_protocol_type (TNY_ACCOUNT (info->transport_account)); + + transport_protocol = modest_protocol_registry_get_protocol_by_type (modest_runtime_get_protocol_registry (), + transport_protocol_type); + if (transport_protocol && MODEST_IS_ACCOUNT_PROTOCOL (transport_protocol)) { + FinishSaveRemoteDraftInfo *srd_info = g_slice_new (FinishSaveRemoteDraftInfo); + srd_info->mailop = info->mailop?g_object_ref (info->mailop):NULL; + srd_info->msg = info->msg?g_object_ref (info->msg):NULL; + srd_info->callback = info->callback; + srd_info->userdata = info->user_data; + modest_account_protocol_save_remote_draft (MODEST_ACCOUNT_PROTOCOL (transport_protocol), + tny_account_get_id (TNY_ACCOUNT (info->transport_account)), + info->msg, info->draft_msg, + finish_save_remote_draft, + srd_info); + + callback_called = TRUE; + } + } + /* Call the user callback */ - if (info->callback) + if (!callback_called && info->callback) info->callback (info->mailop, info->msg, info->user_data); if (info->transport_account) @@ -1190,8 +1349,10 @@ modest_mail_operation_save_to_drafts_add_msg_cb(TnyFolder *self, if (info->msg) g_object_unref (G_OBJECT (info->msg)); - modest_mail_operation_notify_end (info->mailop); - g_object_unref(info->mailop); + if (!callback_called) + modest_mail_operation_notify_end (info->mailop); + if (info->mailop) + g_object_unref(info->mailop); g_slice_free (SaveToDraftsAddMsgInfo, info); } @@ -1231,16 +1392,18 @@ modest_mail_operation_save_to_drafts_cb (ModestMailOperation *self, } 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; - cb_info->callback = info->callback; - cb_info->user_data = info->user_data; - cb_info->drafts = g_object_ref(drafts); - cb_info->msg = g_object_ref(msg); - cb_info->mailop = g_object_ref(self); - tny_folder_add_msg_async(drafts, msg, modest_mail_operation_save_to_drafts_add_msg_cb, - NULL, cb_info); + if (drafts) { + 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; + cb_info->callback = info->callback; + cb_info->user_data = info->user_data; + cb_info->drafts = g_object_ref(drafts); + cb_info->msg = g_object_ref(msg); + cb_info->mailop = g_object_ref(self); + tny_folder_add_msg_async(drafts, msg, modest_mail_operation_save_to_drafts_add_msg_cb, + NULL, cb_info); + } } else { /* Call the user callback */ priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; @@ -1269,6 +1432,9 @@ 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, + TnyList *header_pairs, SaveToDraftstCallback callback, gpointer user_data) { @@ -1294,6 +1460,8 @@ 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, + header_pairs, modest_mail_operation_save_to_drafts_cb, info); } @@ -1329,8 +1497,7 @@ G_DEFINE_TYPE_WITH_CODE (InternalFolderObserver, static void foreach_add_item (gpointer header, gpointer user_data) { - tny_list_prepend (TNY_LIST (user_data), - G_OBJECT (header)); + tny_list_append (TNY_LIST (user_data), G_OBJECT (header)); } /* This is the method that looks for new messages in a folder */ @@ -1404,6 +1571,9 @@ update_account_send_mail (UpdateAccountInfo *info) TnyTransportAccount *transport_account = NULL; ModestTnyAccountStore *account_store; + if (info->update_folder_counts) + return; + account_store = modest_runtime_get_account_store (); /* We don't try to send messages while sending mails is blocked */ @@ -1411,9 +1581,9 @@ update_account_send_mail (UpdateAccountInfo *info) return; /* Get the transport account */ - transport_account = (TnyTransportAccount *) - modest_tny_account_store_get_transport_account_for_open_connection (account_store, - info->account_name); + transport_account = (TnyTransportAccount *) + modest_tny_account_store_get_server_account (account_store, info->account_name, + TNY_ACCOUNT_TYPE_TRANSPORT); if (transport_account) { ModestTnySendQueue *send_queue; @@ -1433,13 +1603,16 @@ update_account_send_mail (UpdateAccountInfo *info) g_warning ("%s: could not get outbox", __FUNCTION__); num_messages = 0; } - + if (num_messages != 0) { + ModestMailOperation *mail_op; /* Reenable suspended items */ - modest_tny_send_queue_wakeup (MODEST_TNY_SEND_QUEUE (send_queue)); - + mail_op = modest_mail_operation_new (NULL); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + mail_op); + modest_mail_operation_queue_wakeup (mail_op, MODEST_TNY_SEND_QUEUE (send_queue)); + /* Try to send */ - tny_camel_send_queue_flush (TNY_CAMEL_SEND_QUEUE (send_queue)); modest_tny_send_queue_set_requested_send_receive (MODEST_TNY_SEND_QUEUE (send_queue), info->interactive); } @@ -1497,9 +1670,10 @@ update_account_get_msg_async_cb (TnyFolder *folder, /* Call the user callback and free */ new_headers = tny_iterator_get_list (msg_info->more_msgs); update_account_notify_user_and_free (info, new_headers); - g_object_unref (new_headers); /* Delete the helper */ + if (msg_info->msg) + g_object_unref (msg_info->msg); g_object_unref (msg_info->more_msgs); g_object_unref (msg_info->mail_op); g_slice_free (GetMsgInfo, msg_info); @@ -1536,20 +1710,18 @@ inbox_refreshed_cb (TnyFolder *inbox, UpdateAccountInfo *info; ModestMailOperationPrivate *priv; TnyIterator *new_headers_iter; - GPtrArray *new_headers_array = NULL; - gint max_size, retrieve_limit, i; + GPtrArray *new_headers_array = NULL; + gint max_size = G_MAXINT, retrieve_limit, i; ModestAccountMgr *mgr; ModestAccountRetrieveType retrieve_type; TnyList *new_headers = NULL; - gboolean headers_only, ignore_limit; + gboolean headers_only; + time_t time_to_store; info = (UpdateAccountInfo *) user_data; priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op); mgr = modest_runtime_get_account_mgr (); - /* Set the last updated as the current time, do it even if the inbox refresh failed */ - modest_account_mgr_set_last_updated (mgr, tny_account_get_id (priv->account), time (NULL)); - if (canceled || err) { priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; if (err) @@ -1559,7 +1731,8 @@ inbox_refreshed_cb (TnyFolder *inbox, MODEST_MAIL_OPERATION_ERROR_OPERATION_CANCELED, "canceled"); - tny_folder_remove_observer (inbox, info->inbox_observer); + if (inbox) + tny_folder_remove_observer (inbox, info->inbox_observer); g_object_unref (info->inbox_observer); info->inbox_observer = NULL; @@ -1573,19 +1746,36 @@ inbox_refreshed_cb (TnyFolder *inbox, goto send_mail; } - /* Get the message max size */ - max_size = modest_conf_get_int (modest_runtime_get_conf (), - MODEST_CONF_MSG_SIZE_LIMIT, NULL); - if (max_size == 0) - max_size = G_MAXINT; - else - max_size = max_size * KB; + if (!info->update_folder_counts) { + /* Set the last updated as the current time */ +#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 (), + MODEST_CONF_MSG_SIZE_LIMIT, NULL); + if (max_size == 0) + max_size = G_MAXINT; + else + max_size = max_size * KB; + } /* Create the new headers array. We need it to sort the new headers by date */ new_headers_array = g_ptr_array_new (); if (info->inbox_observer) { new_headers_iter = tny_list_create_iterator (((InternalFolderObserver *) info->inbox_observer)->new_headers); + if (!tny_iterator_is_done (new_headers_iter)) { + modest_platform_emit_folder_updated_signal (info->account_name, tny_folder_get_id (TNY_FOLDER (inbox))); + modest_account_mgr_set_has_new_mails (modest_runtime_get_account_mgr (), + info->account_name, TRUE); + } while (!tny_iterator_is_done (new_headers_iter)) { TnyHeader *header = NULL; @@ -1593,7 +1783,7 @@ inbox_refreshed_cb (TnyFolder *inbox, /* Apply per-message size limits */ if (tny_header_get_message_size (header) < max_size) g_ptr_array_add (new_headers_array, g_object_ref (header)); - + g_object_unref (header); tny_iterator_next (new_headers_iter); } @@ -1613,47 +1803,32 @@ inbox_refreshed_cb (TnyFolder *inbox, retrieve_limit = modest_account_mgr_get_retrieve_limit (mgr, info->account_name); if (retrieve_limit == 0) retrieve_limit = G_MAXINT; - + /* Get per-account retrieval type */ retrieve_type = modest_account_mgr_get_retrieve_type (mgr, info->account_name); headers_only = (retrieve_type == MODEST_ACCOUNT_RETRIEVE_HEADERS_ONLY); /* Order by date */ g_ptr_array_sort (new_headers_array, (GCompareFunc) compare_headers_by_date); - - /* Ask the users if they want to retrieve all the messages - even though the limit was exceeded */ - ignore_limit = FALSE; - if (new_headers_array->len > retrieve_limit) { - /* Ask the user if a callback has been specified and - if the mail operation has a source (this means that - was invoked by the user and not automatically by a - D-Bus method) */ - if (info->retrieve_all_cb && priv->source) - ignore_limit = info->retrieve_all_cb (priv->source, - new_headers_array->len, - retrieve_limit); - } /* Copy the headers to a list and free the array */ new_headers = tny_simple_list_new (); for (i=0; i < new_headers_array->len; i++) { TnyHeader *header = TNY_HEADER (g_ptr_array_index (new_headers_array, i)); - tny_list_append (new_headers, G_OBJECT (header)); + /* We want the first element to be the most recent + one, that's why we reverse the list */ + tny_list_prepend (new_headers, G_OBJECT (header)); } g_ptr_array_foreach (new_headers_array, (GFunc) g_object_unref, NULL); g_ptr_array_free (new_headers_array, FALSE); - + if (!headers_only && (tny_list_get_length (new_headers) > 0)) { gint msg_num = 0; TnyIterator *iter; GetMsgInfo *msg_info; priv->done = 0; - if (ignore_limit) - priv->total = tny_list_get_length (new_headers); - else - priv->total = MIN (tny_list_get_length (new_headers), retrieve_limit); + priv->total = MIN (tny_list_get_length (new_headers), retrieve_limit); iter = tny_list_create_iterator (new_headers); @@ -1662,22 +1837,25 @@ inbox_refreshed_cb (TnyFolder *inbox, msg_info->mail_op = g_object_ref (info->mail_op); msg_info->total_bytes = compute_message_list_size (new_headers, priv->total); msg_info->more_msgs = g_object_ref (iter); + msg_info->msg = NULL; msg_info->user_data = info; - while ((msg_num < priv->total ) && !tny_iterator_is_done (iter)) { + while ((msg_num < priv->total ) && !tny_iterator_is_done (iter)) { TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); TnyFolder *folder = tny_header_get_folder (header); /* Get message in an async way */ - tny_folder_get_msg_async (folder, header, update_account_get_msg_async_cb, + tny_folder_get_msg_async (folder, header, update_account_get_msg_async_cb, NULL, msg_info); g_object_unref (folder); - + g_object_unref (header); + msg_num++; tny_iterator_next (iter); } g_object_unref (iter); + g_object_unref (new_headers); /* The mail operation will finish when the last message is retrieved */ @@ -1687,11 +1865,11 @@ inbox_refreshed_cb (TnyFolder *inbox, /* If we don't have to retrieve the new messages then simply send mail */ update_account_send_mail (info); - + /* Check if the operation was a success */ if (!priv->error) priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; - + /* Call the user callback and free */ update_account_notify_user_and_free (info, new_headers); } @@ -1806,7 +1984,7 @@ recurse_folders_async_cb (TnyFolderStore *folder_store, folder = TNY_FOLDER (tny_iterator_get_current (iter_all_folders)); - if (tny_folder_get_folder_type (folder) == TNY_FOLDER_TYPE_INBOX) { + if (!info->update_folder_counts && tny_folder_get_folder_type (folder) == TNY_FOLDER_TYPE_INBOX) { /* Get a reference to the INBOX */ inbox = g_object_ref (folder); } else { @@ -1846,7 +2024,6 @@ modest_mail_operation_update_account (ModestMailOperation *self, const gchar *account_name, gboolean poke_all, gboolean interactive, - RetrieveAllCallback retrieve_all_cb, UpdateAccountCallback callback, gpointer user_data) { @@ -1900,10 +2077,10 @@ modest_mail_operation_update_account (ModestMailOperation *self, info->mail_op = g_object_ref (self); info->poke_all = poke_all; info->interactive = interactive; + info->update_folder_counts = FALSE; info->account_name = g_strdup (account_name); info->callback = callback; info->user_data = user_data; - info->retrieve_all_cb = retrieve_all_cb; /* Set account busy */ modest_account_mgr_set_account_busy (modest_runtime_get_account_mgr (), account_name, TRUE); @@ -1921,7 +2098,87 @@ modest_mail_operation_update_account (ModestMailOperation *self, /* Get all folders and continue in the callback */ folders = tny_simple_list_new (); tny_folder_store_get_folders_async (TNY_FOLDER_STORE (priv->account), - folders, NULL, FALSE, + folders, NULL, TRUE, + recurse_folders_async_cb, + NULL, info); + g_object_unref (folders); + + g_object_unref (priv->account); + +} + +void +modest_mail_operation_update_folder_counts (ModestMailOperation *self, + const gchar *account_name) +{ + UpdateAccountInfo *info = NULL; + ModestMailOperationPrivate *priv = NULL; + ModestTnyAccountStore *account_store = NULL; + TnyList *folders; + ModestMailOperationState *state; + + /* Init mail operation */ + priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); + priv->total = 0; + priv->done = 0; + priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; + priv->op_type = MODEST_MAIL_OPERATION_TYPE_UPDATE_FOLDER_COUNTS; + + /* Get the store account */ + account_store = modest_runtime_get_account_store (); + priv->account = + modest_tny_account_store_get_server_account (account_store, + account_name, + TNY_ACCOUNT_TYPE_STORE); + + /* The above function could return NULL */ + if (!priv->account) { + /* Check if the operation was a success */ + g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, + MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND, + "no account"); + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + + /* Notify about operation end */ + modest_mail_operation_notify_end (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); + info->pending_calls = 1; + info->folders = tny_simple_list_new (); + info->mail_op = g_object_ref (self); + info->poke_all = TRUE; + info->interactive = FALSE; + info->update_folder_counts = TRUE; + info->account_name = g_strdup (account_name); + info->callback = NULL; + info->user_data = NULL; + + /* Set account busy */ + modest_account_mgr_set_account_busy (modest_runtime_get_account_mgr (), account_name, TRUE); + modest_mail_operation_notify_start (self); + + /* notify about the start of the operation */ + state = modest_mail_operation_clone_state (self); + state->done = 0; + state->total = 0; + + /* Start notifying progress */ + g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL); + g_slice_free (ModestMailOperationState, state); + + /* Get all folders and continue in the callback */ + folders = tny_simple_list_new (); + tny_folder_store_get_folders_async (TNY_FOLDER_STORE (priv->account), + folders, NULL, TRUE, recurse_folders_async_cb, NULL, info); g_object_unref (folders); @@ -1963,9 +2220,9 @@ compare_headers_by_date (gconstpointer a, /* We want the most recent ones (greater time_t) at the beginning */ if (sent1 < sent2) - return 1; - else return -1; + else + return 1; } @@ -2041,7 +2298,7 @@ modest_mail_operation_create_folder (ModestMailOperation *self, priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, MODEST_MAIL_OPERATION_ERROR_FOLDER_EXISTS, - _CS("ckdg_ib_folder_already_exists")); + _CS_FOLDER_ALREADY_EXISTS); } /* Check parent */ @@ -2057,7 +2314,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, @@ -2188,7 +2445,6 @@ transfer_folder_status_cb (GObject *obj, g_slice_free (ModestMailOperationState, state); } - static void transfer_folder_cb (TnyFolder *folder, gboolean cancelled, @@ -2202,7 +2458,7 @@ transfer_folder_cb (TnyFolder *folder, ModestMailOperationPrivate *priv = NULL; helper = (XFerFolderAsyncHelper *) user_data; - g_return_if_fail (helper != NULL); + g_return_if_fail (helper != NULL); self = helper->mail_op; priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); @@ -2221,7 +2477,13 @@ transfer_folder_cb (TnyFolder *folder, priv->done = 1; priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; } - + + /* Update state of new folder */ + if (new_folder) { + tny_folder_refresh_async (new_folder, NULL, NULL, NULL); + tny_folder_poke_status (new_folder); + } + /* Notify about operation end */ modest_mail_operation_notify_end (self); @@ -2276,7 +2538,7 @@ new_name_valid_if_local_account (ModestMailOperationPrivate *priv, priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, MODEST_MAIL_OPERATION_ERROR_FOLDER_EXISTS, - _CS("ckdg_ib_folder_already_exists")); + _CS_FOLDER_ALREADY_EXISTS); return FALSE; } else return TRUE; @@ -2366,7 +2628,7 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self, priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES, - error_msg); + "%s", error_msg); /* Call the user callback if exists */ if (user_callback) @@ -2450,6 +2712,71 @@ modest_mail_operation_rename_folder (ModestMailOperation *self, /* ******************************************************************* */ void +modest_mail_operation_find_msg (ModestMailOperation *self, + TnyFolder *folder, + const gchar *msg_uid, + gboolean progress_feedback, + GetMsgAsyncUserCallback user_callback, + gpointer user_data) +{ + GetMsgInfo *helper = NULL; + ModestMailOperationPrivate *priv; + + g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); + g_return_if_fail (msg_uid != NULL); + + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); + priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; + priv->total = 1; + priv->done = 0; + + /* Check memory low */ + if (_check_memory_low (self)) { + if (user_callback) + user_callback (self, NULL, FALSE, NULL, priv->error, user_data); + modest_mail_operation_notify_end (self); + return; + } + + /* Get account and set it into mail_operation */ + priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder)); + + /* Check for cached messages */ + if (progress_feedback) { + priv->op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE; + } else { + priv->op_type = MODEST_MAIL_OPERATION_TYPE_UNKNOWN; + } + + /* Create the helper */ + helper = g_slice_new0 (GetMsgInfo); + helper->header = NULL; + helper->mail_op = g_object_ref (self); + helper->user_callback = user_callback; + helper->user_data = user_data; + helper->destroy_notify = NULL; + helper->last_total_bytes = 0; + helper->sum_total_bytes = 0; + helper->total_bytes = 0; + helper->more_msgs = NULL; + helper->get_parts = NULL; + helper->msg = NULL; + + modest_mail_operation_notify_start (self); + + /* notify about the start of the operation */ + ModestMailOperationState *state; + state = modest_mail_operation_clone_state (self); + state->done = 0; + state->total = 0; + g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], + 0, state, NULL); + g_slice_free (ModestMailOperationState, state); + + tny_folder_find_msg_async (folder, msg_uid, get_msg_async_cb, get_msg_status_cb, helper); +} + +void modest_mail_operation_get_msg (ModestMailOperation *self, TnyHeader *header, gboolean progress_feedback, @@ -2501,6 +2828,91 @@ modest_mail_operation_get_msg (ModestMailOperation *self, helper->sum_total_bytes = 0; helper->total_bytes = tny_header_get_message_size (header); helper->more_msgs = NULL; + helper->get_parts = NULL; + helper->msg = NULL; + + modest_mail_operation_notify_start (self); + + /* notify about the start of the operation */ + ModestMailOperationState *state; + state = modest_mail_operation_clone_state (self); + state->done = 0; + state->total = 0; + g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], + 0, state, NULL); + g_slice_free (ModestMailOperationState, state); + + tny_folder_get_msg_async (folder, header, get_msg_async_cb, get_msg_status_cb, helper); + + g_object_unref (G_OBJECT (folder)); +} + +void +modest_mail_operation_get_msg_and_parts (ModestMailOperation *self, + TnyHeader *header, + TnyList *parts, + gboolean progress_feedback, + GetMsgAsyncUserCallback user_callback, + gpointer user_data) +{ + GetMsgInfo *helper = NULL; + 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); + priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; + priv->total = 1; + priv->done = 0; + + /* Check memory low */ + if (_check_memory_low (self)) { + if (user_callback) + user_callback (self, header, FALSE, NULL, priv->error, user_data); + modest_mail_operation_notify_end (self); + return; + } + + /* Get account and set it into mail_operation */ + folder = tny_header_get_folder (header); + if (folder == NULL && MODEST_IS_MSG_VIEW_WINDOW (priv->source)) { + const gchar *acc_name; + acc_name = modest_window_get_active_account (MODEST_WINDOW (priv->source)); + priv->account = modest_tny_account_store_get_server_account + (modest_runtime_get_account_store (), + acc_name, + TNY_ACCOUNT_TYPE_STORE); + folder = modest_tny_folder_store_find_folder_from_uri (TNY_FOLDER_STORE (priv->account), + modest_msg_view_window_get_message_uid (MODEST_MSG_VIEW_WINDOW (priv->source))); + } else { + priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder)); + } + + /* Check for cached messages */ + if (progress_feedback) { + if (tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED) + priv->op_type = MODEST_MAIL_OPERATION_TYPE_OPEN; + else + priv->op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE; + } else { + priv->op_type = MODEST_MAIL_OPERATION_TYPE_UNKNOWN; + } + + /* Create the helper */ + helper = g_slice_new0 (GetMsgInfo); + helper->header = g_object_ref (header); + helper->mail_op = g_object_ref (self); + helper->user_callback = user_callback; + helper->user_data = user_data; + helper->destroy_notify = NULL; + helper->last_total_bytes = 0; + helper->sum_total_bytes = 0; + helper->total_bytes = tny_header_get_message_size (header); + helper->more_msgs = NULL; + helper->get_parts = tny_list_create_iterator (parts); + helper->msg = NULL; modest_mail_operation_notify_start (self); @@ -2540,6 +2952,23 @@ get_msg_status_cb (GObject *obj, } static void +get_msg_async_get_part_cb (TnyMimePart *self, gboolean cancelled, TnyStream *stream, GError *err, gpointer user_data) +{ + GetMsgInfo *helper; + TnyFolder *folder = NULL; + + helper = (GetMsgInfo *) user_data; + + if (helper->header) { + folder = tny_header_get_folder (helper->header); + } + + get_msg_async_cb (folder, cancelled, helper->msg, err, user_data); + + if (folder) g_object_unref (folder); +} + +static void get_msg_async_cb (TnyFolder *folder, gboolean canceled, TnyMsg *msg, @@ -2558,6 +2987,9 @@ get_msg_async_cb (TnyFolder *folder, if (info->more_msgs) { tny_iterator_next (info->more_msgs); finished = (tny_iterator_is_done (info->more_msgs)); + } else if (info->get_parts) { + tny_iterator_next (info->get_parts); + finished = (tny_iterator_is_done (info->get_parts)); } else { finished = (priv->done == priv->total) ? TRUE : FALSE; } @@ -2569,23 +3001,24 @@ 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); + "%s", err->message); } } else if (finished && priv->status == MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS) { /* Set the success status before calling the user callback */ priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; } + if (info->header == NULL && msg) + info->header = tny_msg_get_header (msg); /* Call the user callback */ - if (info->user_callback) + if (info->user_callback && (finished || (info->get_parts == NULL))) info->user_callback (info->mail_op, info->header, canceled, msg, err, info->user_data); @@ -2599,11 +3032,33 @@ get_msg_async_cb (TnyFolder *folder, modest_mail_operation_notify_end (info->mail_op); /* Clean */ + if (info->msg) + g_object_unref (info->msg); if (info->more_msgs) g_object_unref (info->more_msgs); - g_object_unref (info->header); + if (info->header) + g_object_unref (info->header); g_object_unref (info->mail_op); g_slice_free (GetMsgInfo, info); + } else if (info->get_parts) { + CamelStream *null_stream; + TnyStream *tny_null_stream; + TnyMimePart *part; + + if (info->msg == NULL && msg != NULL) + info->msg = g_object_ref (msg); + + null_stream = camel_stream_null_new (); + tny_null_stream = tny_camel_stream_new (null_stream); + + part = TNY_MIME_PART (tny_iterator_get_current (info->get_parts)); + tny_mime_part_decode_to_stream_async (part, tny_null_stream, + get_msg_async_get_part_cb, + get_msg_status_cb, + info); + g_object_unref (tny_null_stream); + g_object_unref (part); + } else if (info->more_msgs) { TnyHeader *header = TNY_HEADER (tny_iterator_get_current (info->more_msgs)); TnyFolder *folder = tny_header_get_folder (header); @@ -2720,6 +3175,7 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self, msg_info->last_total_bytes = 0; msg_info->sum_total_bytes = 0; msg_info->total_bytes = msg_list_size; + msg_info->msg = NULL; /* The callback will call it per each header */ tny_folder_get_msg_async (folder, header, get_msg_async_cb, get_msg_status_cb, msg_info); @@ -2739,13 +3195,14 @@ remove_msgs_async_cb (TnyFolder *folder, GError *err, gpointer user_data) { - gboolean expunge, leave_on_server; + gboolean expunge; const gchar *account_name; TnyAccount *account; ModestProtocolType account_proto = MODEST_PROTOCOL_REGISTRY_TYPE_INVALID; ModestMailOperation *self; ModestMailOperationPrivate *priv; ModestProtocolRegistry *protocol_registry; + SyncFolderHelper *helper; self = (ModestMailOperation *) user_data; priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); @@ -2766,24 +3223,32 @@ 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 (), - account_name); account_proto = modest_tny_account_get_protocol_type (account); g_object_unref (account); - if ((modest_protocol_registry_protocol_type_has_leave_on_server (protocol_registry, account_proto) && - !leave_on_server) || - !modest_tny_folder_is_remote_folder (folder)) + if (modest_protocol_registry_protocol_type_has_leave_on_server (protocol_registry, account_proto)) { + if (modest_account_mgr_get_leave_on_server (modest_runtime_get_account_mgr (), + account_name)) + expunge = FALSE; + else + expunge = TRUE; + } else { expunge = TRUE; - else - expunge = FALSE; + } + + /* Create helper */ + helper = g_slice_new0 (SyncFolderHelper); + helper->mail_op = g_object_ref (self); + helper->user_callback = NULL; + helper->user_data = NULL; /* Sync folder */ - tny_folder_sync_async(folder, expunge, sync_folder_finish_callback, - NULL, self); + tny_folder_sync_async(folder, expunge, sync_folder_finish_callback, NULL, helper); + + /* Remove the extra reference */ + g_object_unref (self); } void @@ -2797,6 +3262,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)); @@ -2808,52 +3274,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 */ @@ -2861,6 +3342,26 @@ 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); + + /* Notify messages are "read" */ + iter = tny_list_create_iterator (remove_headers); + while (!tny_iterator_is_done (iter)) { + gchar *msg_uid; + TnyHeader *header; + + header = TNY_HEADER (tny_iterator_get_current (iter)); + msg_uid = modest_tny_folder_get_header_unique_id (header); + if (msg_uid) { + modest_platform_emit_msg_read_changed_signal (msg_uid, TRUE); + g_free (msg_uid); + } + g_object_unref (header); + tny_iterator_next (iter); + } + g_object_unref (iter); + /* remove message from folder */ modest_mail_operation_notify_start (self); tny_folder_remove_msgs_async (folder, remove_headers, remove_msgs_async_cb, @@ -2871,8 +3372,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); } @@ -3017,6 +3516,34 @@ transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError *err, gpointer u } if (finished) { + TnyAccount *src_account; + TnyAccount *dest_account; + + /* send the notification that the source folder might have changed */ + src_account = modest_tny_folder_get_account (folder); + if (src_account) { + const gchar *src_folder_id; + const gchar *src_account_name; + + src_folder_id = tny_folder_get_id (folder); + src_account_name = + modest_tny_account_get_parent_modest_account_name_for_server_account (src_account); + modest_platform_emit_folder_updated_signal (src_account_name, src_folder_id); + g_object_unref (src_account); + } + /* send the notification that the destination folder might have changed */ + dest_account = modest_tny_folder_get_account (helper->dest_folder); + if (dest_account) { + const gchar *dest_folder_id; + const gchar *dest_account_name; + + dest_folder_id = tny_folder_get_id (helper->dest_folder); + dest_account_name = + modest_tny_account_get_parent_modest_account_name_for_server_account (dest_account); + modest_platform_emit_folder_updated_signal (dest_account_name, dest_folder_id); + g_object_unref (dest_account); + } + /* Synchronize the source folder contents. This should be done by tinymail but the camel_folder_sync it's actually disabled in transfer_msgs_thread_clean @@ -3102,7 +3629,7 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self, priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES, - _CS("ckct_ib_unable_to_paste_here")); + _CS_UNABLE_TO_PASTE_HERE); /* Notify the queue */ modest_mail_operation_notify_end (self); return; @@ -3419,6 +3946,46 @@ modest_mail_operation_run_queue (ModestMailOperation *self, } static void +queue_wakeup_callback (ModestTnySendQueue *queue, + gboolean cancelled, + GError *error, + gpointer userdata) +{ + ModestMailOperation *mail_op; + ModestMailOperationPrivate *priv; + + mail_op = (ModestMailOperation *) userdata; + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_op); + + priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; + tny_camel_send_queue_flush (TNY_CAMEL_SEND_QUEUE (queue)); + + /* Notify end */ + modest_mail_operation_notify_end (mail_op); + g_object_unref (mail_op); +} + +void +modest_mail_operation_queue_wakeup (ModestMailOperation *self, + ModestTnySendQueue *queue) +{ + ModestMailOperationPrivate *priv; + + g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); + g_return_if_fail (MODEST_IS_TNY_SEND_QUEUE (queue)); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); + + priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; + priv->account = TNY_ACCOUNT (tny_camel_send_queue_get_transport_account (TNY_CAMEL_SEND_QUEUE (queue))); + priv->op_type = MODEST_MAIL_OPERATION_TYPE_QUEUE_WAKEUP; + + g_object_ref (self); + + modest_tny_send_queue_wakeup (queue, queue_wakeup_callback, self); + modest_mail_operation_notify_start (self); +} + +static void shutdown_callback (ModestTnyAccountStore *account_store, gpointer userdata) { ModestMailOperation *self = (ModestMailOperation *) userdata; @@ -3455,17 +4022,17 @@ modest_mail_operation_shutdown (ModestMailOperation *self, ModestTnyAccountStore } static void -sync_folder_finish_callback (TnyFolder *self, - gboolean cancelled, - GError *err, +sync_folder_finish_callback (TnyFolder *self, + gboolean cancelled, + GError *err, gpointer user_data) { - ModestMailOperation *mail_op; ModestMailOperationPrivate *priv; + SyncFolderHelper *helper; - mail_op = (ModestMailOperation *) user_data; - priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_op); + helper = (SyncFolderHelper *) user_data; + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (helper->mail_op); /* If canceled by the user, ignore the error given by Tinymail */ if (cancelled) { @@ -3484,15 +4051,26 @@ sync_folder_finish_callback (TnyFolder *self, priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; } - modest_mail_operation_notify_end (mail_op); - g_object_unref (mail_op); + /* User callback */ + if (helper->user_callback) + helper->user_callback (helper->mail_op, self, helper->user_data); + + modest_mail_operation_notify_end (helper->mail_op); + + /* Frees */ + g_object_unref (helper->mail_op); + g_slice_free (SyncFolderHelper, helper); } void modest_mail_operation_sync_folder (ModestMailOperation *self, - TnyFolder *folder, gboolean expunge) + TnyFolder *folder, + gboolean expunge, + SyncFolderCallback callback, + gpointer user_data) { ModestMailOperationPrivate *priv; + SyncFolderHelper *helper; g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); g_return_if_fail (TNY_IS_FOLDER (folder)); @@ -3502,11 +4080,16 @@ modest_mail_operation_sync_folder (ModestMailOperation *self, priv->account = modest_tny_folder_get_account (folder); priv->op_type = MODEST_MAIL_OPERATION_TYPE_SYNC_FOLDER; + /* Create helper */ + helper = g_slice_new0 (SyncFolderHelper); + helper->mail_op = g_object_ref (self); + helper->user_callback = callback; + helper->user_data = user_data; + 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, helper); } static void @@ -3601,12 +4184,14 @@ modest_mail_operation_to_string (ModestMailOperation *self) switch (priv->op_type) { case MODEST_MAIL_OPERATION_TYPE_SEND: type= "SEND"; break; + case MODEST_MAIL_OPERATION_TYPE_SEND_AND_RECEIVE: type= "SEND-AND-RECEIVE"; break; case MODEST_MAIL_OPERATION_TYPE_RECEIVE: type= "RECEIVE"; break; case MODEST_MAIL_OPERATION_TYPE_OPEN: type= "OPEN"; break; case MODEST_MAIL_OPERATION_TYPE_DELETE: type= "DELETE"; break; case MODEST_MAIL_OPERATION_TYPE_INFO: type= "INFO"; break; case MODEST_MAIL_OPERATION_TYPE_RUN_QUEUE: type= "RUN-QUEUE"; break; case MODEST_MAIL_OPERATION_TYPE_SYNC_FOLDER: type= "SYNC-FOLDER"; break; + case MODEST_MAIL_OPERATION_TYPE_SHUTDOWN: type= "SHUTDOWN"; break; case MODEST_MAIL_OPERATION_TYPE_UNKNOWN: type= "UNKNOWN"; break; default: type = "UNEXPECTED"; break; }