TnyMsg *draft_msg;
SaveToDraftstCallback callback;
gpointer user_data;
-} SaveToDraftsInfo;
+ 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;
-
- priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+ SaveToDraftsAddMsgInfo *info = (SaveToDraftsAddMsgInfo *) userdata;
- 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;
-end:
/* Call the user callback */
if (info->callback)
- info->callback (self, msg, info->user_data);
+ 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 = g_object_ref(info->draft_msg);
+ 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);
+ }
if (drafts)
g_object_unref (G_OBJECT(drafts));
- if (src_folder)
- g_object_unref (G_OBJECT(src_folder));
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
{
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;
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,
/* 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;
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 = tny_list_get_length (headers);
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 */
}
/* Free */
- g_slice_free (RefreshAsyncHelper, helper);
+ g_slice_free (RefreshAsyncHelper, helper);
/* Notify about operation end */
modest_mail_operation_notify_end (self);
projects / modest / blobdiff