X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=726cf6dcc475edf62fcbac2219374f15a367ecde;hp=2a627a7996f8101d83c54a50f252d213428808e1;hb=17d7865c512d65aca2b12dc0a980c3309742319a;hpb=3e060acfc9902bc0dc5e560c4b8ff35ced89d766 diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c index 2a627a7..726cf6d 100644 --- a/src/modest-mail-operation.c +++ b/src/modest-mail-operation.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -69,7 +70,10 @@ static void get_msg_status_cb (GObject *obj, TnyStatus *status, gpointer user_data); -static void modest_mail_operation_notify_end (ModestMailOperation *self); +static void modest_mail_operation_notify_end (ModestMailOperation *self, + gboolean need_lock); + +static gboolean did_a_cancel = FALSE; enum _ModestMailOperationSignals { @@ -81,6 +85,7 @@ enum _ModestMailOperationSignals typedef struct _ModestMailOperationPrivate ModestMailOperationPrivate; struct _ModestMailOperationPrivate { TnyAccount *account; + gchar *account_name; guint done; guint total; GObject *source; @@ -101,11 +106,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; @@ -170,6 +181,7 @@ modest_mail_operation_class_init (ModestMailOperationClass *klass) NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); + } static void @@ -197,6 +209,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; @@ -289,8 +303,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 +324,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 +341,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 +361,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; + } - /* cancel current operation in account */ - tny_account_cancel (priv->account); + did_a_cancel = TRUE; /* Set new status */ priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED; - /* Notify about operation end */ - modest_mail_operation_notify_end (self); - + /* 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, FALSE); + return TRUE; } @@ -423,7 +459,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 +478,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; } @@ -456,6 +504,8 @@ modest_mail_operation_send_mail (ModestMailOperation *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)) { @@ -463,16 +513,23 @@ modest_mail_operation_send_mail (ModestMailOperation *self, 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 */ - modest_mail_operation_notify_end (self); + /* TODO: do this in the handler of the "msg-sent" + signal.Notify about operation end */ + modest_mail_operation_notify_end (self, FALSE); } 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, @@ -481,6 +538,8 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self, TnyHeaderFlags priority_flags) { TnyMsg *new_msg = NULL; + TnyFolder *folder = NULL; + TnyHeader *header = NULL; ModestMailOperationPrivate *priv = NULL; g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); @@ -488,9 +547,6 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self, priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); - /* Get account and set it into mail_operation */ - priv->account = g_object_ref (transport_account); - /* Check parametters */ if (to == NULL) { /* Set status failed and set an error */ @@ -511,12 +567,25 @@ 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); /* 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); + g_object_unref (header); + } + } + /* Free */ g_object_unref (G_OBJECT (new_msg)); } @@ -524,6 +593,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, @@ -533,6 +603,7 @@ modest_mail_operation_save_to_drafts (ModestMailOperation *self, { TnyMsg *msg = NULL; TnyFolder *folder = NULL; + TnyHeader *header = NULL; ModestMailOperationPrivate *priv = NULL; g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); @@ -549,23 +620,41 @@ modest_mail_operation_save_to_drafts (ModestMailOperation *self, 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, 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); + folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (transport_account), TNY_FOLDER_TYPE_DRAFTS); if (!folder) { + 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 (draft_msg != NULL) { + header = tny_msg_get_header (draft_msg); + /* Remove the old draft expunging it */ + tny_folder_remove_msg (folder, header, NULL); + tny_folder_sync (folder, TRUE, &(priv->error)); + g_object_unref (header); + } - tny_folder_add_msg (folder, msg, &(priv->error)); - if (priv->error) - goto end; + if (!priv->error) + tny_folder_add_msg (folder, msg, &(priv->error)); + + if (!priv->error) + priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; + else + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; end: if (msg) @@ -573,7 +662,7 @@ end: if (folder) g_object_unref (G_OBJECT(folder)); - modest_mail_operation_notify_end (self); + modest_mail_operation_notify_end (self, FALSE); } typedef struct @@ -584,6 +673,9 @@ typedef struct gint max_size; gint retrieve_limit; gchar *retrieve_type; + gchar *account_name; + UpdateAccountCallback callback; + gpointer user_data; } UpdateAccountInfo; /***** I N T E R N A L F O L D E R O B S E R V E R *****/ @@ -707,12 +799,16 @@ recurse_folders (TnyFolderStore *store, TnyFolderStoreQuery *query, TnyList *all static gboolean idle_notify_progress (gpointer data) { + gdk_threads_enter (); + ModestMailOperation *mail_op = MODEST_MAIL_OPERATION (data); ModestMailOperationState *state; 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); + + gdk_threads_leave (); return TRUE; } @@ -725,6 +821,8 @@ idle_notify_progress (gpointer data) static gboolean idle_notify_progress_once (gpointer data) { + gdk_threads_enter (); + ModestPair *pair; pair = (ModestPair *) data; @@ -735,6 +833,8 @@ idle_notify_progress_once (gpointer data) g_slice_free (ModestMailOperationState, (ModestMailOperationState*)pair->second); g_object_unref (pair->first); + gdk_threads_leave (); + return FALSE; } @@ -743,11 +843,15 @@ 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); - modest_mail_operation_notify_end (mail_op); + /* Do not need to block, the notify end will do it for us */ + modest_mail_operation_notify_end (mail_op, TRUE); g_object_unref (mail_op); return FALSE; @@ -774,16 +878,36 @@ 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 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; - ModestTnySendQueue *send_queue; + ModestMailOperationPrivate *priv = NULL; + ModestTnySendQueue *send_queue = NULL; info = (UpdateAccountInfo *) thr_user_data; priv = MODEST_MAIL_OPERATION_GET_PRIVATE(info->mail_op); @@ -791,6 +915,13 @@ update_account_thread (gpointer thr_user_data) /* 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 (); @@ -825,7 +956,8 @@ update_account_thread (gpointer thr_user_data) /* 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)); @@ -833,8 +965,6 @@ update_account_thread (gpointer thr_user_data) /* Refresh the folder */ /* Our observer receives notification of new emails during folder refreshes, * so we can use observer->new_headers. - * TODO: This does not seem to be providing accurate numbers. - * Possibly the observer is notified asynchronously. */ observer = g_object_new (internal_folder_observer_get_type (), NULL); tny_folder_add_observer (TNY_FOLDER (folder), TNY_FOLDER_OBSERVER (observer)); @@ -843,20 +973,17 @@ update_account_thread (gpointer thr_user_data) * We use the blocking version, because we are already in a separate * thread. */ - tny_folder_refresh (TNY_FOLDER (folder), &(priv->error)); - /* If the retrieve type is headers only do nothing more */ 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)); - /* printf (" DEBUG1.2 %s: checking size: account=%s, subject=%s\n", - * __FUNCTION__, tny_account_get_id (priv->account), - * tny_header_get_subject (header)); - */ /* Apply per-message size limits */ if (tny_header_get_message_size (header) < info->max_size) @@ -866,18 +993,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; + 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); @@ -892,11 +1030,11 @@ update_account_thread (gpointer thr_user_data) * user to download them all, * as per the UI spec "Retrieval Limits" section in 4.4: */ - printf ("DEBUG: %s: account=%s, len=%d, retrieve_limit = %d\n", __FUNCTION__, - tny_account_get_id (priv->account), new_headers->len, info->retrieve_limit); 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. */ + /* 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", @@ -932,7 +1070,7 @@ 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; @@ -959,19 +1097,27 @@ update_account_thread (gpointer thr_user_data) 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: /* 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)); + + if (info->callback) { + /* This thread is not in the main lock */ + gdk_threads_enter (); + info->callback (info->mail_op, + (new_headers) ? new_headers->len : 0, + info->user_data); + gdk_threads_leave (); + } + /* Frees */ g_object_unref (query); g_object_unref (all_folders); @@ -980,12 +1126,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; @@ -1004,34 +1154,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 */ @@ -1039,6 +1193,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 (), @@ -1059,11 +1215,22 @@ modest_mail_operation_update_account (ModestMailOperation *self, if (info->retrieve_limit == 0) info->retrieve_limit = G_MAXINT; - printf ("DEBUG: %s: info->retrieve_limit = %d\n", __FUNCTION__, info->retrieve_limit); + /* 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, FALSE); + return FALSE; } /* ******************************************************************* */ @@ -1106,7 +1273,7 @@ modest_mail_operation_create_folder (ModestMailOperation *self, } /* Notify about operation end */ - modest_mail_operation_notify_end (self); + modest_mail_operation_notify_end (self, FALSE); return new_folder; } @@ -1137,7 +1304,7 @@ 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 */ @@ -1161,7 +1328,7 @@ modest_mail_operation_remove_folder (ModestMailOperation *self, end: /* Notify about operation end */ - modest_mail_operation_notify_end (self); + modest_mail_operation_notify_end (self, FALSE); } static void @@ -1195,7 +1362,8 @@ static void transfer_folder_cb (TnyFolder *folder, TnyFolderStore *into, gboolean cancelled, - TnyFolder *new_folder, GError **err, + TnyFolder *new_folder, + GError **err, gpointer user_data) { ModestMailOperation *self = NULL; @@ -1223,11 +1391,9 @@ transfer_folder_cb (TnyFolder *folder, /* Free */ 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); + modest_mail_operation_notify_end (self, TRUE); } void @@ -1246,7 +1412,7 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self, priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); /* Get account and set it into mail_operation */ - priv->account = tny_folder_get_account (TNY_FOLDER(folder)); + priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder)); priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; /* Get folder rules */ @@ -1266,7 +1432,7 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self, _("mail_in_ui_folder_move_target_error")); /* Notify the queue */ - modest_mail_operation_notify_end (self); + modest_mail_operation_notify_end (self, FALSE); } else if (parent_rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) { /* Set status failed and set an error */ priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; @@ -1275,7 +1441,7 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self, _("FIXME: parent folder does not accept new folders")); /* Notify the queue */ - modest_mail_operation_notify_end (self); + modest_mail_operation_notify_end (self, FALSE); } else { /* Pick references for async calls */ g_object_ref (folder); @@ -1307,7 +1473,7 @@ modest_mail_operation_rename_folder (ModestMailOperation *self, priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); /* Get account and set it into mail_operation */ - priv->account = tny_folder_get_account (TNY_FOLDER(folder)); + priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder)); /* Check folder rules */ rules = modest_tny_folder_get_rules (TNY_FOLDER (folder)); @@ -1319,7 +1485,7 @@ modest_mail_operation_rename_folder (ModestMailOperation *self, _("FIXME: unable to rename")); /* Notify about operation end */ - modest_mail_operation_notify_end (self); + modest_mail_operation_notify_end (self, FALSE); } else { /* Rename. Camel handles folder subscription/unsubscription */ TnyFolderStore *into; @@ -1359,13 +1525,18 @@ void modest_mail_operation_get_msg (ModestMailOperation *self, /* Get message from folder */ if (folder) { /* Get account and set it into mail_operation */ - priv->account = tny_folder_get_account (TNY_FOLDER(folder)); + 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); @@ -1378,7 +1549,7 @@ void modest_mail_operation_get_msg (ModestMailOperation *self, _("Error trying to get a message. No folder found for header")); /* Notify the queue */ - modest_mail_operation_notify_end (self); + modest_mail_operation_notify_end (self, FALSE); } } @@ -1398,8 +1569,6 @@ 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) { @@ -1416,21 +1585,31 @@ get_msg_cb (TnyFolder *folder, goto out; } - priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; + /* The mail operation might have been canceled in which case we do not + want to notify anyone anymore. */ + if(priv->status != MODEST_MAIL_OPERATION_STATUS_CANCELED) { + priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; - /* If user defined callback function was defined, call it */ - if (helper->user_callback) { - helper->user_callback (self, NULL, msg, helper->user_data); + /* If user defined callback function was defined, call it */ + if (helper->user_callback) { + /* 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); + /* Free */ + g_object_unref (helper->header); + g_slice_free (GetMsgAsyncHelper, helper); - /* Notify about operation end */ - modest_mail_operation_notify_end (self); - } + /* Notify about operation end */ + if(priv->status != MODEST_MAIL_OPERATION_STATUS_CANCELED) + modest_mail_operation_notify_end (self, TRUE); + + g_object_unref (G_OBJECT (self)); } static void @@ -1452,6 +1631,9 @@ 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; + if ((status->position == 1) && (status->of_total == 100)) return; @@ -1459,6 +1641,8 @@ get_msg_status_cb (GObject *obj, 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); } @@ -1492,8 +1676,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); @@ -1511,8 +1698,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); @@ -1589,7 +1779,7 @@ get_msgs_full_thread (gpointer thr_user_data) 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); @@ -1622,13 +1812,18 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self, 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); + 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 = tny_folder_get_account (TNY_FOLDER(folder)); + 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 */ @@ -1673,7 +1868,7 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self, 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); + modest_mail_operation_notify_end (self, FALSE); if (notify) notify (user_data); } @@ -1695,7 +1890,7 @@ modest_mail_operation_remove_msg (ModestMailOperation *self, folder = tny_header_get_folder (header); /* Get account and set it into mail_operation */ - priv->account = tny_folder_get_account (TNY_FOLDER(folder)); + priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder)); priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; @@ -1704,7 +1899,7 @@ modest_mail_operation_remove_msg (ModestMailOperation *self, TnyFolder *trash_folder; TnyStoreAccount *store_account; - store_account = TNY_STORE_ACCOUNT (tny_folder_get_account (folder)); + store_account = TNY_STORE_ACCOUNT (modest_tny_folder_get_account (folder)); trash_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT(store_account), TNY_FOLDER_TYPE_TRASH); if (trash_folder) { @@ -1747,7 +1942,7 @@ modest_mail_operation_remove_msg (ModestMailOperation *self, g_object_unref (G_OBJECT (folder)); /* Notify about operation end */ - modest_mail_operation_notify_end (self); + modest_mail_operation_notify_end (self, FALSE); } static void @@ -1811,7 +2006,9 @@ transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError **err, gpointer /* 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 */ @@ -1822,7 +2019,7 @@ transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError **err, gpointer g_object_unref (folder); /* Notify about operation end */ - modest_mail_operation_notify_end (self); + modest_mail_operation_notify_end (self, TRUE); } void @@ -1851,7 +2048,6 @@ 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; @@ -1859,7 +2055,7 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self, MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES, _("FIXME: folder does not accept msgs")); /* Notify the queue */ - modest_mail_operation_notify_end (self); + modest_mail_operation_notify_end (self, FALSE); return; } @@ -1879,7 +2075,7 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self, g_object_unref (iter); /* Get account and set it into mail_operation */ - priv->account = tny_folder_get_account (src_folder); + priv->account = modest_tny_folder_get_account (src_folder); /* Transfer messages */ tny_folder_transfer_msgs_async (src_folder, @@ -1898,10 +2094,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) { @@ -1922,11 +2120,20 @@ 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 (priv->source, 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 */ - modest_mail_operation_notify_end (self); + modest_mail_operation_notify_end (self, TRUE); } static void @@ -1934,14 +2141,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; @@ -1954,9 +2166,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); @@ -1966,7 +2181,13 @@ 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 = tny_folder_get_account (folder); + 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 @@ -1974,7 +2195,7 @@ modest_mail_operation_refresh_folder (ModestMailOperation *self, tny_folder_refresh_async (folder, on_refresh_folder, on_refresh_folder_status_update, - self); + helper); } /** @@ -1986,15 +2207,35 @@ modest_mail_operation_refresh_folder (ModestMailOperation *self, * callback). */ static void -modest_mail_operation_notify_end (ModestMailOperation *self) +modest_mail_operation_notify_end (ModestMailOperation *self, + gboolean need_lock) { 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); + if (need_lock) + gdk_threads_enter (); g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL); + if (need_lock) + gdk_threads_leave (); g_slice_free (ModestMailOperationState, state); - - /* Notify the queue */ - modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self); }