X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=9186d21858da0b4feced96127dbc8614e7940b17;hp=89e369c91c4f9e053ac035fa7020e412f8543695;hb=e1c901e81bcfe668994e305089af9c6367c6b74e;hpb=47d7af9f662d805b13894792beef4c0e0aa77a6a diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c index 89e369c..9186d21 100644 --- a/src/modest-mail-operation.c +++ b/src/modest-mail-operation.c @@ -71,11 +71,11 @@ static void modest_mail_operation_class_init (ModestMailOperationClass *klass); static void modest_mail_operation_init (ModestMailOperation *obj); static void modest_mail_operation_finalize (GObject *obj); -static void get_msg_cb (TnyFolder *folder, - gboolean cancelled, - TnyMsg *msg, - GError *rr, - gpointer user_data); +static void get_msg_async_cb (TnyFolder *folder, + gboolean cancelled, + TnyMsg *msg, + GError *rr, + gpointer user_data); static void get_msg_status_cb (GObject *obj, TnyStatus *status, @@ -84,6 +84,20 @@ static void get_msg_status_cb (GObject *obj, static void modest_mail_operation_notify_start (ModestMailOperation *self); static void modest_mail_operation_notify_end (ModestMailOperation *self); +static void notify_progress_of_multiple_messages (ModestMailOperation *self, + TnyStatus *status, + gint *last_total_bytes, + gint *sum_total_bytes, + gint total_bytes, + gboolean increment_done); + +static guint compute_message_list_size (TnyList *headers); + +static guint compute_message_array_size (GPtrArray *headers); + +static int compare_headers_by_date (gconstpointer a, + gconstpointer b); + enum _ModestMailOperationSignals { PROGRESS_CHANGED_SIGNAL, @@ -95,13 +109,13 @@ enum _ModestMailOperationSignals typedef struct _ModestMailOperationPrivate ModestMailOperationPrivate; struct _ModestMailOperationPrivate { TnyAccount *account; - gchar *account_name; guint done; guint total; GObject *source; GError *error; ErrorCheckingUserCallback error_checking; gpointer error_checking_user_data; + ErrorCheckingUserDataDestroyer error_checking_user_data_destroyer; ModestMailOperationStatus status; ModestMailOperationTypeOperation op_type; }; @@ -114,12 +128,31 @@ struct _ModestMailOperationPrivate { priv->status = new_status;\ } -typedef struct _GetMsgAsyncHelper { - ModestMailOperation *mail_op; + +typedef struct { + GetMsgAsyncUserCallback user_callback; TnyHeader *header; - GetMsgAsyncUserCallback user_callback; gpointer user_data; -} GetMsgAsyncHelper; + ModestMailOperation *mail_op; + GDestroyNotify destroy_notify; + gint last_total_bytes; + gint sum_total_bytes; + gint total_bytes; +} GetMsgInfo; + +typedef struct { + ModestMailOperation *mail_op; + TnyMsg *msg; + gulong msg_sent_handler; + gulong error_happened_handler; +} SendMsgInfo; + +static void send_mail_msg_sent_handler (TnySendQueue *queue, TnyHeader *header, TnyMsg *msg, + guint nth, guint total, gpointer userdata); +static void send_mail_error_happened_handler (TnySendQueue *queue, TnyHeader *header, TnyMsg *msg, + GError *error, gpointer userdata); +static void common_send_mail_operation_end (TnySendQueue *queue, TnyMsg *msg, + SendMsgInfo *info); typedef struct _RefreshAsyncHelper { ModestMailOperation *mail_op; @@ -135,6 +168,9 @@ typedef struct _XFerMsgAsyncHelper XferAsyncUserCallback user_callback; gboolean delete; gpointer user_data; + gint last_total_bytes; + gint sum_total_bytes; + gint total_bytes; } XFerMsgAsyncHelper; typedef void (*ModestMailOperationCreateMsgCallback) (ModestMailOperation *mail_op, @@ -331,7 +367,8 @@ modest_mail_operation_new (GObject *source) ModestMailOperation* modest_mail_operation_new_with_error_handling (GObject *source, ErrorCheckingUserCallback error_handler, - gpointer user_data) + gpointer user_data, + ErrorCheckingUserDataDestroyer error_handler_destroyer) { ModestMailOperation *obj; ModestMailOperationPrivate *priv; @@ -342,6 +379,7 @@ modest_mail_operation_new_with_error_handling (GObject *source, g_return_val_if_fail (error_handler != NULL, obj); priv->error_checking = error_handler; priv->error_checking_user_data = user_data; + priv->error_checking_user_data_destroyer = error_handler_destroyer; return obj; } @@ -350,10 +388,13 @@ void modest_mail_operation_execute_error_handler (ModestMailOperation *self) { ModestMailOperationPrivate *priv; + + g_return_if_fail (self && MODEST_IS_MAIL_OPERATION(self)); priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); g_return_if_fail(priv->status != MODEST_MAIL_OPERATION_STATUS_SUCCESS); + /* Call the user callback */ if (priv->error_checking != NULL) priv->error_checking (self, priv->error_checking_user_data); } @@ -364,6 +405,9 @@ modest_mail_operation_get_type_operation (ModestMailOperation *self) { ModestMailOperationPrivate *priv; + g_return_val_if_fail (self && MODEST_IS_MAIL_OPERATION(self), + MODEST_MAIL_OPERATION_TYPE_UNKNOWN); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); return priv->op_type; @@ -375,6 +419,9 @@ modest_mail_operation_is_mine (ModestMailOperation *self, { ModestMailOperationPrivate *priv; + g_return_val_if_fail (self && MODEST_IS_MAIL_OPERATION(self), + FALSE); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); if (priv->source == NULL) return FALSE; @@ -386,7 +433,8 @@ modest_mail_operation_get_source (ModestMailOperation *self) { ModestMailOperationPrivate *priv; - g_return_val_if_fail (self, NULL); + g_return_val_if_fail (self && MODEST_IS_MAIL_OPERATION(self), + NULL); priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); if (!priv) { @@ -438,8 +486,8 @@ modest_mail_operation_cancel (ModestMailOperation *self) { ModestMailOperationPrivate *priv; gboolean canceled = FALSE; - - g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), FALSE); + + g_return_val_if_fail (self && MODEST_IS_MAIL_OPERATION (self), FALSE); priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); @@ -455,7 +503,16 @@ modest_mail_operation_cancel (ModestMailOperation *self) start/stop operations to allow following calls to the account */ g_return_val_if_fail (priv->account, FALSE); - tny_account_cancel (priv->account); + + if (priv->op_type == MODEST_MAIL_OPERATION_TYPE_SEND) { + ModestTnySendQueue *queue; + queue = modest_runtime_get_send_queue (TNY_TRANSPORT_ACCOUNT (priv->account)); + /* Cancel sending without removing the item */ + tny_send_queue_cancel (TNY_SEND_QUEUE (queue), FALSE, NULL); + } else { + /* Cancel operation */ + tny_account_cancel (priv->account); + } return canceled; } @@ -465,8 +522,9 @@ modest_mail_operation_get_task_done (ModestMailOperation *self) { ModestMailOperationPrivate *priv; - g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), 0); - + g_return_val_if_fail (self && MODEST_IS_MAIL_OPERATION(self), + 0); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); return priv->done; } @@ -476,7 +534,8 @@ modest_mail_operation_get_task_total (ModestMailOperation *self) { ModestMailOperationPrivate *priv; - g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), 0); + g_return_val_if_fail (self && MODEST_IS_MAIL_OPERATION(self), + 0); priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); return priv->total; @@ -488,11 +547,9 @@ modest_mail_operation_is_finished (ModestMailOperation *self) ModestMailOperationPrivate *priv; gboolean retval = FALSE; - if (!MODEST_IS_MAIL_OPERATION (self)) { - g_warning ("%s: invalid parametter", G_GNUC_FUNCTION); - return retval; - } - + g_return_val_if_fail (self && MODEST_IS_MAIL_OPERATION(self), + FALSE); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); if (priv->status == MODEST_MAIL_OPERATION_STATUS_SUCCESS || @@ -553,15 +610,17 @@ modest_mail_operation_send_mail (ModestMailOperation *self, { TnySendQueue *send_queue = NULL; ModestMailOperationPrivate *priv; + SendMsgInfo *info; - g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); - g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account)); - g_return_if_fail (TNY_IS_MSG (msg)); + g_return_if_fail (self && MODEST_IS_MAIL_OPERATION (self)); + g_return_if_fail (transport_account && TNY_IS_TRANSPORT_ACCOUNT (transport_account)); + g_return_if_fail (msg && TNY_IS_MSG (msg)); priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); /* Get account and set it into mail_operation */ priv->account = g_object_ref (transport_account); + priv->op_type = MODEST_MAIL_OPERATION_TYPE_SEND; priv->done = 1; priv->total = 1; @@ -571,27 +630,99 @@ modest_mail_operation_send_mail (ModestMailOperation *self, 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); } else { /* Add the msg to the queue */ modest_mail_operation_notify_start (self); + + info = g_slice_new0 (SendMsgInfo); + + info->mail_op = g_object_ref (self); + info->msg = g_object_ref (msg); + info->msg_sent_handler = g_signal_connect (G_OBJECT (send_queue), "msg-sent", + G_CALLBACK (send_mail_msg_sent_handler), info); + info->error_happened_handler = g_signal_connect (G_OBJECT (send_queue), "error-happened", + G_CALLBACK (send_mail_error_happened_handler), info); + modest_tny_send_queue_add (MODEST_TNY_SEND_QUEUE(send_queue), - msg, - &(priv->error)); + msg, + &(priv->error)); + + priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; + } + +} + +static void +common_send_mail_operation_end (TnySendQueue *queue, TnyMsg *msg, + SendMsgInfo *info) +{ + g_signal_handler_disconnect (queue, info->msg_sent_handler); + g_signal_handler_disconnect (queue, info->error_happened_handler); + + g_object_unref (info->msg); + modest_mail_operation_notify_end (info->mail_op); + g_object_unref (info->mail_op); - /* TODO: we're setting always success, do the check in - the handler */ + g_slice_free (SendMsgInfo, info); +} + +static void +send_mail_msg_sent_handler (TnySendQueue *queue, TnyHeader *header, TnyMsg *msg, + guint nth, guint total, gpointer userdata) +{ + SendMsgInfo *info = (SendMsgInfo *) userdata; + TnyHeader *hdr1, *hdr2; + const char *msgid1, *msgid2; + hdr1 = tny_msg_get_header(msg); + hdr2 = tny_msg_get_header(info->msg); + msgid1 = tny_header_get_message_id(hdr1); + msgid2 = tny_header_get_message_id(hdr2); + if (msgid1 == NULL) msgid1 = "(null)"; + if (msgid2 == NULL) msgid2 = "(null)"; + + if (!strcmp (msgid1, msgid2)) { + ModestMailOperationPrivate *priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op); priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; + + common_send_mail_operation_end (queue, msg, info); } + g_object_unref(G_OBJECT(hdr1)); + g_object_unref(G_OBJECT(hdr2)); +} - if (priv->status == MODEST_MAIL_OPERATION_STATUS_SUCCESS) - modest_platform_information_banner (NULL, NULL, _("mcen_ib_outbox_waiting_to_be_sent")); +static void +send_mail_error_happened_handler (TnySendQueue *queue, TnyHeader *header, TnyMsg *msg, + GError *error, gpointer userdata) +{ + SendMsgInfo *info = (SendMsgInfo *) userdata; + TnyHeader *hdr1, *hdr2; + const char *msgid1, *msgid2; + + hdr1 = tny_msg_get_header(msg); + hdr2 = tny_msg_get_header(info->msg); + msgid1 = tny_header_get_message_id(hdr1); + msgid2 = tny_header_get_message_id(hdr2); + if (msgid1 == NULL) msgid1 = "(null)"; + if (msgid2 == NULL) msgid2 = "(null)"; + + if (!strcmp (msgid1, msgid2)) { + if (error != NULL) + g_warning ("%s: %s\n", __FUNCTION__, error->message); + ModestMailOperationPrivate *priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op); + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, + MODEST_MAIL_OPERATION_ERROR_OPERATION_CANCELED, + "modest: send mail failed\n"); - /* TODO: do this in the handler of the "msg-sent" - signal.Notify about operation end */ - modest_mail_operation_notify_end (self); + common_send_mail_operation_end (queue, msg, info); + } + g_object_unref(G_OBJECT(hdr1)); + g_object_unref(G_OBJECT(hdr2)); } + static gboolean idle_create_msg_cb (gpointer idle_data) { @@ -633,18 +764,15 @@ create_msg_thread (gpointer thread_data) if (new_msg) { TnyHeader *header; - TnyHeaderFlags flags = 0; /* Set priority flags in message */ header = tny_msg_get_header (new_msg); - if (info->priority_flags != 0) - flags |= info->priority_flags; + tny_header_set_flag (header, info->priority_flags); /* Set attachment flags in message */ if (info->attachments_list != NULL) - flags |= TNY_HEADER_FLAG_ATTACHMENTS; + tny_header_set_flag (header, TNY_HEADER_FLAG_ATTACHMENTS); - tny_header_set_flags (header, flags); g_object_unref (G_OBJECT(header)); } else { priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; @@ -669,11 +797,8 @@ create_msg_thread (gpointer thread_data) if (info->callback) { CreateMsgIdleInfo *idle_info; idle_info = g_slice_new0 (CreateMsgIdleInfo); - idle_info->mail_op = info->mail_op; - g_object_ref (info->mail_op); - idle_info->msg = new_msg; - if (new_msg) - g_object_ref (new_msg); + idle_info->mail_op = g_object_ref (info->mail_op); + idle_info->msg = (new_msg) ? g_object_ref (new_msg) : NULL; idle_info->callback = info->callback; idle_info->userdata = info->userdata; g_idle_add (idle_create_msg_cb, idle_info); @@ -683,6 +808,7 @@ create_msg_thread (gpointer thread_data) g_object_unref (info->mail_op); g_slice_free (CreateMsgInfo, info); + if (new_msg) g_object_unref(new_msg); return NULL; } @@ -701,8 +827,7 @@ modest_mail_operation_create_msg (ModestMailOperation *self, CreateMsgInfo *info = NULL; info = g_slice_new0 (CreateMsgInfo); - info->mail_op = self; - g_object_ref (self); + info->mail_op = g_object_ref (self); info->from = g_strdup (from); info->to = g_strdup (to); @@ -748,8 +873,18 @@ modest_mail_operation_send_new_mail_cb (ModestMailOperation *self, modest_mail_operation_send_mail (self, info->transport_account, msg); /* Remove old mail from its source folder */ - draft_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (info->transport_account), TNY_FOLDER_TYPE_DRAFTS); - outbox_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (info->transport_account), TNY_FOLDER_TYPE_OUTBOX); + draft_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (info->transport_account), + TNY_FOLDER_TYPE_DRAFTS); + if (!draft_folder) { + g_warning ("%s: modest_tny_account_get_special_folder(..) returned a NULL drafts folder", __FUNCTION__); + goto end; + } + outbox_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (info->transport_account), + TNY_FOLDER_TYPE_OUTBOX); + if (!outbox_folder) { + g_warning ("%s: modest_tny_account_get_special_folder(..) returned a NULL outbox folder", __FUNCTION__); + goto end; + } if (info->draft_msg != NULL) { TnyFolder *folder = NULL; TnyFolder *src_folder = NULL; @@ -757,6 +892,10 @@ modest_mail_operation_send_new_mail_cb (ModestMailOperation *self, folder = tny_msg_get_folder (info->draft_msg); if (folder == NULL) goto end; folder_type = modest_tny_folder_guess_folder_type (folder); + + if (folder_type == TNY_FOLDER_TYPE_INVALID) + g_warning ("%s: BUG: folder of type TNY_FOLDER_TYPE_INVALID", __FUNCTION__); + if (folder_type == TNY_FOLDER_TYPE_OUTBOX) src_folder = outbox_folder; else @@ -786,7 +925,6 @@ end: if (info->transport_account) g_object_unref (info->transport_account); g_slice_free (SendNewMailInfo, info); - modest_mail_operation_notify_end (self); } void @@ -809,7 +947,9 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self, priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); priv->op_type = MODEST_MAIL_OPERATION_TYPE_SEND; - + priv->account = TNY_ACCOUNT (g_object_ref (transport_account)); + priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; + /* Check parametters */ if (to == NULL) { /* Set status failed and set an error */ @@ -839,94 +979,145 @@ typedef struct { TnyTransportAccount *transport_account; TnyMsg *draft_msg; - ModestMsgEditWindow *edit_window; -} SaveToDraftsInfo; + SaveToDraftstCallback callback; + gpointer user_data; + TnyFolder *drafts; + TnyMsg *msg; + ModestMailOperation *mailop; +} SaveToDraftsAddMsgInfo; static void -modest_mail_operation_save_to_drafts_cb (ModestMailOperation *self, - TnyMsg *msg, - gpointer userdata) +modest_mail_operation_save_to_drafts_add_msg_cb(TnyFolder *self, + gboolean canceled, + GError *err, + gpointer userdata) { - TnyFolder *src_folder = NULL; - TnyFolder *drafts = NULL; - TnyHeader *header = NULL; ModestMailOperationPrivate *priv = NULL; - SaveToDraftsInfo *info = (SaveToDraftsInfo *) userdata; - - priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); + SaveToDraftsAddMsgInfo *info = (SaveToDraftsAddMsgInfo *) userdata; - if (!msg) { - 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"); - goto end; - } + priv = MODEST_MAIL_OPERATION_GET_PRIVATE(info->mailop); - drafts = modest_tny_account_get_special_folder (TNY_ACCOUNT (info->transport_account), - TNY_FOLDER_TYPE_DRAFTS); - if (!drafts) { - priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; - g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, - MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND, - "modest: failed to create a new msg\n"); - goto end; + if (priv->error) { + g_warning ("%s: priv->error != NULL", __FUNCTION__); + g_error_free(priv->error); } - if (!priv->error) - tny_folder_add_msg (drafts, msg, &(priv->error)); + priv->error = (err == NULL) ? NULL : g_error_copy(err); if ((!priv->error) && (info->draft_msg != NULL)) { - header = tny_msg_get_header (info->draft_msg); - src_folder = tny_header_get_folder (header); + TnyHeader *header = tny_msg_get_header (info->draft_msg); + TnyFolder *src_folder = tny_header_get_folder (header); /* Remove the old draft */ tny_folder_remove_msg (src_folder, header, NULL); /* Synchronize to expunge and to update the msg counts */ - tny_folder_sync_async (drafts, TRUE, NULL, NULL, NULL); + tny_folder_sync_async (info->drafts, TRUE, NULL, NULL, NULL); tny_folder_sync_async (src_folder, TRUE, NULL, NULL, NULL); - g_object_unref (header); + g_object_unref (G_OBJECT(header)); + g_object_unref (G_OBJECT(src_folder)); } - + if (!priv->error) priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; else priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; - if (info->edit_window) - modest_msg_edit_window_set_draft (info->edit_window, msg); + /* Call the user callback */ + if (info->callback) + info->callback (info->mailop, info->msg, info->user_data); + + if (info->transport_account) + g_object_unref (G_OBJECT(info->transport_account)); + if (info->draft_msg) + g_object_unref (G_OBJECT (info->draft_msg)); + if (info->drafts) + g_object_unref (G_OBJECT(info->drafts)); + if (info->msg) + g_object_unref (G_OBJECT (info->msg)); + g_slice_free (SaveToDraftsAddMsgInfo, info); + modest_mail_operation_notify_end (info->mailop); + g_object_unref(info->mailop); +} + +typedef struct +{ + TnyTransportAccount *transport_account; + TnyMsg *draft_msg; + SaveToDraftstCallback callback; + gpointer user_data; +} SaveToDraftsInfo; + +static void +modest_mail_operation_save_to_drafts_cb (ModestMailOperation *self, + TnyMsg *msg, + gpointer userdata) +{ + TnyFolder *drafts = NULL; + ModestMailOperationPrivate *priv = NULL; + SaveToDraftsInfo *info = (SaveToDraftsInfo *) userdata; + + priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); + + if (!msg) { + 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"); + } + } else { + drafts = modest_tny_account_get_special_folder (TNY_ACCOUNT (info->transport_account), + TNY_FOLDER_TYPE_DRAFTS); + if (!drafts && !(priv->error)) { + g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, + MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND, + "modest: failed to create a new msg\n"); + } + } + + if (!priv->error) { + 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; + if (info->callback) + info->callback (self, msg, info->user_data); + modest_mail_operation_notify_end (self); + } -end: if (drafts) g_object_unref (G_OBJECT(drafts)); - if (src_folder) - g_object_unref (G_OBJECT(src_folder)); - if (info->edit_window) - g_object_unref (G_OBJECT(info->edit_window)); if (info->draft_msg) g_object_unref (G_OBJECT (info->draft_msg)); if (info->transport_account) g_object_unref (G_OBJECT(info->transport_account)); g_slice_free (SaveToDraftsInfo, info); - - modest_mail_operation_notify_end (self); } void modest_mail_operation_save_to_drafts (ModestMailOperation *self, TnyTransportAccount *transport_account, TnyMsg *draft_msg, - ModestMsgEditWindow *edit_window, const gchar *from, const gchar *to, const gchar *cc, const gchar *bcc, const gchar *subject, const gchar *plain_body, const gchar *html_body, const GList *attachments_list, const GList *images_list, - TnyHeaderFlags priority_flags) + TnyHeaderFlags priority_flags, + SaveToDraftstCallback callback, + gpointer user_data) { ModestMailOperationPrivate *priv = NULL; SaveToDraftsInfo *info = NULL; @@ -942,12 +1133,9 @@ modest_mail_operation_save_to_drafts (ModestMailOperation *self, info = g_slice_new0 (SaveToDraftsInfo); info->transport_account = g_object_ref (transport_account); - info->draft_msg = draft_msg; - if (draft_msg) - g_object_ref (draft_msg); - info->edit_window = edit_window; - if (edit_window) - g_object_ref (edit_window); + info->draft_msg = (draft_msg) ? g_object_ref (draft_msg) : NULL; + info->callback = callback; + info->user_data = user_data; modest_mail_operation_notify_start (self); modest_mail_operation_create_msg (self, from, to, cc, bcc, subject, plain_body, html_body, @@ -955,20 +1143,6 @@ modest_mail_operation_save_to_drafts (ModestMailOperation *self, modest_mail_operation_save_to_drafts_cb, info); } -typedef struct -{ - ModestMailOperation *mail_op; - TnyStoreAccount *account; - TnyTransportAccount *transport_account; - gint max_size; - gint retrieve_limit; - gchar *retrieve_type; - gchar *account_name; - UpdateAccountCallback callback; - gpointer user_data; - TnyList *new_headers; -} UpdateAccountInfo; - typedef struct { ModestMailOperation *mail_op; @@ -1060,433 +1234,312 @@ internal_folder_observer_class_init (InternalFolderObserverClass *klass) object_class->finalize = internal_folder_observer_finalize; } -/*****************/ +typedef struct +{ + ModestMailOperation *mail_op; + gchar *account_name; + UpdateAccountCallback callback; + gpointer user_data; + TnyList *folders; + gint pending_calls; + gboolean poke_all; + TnyFolderObserver *inbox_observer; + RetrieveAllCallback retrieve_all_cb; +} UpdateAccountInfo; + static void -recurse_folders (TnyFolderStore *store, TnyFolderStoreQuery *query, TnyList *all_folders) +destroy_update_account_info (UpdateAccountInfo *info) { - TnyIterator *iter; - TnyList *folders = tny_simple_list_new (); + g_free (info->account_name); + g_object_unref (info->folders); + g_object_unref (info->mail_op); + g_slice_free (UpdateAccountInfo, info); +} + +static void +update_account_get_msg_async_cb (TnyFolder *folder, + gboolean canceled, + TnyMsg *msg, + GError *err, + gpointer user_data) +{ + GetMsgInfo *msg_info = (GetMsgInfo *) user_data; - tny_folder_store_get_folders (store, folders, query, NULL); - iter = tny_list_create_iterator (folders); + /* Just delete the helper. Don't do anything with the new + msg. There is also no need to check for errors */ + g_object_unref (msg_info->mail_op); + g_object_unref (msg_info->header); + g_slice_free (GetMsgInfo, msg_info); +} - while (!tny_iterator_is_done (iter)) { - TnyFolderStore *folder = (TnyFolderStore*) tny_iterator_get_current (iter); - if (folder) { - tny_list_prepend (all_folders, G_OBJECT (folder)); - recurse_folders (folder, query, all_folders); - g_object_unref (G_OBJECT (folder)); - } +static void +inbox_refreshed_cb (TnyFolder *inbox, + gboolean canceled, + GError *err, + gpointer user_data) +{ + UpdateAccountInfo *info; + ModestMailOperationPrivate *priv; + TnyIterator *new_headers_iter; + GPtrArray *new_headers_array = NULL; + gint max_size, retrieve_limit, i; + ModestAccountMgr *mgr; + ModestAccountRetrieveType retrieve_type; + TnyList *new_headers = NULL; + gboolean headers_only, ignore_limit; + TnyTransportAccount *transport_account; + ModestTnySendQueue *send_queue; - tny_iterator_next (iter); + info = (UpdateAccountInfo *) user_data; + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op); + mgr = modest_runtime_get_account_mgr (); + + if (canceled || err || !inbox) { + /* Try to send anyway */ + goto send_mail; } - g_object_unref (G_OBJECT (iter)); - g_object_unref (G_OBJECT (folders)); -} -/* - * Issues the "progress-changed" signal. The timer won't be removed, - * so you must call g_source_remove to stop the signal emission - */ -static gboolean -idle_notify_progress (gpointer data) -{ - ModestMailOperation *mail_op = MODEST_MAIL_OPERATION (data); - ModestMailOperationState *state; + /* 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; - state = modest_mail_operation_clone_state (mail_op); + /* Create the new headers array. We need it to sort the + new headers by date */ + new_headers_array = g_ptr_array_new (); + new_headers_iter = tny_list_create_iterator (((InternalFolderObserver *) info->inbox_observer)->new_headers); + while (!tny_iterator_is_done (new_headers_iter)) { + TnyHeader *header = NULL; + + header = TNY_HEADER (tny_iterator_get_current (new_headers_iter)); + /* 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); + } + g_object_unref (new_headers_iter); + tny_folder_remove_observer (inbox, info->inbox_observer); + g_object_unref (info->inbox_observer); + info->inbox_observer = NULL; - /* This is a GDK lock because we are an idle callback and - * the handlers of this signal can contain Gtk+ code */ + /* 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 (new_headers_array->len == 0) + goto send_mail; - gdk_threads_enter (); /* CHECKED */ - g_signal_emit (G_OBJECT (mail_op), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL); - gdk_threads_leave (); /* CHECKED */ + /* Get per-account message amount retrieval limit */ + 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); - g_slice_free (ModestMailOperationState, state); + /* Order by date */ + g_ptr_array_sort (new_headers_array, (GCompareFunc) compare_headers_by_date); - return TRUE; -} + /* 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); + } + + if (!headers_only) { + gint msg_num = 0; + const gint msg_list_size = compute_message_array_size (new_headers_array); -/* - * Issues the "progress-changed" signal and removes the timer. It uses - * a lock to ensure that the progress information of the mail - * operation is not modified while there are notifications pending - */ -static gboolean -idle_notify_progress_once (gpointer data) -{ - ModestPair *pair; + priv->done = 0; + if (ignore_limit) + priv->total = new_headers_array->len; + else + priv->total = MIN (new_headers_array->len, retrieve_limit); + while (msg_num < priv->total) { + TnyHeader *header = TNY_HEADER (g_ptr_array_index (new_headers_array, msg_num)); + TnyFolder *folder = tny_header_get_folder (header); + GetMsgInfo *msg_info; + + /* Create the message info */ + msg_info = g_slice_new0 (GetMsgInfo); + msg_info->mail_op = g_object_ref (info->mail_op); + msg_info->header = g_object_ref (header); + msg_info->total_bytes = msg_list_size; + + /* Get message in an async way */ + tny_folder_get_msg_async (folder, header, update_account_get_msg_async_cb, + get_msg_status_cb, msg_info); - pair = (ModestPair *) data; + g_object_unref (folder); + + msg_num++; + } + } - /* This is a GDK lock because we are an idle callback and - * the handlers of this signal can contain Gtk+ code */ + /* 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)); + } + g_ptr_array_foreach (new_headers_array, (GFunc) g_object_unref, NULL); + g_ptr_array_free (new_headers_array, FALSE); - gdk_threads_enter (); /* CHECKED */ - g_signal_emit (G_OBJECT (pair->first), signals[PROGRESS_CHANGED_SIGNAL], 0, pair->second, NULL); - gdk_threads_leave (); /* CHECKED */ + send_mail: + /* Send mails */ + priv->done = 0; + priv->total = 0; - /* Free the state and the reference to the mail operation */ - g_slice_free (ModestMailOperationState, (ModestMailOperationState*)pair->second); - g_object_unref (pair->first); + /* Get the transport account */ + transport_account = (TnyTransportAccount *) + modest_tny_account_store_get_transport_account_for_open_connection (modest_runtime_get_account_store(), + info->account_name); + + /* Try to send */ + send_queue = modest_runtime_get_send_queue (transport_account); + modest_tny_send_queue_try_to_send (send_queue); - return FALSE; -} + /* Check if the operation was a success */ + if (!priv->error) + priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; -/* - * Used to notify the queue from the main - * loop. We call it inside an idle call to achieve that - */ -static gboolean -idle_notify_queue (gpointer data) -{ - ModestMailOperation *mail_op = MODEST_MAIL_OPERATION (data); + /* Set the account back to not busy */ + modest_account_mgr_set_account_busy (mgr, info->account_name, FALSE); - /* Do not need to block, the notify end will do it for us */ - modest_mail_operation_notify_end (mail_op); - g_object_unref (mail_op); + /* Call the user callback */ + if (info->callback) + info->callback (info->mail_op, new_headers, info->user_data); - return FALSE; -} - -static int -compare_headers_by_date (gconstpointer a, - gconstpointer b) -{ - TnyHeader **header1, **header2; - time_t sent1, sent2; - - header1 = (TnyHeader **) a; - header2 = (TnyHeader **) b; - - sent1 = tny_header_get_date_sent (*header1); - sent2 = tny_header_get_date_sent (*header2); - - /* We want the most recent ones (greater time_t) at the - beginning */ - if (sent1 < sent2) - return 1; - else - return -1; -} - -static gboolean -set_last_updated_idle (gpointer data) -{ - - /* This is a GDK lock because we are an idle callback and - * modest_account_mgr_set_last_updated can issue Gtk+ code */ - - gdk_threads_enter (); /* CHECKED - please recheck */ - - /* It does not matter if the time is not exactly the same than - the time when this idle was called, it's just an - approximation and it won't be very different */ - - modest_account_mgr_set_last_updated (modest_runtime_get_account_mgr (), - (gchar *) data, - time (NULL)); - - gdk_threads_leave (); /* CHECKED - please recheck */ - - return FALSE; -} - -static gboolean -idle_update_account_cb (gpointer data) -{ - UpdateAccountInfo *idle_info; - - idle_info = (UpdateAccountInfo *) data; - - /* This is a GDK lock because we are an idle callback and - * idle_info->callback can contain Gtk+ code */ - - gdk_threads_enter (); /* CHECKED */ - idle_info->callback (idle_info->mail_op, - idle_info->new_headers, - idle_info->user_data); - gdk_threads_leave (); /* CHECKED */ + /* Notify about operation end */ + modest_mail_operation_notify_end (info->mail_op); /* Frees */ - g_object_unref (idle_info->mail_op); - if (idle_info->new_headers) - g_object_unref (idle_info->new_headers); - g_free (idle_info); - - return FALSE; + if (new_headers) + g_object_unref (new_headers); + destroy_update_account_info (info); } -static TnyList * -get_all_folders_from_account (TnyStoreAccount *account, - GError **error) +static void +recurse_folders_async_cb (TnyFolderStore *folder_store, + gboolean canceled, + TnyList *list, + GError *err, + gpointer user_data) { - TnyList *all_folders = NULL; - TnyIterator *iter = NULL; - TnyFolderStoreQuery *query = NULL; - - all_folders = tny_simple_list_new (); - query = tny_folder_store_query_new (); - tny_folder_store_query_add_item (query, NULL, TNY_FOLDER_STORE_QUERY_OPTION_SUBSCRIBED); - tny_folder_store_get_folders (TNY_FOLDER_STORE (account), - all_folders, - query, - error); - - if (*error) { - if (all_folders) - g_object_unref (all_folders); - return NULL; - } + UpdateAccountInfo *info; + ModestMailOperationPrivate *priv; + + info = (UpdateAccountInfo *) user_data; + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op); - iter = tny_list_create_iterator (all_folders); - while (!tny_iterator_is_done (iter)) { - TnyFolderStore *folder = TNY_FOLDER_STORE (tny_iterator_get_current (iter)); - if (folder) { - recurse_folders (folder, query, all_folders); - g_object_unref (folder); + if (err || canceled) { + /* Try to continue anyway */ + } else { + 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); + + g_object_unref (G_OBJECT (folder)); + + tny_iterator_next (iter); } - tny_iterator_next (iter); + g_object_unref (G_OBJECT (iter)); + g_object_unref (G_OBJECT (list)); } - g_object_unref (G_OBJECT (iter)); - return all_folders; -} + /* Remove my own pending call */ + info->pending_calls--; + /* This means that we have all the folders */ + if (info->pending_calls == 0) { + TnyIterator *iter_all_folders; + TnyFolder *inbox = NULL; -static gpointer -update_account_thread (gpointer thr_user_data) -{ - static gboolean first_time = TRUE; - UpdateAccountInfo *info = NULL; - TnyList *all_folders = NULL, *new_headers = NULL; - GPtrArray *new_headers_array = NULL; - TnyIterator *iter = NULL; - ModestMailOperationPrivate *priv = NULL; - ModestTnySendQueue *send_queue = NULL; - gint i = 0, timeout = 0; - - info = (UpdateAccountInfo *) thr_user_data; - priv = MODEST_MAIL_OPERATION_GET_PRIVATE(info->mail_op); + iter_all_folders = tny_list_create_iterator (info->folders); - /* Get account and set it into mail_operation */ - priv->account = g_object_ref (info->account); - - /* Get all the folders. We can do it synchronously because - we're already running in a different thread than the UI */ - all_folders = get_all_folders_from_account (info->account, &(priv->error)); - if (!all_folders) { - priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; - goto out; - } + /* Do a poke status over all folders */ + while (!tny_iterator_is_done (iter_all_folders) && + priv->status == MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS) { + TnyFolder *folder = NULL; - /* Update status and notify. We need to call the notification - with a source function in order to call it from the main - loop. We need that in order not to get into trouble with - Gtk+. We use a timeout in order to provide more status - information, because the sync tinymail call does not - provide it for the moment */ - timeout = g_timeout_add (100, idle_notify_progress, info->mail_op); + folder = TNY_FOLDER (tny_iterator_get_current (iter_all_folders)); - new_headers_array = g_ptr_array_new (); - iter = tny_list_create_iterator (all_folders); - - while (!tny_iterator_is_done (iter) && !priv->error && - priv->status != MODEST_MAIL_OPERATION_STATUS_CANCELED) { - - TnyFolderType folder_type; - TnyFolder *folder = NULL; - - folder = TNY_FOLDER (tny_iterator_get_current (iter)); - folder_type = tny_folder_get_folder_type (folder); + if (tny_folder_get_folder_type (folder) == TNY_FOLDER_TYPE_INBOX) { + /* Get a reference to the INBOX */ + inbox = g_object_ref (folder); + } else { + /* Issue a poke status over the folder */ + if (info->poke_all) + tny_folder_poke_status (folder); + } - /* Refresh it only if it's the INBOX */ - if (folder_type == TNY_FOLDER_TYPE_INBOX) { - InternalFolderObserver *observer = NULL; - TnyIterator *new_headers_iter = NULL; + /* Free and go to next */ + g_object_unref (folder); + tny_iterator_next (iter_all_folders); + } + g_object_unref (iter_all_folders); + /* Refresh the INBOX */ + if (inbox) { /* Refresh the folder. Our observer receives * the new emails during folder refreshes, so * we can use observer->new_headers */ - observer = g_object_new (internal_folder_observer_get_type (), NULL); - tny_folder_add_observer (TNY_FOLDER (folder), TNY_FOLDER_OBSERVER (observer)); - - tny_folder_refresh (TNY_FOLDER (folder), &(priv->error)); + info->inbox_observer = g_object_new (internal_folder_observer_get_type (), NULL); + tny_folder_add_observer (inbox, info->inbox_observer); - new_headers_iter = tny_list_create_iterator (observer->new_headers); - while (!tny_iterator_is_done (new_headers_iter)) { - TnyHeader *header = NULL; - - header = TNY_HEADER (tny_iterator_get_current (new_headers_iter)); - /* Apply per-message size limits */ - if (tny_header_get_message_size (header) < info->max_size) - g_ptr_array_add (new_headers_array, g_object_ref (header)); - - g_object_unref (header); - tny_iterator_next (new_headers_iter); - } - g_object_unref (new_headers_iter); - - tny_folder_remove_observer (TNY_FOLDER (folder), TNY_FOLDER_OBSERVER (observer)); - g_object_unref (observer); + /* Refresh the INBOX */ + tny_folder_refresh_async (inbox, inbox_refreshed_cb, NULL, info); + g_object_unref (inbox); } else { - /* We no not need to do it the first time, - because it's automatically done by the tree - model */ - if (G_LIKELY (!first_time)) - tny_folder_poke_status (folder); - } - g_object_unref (folder); - - tny_iterator_next (iter); - } - g_object_unref (G_OBJECT (iter)); - g_source_remove (timeout); - - if (priv->status != MODEST_MAIL_OPERATION_STATUS_CANCELED && - priv->status != MODEST_MAIL_OPERATION_STATUS_FAILED && - new_headers_array->len > 0) { - gint msg_num = 0; - - /* Order by date */ - g_ptr_array_sort (new_headers_array, (GCompareFunc) compare_headers_by_date); - - /* TODO: Ask the user, instead of just failing, - * showing mail_nc_msg_count_limit_exceeded, with 'Get - * all' and 'Newest only' buttons. */ - if (new_headers_array->len > info->retrieve_limit) { - /* TODO */ - } - - /* Should be get only the headers or the message as well? */ - if (g_ascii_strcasecmp (info->retrieve_type, - MODEST_ACCOUNT_RETRIEVE_VALUE_HEADERS_ONLY) != 0) { - priv->done = 0; - priv->total = MIN (new_headers_array->len, info->retrieve_limit); - while (msg_num < priv->total) { - - TnyHeader *header = TNY_HEADER (g_ptr_array_index (new_headers_array, msg_num)); - TnyFolder *folder = tny_header_get_folder (header); - TnyMsg *msg = tny_folder_get_msg (folder, header, NULL); - ModestMailOperationState *state; - ModestPair* pair; - - priv->done++; - /* We can not just use the mail operation because the - values of done and total could change before the - idle is called */ - state = modest_mail_operation_clone_state (info->mail_op); - pair = modest_pair_new (g_object_ref (info->mail_op), state, FALSE); - g_idle_add_full (G_PRIORITY_HIGH_IDLE, idle_notify_progress_once, - pair, (GDestroyNotify) modest_pair_free); - - g_object_unref (msg); - g_object_unref (folder); - - msg_num++; - } + /* We could not perform the inbox refresh but + we'll try to send mails anyway */ + inbox_refreshed_cb (inbox, FALSE, NULL, info); } } - - if (priv->status == MODEST_MAIL_OPERATION_STATUS_CANCELED) - goto out; - - /* 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)); - } - g_ptr_array_foreach (new_headers_array, (GFunc) g_object_unref, NULL); - g_ptr_array_free (new_headers_array, FALSE); - - - /* Perform send (if operation was not cancelled) */ - priv->done = 0; - priv->total = 0; - if (priv->account != NULL) - g_object_unref (priv->account); - priv->account = g_object_ref (info->transport_account); - - send_queue = modest_runtime_get_send_queue (info->transport_account); - if (send_queue) { - modest_tny_send_queue_try_to_send (send_queue); - } else { - g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, - MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED, - "cannot create a send queue for %s\n", - tny_account_get_name (TNY_ACCOUNT (info->transport_account))); - priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; - } - - /* Check if the operation was a success */ - if (!priv->error) { - priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; - - /* Update the last updated key */ - g_idle_add_full (G_PRIORITY_HIGH_IDLE, - set_last_updated_idle, - g_strdup (tny_account_get_id (TNY_ACCOUNT (info->account))), - (GDestroyNotify) g_free); - } - - out: - - if (info->callback) { - UpdateAccountInfo *idle_info; - - /* This thread is not in the main lock */ - idle_info = g_malloc0 (sizeof (UpdateAccountInfo)); - idle_info->mail_op = g_object_ref (info->mail_op); - idle_info->new_headers = (new_headers) ? g_object_ref (new_headers) : NULL; - idle_info->callback = info->callback; - idle_info->user_data = info->user_data; - g_idle_add (idle_update_account_cb, idle_info); - } - - /* Notify about operation end. Note that the info could be - freed before this idle happens, but the mail operation will - be still alive */ - g_idle_add (idle_notify_queue, g_object_ref (info->mail_op)); - - /* Frees */ - if (new_headers) - g_object_unref (new_headers); - if (all_folders) - g_object_unref (all_folders); - g_object_unref (info->account); - g_object_unref (info->transport_account); - g_free (info->retrieve_type); - g_slice_free (UpdateAccountInfo, info); - - first_time = FALSE; - - return NULL; } -gboolean +void modest_mail_operation_update_account (ModestMailOperation *self, const gchar *account_name, + gboolean poke_all, + RetrieveAllCallback retrieve_all_cb, UpdateAccountCallback callback, gpointer user_data) { - GThread *thread = NULL; UpdateAccountInfo *info = NULL; ModestMailOperationPrivate *priv = NULL; - ModestAccountMgr *mgr = NULL; + ModestTnyAccountStore *account_store = NULL; TnyStoreAccount *store_account = NULL; - TnyTransportAccount *transport_account = NULL; + TnyList *folders; - g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), FALSE); - g_return_val_if_fail (account_name, FALSE); - - /* Init mail operation. Set total and done to 0, and do not - update them, this way the progress objects will know that - we have no clue about the number of the objects */ + /* Init mail operation */ priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); priv->total = 0; priv->done = 0; @@ -1494,101 +1547,155 @@ modest_mail_operation_update_account (ModestMailOperation *self, priv->op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE; /* Get the store account */ + account_store = modest_runtime_get_account_store (); store_account = (TnyStoreAccount *) - modest_tny_account_store_get_server_account (modest_runtime_get_account_store (), - account_name, - TNY_ACCOUNT_TYPE_STORE); - - if (!store_account) { - g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, - MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND, - "cannot get tny store account for %s\n", account_name); - goto error; - } - - - /* Get the transport account, we can not do it in the thread - due to some problems with dbus */ - transport_account = (TnyTransportAccount *) - modest_tny_account_store_get_transport_account_for_open_connection (modest_runtime_get_account_store(), - account_name); - if (!transport_account) { - g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, - MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND, - "cannot get tny transport account for %s\n", account_name); - goto error; - } + modest_tny_account_store_get_server_account (account_store, + account_name, + TNY_ACCOUNT_TYPE_STORE); + priv->account = g_object_ref (store_account); /* Create the helper object */ - info = g_slice_new (UpdateAccountInfo); - info->mail_op = self; - info->account = store_account; - info->transport_account = transport_account; + 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 = poke_all; + info->account_name = g_strdup (account_name); info->callback = callback; info->user_data = user_data; + info->retrieve_all_cb = retrieve_all_cb; - /* Get the message size limit */ - info->max_size = modest_conf_get_int (modest_runtime_get_conf (), - MODEST_CONF_MSG_SIZE_LIMIT, NULL); - if (info->max_size == 0) - info->max_size = G_MAXINT; - else - info->max_size = info->max_size * KB; - - /* Get per-account retrieval type */ - mgr = modest_runtime_get_account_mgr (); - info->retrieve_type = modest_account_mgr_get_retrieve_type (mgr, account_name); + /* Set account busy */ + modest_account_mgr_set_account_busy (modest_runtime_get_account_mgr (), account_name, TRUE); + modest_mail_operation_notify_start (self); - /* Get per-account message amount retrieval limit */ - info->retrieve_limit = modest_account_mgr_get_retrieve_limit (mgr, account_name); - if (info->retrieve_limit == 0) - info->retrieve_limit = G_MAXINT; - - /* printf ("DEBUG: %s: info->retrieve_limit = %d\n", __FUNCTION__, info->retrieve_limit); */ + /* notify about the start of the operation */ + ModestMailOperationState *state; + state = modest_mail_operation_clone_state (self); + state->done = 0; + state->total = 0; - /* Set account busy */ - modest_account_mgr_set_account_busy(mgr, account_name, TRUE); - priv->account_name = g_strdup(account_name); + /* Start notifying progress */ + g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], + 0, state, NULL); + g_slice_free (ModestMailOperationState, state); - modest_mail_operation_notify_start (self); - thread = g_thread_create (update_account_thread, info, FALSE, NULL); + /* Get all folders and continue in the callback */ + folders = tny_simple_list_new (); + tny_folder_store_get_folders_async (TNY_FOLDER_STORE (store_account), + folders, NULL, + recurse_folders_async_cb, + NULL, info); +} - return TRUE; +/* + * Used to notify the queue from the main + * loop. We call it inside an idle call to achieve that + */ +static gboolean +idle_notify_queue (gpointer data) +{ + ModestMailOperation *mail_op = MODEST_MAIL_OPERATION (data); + + gdk_threads_enter (); + modest_mail_operation_notify_end (mail_op); + gdk_threads_leave (); + g_object_unref (mail_op); - error: - if (store_account) - g_object_unref (store_account); - if (transport_account) - g_object_unref (transport_account); - priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; - if (callback) { - callback (self, NULL, user_data); - } - modest_mail_operation_notify_end (self); return FALSE; } +static int +compare_headers_by_date (gconstpointer a, + gconstpointer b) +{ + TnyHeader **header1, **header2; + time_t sent1, sent2; + + header1 = (TnyHeader **) a; + header2 = (TnyHeader **) b; + + sent1 = tny_header_get_date_sent (*header1); + sent2 = tny_header_get_date_sent (*header2); + + /* We want the most recent ones (greater time_t) at the + beginning */ + if (sent1 < sent2) + return 1; + else + return -1; +} + + /* ******************************************************************* */ /* ************************** STORE ACTIONS ************************* */ /* ******************************************************************* */ +typedef struct { + ModestMailOperation *mail_op; + CreateFolderUserCallback callback; + gpointer user_data; +} CreateFolderInfo; + + +static void +create_folder_cb (TnyFolderStore *parent_folder, + gboolean canceled, + TnyFolder *new_folder, + GError *err, + gpointer user_data) +{ + ModestMailOperationPrivate *priv; + CreateFolderInfo *info; + + info = (CreateFolderInfo *) user_data; + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op); + + 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"); + } else { + priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; + } + + /* The user will unref the new_folder */ + if (info->callback) + info->callback (info->mail_op, parent_folder, + new_folder, info->user_data); + + /* Notify about operation end */ + modest_mail_operation_notify_end (info->mail_op); + + /* Frees */ + g_object_unref (info->mail_op); + g_slice_free (CreateFolderInfo, info); +} -TnyFolder * +void modest_mail_operation_create_folder (ModestMailOperation *self, TnyFolderStore *parent, - const gchar *name) + const gchar *name, + CreateFolderUserCallback callback, + gpointer user_data) { ModestMailOperationPrivate *priv; - TnyFolder *new_folder = NULL; - g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent), NULL); - g_return_val_if_fail (name, NULL); + g_return_if_fail (TNY_IS_FOLDER_STORE (parent)); + g_return_if_fail (name); priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); priv->op_type = MODEST_MAIL_OPERATION_TYPE_INFO; + priv->account = (TNY_IS_ACCOUNT (parent)) ? + g_object_ref (parent) : + modest_tny_folder_get_account (TNY_FOLDER (parent)); /* Check for already existing folder */ - if (modest_tny_folder_has_subfolder_with_name (parent, name)) { + if (modest_tny_folder_has_subfolder_with_name (parent, name, TRUE)) { priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, MODEST_MAIL_OPERATION_ERROR_FOLDER_EXISTS, @@ -1616,18 +1723,25 @@ modest_mail_operation_create_folder (ModestMailOperation *self, } if (!priv->error) { - /* Create the folder */ - modest_mail_operation_notify_start (self); - new_folder = tny_folder_store_create_folder (parent, name, &(priv->error)); - CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED); - if (!priv->error) - priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; - } + CreateFolderInfo *info; - /* Notify about operation end */ - modest_mail_operation_notify_end (self); + info = g_slice_new0 (CreateFolderInfo); + info->mail_op = g_object_ref (self); + info->callback = callback; + info->user_data = user_data; + + modest_mail_operation_notify_start (self); - return new_folder; + /* Create the folder */ + tny_folder_store_create_folder_async (parent, name, create_folder_cb, + NULL, info); + } else { + /* Call the user callback anyway */ + if (callback) + callback (self, parent, NULL, user_data); + /* Notify about operation end */ + modest_mail_operation_notify_end (self); + } } void @@ -1672,19 +1786,22 @@ modest_mail_operation_remove_folder (ModestMailOperation *self, TNY_FOLDER_STORE (trash_folder), TRUE, NULL, NULL); g_object_unref (trash_folder); + } else { + g_warning ("%s: modest_tny_account_get_special_folder(..) returned a NULL trash folder", __FUNCTION__); } } else { TnyFolderStore *parent = tny_folder_get_folder_store (folder); + if (parent) { + modest_mail_operation_notify_start (self); + tny_folder_store_remove_folder (parent, folder, &(priv->error)); + CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED); + + if (!priv->error) + priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; - modest_mail_operation_notify_start (self); - tny_folder_store_remove_folder (parent, folder, &(priv->error)); - CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED); - - if (!priv->error) - priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; - - if (parent) - g_object_unref (G_OBJECT (parent)); + g_object_unref (parent); + } else + g_warning ("%s: could not get parent folder", __FUNCTION__); } g_object_unref (G_OBJECT (account)); @@ -1817,7 +1934,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, - _("ckdg_ib_folder_already_exists")); + _CS("ckdg_ib_folder_already_exists")); return FALSE; } else return TRUE; @@ -1875,7 +1992,7 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self, /* Do not move a parent into a child */ goto error; } else if (TNY_IS_FOLDER_STORE (parent) && - modest_tny_folder_has_subfolder_with_name (parent, folder_name)) { + modest_tny_folder_has_subfolder_with_name (parent, folder_name, TRUE)) { /* Check that the new folder name is not used by any parent subfolder */ goto error; @@ -1995,106 +2112,53 @@ modest_mail_operation_get_msg (ModestMailOperation *self, GetMsgAsyncUserCallback user_callback, gpointer user_data) { - GetMsgAsyncHelper *helper = NULL; + 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); - folder = tny_header_get_folder (header); - - priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; - priv->op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE; - - /* Get message from folder */ - if (folder) { - /* Get account and set it into mail_operation */ - priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder)); - - /* Check for cached messages */ - 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; - - helper = g_slice_new0 (GetMsgAsyncHelper); - helper->mail_op = self; - helper->user_callback = user_callback; - helper->user_data = user_data; - helper->header = g_object_ref (header); - - // The callback's reference so that the mail op is not - // finalized until the async operation is completed even if - // the user canceled the request meanwhile. - g_object_ref (G_OBJECT (helper->mail_op)); - - modest_mail_operation_notify_start (self); - tny_folder_get_msg_async (folder, header, get_msg_cb, get_msg_status_cb, helper); - - g_object_unref (G_OBJECT (folder)); - } else { - /* Set status failed and set an error */ - priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; - g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, - MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND, - _("Error trying to get a message. No folder found for header")); - - /* Notify the queue */ - modest_mail_operation_notify_end (self); - } -} - -static void -get_msg_cb (TnyFolder *folder, - gboolean cancelled, - TnyMsg *msg, - GError *error, - gpointer user_data) -{ - GetMsgAsyncHelper *helper = NULL; - ModestMailOperation *self = NULL; - ModestMailOperationPrivate *priv = NULL; - - helper = (GetMsgAsyncHelper *) user_data; - g_return_if_fail (helper != NULL); - self = helper->mail_op; - g_return_if_fail (MODEST_IS_MAIL_OPERATION(self)); - priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); - - /* Check errors and cancel */ - if (error) { - priv->error = g_error_copy (error); - 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 { - priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; - } + g_return_if_fail (TNY_IS_HEADER (header)); + + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); + folder = tny_header_get_folder (header); - /* If user defined callback function was defined, call it even - if the operation failed*/ - if (helper->user_callback) { - /* This is not a GDK lock because we are a Tinymail callback - * which is already GDK locked by Tinymail */ + priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; + priv->total = 1; + priv->done = 0; - /* no gdk_threads_enter (), CHECKED */ - helper->user_callback (self, helper->header, msg, helper->user_data); - /* no gdk_threads_leave (), CHECKED */ - } + /* Get account and set it into mail_operation */ + priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder)); + + /* Check for cached messages */ + 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; + + /* 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); - /* Notify about operation end */ - modest_mail_operation_notify_end (self); - /* Free */ - g_object_unref (helper->mail_op); - g_object_unref (helper->header); - g_slice_free (GetMsgAsyncHelper, helper); - + 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); + + tny_folder_get_msg_async (folder, header, get_msg_async_cb, get_msg_status_cb, helper); + + g_object_unref (G_OBJECT (folder)); } static void @@ -2102,189 +2166,69 @@ get_msg_status_cb (GObject *obj, TnyStatus *status, gpointer user_data) { - GetMsgAsyncHelper *helper = NULL; - ModestMailOperation *self; - ModestMailOperationPrivate *priv; - ModestMailOperationState *state; + GetMsgInfo *helper = NULL; g_return_if_fail (status != NULL); g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_GET_MSG); - helper = (GetMsgAsyncHelper *) user_data; + helper = (GetMsgInfo *) user_data; g_return_if_fail (helper != NULL); - self = helper->mail_op; - priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); - - priv->done = 1; - priv->total = 1; - - state = modest_mail_operation_clone_state (self); - state->bytes_done = status->position; - state->bytes_total = status->of_total; - - /* This is not a GDK lock because we are a Tinymail callback - * which is already GDK locked by Tinymail */ - - /* no gdk_threads_enter (), CHECKED */ - g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL); - /* no gdk_threads_leave (), CHECKED */ - - g_slice_free (ModestMailOperationState, state); -} - -/****************************************************/ -typedef struct { - ModestMailOperation *mail_op; - TnyList *headers; - GetMsgAsyncUserCallback user_callback; - gpointer user_data; - GDestroyNotify notify; -} GetFullMsgsInfo; - -typedef struct { - GetMsgAsyncUserCallback user_callback; - TnyHeader *header; - TnyMsg *msg; - gpointer user_data; - ModestMailOperation *mail_op; -} NotifyGetMsgsInfo; - - -/* - * Used by get_msgs_full_thread to call the user_callback for each - * message that has been read - */ -static gboolean -notify_get_msgs_full (gpointer data) -{ - NotifyGetMsgsInfo *info; - - info = (NotifyGetMsgsInfo *) data; - - /* This is a GDK lock because we are an idle callback and - * because info->user_callback can contain Gtk+ code */ - - gdk_threads_enter (); /* CHECKED */ - info->user_callback (info->mail_op, info->header, info->msg, info->user_data); - gdk_threads_leave (); /* CHECKED */ - - g_slice_free (NotifyGetMsgsInfo, info); - - return FALSE; -} - -/* - * Used by get_msgs_full_thread to free al the thread resources and to - * call the destroy function for the passed user_data - */ -static gboolean -get_msgs_full_destroyer (gpointer data) -{ - GetFullMsgsInfo *info; - - info = (GetFullMsgsInfo *) data; - - if (info->notify) { - - /* This is a GDK lock because we are an idle callback and - * because info->notify can contain Gtk+ code */ - - gdk_threads_enter (); /* CHECKED */ - info->notify (info->user_data); - gdk_threads_leave (); /* CHECKED */ - } - - /* free */ - g_object_unref (info->headers); - g_slice_free (GetFullMsgsInfo, info); - - return FALSE; + /* Notify progress */ + notify_progress_of_multiple_messages (helper->mail_op, status, &(helper->last_total_bytes), + &(helper->sum_total_bytes), helper->total_bytes, FALSE); } -static gpointer -get_msgs_full_thread (gpointer thr_user_data) +static void +get_msg_async_cb (TnyFolder *folder, + gboolean canceled, + TnyMsg *msg, + GError *err, + gpointer user_data) { - GetFullMsgsInfo *info; + GetMsgInfo *info = NULL; ModestMailOperationPrivate *priv = NULL; - TnyIterator *iter = NULL; - - info = (GetFullMsgsInfo *) thr_user_data; - priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op); - - iter = tny_list_create_iterator (info->headers); - while (!tny_iterator_is_done (iter)) { - TnyHeader *header; - TnyFolder *folder; - - header = TNY_HEADER (tny_iterator_get_current (iter)); - folder = tny_header_get_folder (header); - - /* Check for cached messages */ - 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; - - /* Get message from folder */ - if (folder) { - TnyMsg *msg; - /* The callback will call it per each header */ - msg = tny_folder_get_msg (folder, header, &(priv->error)); + gboolean finished; - if (msg) { - ModestMailOperationState *state; - ModestPair *pair; + info = (GetMsgInfo *) user_data; - priv->done++; + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op); + priv->done++; + finished = (priv->done == priv->total) ? TRUE : FALSE; - /* notify progress */ - state = modest_mail_operation_clone_state (info->mail_op); - pair = modest_pair_new (g_object_ref (info->mail_op), state, FALSE); - g_idle_add_full (G_PRIORITY_HIGH_IDLE, idle_notify_progress_once, - pair, (GDestroyNotify) modest_pair_free); - - /* The callback is the responsible for - freeing the message */ - if (info->user_callback) { - NotifyGetMsgsInfo *info_notify; - info_notify = g_slice_new0 (NotifyGetMsgsInfo); - info_notify->user_callback = info->user_callback; - info_notify->mail_op = info->mail_op; - info_notify->header = g_object_ref (header); - info_notify->msg = g_object_ref (msg); - info_notify->user_data = info->user_data; - g_idle_add_full (G_PRIORITY_HIGH_IDLE, - notify_get_msgs_full, - info_notify, NULL); - } - g_object_unref (msg); - } - } else { - /* Set status failed and set an error */ - priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + /* Check errors */ + if (canceled || err) { + priv->status = MODEST_MAIL_OPERATION_STATUS_FINISHED_WITH_ERRORS; + if (!priv->error) g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND, - "Error trying to get a message. No folder found for header"); - } - - if (header) - g_object_unref (header); - - tny_iterator_next (iter); + err->message); + } else { + /* Set the success status before calling the user callback */ + if (finished && priv->status == MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS) + priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; } - /* Set operation status */ - if (priv->status == MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS) - priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; - /* Notify about operation end */ - g_idle_add (idle_notify_queue, g_object_ref (info->mail_op)); + /* Call the user callback */ + if (info->user_callback) + info->user_callback (info->mail_op, info->header, canceled, + msg, err, info->user_data); - /* Free thread resources. Will be called after all previous idles */ - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE + 1, get_msgs_full_destroyer, info, NULL); + /* Notify about operation end if this is the last callback */ + if (finished) { + /* Free user data */ + if (info->destroy_notify) + info->destroy_notify (info->user_data); - return NULL; + /* Notify about operation end */ + modest_mail_operation_notify_end (info->mail_op); + } + + /* Clean */ + g_object_unref (info->header); + g_object_unref (info->mail_op); + g_slice_free (GetMsgInfo, info); } void @@ -2294,17 +2238,13 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self, gpointer user_data, GDestroyNotify notify) { - TnyHeader *header = NULL; - TnyFolder *folder = NULL; - GThread *thread; ModestMailOperationPrivate *priv = NULL; - GetFullMsgsInfo *info = NULL; gboolean size_ok = TRUE; gint max_size; TnyIterator *iter = NULL; g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); - + /* Init mail operation */ priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; @@ -2315,15 +2255,13 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self, /* Get account and set it into mail_operation */ if (tny_list_get_length (header_list) >= 1) { iter = tny_list_create_iterator (header_list); - header = TNY_HEADER (tny_iterator_get_current (iter)); + TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); if (header) { - folder = tny_header_get_folder (header); + TnyFolder *folder = tny_header_get_folder (header); if (folder) { priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder)); - g_object_unref (folder); } - g_object_unref (header); } @@ -2348,7 +2286,7 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self, always retrieve it */ if (iter != NULL) { while (!tny_iterator_is_done (iter) && size_ok) { - header = TNY_HEADER (tny_iterator_get_current (iter)); + TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); if (header) { if (tny_header_get_message_size (header) >= max_size) size_ok = FALSE; @@ -2361,16 +2299,43 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self, } if (size_ok) { - /* Create the info */ - info = g_slice_new0 (GetFullMsgsInfo); - info->mail_op = self; - info->user_callback = user_callback; - info->user_data = user_data; - info->headers = g_object_ref (header_list); - info->notify = notify; + const gint msg_list_size = compute_message_list_size (header_list); modest_mail_operation_notify_start (self); - thread = g_thread_create (get_msgs_full_thread, info, FALSE, NULL); + iter = tny_list_create_iterator (header_list); + while (!tny_iterator_is_done (iter)) { + /* 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); + + GetMsgInfo *msg_info = NULL; + TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); + TnyFolder *folder = tny_header_get_folder (header); + + /* Create the message info */ + msg_info = g_slice_new0 (GetMsgInfo); + msg_info->mail_op = g_object_ref (self); + msg_info->header = g_object_ref (header); + msg_info->user_callback = user_callback; + msg_info->user_data = user_data; + msg_info->destroy_notify = notify; + msg_info->last_total_bytes = 0; + msg_info->sum_total_bytes = 0; + msg_info->total_bytes = msg_list_size; + + /* 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); + + /* Free and go on */ + g_object_unref (header); + g_object_unref (folder); + tny_iterator_next (iter); + } + g_object_unref (iter); } else { /* Set status failed and set an error */ priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; @@ -2383,6 +2348,7 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self, if (notify) notify (user_data); } + } @@ -2411,21 +2377,36 @@ modest_mail_operation_remove_msg (ModestMailOperation *self, /* remove message from folder */ tny_folder_remove_msg (folder, header, &(priv->error)); if (!priv->error) { - tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED); - tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN); + 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); - if (TNY_IS_CAMEL_IMAP_FOLDER (folder)) -/* tny_folder_sync_async(folder, FALSE, NULL, NULL, NULL); /\* FALSE --> don't expunge *\/ */ - tny_folder_sync (folder, FALSE, &(priv->error)); /* FALSE --> don't expunge */ - else if (TNY_IS_CAMEL_POP_FOLDER (folder)) -/* tny_folder_sync_async(folder, FALSE, NULL, NULL, NULL); /\* TRUE --> dont expunge *\/ */ - tny_folder_sync (folder, TRUE, &(priv->error)); /* TRUE --> expunge */ + /* 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 - /* local folders */ -/* tny_folder_sync_async(folder, TRUE, NULL, NULL, NULL); /\* TRUE --> expunge *\/ */ - tny_folder_sync (folder, TRUE, &(priv->error)); /* TRUE --> expunge */ + expunge = FALSE; + + /* Sync folder */ + tny_folder_sync_async(folder, expunge, NULL, NULL, NULL); + + /* Unref */ + g_object_unref (account); } @@ -2451,6 +2432,8 @@ modest_mail_operation_remove_msgs (ModestMailOperation *self, ModestMailOperationPrivate *priv; TnyIterator *iter = NULL; TnyHeader *header = NULL; + TnyList *remove_headers = NULL; + TnyFolderType folder_type = TNY_FOLDER_TYPE_UNKNOWN; g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); g_return_if_fail (TNY_IS_LIST (headers)); @@ -2460,11 +2443,44 @@ modest_mail_operation_remove_msgs (ModestMailOperation *self, 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); header = TNY_HEADER (tny_iterator_get_current (iter)); folder = tny_header_get_folder (header); - + + /* Don't remove messages that are being sent */ + if (modest_tny_folder_is_local_folder (folder)) { + folder_type = modest_tny_folder_get_local_or_mmc_folder_type (folder); + } + 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); + 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)) { + 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) { + 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); + } + } + /* 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; @@ -2473,14 +2489,35 @@ modest_mail_operation_remove_msgs (ModestMailOperation *self, /* remove message from folder */ modest_mail_operation_notify_start (self); - tny_folder_remove_msgs (folder, headers, &(priv->error)); + tny_folder_remove_msgs (folder, remove_headers, &(priv->error)); if (!priv->error) { - if (TNY_IS_CAMEL_IMAP_FOLDER (folder) || - TNY_IS_CAMEL_POP_FOLDER (folder)) - tny_folder_sync_async(folder, FALSE, NULL, NULL, NULL); /* FALSE --> don't expunge */ + 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 - /* local folders */ - tny_folder_sync_async(folder, TRUE, NULL, NULL, NULL); /* TRUE --> expunge */ + expunge = FALSE; + + /* Sync folder */ + tny_folder_sync_async(folder, expunge, NULL, NULL, NULL); + + g_object_unref (account); } @@ -2491,6 +2528,7 @@ modest_mail_operation_remove_msgs (ModestMailOperation *self, priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; /* Free */ + g_object_unref (remove_headers); g_object_unref (header); g_object_unref (iter); g_object_unref (G_OBJECT (folder)); @@ -2499,42 +2537,69 @@ modest_mail_operation_remove_msgs (ModestMailOperation *self, modest_mail_operation_notify_end (self); } - static void -transfer_msgs_status_cb (GObject *obj, - TnyStatus *status, - gpointer user_data) +notify_progress_of_multiple_messages (ModestMailOperation *self, + TnyStatus *status, + gint *last_total_bytes, + gint *sum_total_bytes, + gint total_bytes, + gboolean increment_done) { - XFerMsgAsyncHelper *helper = NULL; - ModestMailOperation *self; ModestMailOperationPrivate *priv; ModestMailOperationState *state; + gboolean is_num_bytes; + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); - g_return_if_fail (status != NULL); - g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_XFER_MSGS); - - helper = (XFerMsgAsyncHelper *) user_data; - g_return_if_fail (helper != NULL); - - self = helper->mail_op; - priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); - - priv->done = status->position; - priv->total = status->of_total; + /* We know that tinymail sends us information about + transferred bytes with this particular message */ + is_num_bytes = (g_ascii_strcasecmp (status->message, "Retrieving message") == 0); state = modest_mail_operation_clone_state (self); + if (is_num_bytes && !((status->position == 1) && (status->of_total == 100))) { + /* We know that we're in a different message when the + total number of bytes to transfer is different. Of + course it could fail if we're transferring messages + of the same size, but this is a workarround */ + if (status->of_total != *last_total_bytes) { + /* We need to increment the done when there is + no information about each individual + message, we need to do this in message + transfers, and we don't do it for getting + messages */ + if (increment_done) + priv->done++; + *sum_total_bytes += *last_total_bytes; + *last_total_bytes = status->of_total; + } + state->bytes_done += status->position + *sum_total_bytes; + state->bytes_total = total_bytes; - /* This is not a GDK lock because we are a Tinymail callback and - * Tinymail already acquires the Gdk lock */ + /* Notify the status change. Only notify about changes + referred to bytes */ + g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], + 0, state, NULL); + } - /* no gdk_threads_enter (), CHECKED */ + g_slice_free (ModestMailOperationState, state); +} - g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL); +static void +transfer_msgs_status_cb (GObject *obj, + TnyStatus *status, + gpointer user_data) +{ + XFerMsgAsyncHelper *helper; - /* no gdk_threads_leave (), CHECKED */ + g_return_if_fail (status != NULL); + g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_XFER_MSGS); - g_slice_free (ModestMailOperationState, state); + helper = (XFerMsgAsyncHelper *) user_data; + g_return_if_fail (helper != NULL); + + /* Notify progress */ + notify_progress_of_multiple_messages (helper->mail_op, status, &(helper->last_total_bytes), + &(helper->sum_total_bytes), helper->total_bytes, TRUE); } @@ -2578,13 +2643,12 @@ transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError *err, gpointer u iter = tny_list_create_iterator (helper->headers); while (!tny_iterator_is_done (iter)) { header = TNY_HEADER (tny_iterator_get_current (iter)); - tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED); - tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN); + tny_header_set_flag (header, TNY_HEADER_FLAG_DELETED); + tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN); g_object_unref (header); tny_iterator_next (iter); } - } @@ -2615,6 +2679,39 @@ transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError *err, gpointer u g_slice_free (XFerMsgAsyncHelper, helper); } +static guint +compute_message_list_size (TnyList *headers) +{ + TnyIterator *iter; + guint size = 0; + + iter = tny_list_create_iterator (headers); + while (!tny_iterator_is_done (iter)) { + TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); + size += tny_header_get_message_size (header); + g_object_unref (header); + tny_iterator_next (iter); + } + g_object_unref (iter); + + return size; +} + +static guint +compute_message_array_size (GPtrArray *headers) +{ + guint size = 0; + gint i; + + for (i = 0; i < headers->len; i++) { + TnyHeader *header = TNY_HEADER (g_ptr_array_index (headers, i)); + size += tny_header_get_message_size (header); + } + + return size; +} + + void modest_mail_operation_xfer_msgs (ModestMailOperation *self, TnyList *headers, @@ -2630,12 +2727,12 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self, TnyHeader *header = NULL; ModestTnyFolderRules rules = 0; - g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); - g_return_if_fail (TNY_IS_LIST (headers)); - g_return_if_fail (TNY_IS_FOLDER (folder)); + g_return_if_fail (self && MODEST_IS_MAIL_OPERATION (self)); + g_return_if_fail (headers && TNY_IS_LIST (headers)); + g_return_if_fail (folder && TNY_IS_FOLDER (folder)); priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); - priv->total = 1; + priv->total = tny_list_get_length (headers); priv->done = 0; priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; priv->op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE; @@ -2660,16 +2757,24 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self, src_folder = tny_header_get_folder (header); g_object_unref (header); } - g_object_unref (iter); + if (src_folder == NULL) { + /* Notify the queue */ + modest_mail_operation_notify_end (self); + + g_warning ("%s: cannot find folder from header", __FUNCTION__); + return; + } + + /* Check folder source and destination */ if (src_folder == folder) { /* Set status failed and set an error */ priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, MODEST_MAIL_OPERATION_ERROR_BAD_PARAMETER, - _("mcen_ib_unable_to_copy_samefolder")); + _("mail_in_ui_folder_copy_target_error")); /* Notify the queue */ modest_mail_operation_notify_end (self); @@ -2687,6 +2792,9 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self, helper->user_callback = user_callback; helper->user_data = user_data; helper->delete = delete_original; + helper->last_total_bytes = 0; + helper->sum_total_bytes = 0; + helper->total_bytes = compute_message_list_size (headers); /* Get account and set it into mail_operation */ priv->account = modest_tny_folder_get_account (src_folder); @@ -2722,8 +2830,6 @@ on_refresh_folder (TnyFolder *folder, if (error) { priv->error = g_error_copy (error); priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; - printf("DEBUG: %s: Operation error:\n %s", __FUNCTION__, - error->message); goto out; } @@ -2733,11 +2839,11 @@ on_refresh_folder (TnyFolder *folder, MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND, _("Error trying to refresh the contents of %s"), tny_folder_get_name (folder)); - printf("DEBUG: %s: Operation cancelled.\n", __FUNCTION__); goto out; } priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; + out: /* Call user defined callback, if it exists */ if (helper->user_callback) { @@ -2747,9 +2853,8 @@ on_refresh_folder (TnyFolder *folder, helper->user_callback (self, folder, helper->user_data); } - out: /* Free */ - g_slice_free (RefreshAsyncHelper, helper); + g_slice_free (RefreshAsyncHelper, helper); /* Notify about operation end */ modest_mail_operation_notify_end (self); @@ -2815,6 +2920,15 @@ modest_mail_operation_refresh_folder (ModestMailOperation *self, updates before the callback call then this could happen. We must review the design */ modest_mail_operation_notify_start (self); + + /* notify that the operation was started */ + 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); + tny_folder_refresh_async (folder, on_refresh_folder, on_refresh_folder_status_update, @@ -2832,7 +2946,6 @@ modest_mail_operation_notify_start (ModestMailOperation *self) priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); /* Ensure that all the fields are filled correctly */ - g_return_if_fail (priv->account != NULL); g_return_if_fail (priv->op_type != MODEST_MAIL_OPERATION_TYPE_UNKNOWN); /* Notify the observers about the mail operation. We do not @@ -2858,18 +2971,14 @@ modest_mail_operation_notify_end (ModestMailOperation *self) priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); - /* Set the account back to not busy */ - if (priv->account_name) { - modest_account_mgr_set_account_busy (modest_runtime_get_account_mgr(), - priv->account_name, FALSE); - g_free(priv->account_name); - priv->account_name = NULL; - } - /* Notify the observers about the mail operation end. We do not wrapp this emission because we assume that this function is always called from within the main lock */ g_signal_emit (G_OBJECT (self), signals[OPERATION_FINISHED_SIGNAL], 0, NULL); + + /* Remove the error user data */ + if (priv->error_checking_user_data && priv->error_checking_user_data_destroyer) + priv->error_checking_user_data_destroyer (priv->error_checking_user_data); } TnyAccount * @@ -2883,3 +2992,21 @@ modest_mail_operation_get_account (ModestMailOperation *self) return (priv->account) ? g_object_ref (priv->account) : NULL; } + +void +modest_mail_operation_noop (ModestMailOperation *self) +{ + ModestMailOperationPrivate *priv = NULL; + + g_return_if_fail (self); + + priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); + priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; + priv->op_type = MODEST_MAIL_OPERATION_TYPE_INFO; + priv->done = 0; + priv->total = 0; + + /* This mail operation does nothing actually */ + modest_mail_operation_notify_start (self); + modest_mail_operation_notify_end (self); +}