#include <tny-folder-store-query.h>
#include <tny-camel-stream.h>
#include <tny-camel-pop-store-account.h>
+#include <tny-camel-pop-folder.h>
+#include <tny-camel-imap-folder.h>
#include <tny-simple-list.h>
#include <tny-send-queue.h>
#include <tny-status.h>
header = tny_msg_get_header (new_msg);
if (priority_flags != 0)
tny_header_set_flags (header, priority_flags);
+ g_object_unref (G_OBJECT(header));
/* Call mail operation */
modest_mail_operation_send_mail (self, transport_account, new_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);
g_object_unref (header);
}
}
/* add priority flags */
header = tny_msg_get_header (msg);
tny_header_set_flags (header, priority_flags);
+ g_object_unref (G_OBJECT(header));
folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (transport_account), TNY_FOLDER_TYPE_DRAFTS);
if (!folder) {
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)
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 *****/
* 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);
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 */
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)
{
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 ();
}
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 (notify_update_account_queue, g_object_ref (info->mail_op));
+ g_idle_add (idle_notify_update_account_queue, g_object_ref (info->mail_op));
- if (info->callback)
- info->callback (info->mail_op,
- (new_headers) ? new_headers->len : 0,
- info->user_data);
-
/* Frees */
g_object_unref (query);
g_object_unref (all_folders);
* 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 */
}
}
+ 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));
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);
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;
transfer_folder_cb (TnyFolder *folder,
TnyFolderStore *into,
gboolean cancelled,
- TnyFolder *new_folder, GError **err,
+ TnyFolder *new_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);
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);
/* 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,
/* 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,
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,
delete_original,
transfer_folder_cb,
transfer_folder_status_cb,
- self);
+ helper);
+/* 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));
/* 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);
}
}
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));
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 ();
}
- 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
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;
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);
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);
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);
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;
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);
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;
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;
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_slice_free (XFerMsgAsyncHelper, helper);
g_object_unref (folder);
- /* Notify about operation end */
- modest_mail_operation_notify_end (self);
}
void
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));
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);
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);
out:
/* Call user defined callback, if it exists */
- if (helper->user_callback)
- helper->user_callback (priv->source, folder, helper->user_data);
+ if (helper->user_callback) {
+ gdk_threads_enter ();
+ helper->user_callback (self, folder, helper->user_data);
+ gdk_threads_leave ();
+ }
/* Free */
g_object_unref (helper->mail_op);
/* 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;
}
projects / modest / blobdiff