X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=16744148b42ef9bcd13b0f73d730c1f704ed7738;hp=44ee8b8fa2e99434aef2f0a6207e6b1ace0230e7;hb=916772be7b84e78505ce6f8d8344e685ee05d2cd;hpb=b2335f35c3d064afc4e63f916fb5e65aebdd5536 diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c index 44ee8b8..1674414 100644 --- a/src/modest-mail-operation.c +++ b/src/modest-mail-operation.c @@ -27,8 +27,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "modest-mail-operation.h" -/* include other impl specific header files */ #include #include #include @@ -36,6 +34,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -52,6 +53,7 @@ #include "modest-tny-platform-factory.h" #include "modest-marshal.h" #include "modest-error.h" +#include "modest-mail-operation.h" #define KB 1024 @@ -72,6 +74,8 @@ 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, @@ -81,12 +85,14 @@ enum _ModestMailOperationSignals typedef struct _ModestMailOperationPrivate ModestMailOperationPrivate; struct _ModestMailOperationPrivate { - guint id; + TnyAccount *account; + gchar *account_name; guint done; guint total; GObject *source; GError *error; ErrorCheckingUserCallback error_checking; + gpointer error_checking_user_data; ModestMailOperationStatus status; ModestMailOperationTypeOperation op_type; }; @@ -101,11 +107,17 @@ struct _ModestMailOperationPrivate { typedef struct _GetMsgAsyncHelper { ModestMailOperation *mail_op; + TnyHeader *header; GetMsgAsyncUserCallback user_callback; - guint pending_ops; gpointer user_data; } GetMsgAsyncHelper; +typedef struct _RefreshAsyncHelper { + ModestMailOperation *mail_op; + RefreshAsyncUserCallback user_callback; + gpointer user_data; +} RefreshAsyncHelper; + typedef struct _XFerMsgAsyncHelper { ModestMailOperation *mail_op; @@ -115,12 +127,6 @@ typedef struct _XFerMsgAsyncHelper gpointer user_data; } XFerMsgAsyncHelper; -typedef struct _XFerFolderAsyncHelper -{ - ModestMailOperation *mail_op; - -} XFerFolderAsyncHelper; - /* globals */ static GObjectClass *parent_class = NULL; @@ -176,6 +182,7 @@ modest_mail_operation_class_init (ModestMailOperationClass *klass) NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); + } static void @@ -185,14 +192,15 @@ modest_mail_operation_init (ModestMailOperation *obj) priv = MODEST_MAIL_OPERATION_GET_PRIVATE(obj); + priv->account = NULL; priv->status = MODEST_MAIL_OPERATION_STATUS_INVALID; priv->op_type = MODEST_MAIL_OPERATION_TYPE_UNKNOWN; priv->error = NULL; - priv->error_checking = NULL; - priv->id = 0; priv->done = 0; priv->total = 0; priv->source = NULL; + priv->error_checking = NULL; + priv->error_checking_user_data = NULL; } static void @@ -202,6 +210,8 @@ modest_mail_operation_finalize (GObject *obj) priv = MODEST_MAIL_OPERATION_GET_PRIVATE(obj); + + if (priv->error) { g_error_free (priv->error); priv->error = NULL; @@ -210,6 +220,11 @@ modest_mail_operation_finalize (GObject *obj) g_object_unref (priv->source); priv->source = NULL; } + if (priv->account) { + g_object_unref (priv->account); + priv->account = NULL; + } + G_OBJECT_CLASS(parent_class)->finalize (obj); } @@ -234,7 +249,8 @@ modest_mail_operation_new (ModestMailOperationTypeOperation op_type, ModestMailOperation* modest_mail_operation_new_with_error_handling (ModestMailOperationTypeOperation op_type, GObject *source, - ErrorCheckingUserCallback error_handler) + ErrorCheckingUserCallback error_handler, + gpointer user_data) { ModestMailOperation *obj; ModestMailOperationPrivate *priv; @@ -256,9 +272,8 @@ modest_mail_operation_execute_error_handler (ModestMailOperation *self) priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); g_return_if_fail(priv->status != MODEST_MAIL_OPERATION_STATUS_SUCCESS); - if (priv->error_checking == NULL) - return; - priv->error_checking (priv->source, self); + if (priv->error_checking != NULL) + priv->error_checking (self, priv->error_checking_user_data); } @@ -289,8 +304,14 @@ modest_mail_operation_get_source (ModestMailOperation *self) { ModestMailOperationPrivate *priv; + g_return_val_if_fail (self, NULL); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); - + if (!priv) { + g_warning ("BUG: %s: priv == NULL", __FUNCTION__); + return NULL; + } + return g_object_ref (priv->source); } @@ -304,6 +325,11 @@ modest_mail_operation_get_status (ModestMailOperation *self) MODEST_MAIL_OPERATION_STATUS_INVALID); priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); + if (!priv) { + g_warning ("BUG: %s: priv == NULL", __FUNCTION__); + return MODEST_MAIL_OPERATION_STATUS_INVALID; + } + return priv->status; } @@ -316,6 +342,12 @@ modest_mail_operation_get_error (ModestMailOperation *self) g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), NULL); priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); + + if (!priv) { + g_warning ("BUG: %s: priv == NULL", __FUNCTION__); + return NULL; + } + return priv->error; } @@ -330,16 +362,21 @@ modest_mail_operation_cancel (ModestMailOperation *self) } priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); + if (!priv) { + g_warning ("BUG: %s: priv == NULL", __FUNCTION__); + return FALSE; + } - /* TODO: Tinymail does not support cancel operation */ -/* tny_account_cancel (); */ + did_a_cancel = TRUE; /* Set new status */ priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED; - /* Notify about operation end */ + /* 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; } @@ -423,7 +460,17 @@ modest_mail_operation_clone_state (ModestMailOperation *self) ModestMailOperationState *state; ModestMailOperationPrivate *priv; + /* FIXME: this should be fixed properly + * + * in some cases, priv was NULL, so checking here to + * make sure. + */ + g_return_val_if_fail (self, NULL); priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); + g_return_val_if_fail (priv, NULL); + + if (!priv) + return NULL; state = g_slice_new (ModestMailOperationState); @@ -432,6 +479,8 @@ modest_mail_operation_clone_state (ModestMailOperation *self) state->done = priv->done; state->total = priv->total; state->finished = modest_mail_operation_is_finished (self); + state->bytes_done = 0; + state->bytes_total = 0; return state; } @@ -445,34 +494,43 @@ modest_mail_operation_send_mail (ModestMailOperation *self, TnyTransportAccount *transport_account, TnyMsg* msg) { - TnySendQueue *send_queue; + TnySendQueue *send_queue = NULL; + ModestMailOperationPrivate *priv; 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)); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); + + /* Get account and set it into mail_operation */ + priv->account = g_object_ref (transport_account); + priv->done = 1; + priv->total = 1; + send_queue = TNY_SEND_QUEUE (modest_runtime_get_send_queue (transport_account)); - if (!TNY_IS_SEND_QUEUE(send_queue)) - g_printerr ("modest: could not find send queue for account\n"); - else { - GError *err = NULL; - tny_send_queue_add (send_queue, msg, &err); - if (err) { - g_printerr ("modest: error adding msg to send queue: %s\n", - err->message); - g_error_free (err); - } else { - /* g_message ("modest: message added to send queue"); */ - } + if (!TNY_IS_SEND_QUEUE(send_queue)) { + g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, + MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND, + "modest: could not find send queue for account\n"); + } else { + /* TODO: connect to the msg-sent in order to know when + the mail operation is finished */ + tny_send_queue_add (send_queue, msg, &(priv->error)); + /* TODO: we're setting always success, do the check in + the handler */ + priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; } - /* Notify about operation end */ + /* TODO: do this in the handler of the "msg-sent" + signal.Notify about operation end */ modest_mail_operation_notify_end (self); } void modest_mail_operation_send_new_mail (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, @@ -480,9 +538,10 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self, const GList *attachments_list, TnyHeaderFlags priority_flags) { - TnyMsg *new_msg; + TnyMsg *new_msg = NULL; + TnyFolder *folder = NULL; + TnyHeader *header = NULL; ModestMailOperationPrivate *priv = NULL; - /* GList *node = NULL; */ g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account)); @@ -491,6 +550,8 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self, /* Check parametters */ if (to == NULL) { + /* 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, _("Error trying to send a mail. You need to set at least one recipient")); @@ -507,12 +568,27 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self, return; } - /* TODO: add priority handling. It's received in the priority_flags operator, and - it should have effect in the sending operation */ + /* Set priority flags in message */ + header = tny_msg_get_header (new_msg); + if (priority_flags != 0) + tny_header_set_flags (header, priority_flags); + 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); + g_object_unref (header); + } + } + /* Free */ g_object_unref (G_OBJECT (new_msg)); } @@ -520,6 +596,7 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self, void 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, @@ -529,48 +606,68 @@ modest_mail_operation_save_to_drafts (ModestMailOperation *self, { TnyMsg *msg = NULL; TnyFolder *folder = NULL; + TnyHeader *header = NULL; ModestMailOperationPrivate *priv = NULL; - GError *err = NULL; - - /* GList *node = 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); + 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) { - g_printerr ("modest: failed to create a new msg\n"); - goto cleanup; + 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; } + /* add priority flags */ + header = tny_msg_get_header (msg); + tny_header_set_flags (header, priority_flags); + g_object_unref (G_OBJECT(header)); + folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (transport_account), TNY_FOLDER_TYPE_DRAFTS); if (!folder) { - g_printerr ("modest: failed to find Drafts folder\n"); - goto cleanup; + 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; } - - tny_folder_add_msg (folder, msg, &err); - if (err) { - g_printerr ("modest: error adding msg to Drafts folder: %s", - err->message); - g_error_free (err); - goto cleanup; + + if (draft_msg != NULL) { + header = tny_msg_get_header (draft_msg); + /* Remove the old draft expunging it */ + tny_folder_remove_msg (folder, header, NULL); + tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED); + tny_folder_sync (folder, FALSE, &(priv->error)); /* FALSE --> don't expunge */ + g_object_unref (header); } + + if (!priv->error) + tny_folder_add_msg (folder, msg, &(priv->error)); - modest_mail_operation_notify_end (self); + if (!priv->error) + priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; + else + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; - /* Free */ -cleanup: +end: if (msg) g_object_unref (G_OBJECT(msg)); if (folder) g_object_unref (G_OBJECT(folder)); + + modest_mail_operation_notify_end (self); } typedef struct @@ -581,6 +678,10 @@ typedef struct gint max_size; gint retrieve_limit; gchar *retrieve_type; + gchar *account_name; + UpdateAccountCallback callback; + gpointer user_data; + gint new_headers; } UpdateAccountInfo; /***** I N T E R N A L F O L D E R O B S E R V E R *****/ @@ -606,6 +707,9 @@ G_DEFINE_TYPE_WITH_CODE (InternalFolderObserver, static void foreach_add_item (gpointer header, gpointer user_data) { + /* printf("DEBUG: %s: header subject=%s\n", + * __FUNCTION__, tny_header_get_subject(TNY_HEADER(header))); + */ tny_list_prepend (TNY_LIST (user_data), g_object_ref (G_OBJECT (header))); } @@ -614,6 +718,8 @@ foreach_add_item (gpointer header, gpointer user_data) static void internal_folder_observer_update (TnyFolderObserver *self, TnyFolderChange *change) { + InternalFolderObserver *derived = (InternalFolderObserver *)self; + TnyFolderChangeChanged changed; changed = tny_folder_change_get_changed (change); @@ -625,9 +731,13 @@ internal_folder_observer_update (TnyFolderObserver *self, TnyFolderChange *chang list = tny_simple_list_new (); tny_folder_change_get_added_headers (change, list); + /* printf ("DEBUG: %s: Calling foreach with a list of size=%d\n", + * __FUNCTION__, tny_list_get_length(list)); + */ + /* Add them to the folder observer */ tny_list_foreach (list, foreach_add_item, - ((InternalFolderObserver *)self)->new_headers); + derived->new_headers); g_object_unref (G_OBJECT (list)); } @@ -701,7 +811,7 @@ idle_notify_progress (gpointer data) state = modest_mail_operation_clone_state (mail_op); g_signal_emit (G_OBJECT (mail_op), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL); g_slice_free (ModestMailOperationState, state); - + return TRUE; } @@ -731,10 +841,14 @@ idle_notify_progress_once (gpointer data) * loop. We call it inside an idle call to achieve that */ static gboolean -notify_update_account_queue (gpointer data) +idle_notify_update_account_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); g_object_unref (mail_op); @@ -762,20 +876,72 @@ compare_headers_by_date (gconstpointer a, return -1; } +static gboolean +set_last_updated_idle (gpointer data) +{ + gdk_threads_enter (); + + /* 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_int (modest_runtime_get_account_mgr (), + (gchar *) data, + MODEST_ACCOUNT_LAST_UPDATED, + time(NULL), + TRUE); + + gdk_threads_leave (); + + return FALSE; +} + +static gboolean +idle_update_account_cb (gpointer data) +{ + UpdateAccountInfo *idle_info; + + idle_info = (UpdateAccountInfo *) data; + + gdk_threads_enter (); + idle_info->callback (idle_info->mail_op, + idle_info->new_headers, + idle_info->user_data); + gdk_threads_leave (); + + /* Frees */ + g_object_unref (idle_info->mail_op); + g_free (idle_info); + + return FALSE; +} + + static gpointer update_account_thread (gpointer thr_user_data) { + static gboolean first_time = TRUE; UpdateAccountInfo *info; TnyList *all_folders = NULL; - GPtrArray *new_headers; + GPtrArray *new_headers = NULL; TnyIterator *iter = NULL; TnyFolderStoreQuery *query = NULL; - ModestMailOperationPrivate *priv; + ModestMailOperationPrivate *priv = NULL; + ModestTnySendQueue *send_queue = NULL; info = (UpdateAccountInfo *) thr_user_data; priv = MODEST_MAIL_OPERATION_GET_PRIVATE(info->mail_op); - /* Get all the folders We can do it synchronously because + /* Get account and set it into mail_operation */ + priv->account = g_object_ref (info->account); + + /* + * for POP3, we do a logout-login upon send/receive -- many POP-servers (like Gmail) do not + * show any updates unless we do that + */ + if (!first_time && TNY_IS_CAMEL_POP_STORE_ACCOUNT(priv->account)) + tny_camel_pop_store_account_reconnect (TNY_CAMEL_POP_STORE_ACCOUNT(priv->account)); + + /* Get all the folders. We can do it synchronously because we're already running in a different thread than the UI */ all_folders = tny_simple_list_new (); query = tny_folder_store_query_new (); @@ -799,34 +965,45 @@ update_account_thread (gpointer thr_user_data) g_object_unref (G_OBJECT (iter)); /* Update status and notify. We need to call the notification - with a source functopm in order to call it from the main + 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 */ - gint timeout = g_timeout_add (250, idle_notify_progress, info->mail_op); + gint timeout = g_timeout_add (100, idle_notify_progress, info->mail_op); /* Refresh folders */ new_headers = g_ptr_array_new (); iter = tny_list_create_iterator (all_folders); - while (!tny_iterator_is_done (iter) && !priv->error) { + + while (!tny_iterator_is_done (iter) && !priv->error && !did_a_cancel) { InternalFolderObserver *observer; TnyFolderStore *folder = TNY_FOLDER_STORE (tny_iterator_get_current (iter)); /* Refresh the folder */ + /* Our observer receives notification of 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)); + + /* This gets the status information (headers) from the server. + * We use the blocking version, because we are already in a separate + * thread. + */ - /* If the retrieve type is headers only do nothing more */ - if (!strcmp (info->retrieve_type, MODEST_ACCOUNT_RETRIEVE_VALUE_MESSAGES) || - !strcmp (info->retrieve_type, MODEST_ACCOUNT_RETRIEVE_VALUE_MESSAGES_AND_ATTACHMENTS)) { + if (!g_ascii_strcasecmp (info->retrieve_type, MODEST_ACCOUNT_RETRIEVE_VALUE_MESSAGES) || + !g_ascii_strcasecmp (info->retrieve_type, MODEST_ACCOUNT_RETRIEVE_VALUE_MESSAGES_AND_ATTACHMENTS)) { TnyIterator *iter; + /* If the retrieve type is full messages, refresh and get the messages */ + tny_folder_refresh (TNY_FOLDER (folder), &(priv->error)); + iter = tny_list_create_iterator (observer->new_headers); while (!tny_iterator_is_done (iter)) { TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); + /* Apply per-message size limits */ if (tny_header_get_message_size (header) < info->max_size) g_ptr_array_add (new_headers, g_object_ref (header)); @@ -835,16 +1012,29 @@ update_account_thread (gpointer thr_user_data) tny_iterator_next (iter); } g_object_unref (iter); + } else { + /* We do not need to do it the first time + because it's automatically done by the tree + model */ + if (G_UNLIKELY (!first_time)) + tny_folder_poke_status (TNY_FOLDER (folder)); } tny_folder_remove_observer (TNY_FOLDER (folder), TNY_FOLDER_OBSERVER (observer)); g_object_unref (observer); + observer = NULL; + g_object_unref (G_OBJECT (folder)); if (priv->error) + { priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; - - g_object_unref (G_OBJECT (folder)); + goto out; + } + tny_iterator_next (iter); } + + did_a_cancel = FALSE; + g_object_unref (G_OBJECT (iter)); g_source_remove (timeout); @@ -855,11 +1045,26 @@ update_account_thread (gpointer thr_user_data) g_ptr_array_sort (new_headers, (GCompareFunc) compare_headers_by_date); /* Apply message count limit */ - /* TODO if the number of messages exceeds the maximum, ask the - user to download them all */ + /* If the number of messages exceeds the maximum, ask the + * user to download them all, + * as per the UI spec "Retrieval Limits" section in 4.4: + */ + if (new_headers->len > info->retrieve_limit) { + /* TODO: Ask the user, instead of just + * failing, showing + * mail_nc_msg_count_limit_exceeded, with 'Get + * all' and 'Newest only' buttons. */ + g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, + MODEST_MAIL_OPERATION_ERROR_RETRIEVAL_NUMBER_LIMIT, + "The number of messages to retrieve exceeds the chosen limit for account %s\n", + tny_account_get_name (TNY_ACCOUNT (info->transport_account))); + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + goto out; + } + priv->done = 0; priv->total = MIN (new_headers->len, info->retrieve_limit); - while ((msg_num < info->retrieve_limit)) { + while (msg_num < priv->total) { TnyHeader *header = TNY_HEADER (g_ptr_array_index (new_headers, msg_num)); TnyFolder *folder = tny_header_get_folder (header); @@ -884,39 +1089,56 @@ update_account_thread (gpointer thr_user_data) g_ptr_array_foreach (new_headers, (GFunc) g_object_unref, NULL); g_ptr_array_free (new_headers, FALSE); } - + /* Perform send */ priv->op_type = MODEST_MAIL_OPERATION_TYPE_SEND; priv->done = 0; priv->total = 0; - - ModestTnySendQueue *send_queue = modest_runtime_get_send_queue - (info->transport_account); - - timeout = g_timeout_add (250, idle_notify_progress, info->mail_op); - /* TODO: Is this meant to block? */ - modest_tny_send_queue_try_to_send (send_queue); - g_source_remove (timeout); - - g_object_unref (G_OBJECT(send_queue)); + 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) { + timeout = g_timeout_add (250, idle_notify_progress, info->mail_op); + modest_tny_send_queue_try_to_send (send_queue); + g_source_remove (timeout); + } 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 */ - modest_account_mgr_set_int (modest_runtime_get_account_mgr (), - tny_account_get_id (TNY_ACCOUNT (info->account)), - MODEST_ACCOUNT_LAST_UPDATED, - time(NULL), - TRUE); + 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) ? new_headers->len : 0; + idle_info->callback = info->callback; + 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 (notify_update_account_queue, info->mail_op); + g_idle_add (idle_notify_update_account_queue, g_object_ref (info->mail_op)); /* Frees */ g_object_unref (query); @@ -926,12 +1148,16 @@ update_account_thread (gpointer thr_user_data) g_free (info->retrieve_type); g_slice_free (UpdateAccountInfo, info); + first_time = FALSE; + return NULL; } gboolean modest_mail_operation_update_account (ModestMailOperation *self, - const gchar *account_name) + const gchar *account_name, + UpdateAccountCallback callback, + gpointer user_data) { GThread *thread; UpdateAccountInfo *info; @@ -950,34 +1176,38 @@ modest_mail_operation_update_account (ModestMailOperation *self, priv->total = 0; priv->done = 0; priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; - + + /* 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)) + goto error; + /* Get the Modest account */ modest_account = (TnyStoreAccount *) - modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store (), + modest_tny_account_store_get_server_account (modest_runtime_get_account_store (), account_name, TNY_ACCOUNT_TYPE_STORE); if (!modest_account) { - priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; 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); - modest_mail_operation_notify_end (self); - return FALSE; + 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) { - priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; 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); - modest_mail_operation_notify_end (self); - return FALSE; + goto error; } /* Create the helper object */ @@ -985,6 +1215,8 @@ modest_mail_operation_update_account (ModestMailOperation *self, info->mail_op = self; info->account = modest_account; info->transport_account = transport_account; + info->callback = callback; + info->user_data = user_data; /* Get the message size limit */ info->max_size = modest_conf_get_int (modest_runtime_get_conf (), @@ -1004,10 +1236,23 @@ modest_mail_operation_update_account (ModestMailOperation *self, MODEST_ACCOUNT_LIMIT_RETRIEVE, FALSE); if (info->retrieve_limit == 0) info->retrieve_limit = G_MAXINT; + + /* printf ("DEBUG: %s: info->retrieve_limit = %d\n", __FUNCTION__, info->retrieve_limit); */ + /* Set account busy */ + modest_account_mgr_set_account_busy(mgr, account_name, TRUE); + priv->account_name = g_strdup(account_name); + thread = g_thread_create (update_account_thread, info, FALSE, NULL); return TRUE; + + error: + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + if (callback) + callback (self, 0, user_data); + modest_mail_operation_notify_end (self); + return FALSE; } /* ******************************************************************* */ @@ -1020,10 +1265,8 @@ modest_mail_operation_create_folder (ModestMailOperation *self, TnyFolderStore *parent, const gchar *name) { - ModestTnyFolderRules rules; ModestMailOperationPrivate *priv; TnyFolder *new_folder = NULL; - gboolean can_create = FALSE; g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent), NULL); g_return_val_if_fail (name, NULL); @@ -1031,25 +1274,31 @@ modest_mail_operation_create_folder (ModestMailOperation *self, priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); /* Check parent */ - if (!TNY_IS_FOLDER (parent)) { - g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, - MODEST_MAIL_OPERATION_ERROR_BAD_PARAMETER, - _("mail_in_ui_folder_create_error")); - } else { + if (TNY_IS_FOLDER (parent)) { /* Check folder rules */ - rules = modest_tny_folder_get_rules (TNY_FOLDER (parent)); - if (rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) + ModestTnyFolderRules rules = modest_tny_folder_get_rules (TNY_FOLDER (parent)); + if (rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) { + /* 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_FOLDER_RULES, _("mail_in_ui_folder_create_error")); - else - can_create = TRUE; + } + } + + if (!strcmp (name, " ") || strchr (name, '/')) { + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, + MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES, + _("mail_in_ui_folder_create_error")); } - if (can_create) { + if (!priv->error) { /* Create the folder */ 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; } /* Notify about operation end */ @@ -1075,6 +1324,8 @@ modest_mail_operation_remove_folder (ModestMailOperation *self, /* Check folder rules */ rules = modest_tny_folder_get_rules (TNY_FOLDER (folder)); if (rules & MODEST_FOLDER_RULES_FOLDER_NON_DELETABLE) { + /* 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_FOLDER_RULES, _("mail_in_ui_folder_delete_error")); @@ -1082,7 +1333,8 @@ modest_mail_operation_remove_folder (ModestMailOperation *self, } /* Get the account */ - account = tny_folder_get_account (folder); + account = modest_tny_folder_get_account (folder); + priv->account = g_object_ref(account); /* Delete folder or move to trash */ if (remove_to_trash) { @@ -1091,7 +1343,8 @@ modest_mail_operation_remove_folder (ModestMailOperation *self, TNY_FOLDER_TYPE_TRASH); /* TODO: error_handling */ modest_mail_operation_xfer_folder (self, folder, - TNY_FOLDER_STORE (trash_folder), TRUE); + TNY_FOLDER_STORE (trash_folder), + TRUE, NULL, NULL); } else { TnyFolderStore *parent = tny_folder_get_folder_store (folder); @@ -1108,68 +1361,25 @@ modest_mail_operation_remove_folder (ModestMailOperation *self, modest_mail_operation_notify_end (self); } -void -modest_mail_operation_rename_folder (ModestMailOperation *self, - TnyFolder *folder, - const gchar *name) -{ - ModestMailOperationPrivate *priv; - ModestTnyFolderRules rules; - - g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); - g_return_if_fail (TNY_IS_FOLDER_STORE (folder)); - g_return_if_fail (name); - - priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); - - /* Check folder rules */ - rules = modest_tny_folder_get_rules (TNY_FOLDER (folder)); - if (rules & MODEST_FOLDER_RULES_FOLDER_NON_RENAMEABLE) { - g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, - MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES, - _("FIXME: unable to rename")); - } else { - /* Rename. Camel handles folder subscription/unsubscription */ - TnyFolderStore *into; - TnyFolder *nfol; - - into = tny_folder_get_folder_store (folder); - nfol = tny_folder_copy (folder, into, name, TRUE, &(priv->error)); - if (into) - g_object_unref (into); - if (nfol) - g_object_unref (nfol); - - CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED); - - } - - /* Notify about operation end */ - modest_mail_operation_notify_end (self); - } - static void transfer_folder_status_cb (GObject *obj, TnyStatus *status, gpointer user_data) { - XFerMsgAsyncHelper *helper = NULL; ModestMailOperation *self; ModestMailOperationPrivate *priv; ModestMailOperationState *state; + XFerMsgAsyncHelper *helper; g_return_if_fail (status != NULL); g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_COPY_FOLDER); helper = (XFerMsgAsyncHelper *) user_data; - g_return_if_fail (helper != NULL); + g_return_if_fail (helper != NULL); self = helper->mail_op; priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); - if ((status->position == 1) && (status->of_total == 100)) - return; - priv->done = status->position; priv->total = status->of_total; @@ -1180,16 +1390,22 @@ transfer_folder_status_cb (GObject *obj, static void -transfer_folder_cb (TnyFolder *folder, TnyFolderStore *into, gboolean cancelled, TnyFolder *new_folder, GError **err, gpointer user_data) +transfer_folder_cb (TnyFolder *folder, + TnyFolderStore *into, + gboolean cancelled, + TnyFolder *new_folder, + GError **err, + gpointer user_data) { - XFerFolderAsyncHelper *helper = NULL; + XFerMsgAsyncHelper *helper; ModestMailOperation *self = NULL; ModestMailOperationPrivate *priv = NULL; - helper = (XFerFolderAsyncHelper *) user_data; - self = helper->mail_op; + helper = (XFerMsgAsyncHelper *) user_data; + g_return_if_fail (helper != NULL); - priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); + self = helper->mail_op; + priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); if (*err) { priv->error = g_error_copy (*err); @@ -1206,50 +1422,64 @@ transfer_folder_cb (TnyFolder *folder, TnyFolderStore *into, gboolean cancelled, priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; } + /* Notify about operation end */ + modest_mail_operation_notify_end (self); + + /* If user defined callback function was defined, call it */ + if (helper->user_callback) { + gdk_threads_enter (); + helper->user_callback (priv->source, helper->user_data); + gdk_threads_leave (); + } + /* Free */ - g_slice_free (XFerFolderAsyncHelper, helper); + g_object_unref (helper->mail_op); + g_slice_free (XFerMsgAsyncHelper, helper); g_object_unref (folder); g_object_unref (into); - if (new_folder != NULL) - g_object_unref (new_folder); - - /* Notify about operation end */ - modest_mail_operation_notify_end (self); } void modest_mail_operation_xfer_folder (ModestMailOperation *self, TnyFolder *folder, TnyFolderStore *parent, - gboolean delete_original) + gboolean delete_original, + XferMsgsAsynUserCallback user_callback, + gpointer user_data) { - XFerFolderAsyncHelper *helper = NULL; ModestMailOperationPrivate *priv = NULL; - ModestTnyFolderRules parent_rules, rules; + ModestTnyFolderRules parent_rules = 0, rules; + XFerMsgAsyncHelper *helper = NULL; g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); - g_return_if_fail (TNY_IS_FOLDER_STORE (parent)); g_return_if_fail (TNY_IS_FOLDER (folder)); priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); - /* Pick references for async calls */ - g_object_ref (folder); - g_object_ref (parent); + /* Get account and set it into mail_operation */ + priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder)); + priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; /* Get folder rules */ rules = modest_tny_folder_get_rules (TNY_FOLDER (folder)); - parent_rules = modest_tny_folder_get_rules (TNY_FOLDER (parent)); - + if (TNY_IS_FOLDER (parent)) + parent_rules = modest_tny_folder_get_rules (TNY_FOLDER (parent)); + /* The moveable restriction is applied also to copy operation */ - if (rules & MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE) { + if ((!TNY_IS_FOLDER_STORE (parent)) || (rules & MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE)) { + printf("DEBUG: %s: Not allowing the move.\n", __FUNCTION__); + /* 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_FOLDER_RULES, _("mail_in_ui_folder_move_target_error")); /* Notify the queue */ modest_mail_operation_notify_end (self); - } else if (parent_rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) { + } else if (TNY_IS_FOLDER (parent) && + (parent_rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE)) { + /* 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_FOLDER_RULES, _("FIXME: parent folder does not accept new folders")); @@ -1257,9 +1487,18 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self, /* Notify the queue */ modest_mail_operation_notify_end (self); } else { - helper = g_slice_new0 (XFerFolderAsyncHelper); - helper->mail_op = self; - + /* 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, @@ -1268,9 +1507,68 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self, transfer_folder_cb, transfer_folder_status_cb, helper); +/* self); */ } } +void +modest_mail_operation_rename_folder (ModestMailOperation *self, + TnyFolder *folder, + const gchar *name) +{ + ModestMailOperationPrivate *priv; + ModestTnyFolderRules rules; + XFerMsgAsyncHelper *helper; + + g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); + g_return_if_fail (TNY_IS_FOLDER_STORE (folder)); + g_return_if_fail (name); + + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); + + /* Get account and set it into mail_operation */ + priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder)); + + /* Check folder rules */ + rules = modest_tny_folder_get_rules (TNY_FOLDER (folder)); + if (rules & MODEST_FOLDER_RULES_FOLDER_NON_RENAMEABLE) { + /* 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_FOLDER_RULES, + _("FIXME: unable to rename")); + + /* Notify about operation end */ + modest_mail_operation_notify_end (self); + } else if (!strcmp (name, " ") || strchr (name, '/')) { + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, + MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES, + _("FIXME: unable to rename")); + /* Notify about operation end */ + modest_mail_operation_notify_end (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); + } + } /* ******************************************************************* */ /* ************************** MSG ACTIONS ************************* */ @@ -1295,11 +1593,19 @@ void modest_mail_operation_get_msg (ModestMailOperation *self, /* Get message from folder */ if (folder) { + /* Get account and set it into mail_operation */ + priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder)); + helper = g_slice_new0 (GetMsgAsyncHelper); helper->mail_op = self; helper->user_callback = user_callback; - helper->pending_ops = 1; 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)); tny_folder_get_msg_async (folder, header, get_msg_cb, get_msg_status_cb, helper); @@ -1310,6 +1616,9 @@ void modest_mail_operation_get_msg (ModestMailOperation *self, 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); } } @@ -1329,39 +1638,38 @@ get_msg_cb (TnyFolder *folder, self = helper->mail_op; g_return_if_fail (MODEST_IS_MAIL_OPERATION(self)); priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); - - helper->pending_ops--; /* Check errors and cancel */ if (*error) { priv->error = g_error_copy (*error); priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; - goto out; - } - if (cancelled) { + } 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)); - goto out; + } else { + priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; } - priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; - - /* If user defined callback function was defined, call it */ + /* If user defined callback function was defined, call it even + if the operation failed*/ if (helper->user_callback) { - helper->user_callback (self, NULL, msg, helper->user_data); + /* This callback is called into an iddle by tinymail, + and idles are not in the main lock */ + gdk_threads_enter (); + helper->user_callback (self, helper->header, msg, helper->user_data); + gdk_threads_leave (); } /* Free */ - out: - if (helper->pending_ops == 0) { - g_slice_free (GetMsgAsyncHelper, helper); + 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); - } + /* Notify about operation end */ + modest_mail_operation_notify_end (self); } static void @@ -1383,13 +1691,15 @@ get_msg_status_cb (GObject *obj, self = helper->mail_op; priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); - if ((status->position == 1) && (status->of_total == 100)) + 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; g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL); g_slice_free (ModestMailOperationState, state); } @@ -1423,8 +1733,11 @@ notify_get_msgs_full (gpointer data) info = (NotifyGetMsgsInfo *) data; - /* Call the user callback */ + /* Call the user callback. Idles are not in the main lock, so + lock it */ + gdk_threads_enter (); info->user_callback (info->mail_op, info->header, info->msg, info->user_data); + gdk_threads_leave (); g_slice_free (NotifyGetMsgsInfo, info); @@ -1442,8 +1755,11 @@ get_msgs_full_destroyer (gpointer data) info = (GetFullMsgsInfo *) data; - if (info->notify) + if (info->notify) { + gdk_threads_enter (); info->notify (info->user_data); + gdk_threads_leave (); + } /* free */ g_object_unref (info->headers); @@ -1515,8 +1831,12 @@ get_msgs_full_thread (gpointer thr_user_data) tny_iterator_next (iter); } + /* 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 (notify_update_account_queue, info->mail_op); + g_idle_add (idle_notify_update_account_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); @@ -1531,12 +1851,14 @@ 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; - GError *error = NULL; + TnyIterator *iter = NULL; g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); @@ -1546,12 +1868,27 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self, priv->done = 0; priv->total = tny_list_get_length(header_list); + /* 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)); + folder = tny_header_get_folder (header); + priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder)); + g_object_unref (header); + g_object_unref (folder); + + if (tny_list_get_length (header_list) == 1) { + g_object_unref (iter); + iter = NULL; + } + } + /* Get msg size limit */ max_size = modest_conf_get_int (modest_runtime_get_conf (), MODEST_CONF_MSG_SIZE_LIMIT, - &error); - if (error) { - g_clear_error (&error); + &(priv->error)); + if (priv->error) { + g_clear_error (&(priv->error)); max_size = G_MAXINT; } else { max_size = max_size * KB; @@ -1559,12 +1896,9 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self, /* Check message size limits. If there is only one message always retrieve it */ - if (tny_list_get_length (header_list) > 1) { - TnyIterator *iter; - - iter = tny_list_create_iterator (header_list); + if (iter != NULL) { while (!tny_iterator_is_done (iter) && size_ok) { - TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); + header = TNY_HEADER (tny_iterator_get_current (iter)); if (tny_header_get_message_size (header) >= max_size) size_ok = FALSE; g_object_unref (header); @@ -1584,10 +1918,12 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self, thread = g_thread_create (get_msgs_full_thread, info, FALSE, NULL); } else { + /* Set status failed and set an error */ + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; /* FIXME: the error msg is different for pop */ g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, - MODEST_MAIL_OPERATION_ERROR_BAD_PARAMETER, - _("emev_ni_ui_imap_msg_sizelimit_error")); + MODEST_MAIL_OPERATION_ERROR_MESSAGE_SIZE_LIMIT, + _("emev_ni_ui_imap_msg_size_exceed_error")); /* Remove from queue and free resources */ modest_mail_operation_notify_end (self); if (notify) @@ -1597,9 +1933,8 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self, void -modest_mail_operation_remove_msg (ModestMailOperation *self, - TnyHeader *header, - gboolean remove_to_trash) +modest_mail_operation_remove_msg (ModestMailOperation *self, TnyHeader *header, + gboolean remove_to_trash /*ignored*/) { TnyFolder *folder; ModestMailOperationPrivate *priv; @@ -1607,49 +1942,32 @@ modest_mail_operation_remove_msg (ModestMailOperation *self, g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); g_return_if_fail (TNY_IS_HEADER (header)); + if (remove_to_trash) + g_warning ("remove to trash is not implemented"); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); folder = tny_header_get_folder (header); - priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; + /* Get account and set it into mail_operation */ + priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder)); - /* Delete or move to trash */ - if (remove_to_trash) { - TnyFolder *trash_folder; - TnyStoreAccount *store_account; - - store_account = TNY_STORE_ACCOUNT (tny_folder_get_account (folder)); - trash_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT(store_account), - TNY_FOLDER_TYPE_TRASH); - if (trash_folder) { - TnyList *headers; - - /* Create list */ - headers = tny_simple_list_new (); - tny_list_append (headers, G_OBJECT (header)); - g_object_unref (header); + priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; - /* Move to trash */ - modest_mail_operation_xfer_msgs (self, headers, trash_folder, TRUE, NULL, NULL); - g_object_unref (headers); -/* g_object_unref (trash_folder); */ - } else { - ModestMailOperationPrivate *priv; - /* Set status failed and set an error */ - priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); - 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 delete a message. Trash folder not found")); - } + tny_folder_remove_msg (folder, header, &(priv->error)); + if (!priv->error) { + tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED); - g_object_unref (G_OBJECT (store_account)); - } else { - tny_folder_remove_msg (folder, header, &(priv->error)); - if (!priv->error) - tny_folder_sync(folder, TRUE, &(priv->error)); + if (TNY_IS_CAMEL_IMAP_FOLDER (folder)) + tny_folder_sync(folder, FALSE, &(priv->error)); /* FALSE --> don't expunge */ + else if (TNY_IS_CAMEL_POP_FOLDER (folder)) + tny_folder_sync(folder, TRUE, &(priv->error)); /* TRUE --> expunge */ + else + /* lcoal folders */ + tny_folder_sync(folder, TRUE, &(priv->error)); /* TRUE --> expunge */ } - + + /* Set status */ if (!priv->error) priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; @@ -1683,9 +2001,6 @@ transfer_msgs_status_cb (GObject *obj, self = helper->mail_op; priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); - if ((status->position == 1) && (status->of_total == 100)) - return; - priv->done = status->position; priv->total = status->of_total; @@ -1722,9 +2037,14 @@ transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError **err, gpointer priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; } + /* Notify about operation end */ + modest_mail_operation_notify_end (self); + /* If user defined callback function was defined, call it */ if (helper->user_callback) { + gdk_threads_enter (); helper->user_callback (priv->source, helper->user_data); + gdk_threads_leave (); } /* Free */ @@ -1734,8 +2054,6 @@ transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError **err, gpointer g_slice_free (XFerMsgAsyncHelper, helper); g_object_unref (folder); - /* Notify about operation end */ - modest_mail_operation_notify_end (self); } void @@ -1752,6 +2070,9 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self, XFerMsgAsyncHelper *helper; TnyHeader *header; ModestTnyFolderRules rules; + const gchar *id1 = NULL; + const gchar *id2 = NULL; + gboolean same_folder = FALSE; g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); g_return_if_fail (TNY_IS_LIST (headers)); @@ -1764,15 +2085,42 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self, /* Apply folder rules */ rules = modest_tny_folder_get_rules (TNY_FOLDER (folder)); - if (rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) { + /* 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_FOLDER_RULES, - _("FIXME: folder does not accept msgs")); + _("ckct_ib_unable_to_paste_here")); /* Notify the queue */ modest_mail_operation_notify_end (self); return; } + + /* Get source folder */ + iter = tny_list_create_iterator (headers); + header = TNY_HEADER (tny_iterator_get_current (iter)); + src_folder = tny_header_get_folder (header); + g_object_unref (header); + g_object_unref (iter); + + /* Check folder source and destination */ + id1 = tny_folder_get_id (src_folder); + id2 = tny_folder_get_id (TNY_FOLDER(folder)); + same_folder = !g_ascii_strcasecmp (id1, id2); + if (same_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")); + + /* Notify the queue */ + modest_mail_operation_notify_end (self); + + /* Free */ + g_object_unref (src_folder); + return; + } /* Create the helper */ helper = g_slice_new0 (XFerMsgAsyncHelper); @@ -1782,12 +2130,8 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self, helper->user_callback = user_callback; helper->user_data = user_data; - /* Get source folder */ - iter = tny_list_create_iterator (headers); - header = TNY_HEADER (tny_iterator_get_current (iter)); - src_folder = tny_header_get_folder (header); - g_object_unref (header); - g_object_unref (iter); + /* Get account and set it into mail_operation */ + priv->account = modest_tny_folder_get_account (src_folder); /* Transfer messages */ tny_folder_transfer_msgs_async (src_folder, @@ -1806,10 +2150,12 @@ on_refresh_folder (TnyFolder *folder, GError **error, gpointer user_data) { - ModestMailOperation *self; - ModestMailOperationPrivate *priv; + RefreshAsyncHelper *helper = NULL; + ModestMailOperation *self = NULL; + ModestMailOperationPrivate *priv = NULL; - self = MODEST_MAIL_OPERATION (user_data); + helper = (RefreshAsyncHelper *) user_data; + self = helper->mail_op; priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); if (*error) { @@ -1830,7 +2176,16 @@ on_refresh_folder (TnyFolder *folder, priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; out: + /* Call user defined callback, if it exists */ + if (helper->user_callback) { + gdk_threads_enter (); + helper->user_callback (self, folder, helper->user_data); + gdk_threads_leave (); + } + /* Free */ + g_object_unref (helper->mail_op); + g_slice_free (RefreshAsyncHelper, helper); g_object_unref (folder); /* Notify about operation end */ @@ -1842,14 +2197,19 @@ on_refresh_folder_status_update (GObject *obj, TnyStatus *status, gpointer user_data) { - ModestMailOperation *self; - ModestMailOperationPrivate *priv; + RefreshAsyncHelper *helper = NULL; + ModestMailOperation *self = NULL; + ModestMailOperationPrivate *priv = NULL; ModestMailOperationState *state; + g_return_if_fail (user_data != NULL); g_return_if_fail (status != NULL); g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_REFRESH); - self = MODEST_MAIL_OPERATION (user_data); + helper = (RefreshAsyncHelper *) user_data; + self = helper->mail_op; + g_return_if_fail (MODEST_IS_MAIL_OPERATION(self)); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); priv->done = status->position; @@ -1862,9 +2222,12 @@ on_refresh_folder_status_update (GObject *obj, void modest_mail_operation_refresh_folder (ModestMailOperation *self, - TnyFolder *folder) + TnyFolder *folder, + RefreshAsyncUserCallback user_callback, + gpointer user_data) { - ModestMailOperationPrivate *priv; + ModestMailOperationPrivate *priv = NULL; + RefreshAsyncHelper *helper = NULL; priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); @@ -1873,13 +2236,22 @@ modest_mail_operation_refresh_folder (ModestMailOperation *self, priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; + /* Get account and set it into mail_operation */ + priv->account = modest_tny_folder_get_account (folder); + + /* Create the helper */ + helper = g_slice_new0 (RefreshAsyncHelper); + helper->mail_op = g_object_ref(self); + helper->user_callback = user_callback; + helper->user_data = user_data; + /* Refresh the folder. TODO: tinymail could issue a status updates before the callback call then this could happen. We must review the design */ tny_folder_refresh_async (folder, on_refresh_folder, on_refresh_folder_status_update, - self); + helper); } /** @@ -1894,12 +2266,27 @@ static void modest_mail_operation_notify_end (ModestMailOperation *self) { ModestMailOperationState *state; + ModestMailOperationPrivate *priv = NULL; + + g_return_if_fail (self); + + priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); + if (!priv) { + g_warning ("BUG: %s: priv == NULL", __FUNCTION__); + return; + } + + /* 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 opertation end */ 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); - - /* Notify the queue */ - modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self); }