#include "modest-mail-operation.h"
#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 get_msg_cb (TnyFolder *folder,
gboolean cancelled,
TnyMsg *msg,
- GError **err,
+ GError *rr,
gpointer user_data);
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,
TnyList *headers;
TnyFolder *dest_folder;
XferMsgsAsynUserCallback user_callback;
+ gboolean delete;
gpointer user_data;
} XFerMsgAsyncHelper;
g_return_val_if_fail (error_handler != NULL, obj);
priv->error_checking = error_handler;
+ priv->error_checking_user_data = user_data;
return obj;
}
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
g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
"modest: could not find send queue for account\n");
+ priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+
} else {
/* TODO: connect to the msg-sent in order to know when
the mail operation is finished */
- tny_send_queue_add (send_queue, msg, &(priv->error));
+
+/* tny_send_queue_add (send_queue, msg, &(priv->error)); */
+ modest_tny_send_queue_add (MODEST_TNY_SEND_QUEUE(send_queue),
+ msg,
+ &(priv->error));
+
/* TODO: we're setting always success, do the check in
the handler */
priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
}
+ if (priv->status == MODEST_MAIL_OPERATION_STATUS_SUCCESS)
+ modest_platform_information_banner (NULL, NULL, _("mcen_ib_outbox_waiting_to_be_sent"));
+
/* TODO: do this in the handler of the "msg-sent"
signal.Notify about operation end */
modest_mail_operation_notify_end (self);
{
CreateMsgIdleInfo *info = (CreateMsgIdleInfo *) idle_data;
- gdk_threads_enter ();
+ /* This is a GDK lock because we are an idle callback and
+ * info->callback can contain Gtk+ code */
+
+ gdk_threads_enter (); /* CHECKED */
info->callback (info->mail_op, info->msg, info->userdata);
- gdk_threads_leave ();
+ gdk_threads_leave (); /* CHECKED */
+
g_object_unref (info->mail_op);
if (info->msg)
g_object_unref (info->msg);
if (new_msg) {
TnyHeader *header;
+ TnyHeaderFlags flags = 0;
+
/* Set priority flags in message */
header = tny_msg_get_header (new_msg);
if (info->priority_flags != 0)
- tny_header_set_flags (header, info->priority_flags);
- if (info->attachments_list != NULL) {
- tny_header_set_flags (header, TNY_HEADER_FLAG_ATTACHMENTS);
- }
+ flags |= info->priority_flags;
+
+ /* Set attachment flags in message */
+ if (info->attachments_list != NULL)
+ flags |= TNY_HEADER_FLAG_ATTACHMENTS;
+
+ tny_header_set_flags (header, flags);
g_object_unref (G_OBJECT(header));
} else {
priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
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);
gpointer userdata)
{
SendNewMailInfo *info = (SendNewMailInfo *) userdata;
- TnyFolder *folder;
+ TnyFolder *draft_folder = NULL;
+ TnyFolder *outbox_folder = NULL;
TnyHeader *header;
+ GError *err = NULL;
if (!msg) {
goto end;
/* 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_folder_sync (folder, TRUE, &err); /* FALSE --> don't expunge */
+/* tny_folder_sync_async (src_folder, TRUE, NULL, NULL, NULL); /\* expunge *\/ */
+
+ g_object_unref (header);
+ g_object_unref (folder);
}
end:
+ if (err != NULL)
+ g_error_free(err);
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);
TnyMsg *msg,
gpointer userdata)
{
+ TnyFolder *src_folder = NULL;
TnyFolder *folder = NULL;
TnyHeader *header = NULL;
ModestMailOperationPrivate *priv = NULL;
goto end;
}
- if (info->draft_msg != NULL) {
+ if (!priv->error)
+ tny_folder_add_msg (folder, msg, &(priv->error));
+
+ if ((!priv->error) && (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_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_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, TRUE, &(priv->error)); /* FALSE --> don't expunge */
+ tny_folder_sync_async (src_folder, TRUE, NULL, NULL, NULL); /* expunge */
+
g_object_unref (header);
}
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 (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)
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);
}
ModestMailOperationState *state;
state = modest_mail_operation_clone_state (mail_op);
+
+ /* This is a GDK lock because we are an idle callback and
+ * the handlers of this signal can contain Gtk+ code */
+
+ gdk_threads_enter (); /* CHECKED */
g_signal_emit (G_OBJECT (mail_op), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
+ gdk_threads_leave (); /* CHECKED */
+
g_slice_free (ModestMailOperationState, state);
return TRUE;
pair = (ModestPair *) data;
+ /* This is a GDK lock because we are an idle callback and
+ * the handlers of this signal can contain Gtk+ code */
+
+ gdk_threads_enter (); /* CHECKED */
g_signal_emit (G_OBJECT (pair->first), signals[PROGRESS_CHANGED_SIGNAL], 0, pair->second, NULL);
+ gdk_threads_leave (); /* CHECKED */
/* Free the state and the reference to the mail operation */
g_slice_free (ModestMailOperationState, (ModestMailOperationState*)pair->second);
static gboolean
set_last_updated_idle (gpointer data)
{
- gdk_threads_enter ();
+
+ /* This is a GDK lock because we are an idle callback and
+ * modest_account_mgr_set_int can contain Gtk+ code */
+
+ gdk_threads_enter (); /* CHECKED - please recheck */
/* 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 */
+
modest_account_mgr_set_int (modest_runtime_get_account_mgr (),
(gchar *) data,
MODEST_ACCOUNT_LAST_UPDATED,
time(NULL),
TRUE);
- gdk_threads_leave ();
+ gdk_threads_leave (); /* CHECKED - please recheck */
return FALSE;
}
idle_info = (UpdateAccountInfo *) data;
- gdk_threads_enter ();
+ /* This is a GDK lock because we are an idle callback and
+ * idle_info->callback can contain Gtk+ code */
+
+ gdk_threads_enter (); /* CHECKED */
idle_info->callback (idle_info->mail_op,
idle_info->new_headers,
idle_info->user_data);
- gdk_threads_leave ();
+ gdk_threads_leave (); /* CHECKED */
/* Frees */
g_object_unref (idle_info->mail_op);
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);
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 */
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));
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));
if (G_UNLIKELY (!first_time))
tny_folder_poke_status (TNY_FOLDER (folder));
}
+
tny_folder_remove_observer (TNY_FOLDER (folder), TNY_FOLDER_OBSERVER (observer));
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 */
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;
if (priv->account != NULL)
send_queue = modest_runtime_get_send_queue (info->transport_account);
if (send_queue) {
-/* timeout = g_timeout_add (250, idle_notify_progress, info->mail_op); */
modest_tny_send_queue_try_to_send (send_queue);
-/* g_source_remove (timeout); */
} else {
g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED,
/* 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;
+ idle_info->user_data = info->user_data;
g_idle_add (idle_update_account_cb, idle_info);
}
ModestMailOperationPrivate *priv;
TnyFolder *new_folder = NULL;
- TnyList *list = tny_simple_list_new ();
- TnyFolderStoreQuery *query = tny_folder_store_query_new ();
-
g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent), NULL);
g_return_val_if_fail (name, NULL);
priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
/* Check for already existing folder */
- tny_folder_store_query_add_item (query, name, TNY_FOLDER_STORE_QUERY_OPTION_MATCH_ON_NAME);
- tny_folder_store_get_folders (parent, list, query, NULL);
- g_object_unref (G_OBJECT (query));
-
- if (tny_list_get_length (list) > 0) {
+ if (modest_tny_folder_has_subfolder_with_name (parent, name)) {
priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
MODEST_MAIL_OPERATION_ERROR_FOLDER_EXISTS,
_CS("ckdg_ib_folder_already_exists"));
}
- g_object_unref (G_OBJECT (list));
-
/* Check parent */
if (TNY_IS_FOLDER (parent)) {
/* Check folder rules */
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);
tny_folder_store_remove_folder (parent, folder, &(priv->error));
CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED);
+ if (!priv->error)
+ priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+
if (parent)
g_object_unref (G_OBJECT (parent));
}
priv->total = status->of_total;
state = modest_mail_operation_clone_state (self);
- g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
+
+ /* This is not a GDK lock because we are a Tinymail callback
+ * which is already GDK locked by Tinymail */
+
+ /* no gdk_threads_enter (), CHECKED */
+
+ g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
+
+ /* no gdk_threads_leave (), CHECKED */
+
g_slice_free (ModestMailOperationState, state);
}
static void
transfer_folder_cb (TnyFolder *folder,
- TnyFolderStore *into,
gboolean cancelled,
+ TnyFolderStore *into,
TnyFolder *new_folder,
- GError **err,
+ GError *err,
gpointer user_data)
{
XFerMsgAsyncHelper *helper;
self = helper->mail_op;
priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
- if (*err) {
- priv->error = g_error_copy (*err);
+ if (err) {
+ priv->error = g_error_copy (err);
priv->done = 0;
priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
} else if (cancelled) {
/* If user defined callback function was defined, call it */
if (helper->user_callback) {
- gdk_threads_enter ();
+
+ /* This is not a GDK lock because we are a Tinymail callback
+ * which is already GDK locked by Tinymail */
+
+ /* no gdk_threads_enter (), CHECKED */
helper->user_callback (priv->source, helper->user_data);
- gdk_threads_leave ();
+ /* no gdk_threads_leave () , CHECKED */
}
/* Free */
{
if (TNY_IS_ACCOUNT (into) &&
modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (into)) &&
- modest_tny_local_folders_account_extra_folder_exists (MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (into),
- new_name)) {
+ 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"));
+ MODEST_MAIL_OPERATION_ERROR_FOLDER_EXISTS,
+ _("ckdg_ib_folder_already_exists"));
return FALSE;
} else
return TRUE;
}
+/**
+ * This function checks if @ancestor is an acestor of @folder and
+ * returns TRUE in that case
+ */
+static gboolean
+folder_is_ancestor (TnyFolder *folder,
+ TnyFolderStore *ancestor)
+{
+ TnyFolder *tmp = NULL;
+ gboolean found = FALSE;
+
+ tmp = folder;
+ while (!found && tmp && !TNY_IS_ACCOUNT (tmp)) {
+ TnyFolderStore *folder_store;
+
+ folder_store = tny_folder_get_folder_store (tmp);
+ if (ancestor == folder_store)
+ found = TRUE;
+ else
+ tmp = g_object_ref (folder_store);
+ g_object_unref (folder_store);
+ }
+ return found;
+}
+
void
modest_mail_operation_xfer_folder (ModestMailOperation *self,
TnyFolder *folder,
ModestMailOperationPrivate *priv = NULL;
ModestTnyFolderRules parent_rules = 0, rules;
XFerMsgAsyncHelper *helper = NULL;
+ const gchar *folder_name = NULL;
+ const gchar *error_msg;
g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
g_return_if_fail (TNY_IS_FOLDER (folder));
+ g_return_if_fail (TNY_IS_FOLDER_STORE (parent));
priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+ folder_name = tny_folder_get_name (folder);
+
+ /* Set the error msg */
+ error_msg = (delete_original) ?
+ _("mail_in_ui_folder_move_target_error") :
+ _("mail_in_ui_folder_copy_target_error");
/* Get account and set it into mail_operation */
priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder));
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__);
+ if ((gpointer) parent == (gpointer) folder ||
+ (!TNY_IS_FOLDER_STORE (parent)) ||
+ (rules & MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE)) {
+
/* 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_FOLDER_RULES,
- _("mail_in_ui_folder_move_target_error"));
+ error_msg);
/* Notify the queue */
modest_mail_operation_notify_end (self);
+
} 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,
MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
- _("FIXME: parent folder does not accept new folders"));
+ error_msg);
/* Notify the queue */
modest_mail_operation_notify_end (self);
- } else {
+ } else if (TNY_IS_FOLDER (parent) &&
+ TNY_IS_FOLDER_STORE (folder) &&
+ folder_is_ancestor (TNY_FOLDER (parent), TNY_FOLDER_STORE (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_FOLDER_RULES,
+ error_msg);
+
+ /* Notify the queue */
+ modest_mail_operation_notify_end (self);
+ } else if (TNY_IS_FOLDER_STORE (parent) &&
+ modest_tny_folder_has_subfolder_with_name (parent, folder_name)) {
+ /* Check that the new folder name is not used by any
+ parent subfolder */
+
+ /* 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_FOLDER_RULES,
+ error_msg);
+
+ /* Notify the queue */
+ modest_mail_operation_notify_end (self);
+
+ } else if (!(new_name_valid_if_local_account (priv, parent, folder_name))) {
/* 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);
- }
- }
+
+ /* 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_FOLDER_RULES,
+ error_msg);
+
+ /* 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);
+ }
+
}
void
if (folder) {
/* Get account and set it into mail_operation */
priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder));
+
+ /* Check for cached messages */
+ if (tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED)
+ priv->op_type = MODEST_MAIL_OPERATION_TYPE_OPEN;
+ else
+ priv->op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE;
helper = g_slice_new0 (GetMsgAsyncHelper);
helper->mail_op = self;
}
}
-static gboolean
-idle_get_mime_part_size_cb (gpointer userdata)
-{
- GetMimePartSizeInfo *idle_info;
-
- idle_info = (GetMimePartSizeInfo *) userdata;
-
- gdk_threads_enter ();
- idle_info->callback (idle_info->mail_op,
- idle_info->size,
- idle_info->userdata);
- gdk_threads_leave ();
-
- g_object_unref (idle_info->mail_op);
- g_slice_free (GetMimePartSizeInfo, idle_info);
-
- return FALSE;
-}
-
-static gpointer
-get_mime_part_size_thread (gpointer thr_user_data)
-{
- GetMimePartSizeInfo *info;
- gchar read_buffer[GET_SIZE_BUFFER_SIZE];
- TnyStream *stream;
- gssize readed_size;
- gssize total = 0;
- ModestMailOperationPrivate *priv;
-
- info = (GetMimePartSizeInfo *) thr_user_data;
- priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op);
-
- stream = tny_camel_mem_stream_new ();
- tny_mime_part_decode_to_stream (info->mime_part, stream);
- tny_stream_reset (stream);
- if (tny_stream_is_eos (stream)) {
- tny_stream_close (stream);
- stream = tny_mime_part_get_stream (info->mime_part);
- }
-
- while (!tny_stream_is_eos (stream)) {
- readed_size = tny_stream_read (stream, read_buffer, GET_SIZE_BUFFER_SIZE);
- total += readed_size;
- }
-
- if (info->callback) {
- GetMimePartSizeInfo *idle_info;
-
- idle_info = g_slice_new0 (GetMimePartSizeInfo);
- idle_info->mail_op = g_object_ref (info->mail_op);
- idle_info->size = total;
- idle_info->callback = info->callback;
- idle_info->userdata = info->userdata;
- g_idle_add (idle_get_mime_part_size_cb, idle_info);
- }
-
- g_idle_add (idle_notify_queue, g_object_ref (info->mail_op));
-
- g_object_unref (info->mail_op);
- g_object_unref (stream);
- g_object_unref (info->mime_part);
- g_slice_free (GetMimePartSizeInfo, info);
-
- return NULL;
-}
-
-void
-modest_mail_operation_get_mime_part_size (ModestMailOperation *self,
- TnyMimePart *part,
- GetMimePartSizeCallback user_callback,
- gpointer user_data,
- GDestroyNotify notify)
-{
- GetMimePartSizeInfo *info;
- ModestMailOperationPrivate *priv;
- GThread *thread;
-
- g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
- g_return_if_fail (TNY_IS_MIME_PART (part));
-
- priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
-
- priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
- info = g_slice_new0 (GetMimePartSizeInfo);
- info->mail_op = g_object_ref (self);
- info->mime_part = g_object_ref (part);
- info->callback = user_callback;
- info->userdata = user_data;
-
- thread = g_thread_create (get_mime_part_size_thread, info, FALSE, NULL);
-
-}
-
static void
get_msg_cb (TnyFolder *folder,
gboolean cancelled,
TnyMsg *msg,
- GError **error,
+ GError *error,
gpointer user_data)
{
GetMsgAsyncHelper *helper = NULL;
priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
/* Check errors and cancel */
- if (*error) {
- priv->error = g_error_copy (*error);
+ if (error) {
+ priv->error = g_error_copy (error);
priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
} else if (cancelled) {
priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED;
/* 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 ();
+ /* This is not a GDK lock because we are a Tinymail callback
+ * which is already GDK locked by Tinymail */
+
+ /* no gdk_threads_enter (), CHECKED */
helper->user_callback (self, helper->header, msg, helper->user_data);
- gdk_threads_leave ();
+ /* no gdk_threads_leave (), CHECKED */
}
/* Notify about operation end */
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;
+
+ /* This is not a GDK lock because we are a Tinymail callback
+ * which is already GDK locked by Tinymail */
+
+ /* no gdk_threads_enter (), CHECKED */
g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
+ /* no gdk_threads_leave (), CHECKED */
+
g_slice_free (ModestMailOperationState, state);
}
info = (NotifyGetMsgsInfo *) data;
- /* Call the user callback. Idles are not in the main lock, so
- lock it */
- gdk_threads_enter ();
+ /* This is a GDK lock because we are an idle callback and
+ * because info->user_callback can contain Gtk+ code */
+
+ gdk_threads_enter (); /* CHECKED */
info->user_callback (info->mail_op, info->header, info->msg, info->user_data);
- gdk_threads_leave ();
+ gdk_threads_leave (); /* CHECKED */
g_slice_free (NotifyGetMsgsInfo, info);
info = (GetFullMsgsInfo *) data;
if (info->notify) {
- gdk_threads_enter ();
+
+ /* This is a GDK lock because we are an idle callback and
+ * because info->notify can contain Gtk+ code */
+
+ gdk_threads_enter (); /* CHECKED */
info->notify (info->user_data);
- gdk_threads_leave ();
+ gdk_threads_leave (); /* CHECKED */
}
/* free */
header = TNY_HEADER (tny_iterator_get_current (iter));
folder = tny_header_get_folder (header);
+ /* Check for cached messages */
+ if (tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED)
+ priv->op_type = MODEST_MAIL_OPERATION_TYPE_OPEN;
+ else
+ priv->op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE;
+
/* Get message from folder */
if (folder) {
TnyMsg *msg;
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);
}
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);
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);
void
-modest_mail_operation_remove_msg (ModestMailOperation *self, TnyHeader *header,
+modest_mail_operation_remove_msg (ModestMailOperation *self,
+ TnyHeader *header,
gboolean remove_to_trash /*ignored*/)
{
TnyFolder *folder;
priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
-
+ /* remove message from folder */
tny_folder_remove_msg (folder, header, &(priv->error));
if (!priv->error) {
tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED);
tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
if (TNY_IS_CAMEL_IMAP_FOLDER (folder))
- tny_folder_sync(folder, FALSE, &(priv->error)); /* FALSE --> don't expunge */
+/* tny_folder_sync_async(folder, FALSE, NULL, NULL, NULL); /\* FALSE --> don't expunge *\/ */
+ 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 */
+/* tny_folder_sync_async(folder, FALSE, NULL, NULL, NULL); /\* TRUE --> dont expunge *\/ */
+ tny_folder_sync (folder, TRUE, &(priv->error)); /* TRUE --> expunge */
else
- /* lcoal folders */
- tny_folder_sync(folder, TRUE, &(priv->error)); /* TRUE --> expunge */
+ /* local folders */
+/* tny_folder_sync_async(folder, TRUE, NULL, NULL, NULL); /\* TRUE --> expunge *\/ */
+ tny_folder_sync (folder, TRUE, &(priv->error)); /* TRUE --> expunge */
}
modest_mail_operation_notify_end (self);
}
+void
+modest_mail_operation_remove_msgs (ModestMailOperation *self,
+ TnyList *headers,
+ gboolean remove_to_trash /*ignored*/)
+{
+ TnyFolder *folder;
+ ModestMailOperationPrivate *priv;
+ TnyIterator *iter = NULL;
+ TnyHeader *header = NULL;
+
+ g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
+ g_return_if_fail (TNY_IS_LIST (headers));
+
+ if (remove_to_trash)
+ g_warning ("remove to trash is not implemented");
+
+ priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+
+ /* Get folder from first header and sync it */
+ iter = tny_list_create_iterator (headers);
+ header = TNY_HEADER (tny_iterator_get_current (iter));
+ folder = tny_header_get_folder (header);
+
+ /* Get account and set it into mail_operation */
+ priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder));
+
+ priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
+
+ /* remove message from folder */
+ tny_folder_remove_msgs (folder, headers, &(priv->error));
+ if (!priv->error) {
+ if (TNY_IS_CAMEL_IMAP_FOLDER (folder))
+/* tny_folder_sync_async(folder, FALSE, NULL, NULL, NULL); /\* FALSE --> don't expunge *\/ */
+ tny_folder_sync (folder, FALSE, &(priv->error)); /* FALSE --> don't expunge */
+ else if (TNY_IS_CAMEL_POP_FOLDER (folder))
+/* tny_folder_sync_async(folder, FALSE, NULL, NULL, NULL); /\* TRUE --> dont expunge *\/ */
+ tny_folder_sync (folder, TRUE, &(priv->error)); /* TRUE --> expunge */
+ else
+ /* local folders */
+/* tny_folder_sync_async(folder, TRUE, NULL, NULL, NULL); /\* TRUE --> expunge *\/ */
+ tny_folder_sync (folder, TRUE, &(priv->error)); /* TRUE --> expunge */
+ }
+
+
+ /* Set status */
+ if (!priv->error)
+ priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+ else
+ priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+
+ /* Free */
+ g_object_unref (header);
+ g_object_unref (iter);
+ g_object_unref (G_OBJECT (folder));
+
+ /* Notify about operation end */
+ modest_mail_operation_notify_end (self);
+}
+
+
static void
transfer_msgs_status_cb (GObject *obj,
TnyStatus *status,
priv->total = status->of_total;
state = modest_mail_operation_clone_state (self);
+
+ /* This is not a GDK lock because we are a Tinymail callback and
+ * Tinymail already acquires the Gdk lock */
+
+ /* no gdk_threads_enter (), CHECKED */
+
g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
+
+ /* no gdk_threads_leave (), CHECKED */
+
g_slice_free (ModestMailOperationState, state);
}
static void
-transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError **err, gpointer user_data)
+transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError *err, gpointer user_data)
{
XFerMsgAsyncHelper *helper;
ModestMailOperation *self;
ModestMailOperationPrivate *priv;
+ TnyIterator *iter = NULL;
+ TnyHeader *header = NULL;
helper = (XFerMsgAsyncHelper *) user_data;
self = helper->mail_op;
priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
- if (*err) {
- priv->error = g_error_copy (*err);
+ if (err) {
+ priv->error = g_error_copy (err);
priv->done = 0;
priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
} else if (cancelled) {
} else {
priv->done = 1;
priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+
+ /* Update folder counts */
+ tny_folder_poke_status (folder);
+ tny_folder_poke_status (helper->dest_folder);
}
+
+ /* Mark headers as deleted and seen */
+ if ((helper->delete) &&
+ (priv->status == MODEST_MAIL_OPERATION_STATUS_SUCCESS)) {
+ iter = tny_list_create_iterator (helper->headers);
+ while (!tny_iterator_is_done (iter)) {
+ header = TNY_HEADER (tny_iterator_get_current (iter));
+ tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED);
+ tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
+ g_object_unref (header);
+
+ tny_iterator_next (iter);
+ }
+
+ }
+
+
/* 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 ();
+ /* This is not a GDK lock because we are a Tinymail callback and
+ * Tinymail already acquires the Gdk lock */
+
+ /* no gdk_threads_enter (), CHECKED */
helper->user_callback (priv->source, helper->user_data);
- gdk_threads_leave ();
+ /* no gdk_threads_leave (), CHECKED */
}
/* Free */
- g_object_unref (helper->headers);
- g_object_unref (helper->dest_folder);
- g_object_unref (helper->mail_op);
+ if (helper->headers)
+ g_object_unref (helper->headers);
+ if (helper->dest_folder)
+ g_object_unref (helper->dest_folder);
+ if (helper->mail_op)
+ g_object_unref (helper->mail_op);
+ if (folder)
+ g_object_unref (folder);
+ if (iter)
+ g_object_unref (iter);
g_slice_free (XFerMsgAsyncHelper, helper);
- g_object_unref (folder);
}
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;
/* 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 */
helper->headers = g_object_ref(headers);
helper->user_callback = user_callback;
helper->user_data = user_data;
+ helper->delete = delete_original;
/* Get account and set it into mail_operation */
priv->account = modest_tny_folder_get_account (src_folder);
static void
on_refresh_folder (TnyFolder *folder,
gboolean cancelled,
- GError **error,
+ GError *error,
gpointer user_data)
{
RefreshAsyncHelper *helper = NULL;
self = helper->mail_op;
priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
- if (*error) {
- priv->error = g_error_copy (*error);
+ g_return_if_fail(priv!=NULL);
+
+ if (error) {
+ priv->error = g_error_copy (error);
priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+ printf("DEBUG: %s: Operation error:\n %s", __FUNCTION__,
+ error->message);
goto out;
}
MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
_("Error trying to refresh the contents of %s"),
tny_folder_get_name (folder));
+ printf("DEBUG: %s: Operation cancelled.\n", __FUNCTION__);
goto out;
}
priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
- out:
+
/* Call user defined callback, if it exists */
if (helper->user_callback) {
- gdk_threads_enter ();
+
+ /* This is not a GDK lock because we are a Tinymail callback and
+ * Tinymail already acquires the Gdk lock */
helper->user_callback (self, folder, helper->user_data);
- gdk_threads_leave ();
}
+ out:
/* Free */
- g_object_unref (helper->mail_op);
g_slice_free (RefreshAsyncHelper, helper);
/* Notify about operation end */
modest_mail_operation_notify_end (self);
+ g_object_unref(self);
}
static void
priv->total = status->of_total;
state = modest_mail_operation_clone_state (self);
+
+ /* This is not a GDK lock because we are a Tinymail callback and
+ * Tinymail already acquires the Gdk lock */
g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
+
g_slice_free (ModestMailOperationState, state);
}
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);
projects / modest / blobdiff