X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=9d48dae2f272bb784397de5e23dab03ec91f0237;hp=df946213e2f4e25cfdd16007f90fcba7ddccd760;hb=362784ce756b3f0e31cd451d9ac5e69b909d4053;hpb=a2e8dc72d76c5f8b3648e0c54d52f362a5dcefc7 diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c index df94621..9d48dae 100644 --- a/src/modest-mail-operation.c +++ b/src/modest-mail-operation.c @@ -51,6 +51,7 @@ #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" @@ -59,6 +60,12 @@ #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); static void modest_mail_operation_init (ModestMailOperation *obj); @@ -76,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, @@ -395,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 */ + g_return_val_if_fail (priv->account, FALSE); + tny_account_cancel (priv->account); + + return canceled; } guint @@ -669,6 +672,7 @@ modest_mail_operation_create_msg (ModestMailOperation *self, info->from = g_strdup (from); info->to = g_strdup (to); info->cc = g_strdup (cc); + info->bcc = g_strdup (bcc); info->subject = g_strdup (subject); info->plain_body = g_strdup (plain_body); info->html_body = g_strdup (html_body); @@ -694,7 +698,8 @@ modest_mail_operation_send_new_mail_cb (ModestMailOperation *self, gpointer userdata) { SendNewMailInfo *info = (SendNewMailInfo *) userdata; - TnyFolder *folder; + TnyFolder *draft_folder = NULL; + TnyFolder *outbox_folder = NULL; TnyHeader *header; if (!msg) { @@ -704,22 +709,38 @@ modest_mail_operation_send_new_mail_cb (ModestMailOperation *self, /* 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); - } + /* Remove old mail from its source folder */ + draft_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (info->transport_account), TNY_FOLDER_TYPE_DRAFTS); + outbox_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (info->transport_account), TNY_FOLDER_TYPE_OUTBOX); + if (info->draft_msg != NULL) { + TnyFolder *folder = NULL; + TnyFolder *src_folder = NULL; + TnyFolderType folder_type; + folder = tny_msg_get_folder (info->draft_msg); + if (folder == NULL) goto end; + folder_type = modest_tny_folder_guess_folder_type (folder); + if (folder_type == TNY_FOLDER_TYPE_OUTBOX) + src_folder = outbox_folder; + else + src_folder = draft_folder; + + /* 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. */ + header = tny_msg_get_header (info->draft_msg); + tny_folder_remove_msg (src_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 (draft_folder) + g_object_unref (draft_folder); + if (outbox_folder) + g_object_unref (outbox_folder); if (info->transport_account) g_object_unref (info->transport_account); g_slice_free (SendNewMailInfo, info); @@ -779,6 +800,7 @@ modest_mail_operation_save_to_drafts_cb (ModestMailOperation *self, TnyMsg *msg, gpointer userdata) { + TnyFolder *src_folder = NULL; TnyFolder *folder = NULL; TnyHeader *header = NULL; ModestMailOperationPrivate *priv = NULL; @@ -804,11 +826,12 @@ modest_mail_operation_save_to_drafts_cb (ModestMailOperation *self, if (info->draft_msg != NULL) { header = tny_msg_get_header (info->draft_msg); + src_folder = tny_header_get_folder (header); /* Remove the old draft expunging it */ - tny_folder_remove_msg (folder, header, NULL); + tny_folder_remove_msg (src_folder, header, NULL); tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED); tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN); - tny_folder_sync (folder, FALSE, &(priv->error)); /* FALSE --> don't expunge */ + tny_folder_sync (src_folder, TRUE, &(priv->error)); /* expunge */ g_object_unref (header); } @@ -827,6 +850,8 @@ modest_mail_operation_save_to_drafts_cb (ModestMailOperation *self, end: if (folder) g_object_unref (G_OBJECT(folder)); + if (src_folder) + g_object_unref (G_OBJECT(src_folder)); if (info->edit_window) g_object_unref (G_OBJECT(info->edit_window)); if (info->draft_msg) @@ -995,10 +1020,11 @@ recurse_folders (TnyFolderStore *store, TnyFolderStoreQuery *query, TnyList *all while (!tny_iterator_is_done (iter)) { TnyFolderStore *folder = (TnyFolderStore*) tny_iterator_get_current (iter); - - tny_list_prepend (all_folders, G_OBJECT (folder)); - recurse_folders (folder, query, all_folders); - g_object_unref (G_OBJECT (folder)); + if (folder) { + tny_list_prepend (all_folders, G_OBJECT (folder)); + recurse_folders (folder, query, all_folders); + g_object_unref (G_OBJECT (folder)); + } tny_iterator_next (iter); } @@ -1017,7 +1043,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; @@ -1035,7 +1067,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); @@ -1125,13 +1163,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); @@ -1140,11 +1179,17 @@ update_account_thread (gpointer thr_user_data) 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 + * Previousl, we did this for POP3, to do a logout-login upon send/receive, + * because many POP-servers (like Gmail) do not + * show any updates unless we do that. + * But that didn't work with gmail anyway, + * and tinymail now takes care of this itself by disconnecting + * automatically after using the connection. */ - if (!first_time && TNY_IS_CAMEL_POP_STORE_ACCOUNT(priv->account)) + /* + 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 */ @@ -1163,8 +1208,10 @@ update_account_thread (gpointer thr_user_data) iter = tny_list_create_iterator (all_folders); while (!tny_iterator_is_done (iter)) { TnyFolderStore *folder = TNY_FOLDER_STORE (tny_iterator_get_current (iter)); - - recurse_folders (folder, query, all_folders); + if (folder) { + recurse_folders (folder, query, all_folders); + g_object_unref (folder); + } tny_iterator_next (iter); } g_object_unref (G_OBJECT (iter)); @@ -1178,10 +1225,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)); @@ -1228,22 +1277,21 @@ update_account_thread (gpointer thr_user_data) g_object_unref (observer); observer = NULL; - g_object_unref (G_OBJECT (folder)); + if (folder) + 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 */ @@ -1291,12 +1339,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; @@ -1336,7 +1389,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); } @@ -1365,12 +1418,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); @@ -1383,20 +1436,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); @@ -1419,7 +1472,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; @@ -1565,9 +1618,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); @@ -1607,7 +1663,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); } @@ -1660,6 +1722,47 @@ transfer_folder_cb (TnyFolder *folder, g_slice_free (XFerMsgAsyncHelper, helper); } +/** + * + * 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_folder_name_in_use (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 modest_mail_operation_xfer_folder (ModestMailOperation *self, TnyFolder *folder, @@ -1687,7 +1790,9 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self, parent_rules = modest_tny_folder_get_rules (TNY_FOLDER (parent)); /* The moveable restriction is applied also to copy operation */ - if ((!TNY_IS_FOLDER_STORE (parent)) || (rules & MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE)) { + if ((gpointer) parent == (gpointer) folder || + (!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; @@ -1708,23 +1813,31 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self, /* Notify the queue */ modest_mail_operation_notify_end (self); } else { - /* 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); + } } } @@ -1767,25 +1880,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 ************************* */ @@ -2001,28 +2119,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) { - TnyFolder *folder = tny_header_get_folder (helper->header); - if (folder) { - TnyAccount *account; - account = tny_folder_get_account (folder); - if (account) { - tny_account_cancel (account); - g_object_unref (account); - } - g_object_unref (folder); - } - - 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); } @@ -2149,7 +2258,10 @@ get_msgs_full_thread (gpointer thr_user_data) MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND, "Error trying to get a message. No folder found for header"); } - g_object_unref (header); + + if (header) + g_object_unref (header); + tny_iterator_next (iter); } @@ -2194,10 +2306,16 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self, 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 (header) { + folder = tny_header_get_folder (header); + if (folder) { + priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder)); + + g_object_unref (folder); + } + + g_object_unref (header); + } if (tny_list_get_length (header_list) == 1) { g_object_unref (iter); @@ -2221,9 +2339,12 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self, if (iter != NULL) { while (!tny_iterator_is_done (iter) && size_ok) { header = TNY_HEADER (tny_iterator_get_current (iter)); - if (tny_header_get_message_size (header) >= max_size) - size_ok = FALSE; - g_object_unref (header); + if (header) { + if (tny_header_get_message_size (header) >= max_size) + size_ok = FALSE; + g_object_unref (header); + } + tny_iterator_next (iter); } g_object_unref (iter); @@ -2328,7 +2449,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); } @@ -2387,12 +2514,12 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self, XferMsgsAsynUserCallback user_callback, gpointer user_data) { - ModestMailOperationPrivate *priv; - TnyIterator *iter; - TnyFolder *src_folder; - XFerMsgAsyncHelper *helper; - TnyHeader *header; - ModestTnyFolderRules rules; + ModestMailOperationPrivate *priv = NULL; + TnyIterator *iter = NULL; + TnyFolder *src_folder = NULL; + XFerMsgAsyncHelper *helper = NULL; + TnyHeader *header = NULL; + ModestTnyFolderRules rules = 0; const gchar *id1 = NULL; const gchar *id2 = NULL; gboolean same_folder = FALSE; @@ -2422,8 +2549,11 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self, /* 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); + if (header) { + src_folder = tny_header_get_folder (header); + g_object_unref (header); + } + g_object_unref (iter); /* Check folder source and destination */ @@ -2506,7 +2636,6 @@ on_refresh_folder (TnyFolder *folder, } /* Free */ - g_object_unref (helper->mail_op); g_slice_free (RefreshAsyncHelper, helper); /* Notify about operation end */ @@ -2537,7 +2666,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); } @@ -2559,7 +2694,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 = self; helper->user_callback = user_callback; helper->user_data = user_data; @@ -2598,7 +2733,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);