typedef struct _ModestMailOperationPrivate ModestMailOperationPrivate;
struct _ModestMailOperationPrivate {
TnyAccount *account;
- gchar *account_name;
guint done;
guint total;
GObject *source;
GError *error;
ErrorCheckingUserCallback error_checking;
gpointer error_checking_user_data;
+ ErrorCheckingUserDataDestroyer error_checking_user_data_destroyer;
ModestMailOperationStatus status;
ModestMailOperationTypeOperation op_type;
};
XferAsyncUserCallback user_callback;
gboolean delete;
gpointer user_data;
+ gint last_total_bytes;
+ gint sum_total_bytes;
+ gint total_bytes;
} XFerMsgAsyncHelper;
typedef void (*ModestMailOperationCreateMsgCallback) (ModestMailOperation *mail_op,
ModestMailOperation*
modest_mail_operation_new_with_error_handling (GObject *source,
ErrorCheckingUserCallback error_handler,
- gpointer user_data)
+ gpointer user_data,
+ ErrorCheckingUserDataDestroyer error_handler_destroyer)
{
ModestMailOperation *obj;
ModestMailOperationPrivate *priv;
g_return_val_if_fail (error_handler != NULL, obj);
priv->error_checking = error_handler;
priv->error_checking_user_data = user_data;
+ priv->error_checking_user_data_destroyer = error_handler_destroyer;
return obj;
}
priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
g_return_if_fail(priv->status != MODEST_MAIL_OPERATION_STATUS_SUCCESS);
+ /* Call the user callback */
if (priv->error_checking != NULL)
priv->error_checking (self, priv->error_checking_user_data);
}
if (info->attachments_list != NULL)
flags |= TNY_HEADER_FLAG_ATTACHMENTS;
- tny_header_set_flags (header, flags);
+ tny_header_set_flag (header, flags);
g_object_unref (G_OBJECT(header));
} else {
priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
if (info->callback) {
CreateMsgIdleInfo *idle_info;
idle_info = g_slice_new0 (CreateMsgIdleInfo);
- idle_info->mail_op = info->mail_op;
- g_object_ref (info->mail_op);
- idle_info->msg = new_msg;
- if (new_msg)
- g_object_ref (new_msg);
+ idle_info->mail_op = g_object_ref (info->mail_op);
+ idle_info->msg = (new_msg) ? g_object_ref (new_msg) : NULL;
idle_info->callback = info->callback;
idle_info->userdata = info->userdata;
g_idle_add (idle_create_msg_cb, idle_info);
CreateMsgInfo *info = NULL;
info = g_slice_new0 (CreateMsgInfo);
- info->mail_op = self;
- g_object_ref (self);
+ info->mail_op = g_object_ref (self);
info->from = g_strdup (from);
info->to = g_strdup (to);
modest_mail_operation_send_mail (self, info->transport_account, msg);
/* 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);
+ 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;
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_INVALID)
+ g_warning ("%s: BUG: folder of type TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
+
if (folder_type == TNY_FOLDER_TYPE_OUTBOX)
src_folder = outbox_folder;
else
priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
priv->op_type = MODEST_MAIL_OPERATION_TYPE_SEND;
+ priv->account = TNY_ACCOUNT (g_object_ref (transport_account));
/* Check parametters */
if (to == NULL) {
{
TnyTransportAccount *transport_account;
TnyMsg *draft_msg;
- ModestMsgEditWindow *edit_window;
+ SaveToDraftstCallback callback;
+ gpointer user_data;
} SaveToDraftsInfo;
static void
else
priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
- if (info->edit_window)
- modest_msg_edit_window_set_draft (info->edit_window, msg);
-
-
end:
+ /* Call the user callback */
+ if (info->callback)
+ info->callback (self, msg, info->user_data);
+
if (drafts)
g_object_unref (G_OBJECT(drafts));
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)
g_object_unref (G_OBJECT (info->draft_msg));
if (info->transport_account)
modest_mail_operation_save_to_drafts (ModestMailOperation *self,
TnyTransportAccount *transport_account,
TnyMsg *draft_msg,
- ModestMsgEditWindow *edit_window,
const gchar *from, const gchar *to,
const gchar *cc, const gchar *bcc,
const gchar *subject, const gchar *plain_body,
const gchar *html_body,
const GList *attachments_list,
const GList *images_list,
- TnyHeaderFlags priority_flags)
+ TnyHeaderFlags priority_flags,
+ SaveToDraftstCallback callback,
+ gpointer user_data)
{
ModestMailOperationPrivate *priv = NULL;
SaveToDraftsInfo *info = NULL;
info = g_slice_new0 (SaveToDraftsInfo);
info->transport_account = g_object_ref (transport_account);
- info->draft_msg = draft_msg;
- if (draft_msg)
- g_object_ref (draft_msg);
- info->edit_window = edit_window;
- if (edit_window)
- g_object_ref (edit_window);
+ info->draft_msg = (draft_msg) ? g_object_ref (draft_msg) : NULL;
+ info->callback = callback;
+ info->user_data = user_data;
modest_mail_operation_notify_start (self);
modest_mail_operation_create_msg (self, from, to, cc, bcc, subject, plain_body, html_body,
priv->total = 0;
if (priv->account != NULL)
g_object_unref (priv->account);
- priv->account = g_object_ref (info->transport_account);
+
+ if (info->transport_account) {
+ priv->account = g_object_ref (info->transport_account);
- send_queue = modest_runtime_get_send_queue (info->transport_account);
- if (send_queue) {
- modest_tny_send_queue_try_to_send (send_queue);
- } else {
- g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
- MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED,
- "cannot create a send queue for %s\n",
- tny_account_get_name (TNY_ACCOUNT (info->transport_account)));
- priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+ send_queue = modest_runtime_get_send_queue (info->transport_account);
+ if (send_queue) {
+ modest_tny_send_queue_try_to_send (send_queue);
+ } else {
+ g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+ MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED,
+ "cannot create a send queue for %s\n",
+ tny_account_get_name (TNY_ACCOUNT (info->transport_account)));
+ priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+ }
}
/* Check if the operation was a success */
}
out:
-
+ /* Set the account back to not busy */
+ modest_account_mgr_set_account_busy (modest_runtime_get_account_mgr(),
+ info->account_name, FALSE);
+
if (info->callback) {
UpdateAccountInfo *idle_info;
if (all_folders)
g_object_unref (all_folders);
g_object_unref (info->account);
- g_object_unref (info->transport_account);
+ if (info->transport_account)
+ g_object_unref (info->transport_account);
+ g_free (info->account_name);
g_free (info->retrieve_type);
g_slice_free (UpdateAccountInfo, info);
goto error;
}
+ priv->account = g_object_ref (store_account);
/* Get the transport account, we can not do it in the thread
due to some problems with dbus */
info->account = store_account;
info->transport_account = transport_account;
info->callback = callback;
+ info->account_name = g_strdup (account_name);
info->user_data = user_data;
/* Get the message size limit */
/* Set account busy */
modest_account_mgr_set_account_busy(mgr, account_name, TRUE);
- priv->account_name = g_strdup(account_name);
modest_mail_operation_notify_start (self);
thread = g_thread_create (update_account_thread, info, FALSE, NULL);
priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
priv->op_type = MODEST_MAIL_OPERATION_TYPE_INFO;
+ priv->account = (TNY_IS_ACCOUNT (parent)) ?
+ g_object_ref (parent) :
+ modest_tny_folder_get_account (TNY_FOLDER (parent));
/* Check for already existing folder */
- if (modest_tny_folder_has_subfolder_with_name (parent, name)) {
+ if (modest_tny_folder_has_subfolder_with_name (parent, name, TRUE)) {
priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
MODEST_MAIL_OPERATION_ERROR_FOLDER_EXISTS,
priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
MODEST_MAIL_OPERATION_ERROR_FOLDER_EXISTS,
- _("ckdg_ib_folder_already_exists"));
+ _CS("ckdg_ib_folder_already_exists"));
return FALSE;
} else
return TRUE;
/* Do not move a parent into a child */
goto error;
} else if (TNY_IS_FOLDER_STORE (parent) &&
- modest_tny_folder_has_subfolder_with_name (parent, folder_name)) {
+ modest_tny_folder_has_subfolder_with_name (parent, folder_name, TRUE)) {
/* Check that the new folder name is not used by any
parent subfolder */
goto error;
priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
priv->op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE;
- /* Get message from folder */
- if (folder) {
- /* Get account and set it into mail_operation */
- priv->account = modest_tny_folder_get_account (TNY_FOLDER(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;
+ helper->user_callback = user_callback;
+ helper->user_data = user_data;
+ helper->header = g_object_ref (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;
-
- helper = g_slice_new0 (GetMsgAsyncHelper);
- helper->mail_op = self;
- helper->user_callback = user_callback;
- 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));
-
- modest_mail_operation_notify_start (self);
- tny_folder_get_msg_async (folder, header, get_msg_cb, get_msg_status_cb, helper);
+ /* 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));
- g_object_unref (G_OBJECT (folder));
- } else {
- /* 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_ITEM_NOT_FOUND,
- _("Error trying to get a message. No folder found for header"));
+ modest_mail_operation_notify_start (self);
+ tny_folder_get_msg_async (folder, header, get_msg_cb, get_msg_status_cb, helper);
- /* Notify the queue */
- modest_mail_operation_notify_end (self);
- }
+ g_object_unref (G_OBJECT (folder));
}
static void
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);
}
/* 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);
+ tny_header_set_flag (header, TNY_HEADER_FLAG_DELETED);
+ tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN);
modest_mail_operation_notify_start (self);
ModestMailOperation *self;
ModestMailOperationPrivate *priv;
ModestMailOperationState *state;
-
+ gboolean is_num_bytes;
g_return_if_fail (status != NULL);
g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_XFER_MSGS);
self = helper->mail_op;
priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
- priv->done = status->position;
- priv->total = status->of_total;
+ /* We know that tinymail sends us information about
+ transferred bytes with this particular message */
+ is_num_bytes = (g_ascii_strcasecmp (status->message, "Retrieving message") == 0);
state = modest_mail_operation_clone_state (self);
+ if (is_num_bytes && !((status->position == 1) && (status->of_total == 100))) {
+ /* We know that we're in a different message when the
+ total number of bytes to transfer is different. Of
+ course it could fail if we're transferring messages
+ of the same size, but this is a workarround */
+ if (status->of_total != helper->last_total_bytes) {
+ priv->done++;
+ helper->sum_total_bytes += helper->last_total_bytes;
+ helper->last_total_bytes = status->of_total;
+ }
+ state->bytes_done += status->position + helper->sum_total_bytes;
+ state->bytes_total = helper->total_bytes;
- /* 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 */
+ /* Notify the status change. Only notify about changes
+ referred to bytes */
+ g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL],
+ 0, state, NULL);
+ }
g_slice_free (ModestMailOperationState, state);
}
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);
+ tny_header_set_flag (header, TNY_HEADER_FLAG_DELETED);
+ tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN);
g_object_unref (header);
tny_iterator_next (iter);
g_slice_free (XFerMsgAsyncHelper, helper);
}
+static guint
+compute_message_list_size (TnyList *headers)
+{
+ TnyIterator *iter;
+ guint size = 0;
+
+ iter = tny_list_create_iterator (headers);
+ while (!tny_iterator_is_done (iter)) {
+ TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
+ size += tny_header_get_message_size (header);
+ g_object_unref (header);
+ tny_iterator_next (iter);
+ }
+ g_object_unref (iter);
+
+ return size;
+}
+
void
modest_mail_operation_xfer_msgs (ModestMailOperation *self,
TnyList *headers,
TnyHeader *header = NULL;
ModestTnyFolderRules rules = 0;
- g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
- g_return_if_fail (TNY_IS_LIST (headers));
- g_return_if_fail (TNY_IS_FOLDER (folder));
+ g_return_if_fail (self && MODEST_IS_MAIL_OPERATION (self));
+ g_return_if_fail (headers && TNY_IS_LIST (headers));
+ g_return_if_fail (folder && TNY_IS_FOLDER (folder));
priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
- priv->total = 1;
+ priv->total = tny_list_get_length (headers);
priv->done = 0;
priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
priv->op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE;
src_folder = tny_header_get_folder (header);
g_object_unref (header);
}
-
g_object_unref (iter);
+ if (src_folder == NULL) {
+ /* Notify the queue */
+ modest_mail_operation_notify_end (self);
+
+ g_warning ("%s: cannot find folder from header", __FUNCTION__);
+ return;
+ }
+
+
/* Check folder source and destination */
if (src_folder == folder) {
/* Set status failed and set an error */
helper->user_callback = user_callback;
helper->user_data = user_data;
helper->delete = delete_original;
+ helper->last_total_bytes = 0;
+ helper->sum_total_bytes = 0;
+ helper->total_bytes = compute_message_list_size (headers);
/* Get account and set it into mail_operation */
priv->account = modest_tny_folder_get_account (src_folder);
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) {
helper->user_callback (self, folder, helper->user_data);
}
- out:
/* Free */
- g_slice_free (RefreshAsyncHelper, helper);
+ g_slice_free (RefreshAsyncHelper, helper);
/* Notify about operation end */
modest_mail_operation_notify_end (self);
priv = MODEST_MAIL_OPERATION_GET_PRIVATE(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);
- g_free(priv->account_name);
- priv->account_name = NULL;
- }
-
/* 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 */
g_signal_emit (G_OBJECT (self), signals[OPERATION_FINISHED_SIGNAL], 0, NULL);
+
+ /* Remove the error user data */
+ if (priv->error_checking_user_data && priv->error_checking_user_data_destroyer)
+ priv->error_checking_user_data_destroyer (priv->error_checking_user_data);
}
TnyAccount *