X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=7c78ded457ce17130a5aa0cda12ce74bf3532d32;hp=547c959c2fbdd22e23c11cf960dd3fd7e92a1ed4;hb=77ceea6adee9a9d22007093bf92ea989bb6430fb;hpb=e763278a5a8d41349ae3a1ba38e01ddfcfe2c8b9 diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c index 547c959..7c78ded 100644 --- a/src/modest-mail-operation.c +++ b/src/modest-mail-operation.c @@ -673,11 +673,15 @@ send_mail_msg_sent_handler (TnySendQueue *queue, TnyHeader *header, TnyMsg *msg, { SendMsgInfo *info = (SendMsgInfo *) userdata; TnyHeader *hdr1, *hdr2; + const char *msgid1, *msgid2; hdr1 = tny_msg_get_header(msg); hdr2 = tny_msg_get_header(info->msg); + msgid1 = tny_header_get_message_id(hdr1); + msgid2 = tny_header_get_message_id(hdr2); + if (msgid1 == NULL) msgid1 = "(null)"; + if (msgid2 == NULL) msgid2 = "(null)"; - if (!strcmp (tny_header_get_message_id(hdr1), - tny_header_get_message_id(hdr2))) { + if (!strcmp (msgid1, msgid2)) { ModestMailOperationPrivate *priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op); priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; @@ -693,11 +697,16 @@ send_mail_error_happened_handler (TnySendQueue *queue, TnyHeader *header, TnyMsg { SendMsgInfo *info = (SendMsgInfo *) userdata; TnyHeader *hdr1, *hdr2; + const char *msgid1, *msgid2; + hdr1 = tny_msg_get_header(msg); hdr2 = tny_msg_get_header(info->msg); + msgid1 = tny_header_get_message_id(hdr1); + msgid2 = tny_header_get_message_id(hdr2); + if (msgid1 == NULL) msgid1 = "(null)"; + if (msgid2 == NULL) msgid2 = "(null)"; - if (!strcmp (tny_header_get_message_id(hdr1), - tny_header_get_message_id(hdr2))) { + if (!strcmp (msgid1, msgid2)) { ModestMailOperationPrivate *priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op); priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, @@ -796,6 +805,7 @@ create_msg_thread (gpointer thread_data) g_object_unref (info->mail_op); g_slice_free (CreateMsgInfo, info); + if (new_msg) g_object_unref(new_msg); return NULL; } @@ -1222,6 +1232,7 @@ typedef struct gboolean poke_all; TnyFolderObserver *inbox_observer; guint update_timeout; + RetrieveAllCallback retrieve_all_cb; } UpdateAccountInfo; @@ -1270,7 +1281,7 @@ inbox_refreshed_cb (TnyFolder *inbox, ModestAccountMgr *mgr; ModestAccountRetrieveType retrieve_type; TnyList *new_headers = NULL; - gboolean headers_only; + gboolean headers_only, ignore_limit; TnyTransportAccount *transport_account; ModestTnySendQueue *send_queue; @@ -1329,11 +1340,18 @@ inbox_refreshed_cb (TnyFolder *inbox, /* Order by date */ g_ptr_array_sort (new_headers_array, (GCompareFunc) compare_headers_by_date); - /* TODO: Ask the user, instead of just failing, - * showing mail_nc_msg_count_limit_exceeded, with 'Get - * all' and 'Newest only' buttons. */ + /* 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) { - /* TODO */ + /* 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); } if (!headers_only) { @@ -1341,7 +1359,10 @@ inbox_refreshed_cb (TnyFolder *inbox, const gint msg_list_size = compute_message_array_size (new_headers_array); priv->done = 0; - priv->total = MIN (new_headers_array->len, retrieve_limit); + if (ignore_limit) + priv->total = new_headers_array->len; + 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); @@ -1528,6 +1549,7 @@ void modest_mail_operation_update_account (ModestMailOperation *self, const gchar *account_name, gboolean poke_all, + RetrieveAllCallback retrieve_all_cb, UpdateAccountCallback callback, gpointer user_data) { @@ -1562,6 +1584,7 @@ modest_mail_operation_update_account (ModestMailOperation *self, info->callback = callback; info->user_data = user_data; info->update_timeout = g_timeout_add (250, timeout_notify_progress, self); + info->retrieve_all_cb = retrieve_all_cb; /* Set account busy */ modest_account_mgr_set_account_busy (modest_runtime_get_account_mgr (), account_name, TRUE); @@ -1617,17 +1640,62 @@ compare_headers_by_date (gconstpointer a, /* ************************** STORE ACTIONS ************************* */ /* ******************************************************************* */ +typedef struct { + ModestMailOperation *mail_op; + CreateFolderUserCallback callback; + gpointer user_data; +} CreateFolderInfo; + + +static void +create_folder_cb (TnyFolderStore *parent_folder, + gboolean canceled, + TnyFolder *new_folder, + GError *err, + gpointer user_data) +{ + ModestMailOperationPrivate *priv; + CreateFolderInfo *info; + + info = (CreateFolderInfo *) user_data; + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op); + + if (canceled || err) { + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + if (err) + priv->error = g_error_copy (err); + else + g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, + MODEST_MAIL_OPERATION_ERROR_OPERATION_CANCELED, + "canceled"); + } else { + priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; + } + + /* The user will unref the new_folder */ + if (info->callback) + info->callback (info->mail_op, parent_folder, + new_folder, info->user_data); + + /* Notify about operation end */ + modest_mail_operation_notify_end (info->mail_op); + + /* Frees */ + g_object_unref (info->mail_op); + g_slice_free (CreateFolderInfo, info); +} -TnyFolder * +void modest_mail_operation_create_folder (ModestMailOperation *self, TnyFolderStore *parent, - const gchar *name) + const gchar *name, + CreateFolderUserCallback callback, + gpointer user_data) { ModestMailOperationPrivate *priv; - TnyFolder *new_folder = NULL; - g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent), NULL); - g_return_val_if_fail (name, NULL); + g_return_if_fail (TNY_IS_FOLDER_STORE (parent)); + g_return_if_fail (name); priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); priv->op_type = MODEST_MAIL_OPERATION_TYPE_INFO; @@ -1664,18 +1732,25 @@ modest_mail_operation_create_folder (ModestMailOperation *self, } if (!priv->error) { - /* Create the folder */ - modest_mail_operation_notify_start (self); - new_folder = tny_folder_store_create_folder (parent, name, &(priv->error)); - CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED); - if (!priv->error) - priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; - } + CreateFolderInfo *info; - /* Notify about operation end */ - modest_mail_operation_notify_end (self); + info = g_slice_new0 (CreateFolderInfo); + info->mail_op = g_object_ref (self); + info->callback = callback; + info->user_data = user_data; - return new_folder; + modest_mail_operation_notify_start (self); + + /* Create the folder */ + tny_folder_store_create_folder_async (parent, name, create_folder_cb, + NULL, info); + } else { + /* Call the user callback anyway */ + if (callback) + callback (self, parent, NULL, user_data); + /* Notify about operation end */ + modest_mail_operation_notify_end (self); + } } void @@ -2291,16 +2366,32 @@ modest_mail_operation_remove_msg (ModestMailOperation *self, /* remove message from folder */ tny_folder_remove_msg (folder, header, &(priv->error)); if (!priv->error) { + gboolean expunge, leave_on_server; + const gchar *account_name; + TnyAccount *account; + tny_header_set_flag (header, TNY_HEADER_FLAG_DELETED); tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN); modest_mail_operation_notify_start (self); - if (TNY_IS_CAMEL_IMAP_FOLDER (folder) || - TNY_IS_CAMEL_POP_FOLDER (folder)) - tny_folder_sync_async(folder, FALSE, NULL, NULL, NULL); /* FALSE --> dont expunge */ + /* Get leave on server setting */ + account = 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); + + if (TNY_IS_CAMEL_POP_FOLDER (folder) && !leave_on_server) + expunge = TRUE; else - tny_folder_sync_async(folder, TRUE, NULL, NULL, NULL); /* TRUE --> expunge */ + expunge = FALSE; + + /* Sync folder */ + tny_folder_sync_async(folder, expunge, NULL, NULL, NULL); + + /* Unref */ + g_object_unref (account); } @@ -2385,12 +2476,25 @@ modest_mail_operation_remove_msgs (ModestMailOperation *self, tny_folder_remove_msgs (folder, remove_headers, &(priv->error)); if (!priv->error) { - if (TNY_IS_CAMEL_IMAP_FOLDER (folder) || - TNY_IS_CAMEL_POP_FOLDER (folder)) - tny_folder_sync_async(folder, FALSE, NULL, NULL, NULL); /* FALSE --> don't expunge */ + gboolean expunge, leave_on_server; + const gchar *account_name; + TnyAccount *account; + + account = 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); + + if (TNY_IS_CAMEL_POP_FOLDER (folder) && !leave_on_server) + expunge = TRUE; else - /* local folders */ - tny_folder_sync_async(folder, TRUE, NULL, NULL, NULL); /* TRUE --> expunge */ + expunge = FALSE; + + /* Sync folder */ + tny_folder_sync_async(folder, expunge, NULL, NULL, NULL); + + g_object_unref (account); }