static void modest_mail_operation_init (ModestMailOperation *obj);
static void modest_mail_operation_finalize (GObject *obj);
-static void get_msg_cb (TnyFolder *folder,
- gboolean cancelled,
- TnyMsg *msg,
- GError *rr,
- gpointer user_data);
+static void get_msg_async_cb (TnyFolder *folder,
+ gboolean cancelled,
+ TnyMsg *msg,
+ GError *rr,
+ gpointer user_data);
static void get_msg_status_cb (GObject *obj,
TnyStatus *status,
static void modest_mail_operation_notify_start (ModestMailOperation *self);
static void modest_mail_operation_notify_end (ModestMailOperation *self);
+static void notify_progress_of_multiple_messages (ModestMailOperation *self,
+ TnyStatus *status,
+ gint *last_total_bytes,
+ gint *sum_total_bytes,
+ gint total_bytes,
+ gboolean increment_done);
+
+static guint compute_message_list_size (TnyList *headers);
+
enum _ModestMailOperationSignals
{
PROGRESS_CHANGED_SIGNAL,
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;
};
priv->status = new_status;\
}
-typedef struct _GetMsgAsyncHelper {
- ModestMailOperation *mail_op;
+
+typedef struct {
+ GetMsgAsyncUserCallback user_callback;
TnyHeader *header;
- GetMsgAsyncUserCallback user_callback;
gpointer user_data;
-} GetMsgAsyncHelper;
+ ModestMailOperation *mail_op;
+ GDestroyNotify destroy_notify;
+ gint last_total_bytes;
+ gint sum_total_bytes;
+ gint total_bytes;
+} GetMsgInfo;
+
+typedef struct {
+ ModestMailOperation *mail_op;
+ TnyMsg *msg;
+ gulong msg_sent_handler;
+ gulong error_happened_handler;
+} SendMsgInfo;
+
+static void send_mail_msg_sent_handler (TnySendQueue *queue, TnyHeader *header, TnyMsg *msg,
+ guint nth, guint total, gpointer userdata);
+static void send_mail_error_happened_handler (TnySendQueue *queue, TnyHeader *header, TnyMsg *msg,
+ GError *error, gpointer userdata);
+static void common_send_mail_operation_end (TnySendQueue *queue, TnyMsg *msg,
+ SendMsgInfo *info);
typedef struct _RefreshAsyncHelper {
ModestMailOperation *mail_op;
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 (ModestMailOperationTypeOperation op_type,
- GObject *source)
+modest_mail_operation_new (GObject *source)
{
ModestMailOperation *obj;
ModestMailOperationPrivate *priv;
obj = MODEST_MAIL_OPERATION(g_object_new(MODEST_TYPE_MAIL_OPERATION, NULL));
priv = MODEST_MAIL_OPERATION_GET_PRIVATE(obj);
- priv->op_type = op_type;
if (source != NULL)
priv->source = g_object_ref(source);
}
ModestMailOperation*
-modest_mail_operation_new_with_error_handling (ModestMailOperationTypeOperation op_type,
- GObject *source,
+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;
- obj = modest_mail_operation_new (op_type, source);
+ obj = modest_mail_operation_new (source);
priv = MODEST_MAIL_OPERATION_GET_PRIVATE(obj);
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);
}
start/stop operations to allow following calls to the
account */
g_return_val_if_fail (priv->account, FALSE);
- tny_account_cancel (priv->account);
+
+ if (priv->op_type == MODEST_MAIL_OPERATION_TYPE_SEND) {
+ ModestTnySendQueue *queue;
+ queue = modest_runtime_get_send_queue (TNY_TRANSPORT_ACCOUNT (priv->account));
+ /* Cancel sending without removing the item */
+ tny_send_queue_cancel (TNY_SEND_QUEUE (queue), FALSE, NULL);
+ } else {
+ /* Cancel operation */
+ tny_account_cancel (priv->account);
+ }
return canceled;
}
{
TnySendQueue *send_queue = NULL;
ModestMailOperationPrivate *priv;
+ SendMsgInfo *info;
g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account));
/* Get account and set it into mail_operation */
priv->account = g_object_ref (transport_account);
+ priv->op_type = MODEST_MAIL_OPERATION_TYPE_SEND;
priv->done = 1;
priv->total = 1;
MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
"modest: could not find send queue for account\n");
priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+ modest_mail_operation_notify_end (self);
} else {
/* Add the msg to the queue */
msg,
&(priv->error));
- /* TODO: we're setting always success, do the check in
- the handler */
+ priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
+
+ info = g_slice_new0 (SendMsgInfo);
+
+ info->mail_op = g_object_ref (self);
+ info->msg = g_object_ref (msg);
+ info->msg_sent_handler = g_signal_connect (G_OBJECT (send_queue), "msg-sent",
+ G_CALLBACK (send_mail_msg_sent_handler), info);
+ info->error_happened_handler = g_signal_connect (G_OBJECT (send_queue), "error-happened",
+ G_CALLBACK (send_mail_error_happened_handler), info);
+ }
+
+}
+
+static void
+common_send_mail_operation_end (TnySendQueue *queue, TnyMsg *msg,
+ SendMsgInfo *info)
+{
+ if (msg == info->msg) {
+ g_signal_handler_disconnect (queue, info->msg_sent_handler);
+ info->msg_sent_handler = 0;
+ g_signal_handler_disconnect (queue, info->error_happened_handler);
+ info->error_happened_handler = 0;
+ g_object_unref (info->msg);
+ modest_mail_operation_notify_end (info->mail_op);
+ g_object_unref (info->mail_op);
+ g_slice_free (SendMsgInfo, info);
+ }
+}
+
+static void
+send_mail_msg_sent_handler (TnySendQueue *queue, TnyHeader *header, TnyMsg *msg,
+ guint nth, guint total, gpointer userdata)
+{
+ SendMsgInfo *info = (SendMsgInfo *) info;
+
+ if (msg == info->msg) {
+ ModestMailOperationPrivate *priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op);
priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
}
+
+ common_send_mail_operation_end (queue, msg, info);
+}
- if (priv->status == MODEST_MAIL_OPERATION_STATUS_SUCCESS)
- modest_platform_information_banner (NULL, NULL, _("mcen_ib_outbox_waiting_to_be_sent"));
+static void
+send_mail_error_happened_handler (TnySendQueue *queue, TnyHeader *header, TnyMsg *msg,
+ GError *error, gpointer userdata)
+{
+ SendMsgInfo *info = (SendMsgInfo *) info;
- /* TODO: do this in the handler of the "msg-sent"
- signal.Notify about operation end */
- modest_mail_operation_notify_end (self);
+ if (msg == info->msg) {
+ ModestMailOperationPrivate *priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op);
+ priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+ g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+ MODEST_MAIL_OPERATION_ERROR_OPERATION_CANCELED,
+ "modest: send mail failed\n");
+ }
+
+ common_send_mail_operation_end (queue, msg, info);
}
+
static gboolean
idle_create_msg_cb (gpointer idle_data)
{
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)
- flags |= info->priority_flags;
+ tny_header_set_flag (header, info->priority_flags);
/* Set attachment flags in message */
if (info->attachments_list != NULL)
- flags |= TNY_HEADER_FLAG_ATTACHMENTS;
+ tny_header_set_flag (header, TNY_HEADER_FLAG_ATTACHMENTS);
- tny_header_set_flags (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
if (info->transport_account)
g_object_unref (info->transport_account);
g_slice_free (SendNewMailInfo, info);
- modest_mail_operation_notify_end (self);
}
void
g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account));
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;
-} SaveToDraftsInfo;
+ SaveToDraftstCallback callback;
+ gpointer user_data;
+ TnyFolder *drafts;
+ TnyMsg *msg;
+ ModestMailOperation *mailop;
+} SaveToDraftsAddMsgInfo;
static void
-modest_mail_operation_save_to_drafts_cb (ModestMailOperation *self,
- TnyMsg *msg,
- gpointer userdata)
+modest_mail_operation_save_to_drafts_add_msg_cb(TnyFolder *self,
+ gboolean canceled,
+ GError *err,
+ gpointer userdata)
{
- TnyFolder *src_folder = NULL;
- TnyFolder *drafts = NULL;
- TnyHeader *header = NULL;
ModestMailOperationPrivate *priv = NULL;
- SaveToDraftsInfo *info = (SaveToDraftsInfo *) userdata;
+ SaveToDraftsAddMsgInfo *info = (SaveToDraftsAddMsgInfo *) userdata;
- priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
- if (!msg) {
- priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
- g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
- MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED,
- "modest: failed to create a new msg\n");
- goto end;
- }
+ priv = MODEST_MAIL_OPERATION_GET_PRIVATE(info->mailop);
- drafts = modest_tny_account_get_special_folder (TNY_ACCOUNT (info->transport_account),
- TNY_FOLDER_TYPE_DRAFTS);
- if (!drafts) {
- priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
- g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
- MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
- "modest: failed to create a new msg\n");
- goto end;
+ if (priv->error) {
+ g_warning ("%s: priv->error != NULL", __FUNCTION__);
+ g_error_free(priv->error);
}
- if (!priv->error)
- tny_folder_add_msg (drafts, msg, &(priv->error));
+ priv->error = (err == NULL) ? NULL : g_error_copy(err);
if ((!priv->error) && (info->draft_msg != NULL)) {
- header = tny_msg_get_header (info->draft_msg);
- src_folder = tny_header_get_folder (header);
+ TnyHeader *header = tny_msg_get_header (info->draft_msg);
+ TnyFolder *src_folder = tny_header_get_folder (header);
/* Remove the old draft */
tny_folder_remove_msg (src_folder, header, NULL);
/* Synchronize to expunge and to update the msg counts */
- tny_folder_sync_async (drafts, TRUE, NULL, NULL, NULL);
+ tny_folder_sync_async (info->drafts, TRUE, NULL, NULL, NULL);
tny_folder_sync_async (src_folder, TRUE, NULL, NULL, NULL);
- g_object_unref (header);
+ g_object_unref (G_OBJECT(header));
+ g_object_unref (G_OBJECT(src_folder));
}
-
+
if (!priv->error)
priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
else
priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
- if (info->edit_window)
- modest_msg_edit_window_set_draft (info->edit_window, msg);
+ /* Call the user callback */
+ if (info->callback)
+ info->callback (info->mailop, info->msg, info->user_data);
+ if (info->transport_account)
+ g_object_unref (G_OBJECT(info->transport_account));
+ if (info->draft_msg)
+ g_object_unref (G_OBJECT (info->draft_msg));
+ if (info->drafts)
+ g_object_unref (G_OBJECT(info->drafts));
+ if (info->msg)
+ g_object_unref (G_OBJECT (info->msg));
+ g_slice_free (SaveToDraftsAddMsgInfo, info);
+
+ modest_mail_operation_notify_end (info->mailop);
+ g_object_unref(info->mailop);
+}
+
+typedef struct
+{
+ TnyTransportAccount *transport_account;
+ TnyMsg *draft_msg;
+ SaveToDraftstCallback callback;
+ gpointer user_data;
+} SaveToDraftsInfo;
+
+static void
+modest_mail_operation_save_to_drafts_cb (ModestMailOperation *self,
+ TnyMsg *msg,
+ gpointer userdata)
+{
+ TnyFolder *drafts = NULL;
+ ModestMailOperationPrivate *priv = NULL;
+ SaveToDraftsInfo *info = (SaveToDraftsInfo *) userdata;
+
+ priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+
+ if (!msg) {
+ g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+ MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED,
+ "modest: failed to create a new msg\n");
+ } else {
+ drafts = modest_tny_account_get_special_folder (TNY_ACCOUNT (info->transport_account),
+ TNY_FOLDER_TYPE_DRAFTS);
+ if (!drafts) {
+ g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+ MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
+ "modest: failed to create a new msg\n");
+ }
+ }
+
+ if (!priv->error) {
+ SaveToDraftsAddMsgInfo *cb_info = g_slice_new(SaveToDraftsAddMsgInfo);
+ cb_info->transport_account = g_object_ref(info->transport_account);
+ cb_info->draft_msg = info->draft_msg ? g_object_ref(info->draft_msg) : NULL;
+ cb_info->callback = info->callback;
+ cb_info->user_data = info->user_data;
+ cb_info->drafts = g_object_ref(drafts);
+ cb_info->msg = g_object_ref(msg);
+ cb_info->mailop = g_object_ref(self);
+ tny_folder_add_msg_async(drafts, msg, modest_mail_operation_save_to_drafts_add_msg_cb,
+ NULL, cb_info);
+ } else {
+ /* Call the user callback */
+ priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+ if (info->callback)
+ info->callback (self, msg, info->user_data);
+ modest_mail_operation_notify_end (self);
+ }
-end:
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)
g_object_unref (G_OBJECT(info->transport_account));
g_slice_free (SaveToDraftsInfo, info);
-
- modest_mail_operation_notify_end (self);
}
void
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;
/* Get account and set it into mail_operation */
priv->account = g_object_ref (transport_account);
+ priv->op_type = MODEST_MAIL_OPERATION_TYPE_INFO;
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,
{
ModestMailOperation *mail_op = MODEST_MAIL_OPERATION (data);
- /* Do not need to block, the notify end will do it for us */
+ gdk_threads_enter ();
modest_mail_operation_notify_end (mail_op);
+ gdk_threads_leave ();
g_object_unref (mail_op);
return FALSE;
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);
priv->total = 0;
priv->done = 0;
priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
+ priv->op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE;
/* Get the store account */
store_account = (TnyStoreAccount *)
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);
g_return_val_if_fail (name, 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,
/* Get the account */
account = modest_tny_folder_get_account (folder);
priv->account = g_object_ref(account);
+ priv->op_type = MODEST_MAIL_OPERATION_TYPE_DELETE;
/* Delete folder or move to trash */
if (remove_to_trash) {
}
} else {
TnyFolderStore *parent = tny_folder_get_folder_store (folder);
+ if (parent) {
+ modest_mail_operation_notify_start (self);
+ 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;
- modest_mail_operation_notify_start (self);
- 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));
+ g_object_unref (parent);
+ } else
+ g_warning ("%s: could not get parent folder", __FUNCTION__);
}
g_object_unref (G_OBJECT (account));
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;
error_msg = _("mail_in_ui_folder_move_target_error");
/* Get account and set it into mail_operation */
+ priv->op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE;
priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder));
priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
/* 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;
/* 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_INFO;
/* Check folder rules */
rules = modest_tny_folder_get_rules (TNY_FOLDER (folder));
GetMsgAsyncUserCallback user_callback,
gpointer user_data)
{
- GetMsgAsyncHelper *helper = NULL;
+ GetMsgInfo *helper = NULL;
TnyFolder *folder;
ModestMailOperationPrivate *priv;
folder = tny_header_get_folder (header);
priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
+ priv->op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE;
+ priv->total = 1;
+ priv->done = 0;
- /* Get message from folder */
- 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;
- 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);
-
- 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"));
-
- /* Notify the queue */
- modest_mail_operation_notify_end (self);
- }
-}
-
-static void
-get_msg_cb (TnyFolder *folder,
- gboolean cancelled,
- TnyMsg *msg,
- GError *error,
- gpointer user_data)
-{
- GetMsgAsyncHelper *helper = NULL;
- ModestMailOperation *self = NULL;
- ModestMailOperationPrivate *priv = NULL;
-
- helper = (GetMsgAsyncHelper *) user_data;
- g_return_if_fail (helper != NULL);
- self = helper->mail_op;
- g_return_if_fail (MODEST_IS_MAIL_OPERATION(self));
- priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
-
- /* Check errors and cancel */
- 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;
- 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));
- } else {
- priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
- }
-
- /* If user defined callback function was defined, call it even
- if the operation failed*/
- if (helper->user_callback) {
- /* This is not a GDK lock because we are a Tinymail callback
- * which is already GDK locked by Tinymail */
+ /* 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;
+
+ /* Create the helper */
+ helper = g_slice_new0 (GetMsgInfo);
+ helper->header = g_object_ref (header);
+ helper->mail_op = g_object_ref (self);
+ helper->user_callback = user_callback;
+ helper->user_data = user_data;
+ helper->destroy_notify = NULL;
+ helper->last_total_bytes = 0;
+ helper->sum_total_bytes = 0;
+ helper->total_bytes = tny_header_get_message_size (header);
- /* no gdk_threads_enter (), CHECKED */
- helper->user_callback (self, helper->header, msg, helper->user_data);
- /* no gdk_threads_leave (), CHECKED */
- }
+ modest_mail_operation_notify_start (self);
+ tny_folder_get_msg_async (folder, header, get_msg_async_cb, get_msg_status_cb, helper);
- /* Notify about operation end */
- modest_mail_operation_notify_end (self);
- /* Free */
- g_object_unref (helper->mail_op);
- g_object_unref (helper->header);
- g_slice_free (GetMsgAsyncHelper, helper);
-
+ g_object_unref (G_OBJECT (folder));
}
static void
TnyStatus *status,
gpointer user_data)
{
- GetMsgAsyncHelper *helper = NULL;
- ModestMailOperation *self;
- ModestMailOperationPrivate *priv;
- ModestMailOperationState *state;
+ GetMsgInfo *helper = NULL;
g_return_if_fail (status != NULL);
g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_GET_MSG);
- helper = (GetMsgAsyncHelper *) user_data;
+ helper = (GetMsgInfo *) user_data;
g_return_if_fail (helper != NULL);
- self = helper->mail_op;
- priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
-
- 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);
-}
-
-/****************************************************/
-typedef struct {
- ModestMailOperation *mail_op;
- TnyList *headers;
- GetMsgAsyncUserCallback user_callback;
- gpointer user_data;
- GDestroyNotify notify;
-} GetFullMsgsInfo;
-
-typedef struct {
- GetMsgAsyncUserCallback user_callback;
- TnyHeader *header;
- TnyMsg *msg;
- gpointer user_data;
- ModestMailOperation *mail_op;
-} NotifyGetMsgsInfo;
-
-
-/*
- * Used by get_msgs_full_thread to call the user_callback for each
- * message that has been read
- */
-static gboolean
-notify_get_msgs_full (gpointer data)
-{
- NotifyGetMsgsInfo *info;
-
- info = (NotifyGetMsgsInfo *) data;
-
- /* 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 (); /* CHECKED */
-
- g_slice_free (NotifyGetMsgsInfo, info);
-
- return FALSE;
+ /* Notify progress */
+ notify_progress_of_multiple_messages (helper->mail_op, status, &(helper->last_total_bytes),
+ &(helper->sum_total_bytes), helper->total_bytes, FALSE);
}
-/*
- * Used by get_msgs_full_thread to free al the thread resources and to
- * call the destroy function for the passed user_data
- */
-static gboolean
-get_msgs_full_destroyer (gpointer data)
-{
- GetFullMsgsInfo *info;
-
- info = (GetFullMsgsInfo *) data;
-
- if (info->notify) {
-
- /* 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 (); /* CHECKED */
- }
-
- /* free */
- g_object_unref (info->headers);
- g_slice_free (GetFullMsgsInfo, info);
-
- return FALSE;
-}
-
-static gpointer
-get_msgs_full_thread (gpointer thr_user_data)
+static void
+get_msg_async_cb (TnyFolder *folder,
+ gboolean canceled,
+ TnyMsg *msg,
+ GError *err,
+ gpointer user_data)
{
- GetFullMsgsInfo *info;
+ GetMsgInfo *info = NULL;
ModestMailOperationPrivate *priv = NULL;
- TnyIterator *iter = NULL;
-
- info = (GetFullMsgsInfo *) thr_user_data;
- priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op);
+ gboolean finished;
- iter = tny_list_create_iterator (info->headers);
- while (!tny_iterator_is_done (iter)) {
- TnyHeader *header;
- TnyFolder *folder;
-
- 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;
+ info = (GetMsgInfo *) user_data;
- /* Get message from folder */
- if (folder) {
- TnyMsg *msg;
- /* The callback will call it per each header */
- msg = tny_folder_get_msg (folder, header, &(priv->error));
-
- if (msg) {
- ModestMailOperationState *state;
- ModestPair *pair;
-
- priv->done++;
-
- /* notify progress */
- state = modest_mail_operation_clone_state (info->mail_op);
- pair = modest_pair_new (g_object_ref (info->mail_op), state, FALSE);
- g_idle_add_full (G_PRIORITY_HIGH_IDLE, idle_notify_progress_once,
- pair, (GDestroyNotify) modest_pair_free);
+ priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op);
+ priv->done++;
+ finished = (priv->done == priv->total) ? TRUE : FALSE;
- /* The callback is the responsible for
- freeing the message */
- if (info->user_callback) {
- NotifyGetMsgsInfo *info_notify;
- info_notify = g_slice_new0 (NotifyGetMsgsInfo);
- info_notify->user_callback = info->user_callback;
- info_notify->mail_op = info->mail_op;
- info_notify->header = g_object_ref (header);
- info_notify->msg = g_object_ref (msg);
- info_notify->user_data = info->user_data;
- g_idle_add_full (G_PRIORITY_HIGH_IDLE,
- notify_get_msgs_full,
- info_notify, NULL);
- }
- g_object_unref (msg);
- }
- } else {
- /* Set status failed and set an error */
- priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+ /* Check errors */
+ if (canceled || err) {
+ priv->status = MODEST_MAIL_OPERATION_STATUS_FINISHED_WITH_ERRORS;
+ if (!priv->error)
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");
- }
-
- if (header)
- g_object_unref (header);
-
- tny_iterator_next (iter);
+ err->message);
+ } else {
+ /* Set the success status before calling the user callback */
+ if (finished && priv->status == MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS)
+ priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
}
- /* Set operation status */
- if (priv->status == MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS)
- priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
- /* Notify about operation end */
- g_idle_add (idle_notify_queue, g_object_ref (info->mail_op));
+ /* Call the user callback */
+ if (info->user_callback)
+ info->user_callback (info->mail_op, info->header, canceled,
+ msg, err, info->user_data);
- /* 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);
+ /* Notify about operation end if this is the last callback */
+ if (finished) {
+ /* Free user data */
+ if (info->destroy_notify)
+ info->destroy_notify (info->user_data);
- return NULL;
+ /* Notify about operation end */
+ modest_mail_operation_notify_end (info->mail_op);
+ }
+
+ /* Clean */
+ g_object_unref (info->header);
+ g_object_unref (info->mail_op);
+ g_slice_free (GetMsgInfo, info);
}
void
gpointer user_data,
GDestroyNotify notify)
{
- TnyHeader *header = NULL;
- TnyFolder *folder = NULL;
- GThread *thread;
ModestMailOperationPrivate *priv = NULL;
- GetFullMsgsInfo *info = NULL;
gboolean size_ok = TRUE;
gint max_size;
TnyIterator *iter = NULL;
/* Init mail operation */
priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
+ priv->op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE;
priv->done = 0;
priv->total = tny_list_get_length(header_list);
/* Get account and set it into mail_operation */
if (tny_list_get_length (header_list) >= 1) {
iter = tny_list_create_iterator (header_list);
- header = TNY_HEADER (tny_iterator_get_current (iter));
+ TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
if (header) {
- folder = tny_header_get_folder (header);
+ TnyFolder *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);
}
always retrieve it */
if (iter != NULL) {
while (!tny_iterator_is_done (iter) && size_ok) {
- header = TNY_HEADER (tny_iterator_get_current (iter));
+ TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
if (header) {
if (tny_header_get_message_size (header) >= max_size)
size_ok = FALSE;
}
if (size_ok) {
- /* Create the info */
- info = g_slice_new0 (GetFullMsgsInfo);
- info->mail_op = self;
- info->user_callback = user_callback;
- info->user_data = user_data;
- info->headers = g_object_ref (header_list);
- info->notify = notify;
-
modest_mail_operation_notify_start (self);
- thread = g_thread_create (get_msgs_full_thread, info, FALSE, NULL);
+
+ iter = tny_list_create_iterator (header_list);
+ while (!tny_iterator_is_done (iter)) {
+ GetMsgInfo *msg_info = NULL;
+ TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
+ TnyFolder *folder = tny_header_get_folder (header);
+
+ /* Create the message info */
+ msg_info = g_slice_new0 (GetMsgInfo);
+ msg_info->mail_op = g_object_ref (self);
+ msg_info->header = g_object_ref (header);
+ msg_info->user_callback = user_callback;
+ msg_info->user_data = user_data;
+ msg_info->destroy_notify = notify;
+ msg_info->last_total_bytes = 0;
+ msg_info->sum_total_bytes = 0;
+ msg_info->total_bytes = compute_message_list_size (header_list);
+
+ /* The callback will call it per each header */
+ tny_folder_get_msg_async (folder, header, get_msg_async_cb, get_msg_status_cb, msg_info);
+
+ /* Free and go on */
+ g_object_unref (header);
+ g_object_unref (folder);
+ tny_iterator_next (iter);
+ }
+ g_object_unref (iter);
} else {
/* Set status failed and set an error */
priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
/* 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) {
- 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);
- 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 */
+ if (TNY_IS_CAMEL_IMAP_FOLDER (folder) ||
+ TNY_IS_CAMEL_POP_FOLDER (folder))
+ tny_folder_sync_async(folder, FALSE, NULL, NULL, NULL); /* FALSE --> dont expunge */
else
- /* local folders */
-/* tny_folder_sync_async(folder, TRUE, NULL, NULL, NULL); /\* TRUE --> expunge *\/ */
- tny_folder_sync (folder, TRUE, &(priv->error)); /* TRUE --> expunge */
+ tny_folder_sync_async(folder, TRUE, NULL, NULL, NULL); /* TRUE --> expunge */
}
ModestMailOperationPrivate *priv;
TnyIterator *iter = NULL;
TnyHeader *header = NULL;
+ TnyList *remove_headers = NULL;
+ TnyFolderType folder_type = TNY_FOLDER_TYPE_UNKNOWN;
g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
g_return_if_fail (TNY_IS_LIST (headers));
priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+ remove_headers = g_object_ref(headers);
+
/* 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);
-
+
+ /* Don't remove messages that are being sent */
+ if (modest_tny_folder_is_local_folder (folder)) {
+ folder_type = modest_tny_folder_get_local_or_mmc_folder_type (folder);
+ }
+ if (folder_type == TNY_FOLDER_TYPE_OUTBOX) {
+ TnyTransportAccount *traccount = NULL;
+ ModestTnyAccountStore *accstore = modest_runtime_get_account_store();
+ traccount = modest_tny_account_store_get_transport_account_from_outbox_header(accstore, header);
+ if (traccount) {
+ ModestTnySendQueueStatus status;
+ ModestTnySendQueue *send_queue = modest_runtime_get_send_queue(traccount);
+ TnyIterator *iter = tny_list_create_iterator(headers);
+ g_object_unref(remove_headers);
+ remove_headers = TNY_LIST(tny_simple_list_new());
+ while (!tny_iterator_is_done(iter)) {
+ char *msg_id;
+ TnyHeader *hdr = TNY_HEADER(tny_iterator_get_current(iter));
+ msg_id = modest_tny_send_queue_get_msg_id (hdr);
+ status = modest_tny_send_queue_get_msg_status(send_queue, msg_id);
+ if (status != MODEST_TNY_SEND_QUEUE_SENDING) {
+ tny_list_append(remove_headers, G_OBJECT(hdr));
+ }
+ g_object_unref(hdr);
+ g_free(msg_id);
+ tny_iterator_next(iter);
+ }
+ g_object_unref(iter);
+ g_object_unref(traccount);
+ }
+ }
+
/* 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 */
modest_mail_operation_notify_start (self);
- tny_folder_remove_msgs (folder, headers, &(priv->error));
+ tny_folder_remove_msgs (folder, remove_headers, &(priv->error));
if (!priv->error) {
if (TNY_IS_CAMEL_IMAP_FOLDER (folder) ||
TNY_IS_CAMEL_POP_FOLDER (folder))
priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
/* Free */
+ g_object_unref (remove_headers);
g_object_unref (header);
g_object_unref (iter);
g_object_unref (G_OBJECT (folder));
modest_mail_operation_notify_end (self);
}
-
static void
-transfer_msgs_status_cb (GObject *obj,
- TnyStatus *status,
- gpointer user_data)
+notify_progress_of_multiple_messages (ModestMailOperation *self,
+ TnyStatus *status,
+ gint *last_total_bytes,
+ gint *sum_total_bytes,
+ gint total_bytes,
+ gboolean increment_done)
{
- XFerMsgAsyncHelper *helper = NULL;
- ModestMailOperation *self;
ModestMailOperationPrivate *priv;
ModestMailOperationState *state;
+ gboolean is_num_bytes;
+ priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
- g_return_if_fail (status != NULL);
- g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_XFER_MSGS);
-
- helper = (XFerMsgAsyncHelper *) user_data;
- g_return_if_fail (helper != NULL);
-
- 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 != *last_total_bytes) {
+ /* We need to increment the done when there is
+ no information about each individual
+ message, we need to do this in message
+ transfers, and we don't do it for getting
+ messages */
+ if (increment_done)
+ priv->done++;
+ *sum_total_bytes += *last_total_bytes;
+ *last_total_bytes = status->of_total;
+ }
+ state->bytes_done += status->position + *sum_total_bytes;
+ state->bytes_total = total_bytes;
- /* This is not a GDK lock because we are a Tinymail callback and
- * Tinymail already acquires the Gdk lock */
+ /* Notify the status change. Only notify about changes
+ referred to bytes */
+ g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL],
+ 0, state, NULL);
+ }
- /* no gdk_threads_enter (), CHECKED */
+ g_slice_free (ModestMailOperationState, state);
+}
- g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
+static void
+transfer_msgs_status_cb (GObject *obj,
+ TnyStatus *status,
+ gpointer user_data)
+{
+ XFerMsgAsyncHelper *helper;
- /* no gdk_threads_leave (), CHECKED */
+ g_return_if_fail (status != NULL);
+ g_return_if_fail (status->code == TNY_FOLDER_STATUS_CODE_XFER_MSGS);
- g_slice_free (ModestMailOperationState, state);
+ helper = (XFerMsgAsyncHelper *) user_data;
+ g_return_if_fail (helper != NULL);
+
+ /* Notify progress */
+ notify_progress_of_multiple_messages (helper->mail_op, status, &(helper->last_total_bytes),
+ &(helper->sum_total_bytes), helper->total_bytes, TRUE);
}
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;
/* Apply folder rules */
rules = modest_tny_folder_get_rules (TNY_FOLDER (folder));
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 */
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"));
+ _("mail_in_ui_folder_copy_target_error"));
/* Notify the queue */
modest_mail_operation_notify_end (self);
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);
/* Get account and set it into mail_operation */
priv->account = modest_tny_folder_get_account (folder);
+ priv->op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE;
/* Create the helper */
helper = g_slice_new0 (RefreshAsyncHelper);
priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
/* Ensure that all the fields are filled correctly */
-/* g_return_if_fail (priv->account != NULL); */
-/* g_return_if_fail (priv->op_type != MODEST_MAIL_OPERATION_TYPE_UNKNOWN); */
- g_assert (priv->account != NULL);
- g_assert (priv->op_type != MODEST_MAIL_OPERATION_TYPE_UNKNOWN);
+ g_return_if_fail (priv->op_type != MODEST_MAIL_OPERATION_TYPE_UNKNOWN);
/* Notify the observers about the mail operation. We do not
wrapp this emission because we assume that this function is
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 *
return (priv->account) ? g_object_ref (priv->account) : NULL;
}
+
+void
+modest_mail_operation_noop (ModestMailOperation *self)
+{
+ ModestMailOperationPrivate *priv = NULL;
+
+ g_return_if_fail (self);
+
+ priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+ priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+ priv->op_type = MODEST_MAIL_OPERATION_TYPE_INFO;
+ priv->done = 0;
+ priv->total = 0;
+
+ /* This mail operation does nothing actually */
+ modest_mail_operation_notify_start (self);
+ modest_mail_operation_notify_end (self);
+}
projects / modest / blobdiff