gint total_bytes,
gboolean increment_done);
-static guint compute_message_list_size (TnyList *headers);
-
-static guint compute_message_array_size (GPtrArray *headers);
+static guint compute_message_list_size (TnyList *headers, guint num_elements);
static int compare_headers_by_date (gconstpointer a,
gconstpointer b);
static gboolean _check_memory_low (ModestMailOperation *mail_op);
+/* Helpers for the update account operation (send & receive)*/
+typedef struct
+{
+ ModestMailOperation *mail_op;
+ gchar *account_name;
+ UpdateAccountCallback callback;
+ gpointer user_data;
+ TnyList *folders;
+ gint pending_calls;
+ gboolean poke_all;
+ TnyFolderObserver *inbox_observer;
+ RetrieveAllCallback retrieve_all_cb;
+ gboolean interactive;
+ gboolean msg_readed;
+} UpdateAccountInfo;
+
+static void destroy_update_account_info (UpdateAccountInfo *info);
+
+static void update_account_send_mail (UpdateAccountInfo *info);
+
+static void update_account_get_msg_async_cb (TnyFolder *folder,
+ gboolean canceled,
+ TnyMsg *msg,
+ GError *err,
+ gpointer user_data);
+
+static void update_account_notify_user_and_free (UpdateAccountInfo *info,
+ TnyList *new_headers);
+
enum _ModestMailOperationSignals
{
PROGRESS_CHANGED_SIGNAL,
/* ************************** SEND ACTIONS ************************* */
/* ******************************************************************* */
+typedef struct
+{
+ ModestMailOperation *mail_op;
+ gboolean notify;
+} SendNewMailHelper;
+
static void
-send_mail_on_added_to_outbox (TnySendQueue *send_queue,
- gboolean cancelled,
- TnyMsg *msg,
- GError *err,
- gpointer user_data)
+send_mail_common_cb (gboolean cancelled,
+ GError *err,
+ SendNewMailHelper *helper)
{
ModestMailOperationPrivate *priv;
ModestMailOperation *self;
- self = MODEST_MAIL_OPERATION (user_data);
+ self = helper->mail_op;
priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
if (cancelled || err)
} else {
priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
}
+
end:
- modest_mail_operation_notify_end (self);
- g_object_unref (self);
+ if (helper->notify)
+ modest_mail_operation_notify_end (self);
+
+ g_object_unref (helper->mail_op);
+ g_slice_free (SendNewMailHelper, helper);
}
-void
-modest_mail_operation_send_mail (ModestMailOperation *self,
- TnyTransportAccount *transport_account,
- TnyMsg* msg)
+static void
+send_mail_on_sync_async_cb (TnyFolder *self,
+ gboolean cancelled,
+ GError *err,
+ gpointer user_data)
{
- TnySendQueue *send_queue = NULL;
- ModestMailOperationPrivate *priv;
-
- g_return_if_fail (self && MODEST_IS_MAIL_OPERATION (self));
- g_return_if_fail (transport_account && TNY_IS_TRANSPORT_ACCOUNT (transport_account));
- g_return_if_fail (msg && TNY_IS_MSG (msg));
-
- priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
-
- /* 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;
-
- send_queue = TNY_SEND_QUEUE (modest_runtime_get_send_queue (transport_account, TRUE));
- if (!TNY_IS_SEND_QUEUE(send_queue)) {
- if (priv->error) {
- g_error_free (priv->error);
- priv->error = NULL;
- }
- g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
- 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 {
- modest_mail_operation_notify_start (self);
- /* Add the msg to the queue. The callback will
- finalize the mail operation */
- tny_send_queue_add_async (send_queue, msg, send_mail_on_added_to_outbox,
- NULL, g_object_ref (self));
- modest_tny_send_queue_set_requested_send_receive (MODEST_TNY_SEND_QUEUE (send_queue),
- FALSE);
- }
+ send_mail_common_cb (cancelled, err, (SendNewMailHelper *) user_data);
}
+static void
+send_mail_on_added_to_outbox (TnySendQueue *send_queue,
+ gboolean cancelled,
+ TnyMsg *msg,
+ GError *err,
+ gpointer user_data)
+{
+ send_mail_common_cb (cancelled, err, (SendNewMailHelper *) user_data);
+}
static gboolean
idle_create_msg_cb (gpointer idle_data)
TnyMsg *msg,
gpointer userdata)
{
+ TnySendQueue *send_queue = NULL;
ModestMailOperationPrivate *priv = NULL;
SendNewMailInfo *info = (SendNewMailInfo *) userdata;
TnyFolder *draft_folder = NULL;
goto end;
}
- /* Call mail operation */
- modest_mail_operation_send_mail (self, info->transport_account, msg);
+ /* Add message to send queue */
+ send_queue = TNY_SEND_QUEUE (modest_runtime_get_send_queue (info->transport_account, TRUE));
+ if (!TNY_IS_SEND_QUEUE(send_queue)) {
+ if (priv->error) {
+ g_error_free (priv->error);
+ priv->error = NULL;
+ }
+ g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+ 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);
+ goto end;
+ } else {
+ SendNewMailHelper *helper = g_slice_new (SendNewMailHelper);
+ helper->mail_op = g_object_ref (self);
+ helper->notify = (info->draft_msg == NULL);
+
+ /* Add the msg to the queue. The callback will free
+ the helper */
+ modest_tny_send_queue_set_requested_send_receive (MODEST_TNY_SEND_QUEUE (send_queue),
+ FALSE);
+ tny_send_queue_add_async (send_queue, msg, send_mail_on_added_to_outbox,
+ NULL, helper);
+ }
if (info->draft_msg != NULL) {
TnyList *tmp_headers = NULL;
TnyFolder *src_folder = NULL;
TnyFolderType folder_type;
TnyTransportAccount *transport_account = NULL;
+ SendNewMailHelper *helper = NULL;
/* To remove the old mail from its source folder, we need to get the
* transport account of the original draft message (the transport account
if (!draft_folder) {
g_warning ("%s: modest_tny_account_get_special_folder(..) returned a NULL drafts folder",
__FUNCTION__);
+ modest_mail_operation_notify_end (self);
goto end;
}
if (!outbox_folder) {
g_warning ("%s: modest_tny_account_get_special_folder(..) returned a NULL outbox folder",
__FUNCTION__);
+ modest_mail_operation_notify_end (self);
goto end;
}
folder = tny_msg_get_folder (info->draft_msg);
- if (folder == NULL) goto end;
+ if (folder == NULL) {
+ modest_mail_operation_notify_end (self);
+ goto end;
+ }
folder_type = modest_tny_folder_guess_folder_type (folder);
if (folder_type == TNY_FOLDER_TYPE_INVALID)
/* Note: This can fail (with a warning) if the message is not really already in a folder,
* because this function requires it to have a UID. */
+ helper = g_slice_new (SendNewMailHelper);
+ helper->mail_op = g_object_ref (self);
+ helper->notify = TRUE;
+
tmp_headers = tny_simple_list_new ();
tny_list_append (tmp_headers, (GObject*) header);
tny_folder_remove_msgs_async (src_folder, tmp_headers, NULL, NULL, NULL);
g_object_unref (tmp_headers);
- tny_folder_sync_async (src_folder, TRUE, NULL, NULL, NULL); /* expunge */
-
+ tny_folder_sync_async (src_folder, TRUE, send_mail_on_sync_async_cb,
+ NULL, helper);
g_object_unref (folder);
}
priv->op_type = MODEST_MAIL_OPERATION_TYPE_SEND;
priv->account = TNY_ACCOUNT (g_object_ref (transport_account));
priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
-
+
+ modest_mail_operation_notify_start (self);
+
/* Check parametters */
if (to == NULL) {
/* Set status failed and set an error */
g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
MODEST_MAIL_OPERATION_ERROR_BAD_PARAMETER,
_("Error trying to send a mail. You need to set at least one recipient"));
+ modest_mail_operation_notify_end (self);
return;
}
info = g_slice_new0 (SendNewMailInfo);
g_object_ref (draft_msg);
- 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,
modest_mail_operation_send_new_mail_cb, info);
foreach_add_item (gpointer header, gpointer user_data)
{
tny_list_prepend (TNY_LIST (user_data),
- g_object_ref (G_OBJECT (header)));
+ G_OBJECT (header));
}
/* This is the method that looks for new messages in a folder */
object_class->finalize = internal_folder_observer_finalize;
}
-typedef struct
-{
- ModestMailOperation *mail_op;
- gchar *account_name;
- UpdateAccountCallback callback;
- gpointer user_data;
- TnyList *folders;
- gint pending_calls;
- gboolean poke_all;
- TnyFolderObserver *inbox_observer;
- RetrieveAllCallback retrieve_all_cb;
- gboolean interactive;
-} UpdateAccountInfo;
-
-
static void
destroy_update_account_info (UpdateAccountInfo *info)
{
g_slice_free (UpdateAccountInfo, info);
}
+
+static void
+update_account_send_mail (UpdateAccountInfo *info)
+{
+ TnyTransportAccount *transport_account = NULL;
+
+ /* 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);
+
+ if (transport_account) {
+ ModestTnySendQueue *send_queue;
+ TnyFolder *outbox;
+ guint num_messages;
+
+ send_queue = modest_runtime_get_send_queue (transport_account, TRUE);
+ g_object_unref (transport_account);
+
+ if (TNY_IS_SEND_QUEUE (send_queue)) {
+ /* Get outbox folder */
+ outbox = tny_send_queue_get_outbox (TNY_SEND_QUEUE (send_queue));
+ if (outbox) { /* this could fail in some cases */
+ num_messages = tny_folder_get_all_count (outbox);
+ g_object_unref (outbox);
+ } else {
+ g_warning ("%s: could not get outbox", __FUNCTION__);
+ num_messages = 0;
+ }
+
+ if (num_messages != 0) {
+ /* Reenable suspended items */
+ modest_tny_send_queue_wakeup (MODEST_TNY_SEND_QUEUE (send_queue));
+
+ /* Try to send */
+ tny_camel_send_queue_flush (TNY_CAMEL_SEND_QUEUE (send_queue));
+ modest_tny_send_queue_set_requested_send_receive (MODEST_TNY_SEND_QUEUE (send_queue),
+ info->interactive);
+ }
+ }
+ }
+}
+
static void
update_account_get_msg_async_cb (TnyFolder *folder,
gboolean canceled,
gpointer user_data)
{
GetMsgInfo *msg_info = (GetMsgInfo *) user_data;
+ ModestMailOperationPrivate *priv;
+
+ priv = MODEST_MAIL_OPERATION_GET_PRIVATE (msg_info->mail_op);
+ priv->done++;
+
+ if (TNY_IS_MSG (msg)) {
+ TnyHeader *header = tny_msg_get_header (msg);
+
+ if (header) {
+ ModestMailOperationState *state;
+ state = modest_mail_operation_clone_state (msg_info->mail_op);
+ msg_info->sum_total_bytes += tny_header_get_message_size (header);
+ state->bytes_done = msg_info->sum_total_bytes;
+ state->bytes_total = msg_info->total_bytes;
+
+ /* Notify the status change. Only notify about changes
+ referred to bytes */
+ g_signal_emit (G_OBJECT (msg_info->mail_op),
+ signals[PROGRESS_CHANGED_SIGNAL],
+ 0, state, NULL);
+
+ g_object_unref (header);
+ g_slice_free (ModestMailOperationState, state);
+ }
+ }
+
+ if (priv->done == priv->total) {
+ TnyList *new_headers;
+ UpdateAccountInfo *info;
+
+ /* After getting all the messages send the ones in the
+ outboxes */
+ info = (UpdateAccountInfo *) msg_info->user_data;
+ update_account_send_mail (info);
+
+ /* Check if the operation was a success */
+ if (!priv->error)
+ priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+
+ /* Call the user callback and free */
+ new_headers = tny_iterator_get_list (msg_info->more_msgs);
+ update_account_notify_user_and_free (info, new_headers);
+ g_object_unref (new_headers);
- /* Just delete the helper. Don't do anything with the new
- msg. There is also no need to check for errors */
- g_object_unref (msg_info->mail_op);
- g_object_unref (msg_info->header);
- g_slice_free (GetMsgInfo, msg_info);
+ /* Delete the helper */
+ g_object_unref (msg_info->more_msgs);
+ g_object_unref (msg_info->mail_op);
+ g_slice_free (GetMsgInfo, msg_info);
+ }
}
static void
ModestAccountRetrieveType retrieve_type;
TnyList *new_headers = NULL;
gboolean headers_only, ignore_limit;
- TnyTransportAccount *transport_account = NULL;
info = (UpdateAccountInfo *) user_data;
priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op);
MODEST_MAIL_OPERATION_ERROR_OPERATION_CANCELED,
"canceled");
+ tny_folder_remove_observer (inbox, info->inbox_observer);
+ g_object_unref (info->inbox_observer);
+ info->inbox_observer = NULL;
+
/* Notify the user about the error and then exit */
update_account_notify_user_and_free (info, NULL);
return;
/* Create the new headers array. We need it to sort the
new headers by date */
new_headers_array = g_ptr_array_new ();
- new_headers_iter = tny_list_create_iterator (((InternalFolderObserver *) info->inbox_observer)->new_headers);
- while (!tny_iterator_is_done (new_headers_iter)) {
- TnyHeader *header = NULL;
-
- header = TNY_HEADER (tny_iterator_get_current (new_headers_iter));
- /* Apply per-message size limits */
- if (tny_header_get_message_size (header) < max_size)
- g_ptr_array_add (new_headers_array, g_object_ref (header));
-
- g_object_unref (header);
- tny_iterator_next (new_headers_iter);
+ if (info->inbox_observer) {
+ new_headers_iter = tny_list_create_iterator (((InternalFolderObserver *) info->inbox_observer)->new_headers);
+ while (!tny_iterator_is_done (new_headers_iter)) {
+ TnyHeader *header = NULL;
+
+ header = TNY_HEADER (tny_iterator_get_current (new_headers_iter));
+ /* Apply per-message size limits */
+ if (tny_header_get_message_size (header) < max_size)
+ g_ptr_array_add (new_headers_array, g_object_ref (header));
+
+ g_object_unref (header);
+ tny_iterator_next (new_headers_iter);
+ }
+ g_object_unref (new_headers_iter);
+
+ tny_folder_remove_observer (inbox, info->inbox_observer);
+ g_object_unref (info->inbox_observer);
+ info->inbox_observer = NULL;
}
- g_object_unref (new_headers_iter);
- tny_folder_remove_observer (inbox, info->inbox_observer);
- g_object_unref (info->inbox_observer);
- info->inbox_observer = NULL;
- if (new_headers_array->len == 0)
+ if (new_headers_array->len == 0) {
+ g_ptr_array_free (new_headers_array, FALSE);
goto send_mail;
+ }
/* Get per-account message amount retrieval limit */
retrieve_limit = modest_account_mgr_get_retrieve_limit (mgr, info->account_name);
new_headers_array->len,
retrieve_limit);
}
+
+ /* Copy the headers to a list and free the array */
+ new_headers = tny_simple_list_new ();
+ for (i=0; i < new_headers_array->len; i++) {
+ TnyHeader *header = TNY_HEADER (g_ptr_array_index (new_headers_array, i));
+ tny_list_append (new_headers, G_OBJECT (header));
+ }
+ g_ptr_array_foreach (new_headers_array, (GFunc) g_object_unref, NULL);
+ g_ptr_array_free (new_headers_array, FALSE);
- if (!headers_only) {
+ if (!headers_only && (tny_list_get_length (new_headers) > 0)) {
gint msg_num = 0;
- const gint msg_list_size = compute_message_array_size (new_headers_array);
+ TnyIterator *iter;
+ GetMsgInfo *msg_info;
priv->done = 0;
if (ignore_limit)
- priv->total = new_headers_array->len;
+ priv->total = tny_list_get_length (new_headers);
else
- priv->total = MIN (new_headers_array->len, retrieve_limit);
- while (msg_num < priv->total) {
- TnyHeader *header = TNY_HEADER (g_ptr_array_index (new_headers_array, msg_num));
- TnyFolder *folder = tny_header_get_folder (header);
- GetMsgInfo *msg_info;
+ priv->total = MIN (tny_list_get_length (new_headers), retrieve_limit);
- /* Create the message info */
- msg_info = g_slice_new0 (GetMsgInfo);
- msg_info->mail_op = g_object_ref (info->mail_op);
- msg_info->header = g_object_ref (header);
- msg_info->total_bytes = msg_list_size;
+ iter = tny_list_create_iterator (new_headers);
+
+ /* Create the message info */
+ msg_info = g_slice_new0 (GetMsgInfo);
+ msg_info->mail_op = g_object_ref (info->mail_op);
+ msg_info->total_bytes = compute_message_list_size (new_headers, priv->total);
+ msg_info->more_msgs = g_object_ref (iter);
+ msg_info->user_data = info;
+
+ while ((msg_num < priv->total ) && !tny_iterator_is_done (iter)) {
+ TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
+ TnyFolder *folder = tny_header_get_folder (header);
/* Get message in an async way */
tny_folder_get_msg_async (folder, header, update_account_get_msg_async_cb,
- get_msg_status_cb, msg_info);
+ NULL, msg_info);
g_object_unref (folder);
msg_num++;
+ tny_iterator_next (iter);
}
- }
+ g_object_unref (iter);
- /* Copy the headers to a list and free the array */
- new_headers = tny_simple_list_new ();
- for (i=0; i < new_headers_array->len; i++) {
- TnyHeader *header = TNY_HEADER (g_ptr_array_index (new_headers_array, i));
- tny_list_append (new_headers, G_OBJECT (header));
+ /* The mail operation will finish when the last
+ message is retrieved */
+ return;
}
- g_ptr_array_foreach (new_headers_array, (GFunc) g_object_unref, NULL);
- g_ptr_array_free (new_headers_array, FALSE);
-
send_mail:
- /* 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);
-
- if (transport_account) {
- ModestTnySendQueue *send_queue;
- TnyFolder *outbox;
- guint num_messages;
-
- send_queue = modest_runtime_get_send_queue (transport_account, TRUE);
- g_object_unref (transport_account);
-
- if (TNY_IS_SEND_QUEUE (send_queue)) {
- /* Get outbox folder */
- outbox = tny_send_queue_get_outbox (TNY_SEND_QUEUE (send_queue));
- if (outbox) { /* this could fail in some cases */
- num_messages = tny_folder_get_all_count (outbox);
- g_object_unref (outbox);
- } else {
- g_warning ("%s: could not get outbox", __FUNCTION__);
- num_messages = 0;
- }
-
- if (num_messages != 0) {
- /* Reenable suspended items */
- modest_tny_send_queue_wakeup (MODEST_TNY_SEND_QUEUE (send_queue));
-
- /* Try to send */
- tny_camel_send_queue_flush (TNY_CAMEL_SEND_QUEUE (send_queue));
- modest_tny_send_queue_set_requested_send_receive (MODEST_TNY_SEND_QUEUE (send_queue),
- info->interactive);
- }
- }
- }
-
+ /* If we don't have to retrieve the new messages then
+ simply send mail */
+ update_account_send_mail (info);
+
/* Check if the operation was a success */
if (!priv->error)
priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
-
+
/* Call the user callback and free */
update_account_notify_user_and_free (info, new_headers);
}
g_object_unref (iterator);
}
- msg_list_size = compute_message_list_size (header_list);
+ msg_list_size = compute_message_list_size (header_list, 0);
modest_mail_operation_notify_start (self);
iter = tny_list_create_iterator (header_list);
}
}
+/* Computes the size of the messages the headers in the list belongs
+ to. If num_elements is different from 0 then it only takes into
+ account the first num_elements for the calculation */
static guint
-compute_message_list_size (TnyList *headers)
+compute_message_list_size (TnyList *headers,
+ guint num_elements)
{
TnyIterator *iter;
- guint size = 0;
+ guint size = 0, element = 0;
+
+ /* If num_elements is not valid then take all into account */
+ if ((num_elements <= 0) || (num_elements > tny_list_get_length (headers)))
+ num_elements = tny_list_get_length (headers);
iter = tny_list_create_iterator (headers);
- while (!tny_iterator_is_done (iter)) {
+ while (!tny_iterator_is_done (iter) && element < num_elements) {
TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
size += tny_header_get_message_size (header);
g_object_unref (header);
tny_iterator_next (iter);
+ element++;
}
g_object_unref (iter);
return size;
}
-static guint
-compute_message_array_size (GPtrArray *headers)
-{
- guint size = 0;
- gint i;
-
- for (i = 0; i < headers->len; i++) {
- TnyHeader *header = TNY_HEADER (g_ptr_array_index (headers, i));
- size += tny_header_get_message_size (header);
- }
-
- return size;
-}
-
-
void
modest_mail_operation_xfer_msgs (ModestMailOperation *self,
TnyList *headers,
ModestTnyFolderRules rules = 0;
TnyAccount *dst_account = NULL;
gboolean leave_on_server;
+ ModestMailOperationState *state;
g_return_if_fail (self && MODEST_IS_MAIL_OPERATION (self));
g_return_if_fail (headers && TNY_IS_LIST (headers));
helper->user_data = user_data;
helper->last_total_bytes = 0;
helper->sum_total_bytes = 0;
- helper->total_bytes = compute_message_list_size (headers);
+ helper->total_bytes = compute_message_list_size (headers, 0);
/* Get account and set it into mail_operation */
priv->account = modest_tny_folder_get_account (src_folder);
helper->delete = (leave_on_server) ? FALSE : delete_original;
modest_mail_operation_notify_start (self);
+
+ /* Start notifying progress */
+ state = modest_mail_operation_clone_state (self);
+ state->done = 0;
+ state->total = 0;
+ g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
+ g_slice_free (ModestMailOperationState, state);
+
tny_folder_transfer_msgs_async (src_folder,
helper->headers,
folder,
state->total = 0;
g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL],
0, state, NULL);
-
- /* FIXME: we're leaking the state here, or? valgrind thinks so */
+ g_slice_free (ModestMailOperationState, state);
tny_folder_refresh_async (folder,
on_refresh_folder,
projects / modest / blobdiff