- /* Get account and set it into mail_operation */
- priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder));
- priv->op_type = MODEST_MAIL_OPERATION_TYPE_DELETE;
- priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
-
- /* remove message from folder */
- tny_folder_remove_msg (folder, header, &(priv->error));
- if (!priv->error) {
- gboolean expunge, leave_on_server;
- const gchar *account_name;
- TnyAccount *account;
- ModestTransportStoreProtocol account_proto;
-
- tny_header_set_flag (header, TNY_HEADER_FLAG_DELETED);
- tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN);
-
- modest_mail_operation_notify_start (self);
-
- /* Get leave on server setting */
- account = tny_folder_get_account (folder);
- account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account);
- leave_on_server =
- modest_account_mgr_get_leave_on_server (modest_runtime_get_account_mgr (),
- account_name);
-
- account_proto = modest_protocol_info_get_transport_store_protocol (tny_account_get_proto (account));
-
- if (((account_proto == MODEST_PROTOCOL_STORE_POP) && !leave_on_server) ||
- modest_tny_folder_is_remote_folder (folder) == FALSE)
- expunge = TRUE;
- else
- expunge = FALSE;
+ if (canceled || err) {
+ /* If canceled by the user, ignore the error given by Tinymail */
+ if (canceled) {
+ priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED;
+ } else if (err) {
+ priv->status = MODEST_MAIL_OPERATION_STATUS_FINISHED_WITH_ERRORS;
+ priv->error = g_error_copy ((const GError *) err);
+ priv->error->domain = MODEST_MAIL_OPERATION_ERROR;
+ }
+ /* Exit */
+ modest_mail_operation_notify_end (self);
+ g_object_unref (self);
+ return;
+ }