X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=9dfcaf81ccaadb1c31c50b01314ad957dd619913;hp=0564f08c45456a9a518976fd0cfa5a8389210354;hb=f7a80e39c3b0725566145d3bc2357846610bdcfb;hpb=953b423dda6919b6f7c31f65b99ddb3d9fd90012 diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c index 0564f08..9dfcaf8 100644 --- a/src/modest-mail-operation.c +++ b/src/modest-mail-operation.c @@ -35,6 +35,8 @@ #include #include #include +#include +#include #include #include #include @@ -570,6 +572,10 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self, header = tny_msg_get_header (new_msg); if (priority_flags != 0) tny_header_set_flags (header, priority_flags); + if (attachments_list != NULL) { + tny_header_set_flags (header, TNY_HEADER_FLAG_ATTACHMENTS); + } + g_object_unref (G_OBJECT(header)); /* Call mail operation */ modest_mail_operation_send_mail (self, transport_account, new_msg); @@ -581,6 +587,7 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self, /* 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); } } @@ -589,7 +596,7 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self, g_object_unref (G_OBJECT (new_msg)); } -void +TnyMsg* modest_mail_operation_save_to_drafts (ModestMailOperation *self, TnyTransportAccount *transport_account, TnyMsg *draft_msg, @@ -605,8 +612,8 @@ modest_mail_operation_save_to_drafts (ModestMailOperation *self, TnyHeader *header = NULL; ModestMailOperationPrivate *priv = NULL; - g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); - g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account)); + g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), NULL); + g_return_val_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account), NULL); priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); @@ -629,6 +636,9 @@ modest_mail_operation_save_to_drafts (ModestMailOperation *self, /* add priority flags */ header = tny_msg_get_header (msg); tny_header_set_flags (header, priority_flags); + if (attachments_list != NULL) + tny_header_set_flags (header, TNY_HEADER_FLAG_ATTACHMENTS); + g_object_unref (G_OBJECT(header)); folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (transport_account), TNY_FOLDER_TYPE_DRAFTS); if (!folder) { @@ -643,21 +653,25 @@ modest_mail_operation_save_to_drafts (ModestMailOperation *self, 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, 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); } - tny_folder_add_msg (folder, msg, &(priv->error)); + 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) - g_object_unref (G_OBJECT(msg)); if (folder) g_object_unref (G_OBJECT(folder)); modest_mail_operation_notify_end (self); + return msg; } typedef struct @@ -671,6 +685,7 @@ typedef struct 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 *****/ @@ -794,8 +809,6 @@ 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; @@ -803,8 +816,6 @@ idle_notify_progress (gpointer data) g_signal_emit (G_OBJECT (mail_op), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL); g_slice_free (ModestMailOperationState, state); - gdk_threads_leave (); - return TRUE; } @@ -816,8 +827,6 @@ idle_notify_progress (gpointer data) static gboolean idle_notify_progress_once (gpointer data) { - gdk_threads_enter (); - ModestPair *pair; pair = (ModestPair *) data; @@ -828,8 +837,6 @@ idle_notify_progress_once (gpointer data) g_slice_free (ModestMailOperationState, (ModestMailOperationState*)pair->second); g_object_unref (pair->first); - gdk_threads_leave (); - return FALSE; } @@ -840,18 +847,15 @@ idle_notify_progress_once (gpointer data) static gboolean idle_notify_update_account_queue (gpointer data) { - gdk_threads_enter (); - 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); - gdk_threads_leave (); - return FALSE; } @@ -895,6 +899,27 @@ set_last_updated_idle (gpointer data) 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) { @@ -949,7 +974,7 @@ update_account_thread (gpointer thr_user_data) 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 (); @@ -1069,7 +1094,8 @@ update_account_thread (gpointer thr_user_data) g_ptr_array_free (new_headers, FALSE); } - /* Perform send */ + /* 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; @@ -1102,20 +1128,23 @@ update_account_thread (gpointer thr_user_data) } 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 (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); @@ -1157,7 +1186,7 @@ modest_mail_operation_update_account (ModestMailOperation *self, * 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)) goto error; /* Get the Modest account */ @@ -1262,6 +1291,13 @@ modest_mail_operation_create_folder (ModestMailOperation *self, } } + 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 (!priv->error) { /* Create the folder */ new_folder = tny_folder_store_create_folder (parent, name, &(priv->error)); @@ -1312,7 +1348,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); @@ -1337,15 +1374,16 @@ transfer_folder_status_cb (GObject *obj, 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); - self = MODEST_MAIL_OPERATION (user_data); - priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); + helper = (XFerMsgAsyncHelper *) user_data; + g_return_if_fail (helper != NULL); - if ((status->position == 1) && (status->of_total == 100)) - return; + self = helper->mail_op; + priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); priv->done = status->position; priv->total = status->of_total; @@ -1364,12 +1402,15 @@ transfer_folder_cb (TnyFolder *folder, GError **err, gpointer user_data) { + XFerMsgAsyncHelper *helper; ModestMailOperation *self = NULL; ModestMailOperationPrivate *priv = NULL; - self = MODEST_MAIL_OPERATION (user_data); + 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); @@ -1386,28 +1427,37 @@ transfer_folder_cb (TnyFolder *folder, 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_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) { 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 (folder)); - g_return_if_fail (TNY_IS_FOLDER (parent)); priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); @@ -1417,14 +1467,12 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self, /* 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_STORE (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 ((!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, @@ -1433,7 +1481,8 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self, /* 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, @@ -1447,6 +1496,14 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self, 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, @@ -1454,7 +1511,8 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self, delete_original, transfer_folder_cb, transfer_folder_status_cb, - self); + helper); +/* self); */ } } @@ -1465,6 +1523,7 @@ modest_mail_operation_rename_folder (ModestMailOperation *self, { ModestMailOperationPrivate *priv; ModestTnyFolderRules rules; + XFerMsgAsyncHelper *helper; g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); g_return_if_fail (TNY_IS_FOLDER_STORE (folder)); @@ -1486,18 +1545,33 @@ modest_mail_operation_rename_folder (ModestMailOperation *self, /* 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 { - /* Rename. Camel handles folder subscription/unsubscription */ 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, - self); + helper); +/* self); */ if (into) - g_object_unref (into); - + g_object_unref (into); } } @@ -1533,6 +1607,11 @@ void modest_mail_operation_get_msg (ModestMailOperation *self, 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); g_object_unref (G_OBJECT (folder)); @@ -1569,35 +1648,33 @@ get_msg_cb (TnyFolder *folder, 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) { /* 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 (); + gdk_threads_leave (); } - out: /* Free */ + g_object_unref (helper->mail_op); g_object_unref (helper->header); g_slice_free (GetMsgAsyncHelper, helper); /* Notify about operation end */ - modest_mail_operation_notify_end (self); + modest_mail_operation_notify_end (self); } static void @@ -1619,7 +1696,7 @@ 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; @@ -1657,8 +1734,6 @@ typedef struct { static gboolean notify_get_msgs_full (gpointer data) { - gdk_threads_enter (); - NotifyGetMsgsInfo *info; info = (NotifyGetMsgsInfo *) data; @@ -1671,8 +1746,6 @@ notify_get_msgs_full (gpointer data) g_slice_free (NotifyGetMsgsInfo, info); - gdk_threads_leave (); - return FALSE; } @@ -1683,21 +1756,20 @@ notify_get_msgs_full (gpointer data) static gboolean get_msgs_full_destroyer (gpointer data) { - gdk_threads_enter (); - GetFullMsgsInfo *info; 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); g_slice_free (GetFullMsgsInfo, info); - gdk_threads_leave (); - return FALSE; } @@ -1866,9 +1938,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; @@ -1876,6 +1947,9 @@ 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); @@ -1884,44 +1958,21 @@ modest_mail_operation_remove_msg (ModestMailOperation *self, priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; - /* Delete or move to trash */ - if (remove_to_trash) { - TnyFolder *trash_folder; - TnyStoreAccount *store_account; - - 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) { - TnyList *headers; - /* Create list */ - headers = tny_simple_list_new (); - tny_list_append (headers, G_OBJECT (header)); - g_object_unref (header); - - /* 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")); - } - - 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)); + tny_folder_remove_msg (folder, header, &(priv->error)); + if (!priv->error) { + tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED); + + 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; @@ -1955,9 +2006,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; @@ -1994,6 +2042,9 @@ 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 (); @@ -2008,8 +2059,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 @@ -2026,6 +2075,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)); @@ -2043,11 +2095,37 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self, 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); @@ -2057,13 +2135,6 @@ 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); @@ -2108,13 +2179,12 @@ 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 (); */ + gdk_threads_enter (); + helper->user_callback (self, folder, helper->user_data); + gdk_threads_leave (); } /* Free */ @@ -2206,11 +2276,6 @@ modest_mail_operation_notify_end (ModestMailOperation *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(),