header = tny_msg_get_header (draft_msg);
/* Remove the old draft expunging it */
tny_folder_remove_msg (folder, header, NULL);
- tny_folder_sync (folder, TRUE, NULL);
+ tny_folder_sync (folder, TRUE, &(priv->error));
g_object_unref (header);
}
- tny_folder_add_msg (folder, msg, &(priv->error));
+ if (!priv->error)
+ tny_folder_add_msg (folder, msg, &(priv->error));
+
if (!priv->error)
priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+ else
+ priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
end:
if (msg)
static gboolean
idle_notify_progress (gpointer data)
{
+ gdk_threads_enter ();
+
ModestMailOperation *mail_op = MODEST_MAIL_OPERATION (data);
ModestMailOperationState *state;
g_signal_emit (G_OBJECT (mail_op), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
g_slice_free (ModestMailOperationState, state);
+ gdk_threads_leave ();
+
return TRUE;
}
static gboolean
idle_notify_progress_once (gpointer data)
{
+ gdk_threads_enter ();
+
ModestPair *pair;
pair = (ModestPair *) data;
g_slice_free (ModestMailOperationState, (ModestMailOperationState*)pair->second);
g_object_unref (pair->first);
+ gdk_threads_leave ();
+
return FALSE;
}
time(NULL),
TRUE);
+ gdk_threads_leave ();
+
return FALSE;
}
helper->user_data = user_data;
helper->header = g_object_ref (header);
+ // The callback's reference so that the mail op is not
+ // finalized until the async operation is completed even if
+ // the user canceled the request meanwhile.
+ g_object_ref (G_OBJECT (helper->mail_op));
+
tny_folder_get_msg_async (folder, header, get_msg_cb, get_msg_status_cb, helper);
g_object_unref (G_OBJECT (folder));
goto out;
}
- priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+ /* The mail operation might have been canceled in which case we do not
+ want to notify anyone anymore. */
+ if(priv->status != MODEST_MAIL_OPERATION_STATUS_CANCELED) {
+ priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
- /* If user defined callback function was defined, call it */
- if (helper->user_callback) {
- /* This callback is called into an iddle by tinymail,
- and idles are not in the main lock */
- gdk_threads_enter ();
- helper->user_callback (self, helper->header, msg, helper->user_data);
- gdk_threads_leave ();
+ /* If user defined callback function was defined, call it */
+ if (helper->user_callback) {
+ /* This callback is called into an iddle by tinymail,
+ and idles are not in the main lock */
+ gdk_threads_enter ();
+ helper->user_callback (self, helper->header, msg, helper->user_data);
+ gdk_threads_leave ();
+ }
}
out:
g_slice_free (GetMsgAsyncHelper, helper);
/* Notify about operation end */
- modest_mail_operation_notify_end (self, TRUE);
+ if(priv->status != MODEST_MAIL_OPERATION_STATUS_CANCELED)
+ modest_mail_operation_notify_end (self, TRUE);
+
+ g_object_unref (G_OBJECT (self));
}
static void
self = helper->mail_op;
priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+ if(priv->status == MODEST_MAIL_OPERATION_STATUS_CANCELED)
+ return;
+
if ((status->position == 1) && (status->of_total == 100))
return;