X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=3758802dac2de5e1d83ecdd9e7057e956fffcd20;hb=f12789961e471f75c7ba2461e7420262c6023376;hp=e203be279636fa92788fe29ea3e92f0e0bf24629;hpb=84d8e0aa2e46366d51ab5eacb51fe392131942c9;p=modest diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c index e203be2..3758802 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 @@ -643,13 +645,17 @@ 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_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) @@ -671,6 +677,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 *****/ @@ -830,13 +837,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); @@ -867,6 +875,8 @@ compare_headers_by_date (gconstpointer a, 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 */ @@ -876,9 +886,32 @@ set_last_updated_idle (gpointer data) 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) { @@ -933,7 +966,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 (); @@ -1086,20 +1119,23 @@ update_account_thread (gpointer thr_user_data) } 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, g_object_ref (info->mail_op)); if (info->callback) { + UpdateAccountInfo *idle_info; + /* 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 (); + 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)); + /* Frees */ g_object_unref (query); g_object_unref (all_folders); @@ -1137,13 +1173,6 @@ modest_mail_operation_update_account (ModestMailOperation *self, 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_server_account (modest_runtime_get_account_store (), @@ -1246,6 +1275,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)); @@ -1328,9 +1364,6 @@ transfer_folder_status_cb (GObject *obj, self = MODEST_MAIL_OPERATION (user_data); 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; @@ -1344,7 +1377,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; @@ -1372,8 +1406,6 @@ 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); @@ -1386,11 +1418,10 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self, gboolean delete_original) { ModestMailOperationPrivate *priv = NULL; - ModestTnyFolderRules parent_rules, rules; + ModestTnyFolderRules parent_rules = 0, rules; 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); @@ -1400,14 +1431,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, @@ -1416,7 +1445,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, @@ -1469,18 +1499,24 @@ 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; + /* 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); if (into) - g_object_unref (into); - + g_object_unref (into); } } @@ -1516,6 +1552,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)); @@ -1563,15 +1604,19 @@ 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) { - /* 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 (); + /* 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 (); + } } out: @@ -1580,7 +1625,10 @@ get_msg_cb (TnyFolder *folder, g_slice_free (GetMsgAsyncHelper, helper); /* Notify about operation end */ - modest_mail_operation_notify_end (self); + if(priv->status != MODEST_MAIL_OPERATION_STATUS_CANCELED) + modest_mail_operation_notify_end (self); + + g_object_unref (G_OBJECT (self)); } static void @@ -1602,7 +1650,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; @@ -1666,8 +1714,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); @@ -1744,7 +1795,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, g_object_ref (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); @@ -1841,9 +1892,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; @@ -1851,6 +1901,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); @@ -1859,44 +1912,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; @@ -1930,9 +1960,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; @@ -1969,6 +1996,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 (); @@ -1983,8 +2013,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 @@ -2001,6 +2029,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)); @@ -2018,9 +2049,35 @@ 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; } @@ -2032,13 +2089,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); @@ -2188,8 +2238,8 @@ modest_mail_operation_notify_end (ModestMailOperation *self) /* 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); + modest_account_mgr_set_account_busy (modest_runtime_get_account_mgr(), + priv->account_name, FALSE); g_free(priv->account_name); priv->account_name = NULL; }