#include <camel/camel-stream-mem.h>
#include <glib/gi18n.h>
#include <modest-tny-account.h>
+#include <modest-tny-send-queue.h>
+#include <modest-runtime.h>
#include "modest-text-utils.h"
-#include "modest-tny-msg-actions.h"
+#include "modest-tny-msg.h"
#include "modest-tny-platform-factory.h"
#include "modest-marshal.h"
#include "modest-formatter.h"
TnyTransportAccount *transport_account,
TnyMsg* msg)
{
+ TnySendQueue *send_queue;
+
g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account));
- tny_transport_account_send (transport_account, msg, NULL); /* FIXME */
+ send_queue = TNY_SEND_QUEUE (modest_runtime_get_send_queue (transport_account));
+
+ tny_send_queue_add (send_queue, msg);
}
void
add_attachments (new_msg, (GList*) attachments_list);
/* Send mail */
- tny_transport_account_send (transport_account, new_msg, NULL); /* FIXME */
+ modest_mail_operation_send_mail (self, transport_account, new_msg);
/* Clean */
g_object_unref (header);
/* Get body from original msg. Always look for the text/plain
part of the message to create the reply/forwarded mail */
header = tny_msg_get_header (msg);
- body = modest_tny_msg_actions_find_body_part (msg, FALSE);
+ body = modest_tny_msg_find_body_part (msg, FALSE);
/* TODO: select the formatter from account prefs */
formatter = modest_formatter_new ("text/plain");
break;
}
}
- g_object_unref (G_OBJECT (formatter));
-
+ g_object_unref (G_OBJECT(formatter));
+ g_object_unref (G_OBJECT(body));
+
/* Fill the header */
fact = modest_tny_platform_factory_get_instance ();
new_header = TNY_HEADER (tny_platform_factory_new_header (fact));
g_object_unref (G_OBJECT (list));
g_slice_free (RefreshFolderAsyncHelper, helper);
} else {
- tny_folder_refresh_async (TNY_FOLDER (tny_iterator_get_current (helper->iter)),
- folder_refresh_cb,
+ TnyFolder *folder = TNY_FOLDER (tny_iterator_get_current (helper->iter));
+ tny_folder_refresh_async (folder, folder_refresh_cb,
status_update_cb,
helper);
+ g_object_unref (G_OBJECT(folder));
}
g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL);
}
ModestMailOperation *self;
ModestMailOperationPrivate *priv;
RefreshFolderAsyncHelper *helper;
-
+ TnyFolder *folder;
+
self = MODEST_MAIL_OPERATION (user_data);
priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
helper->canceled = 0;
/* Async refresh folders */
- tny_folder_refresh_async (TNY_FOLDER (tny_iterator_get_current (helper->iter)),
- folder_refresh_cb,
- status_update_cb,
- helper);
+ folder = TNY_FOLDER (tny_iterator_get_current (helper->iter));
+ tny_folder_refresh_async (folder, folder_refresh_cb,
+ status_update_cb, helper);
+ g_object_unref (G_OBJECT(folder));
}
gboolean
TnyFolder *trash_folder;
trash_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT(folder_store),
TNY_FOLDER_TYPE_TRASH);
-
/* TODO: error_handling */
- modest_mail_operation_move_folder (self,
- folder,
+ modest_mail_operation_move_folder (self, folder,
TNY_FOLDER_STORE (trash_folder));
} else {
tny_folder_store_remove_folder (folder_store, folder, NULL); /* FIXME */
/* Create the destination folder */
folder_name = tny_folder_get_name (folder);
- dest_folder = modest_mail_operation_create_folder (self,
- parent, folder_name);
+ dest_folder = modest_mail_operation_create_folder (self, parent, folder_name);
/* Transfer messages */
headers = TNY_LIST (tny_simple_list_new ());
iter = tny_list_create_iterator (folders);
while (!tny_iterator_is_done (iter)) {
-
child = TNY_FOLDER (tny_iterator_get_current (iter));
- modest_mail_operation_xfer_folder (self, child,
- TNY_FOLDER_STORE (dest_folder),
+ modest_mail_operation_xfer_folder (self, child, TNY_FOLDER_STORE (dest_folder),
delete_original);
tny_iterator_next (iter);
+ g_object_unref (G_OBJECT(child));
}
/* Delete source folder (if needed) */