X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=39dbea77a0a47b5acfd8aedbe375ece95a26d2d0;hp=07e85cd11ab0277f503fd045d76385edba4b968c;hb=85e6aca5e8c16f61f95e29b62ea295d785c9cbdf;hpb=07ac4ad3a1ccdf9726df452128440f26d545c303 diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c index 07e85cd..39dbea7 100644 --- a/src/modest-mail-operation.c +++ b/src/modest-mail-operation.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -50,12 +51,20 @@ #include "modest-text-utils.h" #include "modest-tny-msg.h" #include "modest-tny-folder.h" +#include "modest-tny-account-store.h" #include "modest-tny-platform-factory.h" #include "modest-marshal.h" #include "modest-error.h" #include "modest-mail-operation.h" #define KB 1024 +#define GET_SIZE_BUFFER_SIZE 128 + +/* + * Remove all these #ifdef stuff when the tinymail's idle calls become + * locked + */ +#define TINYMAIL_IDLES_NOT_LOCKED_YET 1 /* 'private'/'protected' functions */ static void modest_mail_operation_class_init (ModestMailOperationClass *klass); @@ -74,8 +83,6 @@ static void get_msg_status_cb (GObject *obj, static void modest_mail_operation_notify_end (ModestMailOperation *self); -static gboolean did_a_cancel = FALSE; - enum _ModestMailOperationSignals { PROGRESS_CHANGED_SIGNAL, @@ -127,6 +134,44 @@ typedef struct _XFerMsgAsyncHelper gpointer user_data; } XFerMsgAsyncHelper; +typedef void (*ModestMailOperationCreateMsgCallback) (ModestMailOperation *mail_op, + TnyMsg *msg, + gpointer userdata); + +static void modest_mail_operation_create_msg (ModestMailOperation *self, + 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, + TnyHeaderFlags priority_flags, + ModestMailOperationCreateMsgCallback callback, + gpointer userdata); + +static gboolean idle_notify_queue (gpointer data); +typedef struct +{ + ModestMailOperation *mail_op; + gchar *from; + gchar *to; + gchar *cc; + gchar *bcc; + gchar *subject; + gchar *plain_body; + gchar *html_body; + GList *attachments_list; + TnyHeaderFlags priority_flags; + ModestMailOperationCreateMsgCallback callback; + gpointer userdata; +} CreateMsgInfo; + +typedef struct +{ + ModestMailOperation *mail_op; + TnyMsg *msg; + ModestMailOperationCreateMsgCallback callback; + gpointer userdata; +} CreateMsgIdleInfo; + /* globals */ static GObjectClass *parent_class = NULL; @@ -355,29 +400,27 @@ gboolean modest_mail_operation_cancel (ModestMailOperation *self) { ModestMailOperationPrivate *priv; + gboolean canceled = FALSE; - if (!MODEST_IS_MAIL_OPERATION (self)) { - g_warning ("%s: invalid parametter", G_GNUC_FUNCTION); - return FALSE; - } + g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), FALSE); priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); - if (!priv) { - g_warning ("BUG: %s: priv == NULL", __FUNCTION__); - return FALSE; - } - did_a_cancel = TRUE; + /* Note that if we call cancel with an already canceled mail + operation the progress changed signal won't be emitted */ + if (priv->status == MODEST_MAIL_OPERATION_STATUS_CANCELED) + return FALSE; /* Set new status */ priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED; - - /* This emits progress-changed on which the mail operation queue is - * listening, so the mail operation is correctly removed from the - * queue without further explicit calls. */ - modest_mail_operation_notify_end (self); - return TRUE; + /* Cancel the mail operation. We need to wrap it between this + start/stop operations to allow following calls to the + account */ + if (priv->account) + tny_account_cancel (priv->account); + + return canceled; } guint @@ -527,6 +570,166 @@ modest_mail_operation_send_mail (ModestMailOperation *self, modest_mail_operation_notify_end (self); } +static gboolean +idle_create_msg_cb (gpointer idle_data) +{ + CreateMsgIdleInfo *info = (CreateMsgIdleInfo *) idle_data; + + gdk_threads_enter (); + info->callback (info->mail_op, info->msg, info->userdata); + gdk_threads_leave (); + g_object_unref (info->mail_op); + if (info->msg) + g_object_unref (info->msg); + g_slice_free (CreateMsgIdleInfo, info); + + return FALSE; +} + +static gpointer +create_msg_thread (gpointer thread_data) +{ + CreateMsgInfo *info = (CreateMsgInfo *) thread_data; + TnyMsg *new_msg = NULL; + ModestMailOperationPrivate *priv; + + 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->attachments_list); /* FIXME: attachments */ + } else { + new_msg = modest_tny_msg_new_html_plain (info->to, info->from, info->cc, + info->bcc, info->subject, info->html_body, + info->plain_body, info->attachments_list); + } + + if (new_msg) { + TnyHeader *header; + /* Set priority flags in message */ + header = tny_msg_get_header (new_msg); + if (info->priority_flags != 0) + tny_header_set_flags (header, info->priority_flags); + if (info->attachments_list != NULL) { + tny_header_set_flags (header, TNY_HEADER_FLAG_ATTACHMENTS); + } + g_object_unref (G_OBJECT(header)); + } else { + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, + MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED, + "modest: failed to create a new msg\n"); + } + + + g_free (info->to); + g_free (info->from); + g_free (info->cc); + g_free (info->bcc); + g_free (info->plain_body); + g_free (info->html_body); + g_free (info->subject); + g_list_foreach (info->attachments_list, (GFunc) g_object_unref, NULL); + g_list_free (info->attachments_list); + + 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->callback = info->callback; + idle_info->userdata = info->userdata; + g_idle_add (idle_create_msg_cb, idle_info); + } else { + g_idle_add (idle_notify_queue, g_object_ref (info->mail_op)); + } + + g_object_unref (info->mail_op); + g_slice_free (CreateMsgInfo, info); + return NULL; +} + +void +modest_mail_operation_create_msg (ModestMailOperation *self, + 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, + TnyHeaderFlags priority_flags, + ModestMailOperationCreateMsgCallback callback, + gpointer userdata) +{ + CreateMsgInfo *info = NULL; + + info = g_slice_new0 (CreateMsgInfo); + info->mail_op = self; + g_object_ref (self); + + info->from = g_strdup (from); + info->to = g_strdup (to); + info->cc = g_strdup (cc); + info->subject = g_strdup (subject); + info->plain_body = g_strdup (plain_body); + info->html_body = g_strdup (html_body); + info->attachments_list = g_list_copy ((GList *) attachments_list); + g_list_foreach (info->attachments_list, (GFunc) g_object_ref, NULL); + info->priority_flags = priority_flags; + + info->callback = callback; + info->userdata = userdata; + + g_thread_create (create_msg_thread, info, FALSE, NULL); +} + +typedef struct +{ + TnyTransportAccount *transport_account; + TnyMsg *draft_msg; +} SendNewMailInfo; + +static void +modest_mail_operation_send_new_mail_cb (ModestMailOperation *self, + TnyMsg *msg, + gpointer userdata) +{ + SendNewMailInfo *info = (SendNewMailInfo *) userdata; + TnyFolder *folder; + TnyHeader *header; + + if (!msg) { + goto end; + } + + /* Call mail operation */ + modest_mail_operation_send_mail (self, info->transport_account, msg); + + folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (info->transport_account), TNY_FOLDER_TYPE_DRAFTS); + if (folder) { + if (info->draft_msg != NULL) { + header = tny_msg_get_header (info->draft_msg); + /* Note: This can fail (with a warning) if the message is not really already in a folder, + * because this function requires it to have a UID. */ + tny_folder_remove_msg (folder, header, NULL); + tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED); + tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN); + g_object_unref (header); + g_object_unref (folder); + } + } + +end: + if (info->draft_msg) + g_object_unref (info->draft_msg); + if (info->transport_account) + g_object_unref (info->transport_account); + g_slice_free (SendNewMailInfo, info); + modest_mail_operation_notify_end (self); +} + void modest_mail_operation_send_new_mail (ModestMailOperation *self, TnyTransportAccount *transport_account, @@ -538,10 +741,8 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self, const GList *attachments_list, TnyHeaderFlags priority_flags) { - TnyMsg *new_msg = NULL; - TnyFolder *folder = NULL; - TnyHeader *header = NULL; ModestMailOperationPrivate *priv = NULL; + SendNewMailInfo *info; g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account)); @@ -557,75 +758,37 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self, _("Error trying to send a mail. You need to set at least one recipient")); return; } + info = g_slice_new0 (SendNewMailInfo); + info->transport_account = transport_account; + if (transport_account) + g_object_ref (transport_account); + info->draft_msg = draft_msg; + if (draft_msg) + g_object_ref (draft_msg); + modest_mail_operation_create_msg (self, from, to, cc, bcc, subject, plain_body, html_body, + attachments_list, priority_flags, + modest_mail_operation_send_new_mail_cb, info); - if (html_body == NULL) { - new_msg = modest_tny_msg_new (to, from, cc, bcc, subject, plain_body, (GSList *) attachments_list); /* FIXME: attachments */ - } else { - new_msg = modest_tny_msg_new_html_plain (to, from, cc, bcc, subject, html_body, plain_body, (GSList *) attachments_list); - } - if (!new_msg) { - g_printerr ("modest: failed to create a new msg\n"); - return; - } - - /* Set priority flags in message */ - header = tny_msg_get_header (new_msg); - if (priority_flags != 0) - tny_header_set_flags (header, priority_flags); - if (attachments_list != NULL) { - tny_header_set_flags (header, TNY_HEADER_FLAG_ATTACHMENTS); - } - g_object_unref (G_OBJECT(header)); - - /* Call mail operation */ - modest_mail_operation_send_mail (self, transport_account, new_msg); - - folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (transport_account), TNY_FOLDER_TYPE_DRAFTS); - if (folder) { - if (draft_msg != NULL) { - header = tny_msg_get_header (draft_msg); - /* Note: This can fail (with a warning) if the message is not really already in a folder, - * because this function requires it to have a UID. */ - tny_folder_remove_msg (folder, header, NULL); - tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED); - tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN); - g_object_unref (header); - } - } - - /* Free */ - g_object_unref (G_OBJECT (new_msg)); } -TnyMsg* -modest_mail_operation_save_to_drafts (ModestMailOperation *self, - TnyTransportAccount *transport_account, - TnyMsg *draft_msg, - 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, - TnyHeaderFlags priority_flags) +typedef struct +{ + TnyTransportAccount *transport_account; + TnyMsg *draft_msg; + ModestMsgEditWindow *edit_window; +} SaveToDraftsInfo; + +static void +modest_mail_operation_save_to_drafts_cb (ModestMailOperation *self, + TnyMsg *msg, + gpointer userdata) { - TnyMsg *msg = NULL; TnyFolder *folder = NULL; TnyHeader *header = NULL; ModestMailOperationPrivate *priv = NULL; - - g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), NULL); - g_return_val_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account), NULL); + SaveToDraftsInfo *info = (SaveToDraftsInfo *) userdata; priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); - - /* Get account and set it into mail_operation */ - priv->account = g_object_ref (transport_account); - - if (html_body == NULL) { - msg = modest_tny_msg_new (to, from, cc, bcc, subject, plain_body, (GSList *) attachments_list); /* FIXME: attachments */ - } else { - msg = modest_tny_msg_new_html_plain (to, from, cc, bcc, subject, html_body, plain_body, (GSList *) attachments_list); - } if (!msg) { priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, @@ -634,14 +797,7 @@ modest_mail_operation_save_to_drafts (ModestMailOperation *self, goto end; } - /* add priority flags */ - header = tny_msg_get_header (msg); - tny_header_set_flags (header, priority_flags); - if (attachments_list != NULL) - tny_header_set_flags (header, TNY_HEADER_FLAG_ATTACHMENTS); - g_object_unref (G_OBJECT(header)); - - folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (transport_account), TNY_FOLDER_TYPE_DRAFTS); + folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (info->transport_account), TNY_FOLDER_TYPE_DRAFTS); if (!folder) { priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, @@ -650,8 +806,8 @@ modest_mail_operation_save_to_drafts (ModestMailOperation *self, goto end; } - if (draft_msg != NULL) { - header = tny_msg_get_header (draft_msg); + if (info->draft_msg != NULL) { + header = tny_msg_get_header (info->draft_msg); /* Remove the old draft expunging it */ tny_folder_remove_msg (folder, header, NULL); tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED); @@ -668,12 +824,60 @@ modest_mail_operation_save_to_drafts (ModestMailOperation *self, else priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + if (info->edit_window) + modest_msg_edit_window_set_draft (info->edit_window, msg); + + end: if (folder) g_object_unref (G_OBJECT(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); - return msg; +} + +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, + TnyHeaderFlags priority_flags) +{ + ModestMailOperationPrivate *priv = NULL; + SaveToDraftsInfo *info = NULL; + + g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); + g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account)); + + priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); + + /* Get account and set it into mail_operation */ + priv->account = g_object_ref (transport_account); + + 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); + + modest_mail_operation_create_msg (self, from, to, cc, bcc, subject, plain_body, html_body, + attachments_list, priority_flags, + modest_mail_operation_save_to_drafts_cb, info); + } typedef struct @@ -690,6 +894,15 @@ typedef struct gint new_headers; } UpdateAccountInfo; +typedef struct +{ + ModestMailOperation *mail_op; + TnyMimePart *mime_part; + gssize size; + GetMimePartSizeCallback callback; + gpointer userdata; +} GetMimePartSizeInfo; + /***** I N T E R N A L F O L D E R O B S E R V E R *****/ /* We use this folder observer to track the headers that have been * added to a folder */ @@ -808,7 +1021,13 @@ idle_notify_progress (gpointer data) ModestMailOperationState *state; state = modest_mail_operation_clone_state (mail_op); +#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET + gdk_threads_enter (); +#endif g_signal_emit (G_OBJECT (mail_op), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL); +#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET + gdk_threads_leave (); +#endif g_slice_free (ModestMailOperationState, state); return TRUE; @@ -826,7 +1045,13 @@ idle_notify_progress_once (gpointer data) pair = (ModestPair *) data; +#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET + gdk_threads_enter (); +#endif g_signal_emit (G_OBJECT (pair->first), signals[PROGRESS_CHANGED_SIGNAL], 0, pair->second, NULL); +#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET + gdk_threads_leave (); +#endif /* Free the state and the reference to the mail operation */ g_slice_free (ModestMailOperationState, (ModestMailOperationState*)pair->second); @@ -836,16 +1061,13 @@ idle_notify_progress_once (gpointer data) } /* - * Used by update_account_thread to notify the queue from the main + * Used to notify the queue from the main * loop. We call it inside an idle call to achieve that */ static gboolean -idle_notify_update_account_queue (gpointer data) +idle_notify_queue (gpointer data) { ModestMailOperation *mail_op = MODEST_MAIL_OPERATION (data); - ModestMailOperationPrivate *priv = NULL; - - priv = MODEST_MAIL_OPERATION_GET_PRIVATE(mail_op); /* Do not need to block, the notify end will do it for us */ modest_mail_operation_notify_end (mail_op); @@ -919,13 +1141,14 @@ static gpointer update_account_thread (gpointer thr_user_data) { static gboolean first_time = TRUE; - UpdateAccountInfo *info; + UpdateAccountInfo *info = NULL; TnyList *all_folders = NULL; GPtrArray *new_headers = NULL; TnyIterator *iter = NULL; TnyFolderStoreQuery *query = NULL; ModestMailOperationPrivate *priv = NULL; ModestTnySendQueue *send_queue = NULL; + gint num_new_headers = 0; info = (UpdateAccountInfo *) thr_user_data; priv = MODEST_MAIL_OPERATION_GET_PRIVATE(info->mail_op); @@ -972,10 +1195,12 @@ update_account_thread (gpointer thr_user_data) gint timeout = g_timeout_add (100, idle_notify_progress, info->mail_op); /* Refresh folders */ + num_new_headers = 0; new_headers = g_ptr_array_new (); iter = tny_list_create_iterator (all_folders); - while (!tny_iterator_is_done (iter) && !priv->error && !did_a_cancel) { + while (!tny_iterator_is_done (iter) && !priv->error && + priv->status != MODEST_MAIL_OPERATION_STATUS_CANCELED) { InternalFolderObserver *observer; TnyFolderStore *folder = TNY_FOLDER_STORE (tny_iterator_get_current (iter)); @@ -1024,20 +1249,17 @@ update_account_thread (gpointer thr_user_data) g_object_unref (G_OBJECT (folder)); if (priv->error) - { priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; - goto out; - } - + tny_iterator_next (iter); } - did_a_cancel = FALSE; - g_object_unref (G_OBJECT (iter)); g_source_remove (timeout); - if (new_headers->len > 0) { + if (priv->status != MODEST_MAIL_OPERATION_STATUS_CANCELED && + priv->status != MODEST_MAIL_OPERATION_STATUS_FAILED && + new_headers->len > 0) { gint msg_num = 0; /* Order by date */ @@ -1085,12 +1307,17 @@ update_account_thread (gpointer thr_user_data) msg_num++; } - g_ptr_array_foreach (new_headers, (GFunc) g_object_unref, NULL); - g_ptr_array_free (new_headers, FALSE); } + + /* Get the number of new headers and free them */ + num_new_headers = new_headers->len; + g_ptr_array_foreach (new_headers, (GFunc) g_object_unref, NULL); + g_ptr_array_free (new_headers, FALSE); + if (priv->status == MODEST_MAIL_OPERATION_STATUS_CANCELED) + goto out; + /* Perform send (if operation was not cancelled) */ - if (did_a_cancel) goto out; /* priv->op_type = MODEST_MAIL_OPERATION_TYPE_SEND; */ priv->done = 0; priv->total = 0; @@ -1130,7 +1357,7 @@ update_account_thread (gpointer thr_user_data) /* 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) ? new_headers->len : 0; + idle_info->new_headers = num_new_headers; idle_info->callback = info->callback; g_idle_add (idle_update_account_cb, idle_info); } @@ -1138,7 +1365,7 @@ update_account_thread (gpointer thr_user_data) /* 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_update_account_queue, g_object_ref (info->mail_op)); + g_idle_add (idle_notify_queue, g_object_ref (info->mail_op)); /* Frees */ g_object_unref (query); @@ -1159,12 +1386,12 @@ modest_mail_operation_update_account (ModestMailOperation *self, UpdateAccountCallback callback, gpointer user_data) { - GThread *thread; - UpdateAccountInfo *info; - ModestMailOperationPrivate *priv; - ModestAccountMgr *mgr; - TnyStoreAccount *modest_account; - TnyTransportAccount *transport_account; + GThread *thread = NULL; + UpdateAccountInfo *info = NULL; + ModestMailOperationPrivate *priv = NULL; + ModestAccountMgr *mgr = NULL; + TnyStoreAccount *store_account = NULL; + TnyTransportAccount *transport_account = NULL; g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), FALSE); g_return_val_if_fail (account_name, FALSE); @@ -1177,20 +1404,20 @@ modest_mail_operation_update_account (ModestMailOperation *self, priv->done = 0; priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; + /* Get the Modest account */ + store_account = (TnyStoreAccount *) + modest_tny_account_store_get_server_account (modest_runtime_get_account_store (), + account_name, + TNY_ACCOUNT_TYPE_STORE); + /* Make sure that we have a connection, and request one * if necessary: * TODO: Is there some way to trigger this for every attempt to * use the network? */ - if (!modest_platform_connect_and_wait (NULL)) + if (!modest_platform_connect_and_wait (NULL, TNY_ACCOUNT (store_account))) goto error; - /* Get the Modest account */ - modest_account = (TnyStoreAccount *) - modest_tny_account_store_get_server_account (modest_runtime_get_account_store (), - account_name, - TNY_ACCOUNT_TYPE_STORE); - - if (!modest_account) { + 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); @@ -1213,7 +1440,7 @@ modest_mail_operation_update_account (ModestMailOperation *self, /* Create the helper object */ info = g_slice_new (UpdateAccountInfo); info->mail_op = self; - info->account = modest_account; + info->account = store_account; info->transport_account = transport_account; info->callback = callback; info->user_data = user_data; @@ -1268,11 +1495,28 @@ modest_mail_operation_create_folder (ModestMailOperation *self, ModestMailOperationPrivate *priv; TnyFolder *new_folder = NULL; + TnyList *list = tny_simple_list_new (); + TnyFolderStoreQuery *query = tny_folder_store_query_new (); + g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent), NULL); g_return_val_if_fail (name, NULL); priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); + /* Check for already existing folder */ + tny_folder_store_query_add_item (query, name, TNY_FOLDER_STORE_QUERY_OPTION_MATCH_ON_NAME); + tny_folder_store_get_folders (parent, list, query, NULL); + g_object_unref (G_OBJECT (query)); + + if (tny_list_get_length (list) > 0) { + 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")); + } + + g_object_unref (G_OBJECT (list)); + /* Check parent */ if (TNY_IS_FOLDER (parent)) { /* Check folder rules */ @@ -1342,9 +1586,12 @@ modest_mail_operation_remove_folder (ModestMailOperation *self, trash_folder = modest_tny_account_get_special_folder (account, TNY_FOLDER_TYPE_TRASH); /* TODO: error_handling */ - modest_mail_operation_xfer_folder (self, folder, + if (trash_folder) { + modest_mail_operation_xfer_folder (self, folder, TNY_FOLDER_STORE (trash_folder), TRUE, NULL, NULL); + g_object_unref (trash_folder); + } } else { TnyFolderStore *parent = tny_folder_get_folder_store (folder); @@ -1384,7 +1631,13 @@ transfer_folder_status_cb (GObject *obj, priv->total = status->of_total; state = modest_mail_operation_clone_state (self); +#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET + gdk_threads_enter (); +#endif g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL); +#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET + gdk_threads_leave (); +#endif g_slice_free (ModestMailOperationState, state); } @@ -1435,8 +1688,47 @@ transfer_folder_cb (TnyFolder *folder, /* Free */ g_object_unref (helper->mail_op); g_slice_free (XFerMsgAsyncHelper, helper); - g_object_unref (folder); - g_object_unref (into); +} + +/** + * + * This function checks if the new name is a valid name for our local + * folders account. The new name could not be the same than then name + * of any of the mandatory local folders + * + * We can not rely on tinymail because tinymail does not check the + * name of the virtual folders that the account could have in the case + * that we're doing a rename (because it directly calls Camel which + * knows nothing about our virtual folders). + * + * In the case of an actual copy/move (i.e. move/copy a folder between + * accounts) tinymail uses the tny_folder_store_create_account which + * is reimplemented by our ModestTnyLocalFoldersAccount that indeed + * checks the new name of the folder, so this call in that case + * wouldn't be needed. *But* NOTE that if tinymail changes its + * implementation (if folder transfers within the same account is no + * longer implemented as a rename) this call will allow Modest to work + * perfectly + * + * If the new name is not valid, this function will set the status to + * failed and will set also an error in the mail operation + */ +static gboolean +new_name_valid_if_local_account (ModestMailOperationPrivate *priv, + TnyFolderStore *into, + const gchar *new_name) +{ + if (TNY_IS_ACCOUNT (into) && + modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (into)) && + modest_tny_local_folders_account_extra_folder_exists (MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (into), + new_name)) { + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, + MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES, + _("FIXME: folder name already in use")); + return FALSE; + } else + return TRUE; } void @@ -1487,27 +1779,31 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self, /* Notify the queue */ modest_mail_operation_notify_end (self); } else { - /* Pick references for async calls */ - g_object_ref (folder); - g_object_ref (parent); - - /* Create the helper */ - helper = g_slice_new0 (XFerMsgAsyncHelper); - helper->mail_op = g_object_ref(self); - helper->dest_folder = NULL; - helper->headers = NULL; - helper->user_callback = user_callback; - helper->user_data = user_data; - - /* Move/Copy folder */ - tny_folder_copy_async (folder, - parent, - tny_folder_get_name (folder), - delete_original, - transfer_folder_cb, - transfer_folder_status_cb, - helper); -/* self); */ + + + /* Check that the new folder name is not used by any + special local folder */ + if (new_name_valid_if_local_account (priv, parent, + tny_folder_get_name (folder))) { + /* Create the helper */ + helper = g_slice_new0 (XFerMsgAsyncHelper); + helper->mail_op = g_object_ref(self); + helper->dest_folder = NULL; + helper->headers = NULL; + helper->user_callback = user_callback; + helper->user_data = user_data; + + /* Move/Copy folder */ + tny_folder_copy_async (folder, + parent, + tny_folder_get_name (folder), + delete_original, + transfer_folder_cb, + transfer_folder_status_cb, + helper); + } else { + modest_mail_operation_notify_end (self); + } } } @@ -1550,25 +1846,30 @@ modest_mail_operation_rename_folder (ModestMailOperation *self, } else { TnyFolderStore *into; - /* Create the helper */ - helper = g_slice_new0 (XFerMsgAsyncHelper); - helper->mail_op = g_object_ref(self); - helper->dest_folder = NULL; - helper->headers = NULL; - helper->user_callback = NULL; - helper->user_data = NULL; - - /* Rename. Camel handles folder subscription/unsubscription */ - into = tny_folder_get_folder_store (folder); - tny_folder_copy_async (folder, into, name, TRUE, - transfer_folder_cb, - transfer_folder_status_cb, - helper); -/* self); */ - if (into) - g_object_unref (into); + into = tny_folder_get_folder_store (folder); + + /* Check that the new folder name is not used by any + special local folder */ + if (new_name_valid_if_local_account (priv, into, name)) { + /* Create the helper */ + helper = g_slice_new0 (XFerMsgAsyncHelper); + helper->mail_op = g_object_ref(self); + helper->dest_folder = NULL; + helper->headers = NULL; + helper->user_callback = NULL; + helper->user_data = NULL; + + /* Rename. Camel handles folder subscription/unsubscription */ + tny_folder_copy_async (folder, into, name, TRUE, + transfer_folder_cb, + transfer_folder_status_cb, + helper); + } else { + modest_mail_operation_notify_end (self); + } + g_object_unref (into); } - } +} /* ******************************************************************* */ /* ************************** MSG ACTIONS ************************* */ @@ -1622,6 +1923,99 @@ void modest_mail_operation_get_msg (ModestMailOperation *self, } } +static gboolean +idle_get_mime_part_size_cb (gpointer userdata) +{ + GetMimePartSizeInfo *idle_info; + + idle_info = (GetMimePartSizeInfo *) userdata; + + gdk_threads_enter (); + idle_info->callback (idle_info->mail_op, + idle_info->size, + idle_info->userdata); + gdk_threads_leave (); + + g_object_unref (idle_info->mail_op); + g_slice_free (GetMimePartSizeInfo, idle_info); + + return FALSE; +} + +static gpointer +get_mime_part_size_thread (gpointer thr_user_data) +{ + GetMimePartSizeInfo *info; + gchar read_buffer[GET_SIZE_BUFFER_SIZE]; + TnyStream *stream; + gssize readed_size; + gssize total = 0; + ModestMailOperationPrivate *priv; + + info = (GetMimePartSizeInfo *) thr_user_data; + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op); + + stream = tny_camel_mem_stream_new (); + tny_mime_part_decode_to_stream (info->mime_part, stream); + tny_stream_reset (stream); + if (tny_stream_is_eos (stream)) { + tny_stream_close (stream); + stream = tny_mime_part_get_stream (info->mime_part); + } + + while (!tny_stream_is_eos (stream)) { + readed_size = tny_stream_read (stream, read_buffer, GET_SIZE_BUFFER_SIZE); + total += readed_size; + } + + if (info->callback) { + GetMimePartSizeInfo *idle_info; + + idle_info = g_slice_new0 (GetMimePartSizeInfo); + idle_info->mail_op = g_object_ref (info->mail_op); + idle_info->size = total; + idle_info->callback = info->callback; + idle_info->userdata = info->userdata; + g_idle_add (idle_get_mime_part_size_cb, idle_info); + } + + g_idle_add (idle_notify_queue, g_object_ref (info->mail_op)); + + g_object_unref (info->mail_op); + g_object_unref (stream); + g_object_unref (info->mime_part); + g_slice_free (GetMimePartSizeInfo, info); + + return NULL; +} + +void +modest_mail_operation_get_mime_part_size (ModestMailOperation *self, + TnyMimePart *part, + GetMimePartSizeCallback user_callback, + gpointer user_data, + GDestroyNotify notify) +{ + GetMimePartSizeInfo *info; + ModestMailOperationPrivate *priv; + GThread *thread; + + g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); + g_return_if_fail (TNY_IS_MIME_PART (part)); + + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); + + priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; + info = g_slice_new0 (GetMimePartSizeInfo); + info->mail_op = g_object_ref (self); + info->mime_part = g_object_ref (part); + info->callback = user_callback; + info->userdata = user_data; + + thread = g_thread_create (get_mime_part_size_thread, info, FALSE, NULL); + +} + static void get_msg_cb (TnyFolder *folder, gboolean cancelled, @@ -1663,13 +2057,13 @@ get_msg_cb (TnyFolder *folder, gdk_threads_leave (); } + /* 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); - /* Notify about operation end */ - modest_mail_operation_notify_end (self); } static void @@ -1691,16 +2085,19 @@ get_msg_status_cb (GObject *obj, self = helper->mail_op; priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); - if(priv->status == MODEST_MAIL_OPERATION_STATUS_CANCELED) - return; - priv->done = 1; priv->total = 1; state = modest_mail_operation_clone_state (self); state->bytes_done = status->position; state->bytes_total = status->of_total; +#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET + gdk_threads_enter (); +#endif g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL); +#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET + gdk_threads_leave (); +#endif g_slice_free (ModestMailOperationState, state); } @@ -1819,7 +2216,7 @@ get_msgs_full_thread (gpointer thr_user_data) info_notify, NULL); } g_object_unref (msg); - } + } } else { /* Set status failed and set an error */ priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; @@ -1836,7 +2233,7 @@ get_msgs_full_thread (gpointer thr_user_data) priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; /* Notify about operation end */ - g_idle_add (idle_notify_update_account_queue, g_object_ref (info->mail_op)); + g_idle_add (idle_notify_queue, g_object_ref (info->mail_op)); /* 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); @@ -2006,7 +2403,13 @@ transfer_msgs_status_cb (GObject *obj, priv->total = status->of_total; state = modest_mail_operation_clone_state (self); +#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET + gdk_threads_enter (); +#endif g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL); +#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET + gdk_threads_leave (); +#endif g_slice_free (ModestMailOperationState, state); } @@ -2184,9 +2587,8 @@ on_refresh_folder (TnyFolder *folder, } /* Free */ - g_object_unref (helper->mail_op); +/* g_object_unref (helper->mail_op); */ g_slice_free (RefreshAsyncHelper, helper); - g_object_unref (folder); /* Notify about operation end */ modest_mail_operation_notify_end (self); @@ -2216,7 +2618,13 @@ on_refresh_folder_status_update (GObject *obj, priv->total = status->of_total; state = modest_mail_operation_clone_state (self); +#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET + gdk_threads_enter (); +#endif g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL); +#ifdef TINYMAIL_IDLES_NOT_LOCKED_YET + gdk_threads_leave (); +#endif g_slice_free (ModestMailOperationState, state); } @@ -2231,9 +2639,6 @@ modest_mail_operation_refresh_folder (ModestMailOperation *self, priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); - /* Pick a reference */ - g_object_ref (folder); - priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; /* Get account and set it into mail_operation */ @@ -2241,7 +2646,7 @@ modest_mail_operation_refresh_folder (ModestMailOperation *self, /* Create the helper */ helper = g_slice_new0 (RefreshAsyncHelper); - helper->mail_op = g_object_ref(self); + helper->mail_op = g_object_ref (self); helper->user_callback = user_callback; helper->user_data = user_data; @@ -2280,7 +2685,9 @@ modest_mail_operation_notify_end (ModestMailOperation *self) priv->account_name = NULL; } - /* Notify the observers about the mail opertation end */ + /* 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 */ state = modest_mail_operation_clone_state (self); g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL); g_slice_free (ModestMailOperationState, state);