#include <tny-simple-list.h>
#include <tny-send-queue.h>
#include <tny-status.h>
+#include <tny-error.h>
#include <tny-folder-observer.h>
#include <camel/camel-stream-mem.h>
#include <glib/gi18n.h>
+#include <modest-defs.h>
#include "modest-platform.h"
#include "modest-account-mgr-helpers.h"
#include <modest-tny-account.h>
static gboolean _check_memory_low (ModestMailOperation *mail_op);
+
+typedef struct {
+ ModestTnySendQueue *queue;
+ ModestMailOperation *self;
+ guint error_handler;
+ guint start_handler;
+ guint stop_handler;
+} RunQueueHelper;
+
+static void run_queue_notify_and_destroy (RunQueueHelper *helper,
+ ModestMailOperationStatus status);
+
/* Helpers for the update account operation (send & receive)*/
typedef struct
{
ModestMailOperationState *state;
ModestMailOperationPrivate *priv;
- /* FIXME: this should be fixed properly
- *
- * in some cases, priv was NULL, so checking here to
- * make sure.
- */
g_return_val_if_fail (self, NULL);
priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
g_return_val_if_fail (priv, NULL);
} SendNewMailHelper;
static void
-send_mail_common_cb (gboolean cancelled,
- GError *err,
- SendNewMailHelper *helper)
+send_mail_on_sync_async_cb (TnyFolder *folder,
+ gboolean cancelled,
+ GError *err,
+ gpointer user_data)
{
ModestMailOperationPrivate *priv;
ModestMailOperation *self;
+ SendNewMailHelper *helper;
+ helper = (SendNewMailHelper *) user_data;
self = helper->mail_op;
priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
}
static void
-send_mail_on_sync_async_cb (TnyFolder *self,
- gboolean cancelled,
- GError *err,
- gpointer user_data)
+run_queue_start (TnySendQueue *self,
+ gpointer user_data)
{
- send_mail_common_cb (cancelled, err, (SendNewMailHelper *) user_data);
+ RunQueueHelper *helper = (RunQueueHelper *) user_data;
+ ModestMailOperation *mail_op;
+
+ g_debug ("%s sending queue successfully started", __FUNCTION__);
+
+ /* Wait for the message to be sent */
+ mail_op = modest_mail_operation_new (NULL);
+ modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+ mail_op);
+ modest_mail_operation_run_queue (mail_op, helper->queue);
+ g_object_unref (mail_op);
+
+ /* Free the helper and end operation */
+ run_queue_notify_and_destroy (helper, MODEST_MAIL_OPERATION_STATUS_SUCCESS);
+}
+
+static void
+run_queue_error_happened (TnySendQueue *queue,
+ TnyHeader *header,
+ TnyMsg *msg,
+ GError *error,
+ gpointer user_data)
+{
+ RunQueueHelper *helper = (RunQueueHelper *) user_data;
+ ModestMailOperationPrivate *priv;
+
+ /* If we are here this means that the send queue could not
+ start to send emails. Shouldn't happen as this means that
+ we could not create the thread */
+ g_debug ("%s sending queue failed to create the thread", __FUNCTION__);
+
+ priv = MODEST_MAIL_OPERATION_GET_PRIVATE (helper->self);
+ priv->error = g_error_copy ((const GError *) error);
+
+ if (error->code != TNY_SYSTEM_ERROR_UNKNOWN) {
+ /* This code is here for safety reasons. It should
+ never be called, because that would mean that we
+ are not controlling some error case */
+ g_warning ("%s Error %s should not happen",
+ __FUNCTION__, error->message);
+ }
+
+ /* Free helper and end operation */
+ run_queue_notify_and_destroy (helper, MODEST_MAIL_OPERATION_STATUS_FAILED);
}
static void
GError *err,
gpointer user_data)
{
- send_mail_common_cb (cancelled, err, (SendNewMailHelper *) user_data);
+ ModestMailOperationPrivate *priv;
+ ModestMailOperation *self;
+ SendNewMailHelper *helper;
+
+ helper = (SendNewMailHelper *) user_data;
+ self = helper->mail_op;
+ priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+
+ if (cancelled || err)
+ goto end;
+
+ if (err) {
+ g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+ MODEST_MAIL_OPERATION_ERROR_SEND_QUEUE_ADD_ERROR,
+ "Error adding a msg to the send queue\n");
+ priv->status = MODEST_MAIL_OPERATION_STATUS_FINISHED_WITH_ERRORS;
+ } else {
+ priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+ }
+
+ end:
+ if (helper->notify) {
+ TnyTransportAccount *trans_account;
+ ModestTnySendQueue *queue;
+
+ trans_account = (TnyTransportAccount *) modest_mail_operation_get_account (self);
+ queue = modest_runtime_get_send_queue (trans_account, TRUE);
+ if (queue) {
+ RunQueueHelper *helper;
+
+ /* Create the helper */
+ helper = g_slice_new0 (RunQueueHelper);
+ helper->queue = g_object_ref (queue);
+ helper->self = g_object_ref (self);
+
+ /* if sending is ongoing wait for the queue to
+ stop. Otherwise wait for the queue-start
+ signal. It could happen that the queue
+ could not start, then check also the error
+ happened signal */
+ if (modest_tny_send_queue_sending_in_progress (queue)) {
+ run_queue_start (TNY_SEND_QUEUE (queue), helper);
+ } else {
+ helper->start_handler = g_signal_connect (queue, "queue-start",
+ G_CALLBACK (run_queue_start),
+ helper);
+ helper->error_handler = g_signal_connect (queue, "error-happened",
+ G_CALLBACK (run_queue_error_happened),
+ helper);
+ }
+ } else {
+ /* Finalize this mail operation */
+ modest_mail_operation_notify_end (self);
+ }
+ g_object_unref (trans_account);
+ }
+
+ g_object_unref (helper->mail_op);
+ g_slice_free (SendNewMailHelper, helper);
}
static gboolean
TnyHeader *header = tny_msg_get_header (info->draft_msg);
TnyFolder *src_folder = tny_header_get_folder (header);
+ g_debug ("--- REMOVE AND SYNC");
/* 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 (info->drafts, TRUE, NULL, NULL, NULL);
tny_folder_sync_async (src_folder, TRUE, NULL, NULL, NULL);
+ g_debug ("--- REMOVED - SYNCED");
g_object_unref (G_OBJECT(header));
g_object_unref (G_OBJECT(src_folder));
info->callback = callback;
info->user_data = user_data;
+ g_debug ("--- CREATE MESSAGE");
modest_mail_operation_notify_start (self);
modest_mail_operation_create_msg (self, from, to, cc, bcc, subject, plain_body, html_body,
attachments_list, images_list, priority_flags,
static void
foreach_add_item (gpointer header, gpointer user_data)
{
- tny_list_prepend (TNY_LIST (user_data),
- G_OBJECT (header));
+ tny_list_append (TNY_LIST (user_data), G_OBJECT (header));
}
/* This is the method that looks for new messages in a folder */
update_account_send_mail (UpdateAccountInfo *info)
{
TnyTransportAccount *transport_account = NULL;
+ ModestTnyAccountStore *account_store;
+
+ account_store = modest_runtime_get_account_store ();
+
+ /* We don't try to send messages while sending mails is blocked */
+ if (modest_tny_account_store_is_send_mail_blocked (account_store))
+ return;
/* Get the transport account */
- transport_account = (TnyTransportAccount *)
- modest_tny_account_store_get_transport_account_for_open_connection (modest_runtime_get_account_store(),
- info->account_name);
+ transport_account = (TnyTransportAccount *)
+ modest_tny_account_store_get_server_account (account_store, info->account_name,
+ TNY_ACCOUNT_TYPE_TRANSPORT);
if (transport_account) {
ModestTnySendQueue *send_queue;
}
if (num_messages != 0) {
+ ModestMailOperation *mail_op;
/* Reenable suspended items */
- modest_tny_send_queue_wakeup (MODEST_TNY_SEND_QUEUE (send_queue));
+ mail_op = modest_mail_operation_new (NULL);
+ modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+ mail_op);
+ modest_mail_operation_queue_wakeup (mail_op, MODEST_TNY_SEND_QUEUE (send_queue));
/* Try to send */
tny_camel_send_queue_flush (TNY_CAMEL_SEND_QUEUE (send_queue));
UpdateAccountInfo *info;
ModestMailOperationPrivate *priv;
TnyIterator *new_headers_iter;
- GPtrArray *new_headers_array = NULL;
+ GPtrArray *new_headers_array = NULL;
gint max_size, retrieve_limit, i;
ModestAccountMgr *mgr;
ModestAccountRetrieveType retrieve_type;
priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op);
mgr = modest_runtime_get_account_mgr ();
- /* Set the last updated as the current time, do it even if the inbox refresh failed */
- modest_account_mgr_set_last_updated (mgr, tny_account_get_id (priv->account), time (NULL));
-
if (canceled || err) {
priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
if (err)
goto send_mail;
}
+ /* Set the last updated as the current time */
+ modest_account_mgr_set_last_updated (mgr, tny_account_get_id (priv->account), time (NULL));
+
/* Get the message max size */
max_size = modest_conf_get_int (modest_runtime_get_conf (),
MODEST_CONF_MSG_SIZE_LIMIT, NULL);
/* Add pending call */
info->pending_calls++;
- tny_folder_store_get_folders_async (folder, folders, NULL,
+ tny_folder_store_get_folders_async (folder, folders, NULL, FALSE,
recurse_folders_async_cb,
NULL, info);
g_object_unref (folders);
/* Get all folders and continue in the callback */
folders = tny_simple_list_new ();
tny_folder_store_get_folders_async (TNY_FOLDER_STORE (priv->account),
- folders, NULL,
+ folders, NULL, FALSE,
recurse_folders_async_cb,
NULL, info);
g_object_unref (folders);
g_slice_free (ModestMailOperationState, state);
}
-
static void
transfer_folder_cb (TnyFolder *folder,
gboolean cancelled,
ModestMailOperationPrivate *priv = NULL;
helper = (XFerFolderAsyncHelper *) user_data;
- g_return_if_fail (helper != NULL);
+ g_return_if_fail (helper != NULL);
self = helper->mail_op;
priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
priv->done = 1;
priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
}
-
+
+ /* Update state of new folder */
+ tny_folder_refresh_async (new_folder, NULL, NULL, NULL);
+ tny_folder_poke_status (new_folder);
+
/* Notify about operation end */
modest_mail_operation_notify_end (self);
{
gboolean expunge, leave_on_server;
const gchar *account_name;
- const gchar *proto;
TnyAccount *account;
- ModestTransportStoreProtocol account_proto = MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN;
+ ModestProtocolType account_proto = MODEST_PROTOCOL_REGISTRY_TYPE_INVALID;
ModestMailOperation *self;
ModestMailOperationPrivate *priv;
+ ModestProtocolRegistry *protocol_registry;
self = (ModestMailOperation *) user_data;
priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+ protocol_registry = modest_runtime_get_protocol_registry ();
if (canceled || err) {
/* If canceled by the user, ignore the error given by Tinymail */
leave_on_server =
modest_account_mgr_get_leave_on_server (modest_runtime_get_account_mgr (),
account_name);
- proto = tny_account_get_proto (account);
+ account_proto = modest_tny_account_get_protocol_type (account);
g_object_unref (account);
- if (proto)
- account_proto = modest_protocol_info_get_transport_store_protocol (proto);
-
- if (((account_proto == MODEST_PROTOCOL_STORE_POP) && !leave_on_server) ||
- modest_tny_folder_is_remote_folder (folder) == FALSE)
+ if ((modest_protocol_registry_protocol_type_has_leave_on_server (protocol_registry, account_proto) &&
+ !leave_on_server) ||
+ !modest_tny_folder_is_remote_folder (folder))
expunge = TRUE;
else
expunge = FALSE;
-
+
/* Sync folder */
tny_folder_sync_async(folder, expunge, sync_folder_finish_callback,
NULL, self);
/* We know that tinymail sends us information about
* transferred bytes with this particular message
- *
- * (FIXME: this is very ugly, and no I (djcb) didn't write this code,
- * I just added the 'if' so we don't get runtime warning)
*/
if (status->message)
is_num_bytes = (g_ascii_strcasecmp (status->message, "Retrieving message") == 0);
TnyAccount *dst_account = NULL;
gboolean leave_on_server;
ModestMailOperationState *state;
+ ModestProtocolRegistry *protocol_registry;
+ ModestProtocolType account_protocol;
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);
+ protocol_registry = modest_runtime_get_protocol_registry ();
+
priv->total = tny_list_get_length (headers);
priv->done = 0;
priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
this could cause an error if we're offline while
transferring an already downloaded message from a POP
account */
- if (modest_protocol_info_get_transport_store_protocol (tny_account_get_proto (priv->account)) ==
- MODEST_PROTOCOL_STORE_POP) {
+ account_protocol = modest_tny_account_get_protocol_type (priv->account);
+ if (modest_protocol_registry_protocol_type_has_leave_on_server (protocol_registry, account_protocol)) {
const gchar *account_name;
account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (priv->account);
}
static void
-run_queue_stop (ModestTnySendQueue *queue,
- ModestMailOperation *self)
+run_queue_notify_and_destroy (RunQueueHelper *helper,
+ ModestMailOperationStatus status)
{
ModestMailOperationPrivate *priv;
- g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
- g_return_if_fail (MODEST_IS_TNY_SEND_QUEUE (queue));
- priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+ /* Disconnect */
+ if (helper->error_handler &&
+ g_signal_handler_is_connected (helper->queue, helper->error_handler))
+ g_signal_handler_disconnect (helper->queue, helper->error_handler);
+ if (helper->start_handler &&
+ g_signal_handler_is_connected (helper->queue, helper->start_handler))
+ g_signal_handler_disconnect (helper->queue, helper->start_handler);
+ if (helper->stop_handler &&
+ g_signal_handler_is_connected (helper->queue, helper->stop_handler))
+ g_signal_handler_disconnect (helper->queue, helper->stop_handler);
- priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+ /* Set status */
+ priv = MODEST_MAIL_OPERATION_GET_PRIVATE (helper->self);
+ priv->status = status;
- modest_mail_operation_notify_end (self);
- g_signal_handlers_disconnect_by_func (queue, run_queue_stop, self);
- g_object_unref (self);
+ /* Notify end */
+ modest_mail_operation_notify_end (helper->self);
+
+ /* Free data */
+ g_object_unref (helper->queue);
+ g_object_unref (helper->self);
+ g_slice_free (RunQueueHelper, helper);
+}
+
+static void
+run_queue_stop (ModestTnySendQueue *queue,
+ gpointer user_data)
+{
+ RunQueueHelper *helper;
+
+ g_debug ("%s sending queue stopped", __FUNCTION__);
+
+ helper = (RunQueueHelper *) user_data;
+ run_queue_notify_and_destroy (helper, MODEST_MAIL_OPERATION_STATUS_SUCCESS);
}
void
ModestTnySendQueue *queue)
{
ModestMailOperationPrivate *priv;
+ RunQueueHelper *helper;
g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
g_return_if_fail (MODEST_IS_TNY_SEND_QUEUE (queue));
priv->account = TNY_ACCOUNT (tny_camel_send_queue_get_transport_account (TNY_CAMEL_SEND_QUEUE (queue)));
priv->op_type = MODEST_MAIL_OPERATION_TYPE_RUN_QUEUE;
+ /* Create the helper */
+ helper = g_slice_new0 (RunQueueHelper);
+ helper->queue = g_object_ref (queue);
+ helper->self = g_object_ref (self);
+ helper->stop_handler = g_signal_connect (queue, "queue-stop",
+ G_CALLBACK (run_queue_stop),
+ helper);
+
+ /* Notify operation has started */
modest_mail_operation_notify_start (self);
+ g_debug ("%s, run queue started", __FUNCTION__);
+}
+
+static void
+queue_wakeup_callback (ModestTnySendQueue *queue,
+ gboolean cancelled,
+ GError *error,
+ gpointer userdata)
+{
+ ModestMailOperation *mail_op;
+ ModestMailOperationPrivate *priv;
+
+ mail_op = (ModestMailOperation *) userdata;
+ priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_op);
+
+ priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+
+ /* Notify end */
+ modest_mail_operation_notify_end (mail_op);
+ g_object_unref (mail_op);
+}
+
+void
+modest_mail_operation_queue_wakeup (ModestMailOperation *self,
+ ModestTnySendQueue *queue)
+{
+ ModestMailOperationPrivate *priv;
+
+ g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
+ g_return_if_fail (MODEST_IS_TNY_SEND_QUEUE (queue));
+ priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+
+ priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
+ priv->account = TNY_ACCOUNT (tny_camel_send_queue_get_transport_account (TNY_CAMEL_SEND_QUEUE (queue)));
+ priv->op_type = MODEST_MAIL_OPERATION_TYPE_QUEUE_WAKEUP;
+
g_object_ref (self);
- g_signal_connect ((gpointer) queue, "queue-stop", G_CALLBACK (run_queue_stop), (gpointer) self);
+
+ modest_tny_send_queue_wakeup (queue, queue_wakeup_callback, self);
+ modest_mail_operation_notify_start (self);
}
static void
projects / modest / blobdiff