X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=9b012185e10fc834f527b4a6fdacd43aa9d305c4;hb=ad22f66c880fef5504167946fc6c9f40756213c2;hp=adee12543afa7e59a1f087a7e4a5b26ee1243794;hpb=9448e1743b2e38e9a7b0466894a093cb96bc1934;p=modest diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c index adee125..9b01218 100644 --- a/src/modest-mail-operation.c +++ b/src/modest-mail-operation.c @@ -63,6 +63,12 @@ #include #include "modest-utils.h" #include "modest-debug.h" +#ifdef MODEST_USE_LIBTIME +#include +#endif +#include "modest-account-protocol.h" +#include +#include #define KB 1024 @@ -132,9 +138,9 @@ typedef struct gint pending_calls; gboolean poke_all; TnyFolderObserver *inbox_observer; - RetrieveAllCallback retrieve_all_cb; gboolean interactive; gboolean msg_readed; + gboolean update_folder_counts; } UpdateAccountInfo; static void destroy_update_account_info (UpdateAccountInfo *info); @@ -191,6 +197,8 @@ typedef struct { gint last_total_bytes; gint sum_total_bytes; gint total_bytes; + TnyIterator *get_parts; + TnyMsg *msg; } GetMsgInfo; typedef struct _RefreshAsyncHelper { @@ -220,6 +228,12 @@ typedef struct _XFerFolderAsyncHelper gpointer user_data; } XFerFolderAsyncHelper; +typedef struct _SyncFolderHelper { + ModestMailOperation *mail_op; + SyncFolderCallback user_callback; + gpointer user_data; +} SyncFolderHelper; + typedef void (*ModestMailOperationCreateMsgCallback) (ModestMailOperation *mail_op, TnyMsg *msg, gpointer userdata); @@ -662,7 +676,7 @@ send_mail_on_sync_async_cb (TnyFolder *folder, self = helper->mail_op; priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); - if (cancelled || err) + if (cancelled) goto end; if (err) { @@ -747,7 +761,7 @@ send_mail_on_added_to_outbox (TnySendQueue *send_queue, self = helper->mail_op; priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); - if (cancelled || err) + if (cancelled) goto end; if (err) { @@ -851,11 +865,11 @@ create_msg_thread (gpointer thread_data) } if (new_msg) { - TnyHeader *header; + TnyHeader *header = tny_msg_get_header (new_msg); /* Set priority flags in message */ - header = tny_msg_get_header (new_msg); - tny_header_set_flag (header, info->priority_flags); + if (info->priority_flags != TNY_HEADER_FLAG_NORMAL_PRIORITY) + tny_header_set_flag (header, info->priority_flags); /* Set attachment flags in message */ if (info->attachments_list != NULL && attached > 0) @@ -936,7 +950,7 @@ modest_mail_operation_create_msg (ModestMailOperation *self, g_list_foreach (info->attachments_list, (GFunc) g_object_ref, NULL); info->images_list = g_list_copy ((GList *) images_list); g_list_foreach (info->images_list, (GFunc) g_object_ref, NULL); - info->priority_flags = priority_flags; + info->priority_flags = 0 | priority_flags; info->callback = callback; info->userdata = userdata; @@ -1136,6 +1150,46 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self, typedef struct { + ModestMailOperation *mailop; + TnyMsg *msg; + SaveToDraftstCallback callback; + gpointer userdata; +} FinishSaveRemoteDraftInfo; + +static void +finish_save_remote_draft (ModestAccountProtocol *protocol, + GError *err, + const gchar *account_id, + TnyMsg *new_remote_msg, + TnyMsg *new_msg, + TnyMsg *old_msg, + gpointer userdata) +{ + FinishSaveRemoteDraftInfo *info = (FinishSaveRemoteDraftInfo *) userdata; + ModestMailOperationPrivate *priv = NULL; + + priv = MODEST_MAIL_OPERATION_GET_PRIVATE(info->mailop); + + if (!priv->error && err != NULL) { + /* Priority for errors in save to local stage */ + priv->error = g_error_copy (err); + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + } + + if (info->callback) + info->callback (info->mailop, info->msg, info->userdata); + + if (info->msg) + g_object_unref (info->msg); + + modest_mail_operation_notify_end (info->mailop); + g_object_unref (info->mailop); + + g_slice_free (FinishSaveRemoteDraftInfo, info); +} + +typedef struct +{ TnyTransportAccount *transport_account; TnyMsg *draft_msg; SaveToDraftstCallback callback; @@ -1154,6 +1208,7 @@ modest_mail_operation_save_to_drafts_add_msg_cb(TnyFolder *self, ModestMailOperationPrivate *priv = NULL; SaveToDraftsAddMsgInfo *info = (SaveToDraftsAddMsgInfo *) userdata; GError *io_error = NULL; + gboolean callback_called = FALSE; priv = MODEST_MAIL_OPERATION_GET_PRIVATE(info->mailop); @@ -1198,8 +1253,32 @@ modest_mail_operation_save_to_drafts_add_msg_cb(TnyFolder *self, priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; } + if (info->transport_account) { + ModestProtocolType transport_protocol_type; + ModestProtocol *transport_protocol; + + transport_protocol_type = modest_tny_account_get_protocol_type (TNY_ACCOUNT (info->transport_account)); + + transport_protocol = modest_protocol_registry_get_protocol_by_type (modest_runtime_get_protocol_registry (), + transport_protocol_type); + if (transport_protocol && MODEST_IS_ACCOUNT_PROTOCOL (transport_protocol)) { + FinishSaveRemoteDraftInfo *srd_info = g_slice_new (FinishSaveRemoteDraftInfo); + srd_info->mailop = info->mailop?g_object_ref (info->mailop):NULL; + srd_info->msg = info->msg?g_object_ref (info->msg):NULL; + srd_info->callback = info->callback; + srd_info->userdata = info->user_data; + modest_account_protocol_save_remote_draft (MODEST_ACCOUNT_PROTOCOL (transport_protocol), + tny_account_get_id (TNY_ACCOUNT (info->transport_account)), + info->msg, info->draft_msg, + finish_save_remote_draft, + srd_info); + + callback_called = TRUE; + } + } + /* Call the user callback */ - if (info->callback) + if (!callback_called && info->callback) info->callback (info->mailop, info->msg, info->user_data); if (info->transport_account) @@ -1211,8 +1290,10 @@ modest_mail_operation_save_to_drafts_add_msg_cb(TnyFolder *self, if (info->msg) g_object_unref (G_OBJECT (info->msg)); - modest_mail_operation_notify_end (info->mailop); - g_object_unref(info->mailop); + if (!callback_called) + modest_mail_operation_notify_end (info->mailop); + if (info->mailop) + g_object_unref(info->mailop); g_slice_free (SaveToDraftsAddMsgInfo, info); } @@ -1429,6 +1510,9 @@ update_account_send_mail (UpdateAccountInfo *info) TnyTransportAccount *transport_account = NULL; ModestTnyAccountStore *account_store; + if (info->update_folder_counts) + return; + account_store = modest_runtime_get_account_store (); /* We don't try to send messages while sending mails is blocked */ @@ -1525,9 +1609,10 @@ update_account_get_msg_async_cb (TnyFolder *folder, /* 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); /* Delete the helper */ + if (msg_info->msg) + g_object_unref (msg_info->msg); g_object_unref (msg_info->more_msgs); g_object_unref (msg_info->mail_op); g_slice_free (GetMsgInfo, msg_info); @@ -1565,11 +1650,12 @@ inbox_refreshed_cb (TnyFolder *inbox, ModestMailOperationPrivate *priv; TnyIterator *new_headers_iter; GPtrArray *new_headers_array = NULL; - gint max_size, retrieve_limit, i; + gint max_size = G_MAXINT, retrieve_limit, i; ModestAccountMgr *mgr; ModestAccountRetrieveType retrieve_type; TnyList *new_headers = NULL; - gboolean headers_only, ignore_limit; + gboolean headers_only; + time_t time_to_store; info = (UpdateAccountInfo *) user_data; priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op); @@ -1599,16 +1685,25 @@ inbox_refreshed_cb (TnyFolder *inbox, 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); - if (max_size == 0) - max_size = G_MAXINT; - else - max_size = max_size * KB; + if (!info->update_folder_counts) { + /* Set the last updated as the current time */ +#ifdef MODEST_USE_LIBTIME + struct tm utc_tm; + time_get_utc (&utc_tm); + time_to_store = time_mktime (&utc_tm, "GMT"); +#else + time_to_store = time (NULL); +#endif + modest_account_mgr_set_last_updated (mgr, tny_account_get_id (priv->account), time_to_store); + + /* Get the message max size */ + max_size = modest_conf_get_int (modest_runtime_get_conf (), + MODEST_CONF_MSG_SIZE_LIMIT, NULL); + if (max_size == 0) + max_size = G_MAXINT; + else + max_size = max_size * KB; + } /* Create the new headers array. We need it to sort the new headers by date */ @@ -1650,25 +1745,13 @@ inbox_refreshed_cb (TnyFolder *inbox, /* Order by date */ g_ptr_array_sort (new_headers_array, (GCompareFunc) compare_headers_by_date); - /* Ask the users if they want to retrieve all the messages - even though the limit was exceeded */ - ignore_limit = FALSE; - if (new_headers_array->len > retrieve_limit) { - /* Ask the user if a callback has been specified and - if the mail operation has a source (this means that - was invoked by the user and not automatically by a - D-Bus method) */ - if (info->retrieve_all_cb && priv->source) - ignore_limit = info->retrieve_all_cb (priv->source, - 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)); + /* We want the first element to be the most recent + one, that's why we reverse the list */ + tny_list_prepend (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); @@ -1679,10 +1762,7 @@ inbox_refreshed_cb (TnyFolder *inbox, GetMsgInfo *msg_info; priv->done = 0; - if (ignore_limit) - priv->total = tny_list_get_length (new_headers); - else - priv->total = MIN (tny_list_get_length (new_headers), retrieve_limit); + priv->total = MIN (tny_list_get_length (new_headers), retrieve_limit); iter = tny_list_create_iterator (new_headers); @@ -1691,6 +1771,7 @@ inbox_refreshed_cb (TnyFolder *inbox, 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->msg = NULL; msg_info->user_data = info; while ((msg_num < priv->total ) && !tny_iterator_is_done (iter)) { @@ -1702,11 +1783,13 @@ inbox_refreshed_cb (TnyFolder *inbox, NULL, msg_info); g_object_unref (folder); + g_object_unref (header); msg_num++; tny_iterator_next (iter); } g_object_unref (iter); + g_object_unref (new_headers); /* The mail operation will finish when the last message is retrieved */ @@ -1835,7 +1918,7 @@ recurse_folders_async_cb (TnyFolderStore *folder_store, folder = TNY_FOLDER (tny_iterator_get_current (iter_all_folders)); - if (tny_folder_get_folder_type (folder) == TNY_FOLDER_TYPE_INBOX) { + if (!info->update_folder_counts && tny_folder_get_folder_type (folder) == TNY_FOLDER_TYPE_INBOX) { /* Get a reference to the INBOX */ inbox = g_object_ref (folder); } else { @@ -1875,7 +1958,6 @@ modest_mail_operation_update_account (ModestMailOperation *self, const gchar *account_name, gboolean poke_all, gboolean interactive, - RetrieveAllCallback retrieve_all_cb, UpdateAccountCallback callback, gpointer user_data) { @@ -1929,10 +2011,10 @@ modest_mail_operation_update_account (ModestMailOperation *self, info->mail_op = g_object_ref (self); info->poke_all = poke_all; info->interactive = interactive; + info->update_folder_counts = FALSE; info->account_name = g_strdup (account_name); info->callback = callback; info->user_data = user_data; - info->retrieve_all_cb = retrieve_all_cb; /* Set account busy */ modest_account_mgr_set_account_busy (modest_runtime_get_account_mgr (), account_name, TRUE); @@ -1950,7 +2032,87 @@ modest_mail_operation_update_account (ModestMailOperation *self, /* 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, FALSE, + folders, NULL, TRUE, + recurse_folders_async_cb, + NULL, info); + g_object_unref (folders); + + g_object_unref (priv->account); + +} + +void +modest_mail_operation_update_folder_counts (ModestMailOperation *self, + const gchar *account_name) +{ + UpdateAccountInfo *info = NULL; + ModestMailOperationPrivate *priv = NULL; + ModestTnyAccountStore *account_store = NULL; + TnyList *folders; + ModestMailOperationState *state; + + /* Init mail operation */ + priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); + priv->total = 0; + priv->done = 0; + priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; + priv->op_type = MODEST_MAIL_OPERATION_TYPE_UPDATE_FOLDER_COUNTS; + + /* Get the store account */ + account_store = modest_runtime_get_account_store (); + priv->account = + modest_tny_account_store_get_server_account (account_store, + account_name, + TNY_ACCOUNT_TYPE_STORE); + + /* The above function could return NULL */ + if (!priv->account) { + /* Check if the operation was a success */ + g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, + MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND, + "no account"); + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + + /* Notify about operation end */ + modest_mail_operation_notify_end (self); + + return; + } + + /* We have once seen priv->account getting finalized during this code, + * therefore adding a reference (bug #82296) */ + + g_object_ref (priv->account); + + /* Create the helper object */ + info = g_slice_new0 (UpdateAccountInfo); + info->pending_calls = 1; + info->folders = tny_simple_list_new (); + info->mail_op = g_object_ref (self); + info->poke_all = TRUE; + info->interactive = FALSE; + info->update_folder_counts = TRUE; + info->account_name = g_strdup (account_name); + info->callback = NULL; + info->user_data = NULL; + + /* Set account busy */ + modest_account_mgr_set_account_busy (modest_runtime_get_account_mgr (), account_name, TRUE); + modest_mail_operation_notify_start (self); + + /* notify about the start of the operation */ + state = modest_mail_operation_clone_state (self); + state->done = 0; + state->total = 0; + + /* Start notifying progress */ + g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL); + g_slice_free (ModestMailOperationState, state); + + /* 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, TRUE, recurse_folders_async_cb, NULL, info); g_object_unref (folders); @@ -2086,7 +2248,7 @@ modest_mail_operation_create_folder (ModestMailOperation *self, } } - if (!strcmp (name, " ") || strchr (name, '/')) { + if (!priv->error && (!strcmp (name, " ") || strchr (name, '/'))) { priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES, @@ -2400,7 +2562,7 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self, priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES, - error_msg); + "%s", error_msg); /* Call the user callback if exists */ if (user_callback) @@ -2484,6 +2646,71 @@ modest_mail_operation_rename_folder (ModestMailOperation *self, /* ******************************************************************* */ void +modest_mail_operation_find_msg (ModestMailOperation *self, + TnyFolder *folder, + const gchar *msg_uid, + gboolean progress_feedback, + GetMsgAsyncUserCallback user_callback, + gpointer user_data) +{ + GetMsgInfo *helper = NULL; + ModestMailOperationPrivate *priv; + + g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); + g_return_if_fail (msg_uid != NULL); + + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); + priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; + priv->total = 1; + priv->done = 0; + + /* Check memory low */ + if (_check_memory_low (self)) { + if (user_callback) + user_callback (self, NULL, FALSE, NULL, priv->error, user_data); + modest_mail_operation_notify_end (self); + return; + } + + /* Get account and set it into mail_operation */ + priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder)); + + /* Check for cached messages */ + if (progress_feedback) { + priv->op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE; + } else { + priv->op_type = MODEST_MAIL_OPERATION_TYPE_UNKNOWN; + } + + /* Create the helper */ + helper = g_slice_new0 (GetMsgInfo); + helper->header = NULL; + helper->mail_op = g_object_ref (self); + helper->user_callback = user_callback; + helper->user_data = user_data; + helper->destroy_notify = NULL; + helper->last_total_bytes = 0; + helper->sum_total_bytes = 0; + helper->total_bytes = 0; + helper->more_msgs = NULL; + helper->get_parts = NULL; + helper->msg = NULL; + + modest_mail_operation_notify_start (self); + + /* notify about the start of the operation */ + ModestMailOperationState *state; + 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_find_msg_async (folder, msg_uid, get_msg_async_cb, get_msg_status_cb, helper); +} + +void modest_mail_operation_get_msg (ModestMailOperation *self, TnyHeader *header, gboolean progress_feedback, @@ -2535,6 +2762,91 @@ modest_mail_operation_get_msg (ModestMailOperation *self, helper->sum_total_bytes = 0; helper->total_bytes = tny_header_get_message_size (header); helper->more_msgs = NULL; + helper->get_parts = NULL; + helper->msg = NULL; + + modest_mail_operation_notify_start (self); + + /* notify about the start of the operation */ + ModestMailOperationState *state; + 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_get_msg_async (folder, header, get_msg_async_cb, get_msg_status_cb, helper); + + g_object_unref (G_OBJECT (folder)); +} + +void +modest_mail_operation_get_msg_and_parts (ModestMailOperation *self, + TnyHeader *header, + TnyList *parts, + gboolean progress_feedback, + GetMsgAsyncUserCallback user_callback, + gpointer user_data) +{ + GetMsgInfo *helper = NULL; + TnyFolder *folder; + ModestMailOperationPrivate *priv; + + g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); + g_return_if_fail (TNY_IS_HEADER (header)); + + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); + priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; + priv->total = 1; + priv->done = 0; + + /* Check memory low */ + if (_check_memory_low (self)) { + if (user_callback) + user_callback (self, header, FALSE, NULL, priv->error, user_data); + modest_mail_operation_notify_end (self); + return; + } + + /* Get account and set it into mail_operation */ + folder = tny_header_get_folder (header); + if (folder == NULL && MODEST_IS_MSG_VIEW_WINDOW (priv->source)) { + const gchar *acc_name; + acc_name = modest_window_get_active_account (MODEST_WINDOW (priv->source)); + priv->account = modest_tny_account_store_get_server_account + (modest_runtime_get_account_store (), + acc_name, + TNY_ACCOUNT_TYPE_STORE); + folder = modest_tny_folder_store_find_folder_from_uri (TNY_FOLDER_STORE (priv->account), + modest_msg_view_window_get_message_uid (MODEST_MSG_VIEW_WINDOW (priv->source))); + } else { + priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder)); + } + + /* Check for cached messages */ + if (progress_feedback) { + if (tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED) + priv->op_type = MODEST_MAIL_OPERATION_TYPE_OPEN; + else + priv->op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE; + } else { + priv->op_type = MODEST_MAIL_OPERATION_TYPE_UNKNOWN; + } + + /* Create the helper */ + helper = g_slice_new0 (GetMsgInfo); + helper->header = g_object_ref (header); + helper->mail_op = g_object_ref (self); + helper->user_callback = user_callback; + helper->user_data = user_data; + helper->destroy_notify = NULL; + helper->last_total_bytes = 0; + helper->sum_total_bytes = 0; + helper->total_bytes = tny_header_get_message_size (header); + helper->more_msgs = NULL; + helper->get_parts = tny_list_create_iterator (parts); + helper->msg = NULL; modest_mail_operation_notify_start (self); @@ -2574,6 +2886,23 @@ get_msg_status_cb (GObject *obj, } static void +get_msg_async_get_part_cb (TnyMimePart *self, gboolean cancelled, TnyStream *stream, GError *err, gpointer user_data) +{ + GetMsgInfo *helper; + TnyFolder *folder = NULL; + + helper = (GetMsgInfo *) user_data; + + if (helper->header) { + folder = tny_header_get_folder (helper->header); + } + + get_msg_async_cb (folder, cancelled, helper->msg, err, user_data); + + if (folder) g_object_unref (folder); +} + +static void get_msg_async_cb (TnyFolder *folder, gboolean canceled, TnyMsg *msg, @@ -2592,6 +2921,9 @@ get_msg_async_cb (TnyFolder *folder, if (info->more_msgs) { tny_iterator_next (info->more_msgs); finished = (tny_iterator_is_done (info->more_msgs)); + } else if (info->get_parts) { + tny_iterator_next (info->get_parts); + finished = (tny_iterator_is_done (info->get_parts)); } else { finished = (priv->done == priv->total) ? TRUE : FALSE; } @@ -2609,16 +2941,18 @@ get_msg_async_cb (TnyFolder *folder, } else { g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND, - err->message); + "%s", err->message); } } else if (finished && priv->status == MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS) { /* Set the success status before calling the user callback */ priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; } + if (info->header == NULL && msg) + info->header = tny_msg_get_header (msg); /* Call the user callback */ - if (info->user_callback) + if (info->user_callback && (finished || (info->get_parts == NULL))) info->user_callback (info->mail_op, info->header, canceled, msg, err, info->user_data); @@ -2632,11 +2966,33 @@ get_msg_async_cb (TnyFolder *folder, modest_mail_operation_notify_end (info->mail_op); /* Clean */ + if (info->msg) + g_object_unref (info->msg); if (info->more_msgs) g_object_unref (info->more_msgs); - g_object_unref (info->header); + if (info->header) + g_object_unref (info->header); g_object_unref (info->mail_op); g_slice_free (GetMsgInfo, info); + } else if (info->get_parts) { + CamelStream *null_stream; + TnyStream *tny_null_stream; + TnyMimePart *part; + + if (info->msg == NULL && msg != NULL) + info->msg = g_object_ref (msg); + + null_stream = camel_stream_null_new (); + tny_null_stream = tny_camel_stream_new (null_stream); + + part = TNY_MIME_PART (tny_iterator_get_current (info->get_parts)); + tny_mime_part_decode_to_stream_async (part, tny_null_stream, + get_msg_async_get_part_cb, + get_msg_status_cb, + info); + g_object_unref (tny_null_stream); + g_object_unref (part); + } else if (info->more_msgs) { TnyHeader *header = TNY_HEADER (tny_iterator_get_current (info->more_msgs)); TnyFolder *folder = tny_header_get_folder (header); @@ -2753,6 +3109,7 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self, msg_info->last_total_bytes = 0; msg_info->sum_total_bytes = 0; msg_info->total_bytes = msg_list_size; + msg_info->msg = NULL; /* The callback will call it per each header */ tny_folder_get_msg_async (folder, header, get_msg_async_cb, get_msg_status_cb, msg_info); @@ -2772,13 +3129,14 @@ remove_msgs_async_cb (TnyFolder *folder, GError *err, gpointer user_data) { - gboolean expunge, leave_on_server; + gboolean expunge; const gchar *account_name; TnyAccount *account; ModestProtocolType account_proto = MODEST_PROTOCOL_REGISTRY_TYPE_INVALID; ModestMailOperation *self; ModestMailOperationPrivate *priv; ModestProtocolRegistry *protocol_registry; + SyncFolderHelper *helper; self = (ModestMailOperation *) user_data; priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); @@ -2801,22 +3159,30 @@ remove_msgs_async_cb (TnyFolder *folder, account = modest_tny_folder_get_account (folder); account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account); - leave_on_server = - modest_account_mgr_get_leave_on_server (modest_runtime_get_account_mgr (), - account_name); account_proto = modest_tny_account_get_protocol_type (account); g_object_unref (account); - if ((modest_protocol_registry_protocol_type_has_leave_on_server (protocol_registry, account_proto) && - !leave_on_server) || - !modest_tny_folder_is_remote_folder (folder)) + if (modest_protocol_registry_protocol_type_has_leave_on_server (protocol_registry, account_proto)) { + if (modest_account_mgr_get_leave_on_server (modest_runtime_get_account_mgr (), + account_name)) + expunge = FALSE; + else + expunge = TRUE; + } else { expunge = TRUE; - else - expunge = FALSE; + } + + /* Create helper */ + helper = g_slice_new0 (SyncFolderHelper); + helper->mail_op = g_object_ref (self); + helper->user_callback = NULL; + helper->user_data = NULL; /* Sync folder */ - tny_folder_sync_async(folder, expunge, sync_folder_finish_callback, - NULL, self); + tny_folder_sync_async(folder, expunge, sync_folder_finish_callback, NULL, helper); + + /* Remove the extra reference */ + g_object_unref (self); } void @@ -2862,9 +3228,11 @@ modest_mail_operation_remove_msgs (ModestMailOperation *self, local_account = (ModestTnyLocalFoldersAccount *) modest_tny_account_store_get_local_folders_account (accstore); - g_object_unref (folder); - folder = modest_tny_local_folders_account_get_merged_outbox (local_account); folder_type = modest_tny_folder_get_local_or_mmc_folder_type (folder); + if (folder_type == TNY_FOLDER_TYPE_OUTBOX) { + g_object_unref (folder); + folder = modest_tny_local_folders_account_get_merged_outbox (local_account); + } g_object_unref (local_account); } @@ -3543,17 +3911,17 @@ modest_mail_operation_shutdown (ModestMailOperation *self, ModestTnyAccountStore } static void -sync_folder_finish_callback (TnyFolder *self, - gboolean cancelled, - GError *err, +sync_folder_finish_callback (TnyFolder *self, + gboolean cancelled, + GError *err, gpointer user_data) { - ModestMailOperation *mail_op; ModestMailOperationPrivate *priv; + SyncFolderHelper *helper; - mail_op = (ModestMailOperation *) user_data; - priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_op); + helper = (SyncFolderHelper *) user_data; + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (helper->mail_op); /* If canceled by the user, ignore the error given by Tinymail */ if (cancelled) { @@ -3572,15 +3940,26 @@ sync_folder_finish_callback (TnyFolder *self, priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; } - modest_mail_operation_notify_end (mail_op); - g_object_unref (mail_op); + /* User callback */ + if (helper->user_callback) + helper->user_callback (helper->mail_op, self, helper->user_data); + + modest_mail_operation_notify_end (helper->mail_op); + + /* Frees */ + g_object_unref (helper->mail_op); + g_slice_free (SyncFolderHelper, helper); } void modest_mail_operation_sync_folder (ModestMailOperation *self, - TnyFolder *folder, gboolean expunge) + TnyFolder *folder, + gboolean expunge, + SyncFolderCallback callback, + gpointer user_data) { ModestMailOperationPrivate *priv; + SyncFolderHelper *helper; g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); g_return_if_fail (TNY_IS_FOLDER (folder)); @@ -3590,11 +3969,16 @@ modest_mail_operation_sync_folder (ModestMailOperation *self, priv->account = modest_tny_folder_get_account (folder); priv->op_type = MODEST_MAIL_OPERATION_TYPE_SYNC_FOLDER; + /* Create helper */ + helper = g_slice_new0 (SyncFolderHelper); + helper->mail_op = g_object_ref (self); + helper->user_callback = callback; + helper->user_data = user_data; + modest_mail_operation_notify_start (self); - g_object_ref (self); - tny_folder_sync_async (folder, expunge, - (TnyFolderCallback) sync_folder_finish_callback, - NULL, self); + tny_folder_sync_async (folder, expunge, + (TnyFolderCallback) sync_folder_finish_callback, + NULL, helper); } static void @@ -3689,12 +4073,14 @@ modest_mail_operation_to_string (ModestMailOperation *self) switch (priv->op_type) { case MODEST_MAIL_OPERATION_TYPE_SEND: type= "SEND"; break; + case MODEST_MAIL_OPERATION_TYPE_SEND_AND_RECEIVE: type= "SEND-AND-RECEIVE"; break; case MODEST_MAIL_OPERATION_TYPE_RECEIVE: type= "RECEIVE"; break; case MODEST_MAIL_OPERATION_TYPE_OPEN: type= "OPEN"; break; case MODEST_MAIL_OPERATION_TYPE_DELETE: type= "DELETE"; break; case MODEST_MAIL_OPERATION_TYPE_INFO: type= "INFO"; break; case MODEST_MAIL_OPERATION_TYPE_RUN_QUEUE: type= "RUN-QUEUE"; break; case MODEST_MAIL_OPERATION_TYPE_SYNC_FOLDER: type= "SYNC-FOLDER"; break; + case MODEST_MAIL_OPERATION_TYPE_SHUTDOWN: type= "SHUTDOWN"; break; case MODEST_MAIL_OPERATION_TYPE_UNKNOWN: type= "UNKNOWN"; break; default: type = "UNEXPECTED"; break; }