X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=c902b661443dc6a7000783db061746d89620f20c;hp=24ad55060e54bbe4a041125353d262b58daae529;hb=f7633249cd82c0808fa5a563b48b900e49988db7;hpb=05b334266f1e1b7af7f1bcfe113db1ab5f414f5b diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c index 24ad550..c902b66 100644 --- a/src/modest-mail-operation.c +++ b/src/modest-mail-operation.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -70,23 +71,6 @@ static void update_folders_cb (TnyFolderStore *self, static void add_attachments (TnyMsg *msg, GList *attachments_list); - -static TnyMimePart * add_body_part (TnyMsg *msg, - const gchar *body, - const gchar *content_type, - gboolean has_attachments); - - -static void modest_mail_operation_xfer_folder (ModestMailOperation *self, - TnyFolder *folder, - TnyFolderStore *parent, - gboolean delete_original); - -static gboolean modest_mail_operation_xfer_msg (ModestMailOperation *self, - TnyHeader *header, - TnyFolder *folder, - gboolean delete_original); - enum _ModestMailOperationSignals { PROGRESS_CHANGED_SIGNAL, @@ -120,10 +104,6 @@ typedef struct _RefreshFolderAsyncHelper } RefreshFolderAsyncHelper; -/* some utility functions */ -static char * get_content_type(const gchar *s); -static gboolean is_ascii(const gchar *s); - /* globals */ static GObjectClass *parent_class = NULL; @@ -225,29 +205,31 @@ modest_mail_operation_send_mail (ModestMailOperation *self, g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account)); - + send_queue = TNY_SEND_QUEUE (modest_runtime_get_send_queue (transport_account)); if (!TNY_IS_SEND_QUEUE(send_queue)) g_printerr ("modest: could not find send queue for account\n"); - else - tny_send_queue_add (send_queue, msg); + else { + GError *err = NULL; + tny_send_queue_add (send_queue, msg, &err); + if (err) { + g_printerr ("modest: error adding msg to send queue: %s\n", + err->message); + g_error_free (err); + } else + g_message ("modest: message added to send queue"); + } } void modest_mail_operation_send_new_mail (ModestMailOperation *self, TnyTransportAccount *transport_account, - const gchar *from, - const gchar *to, - const gchar *cc, - const gchar *bcc, - const gchar *subject, - const gchar *body, + const gchar *from, const gchar *to, + const gchar *cc, const gchar *bcc, + const gchar *subject, const gchar *body, const GList *attachments_list) { - TnyPlatformFactory *fact; TnyMsg *new_msg; - TnyHeader *header; - gchar *content_type; ModestMailOperationPrivate *priv = NULL; g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); @@ -259,40 +241,19 @@ modest_mail_operation_send_new_mail (ModestMailOperation *self, if (to == NULL) { g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, MODEST_MAIL_OPERATION_ERROR_MISSING_PARAMETER, - _("Error trying to send a mail. You need to set almost one a recipient")); + _("Error trying to send a mail. You need to set at least one recipient")); return; } - /* Create new msg */ - fact = modest_tny_platform_factory_get_instance (); - new_msg = tny_platform_factory_new_msg (fact); - header = tny_platform_factory_new_header (fact); - - /* WARNING: set the header before assign values to it */ - tny_msg_set_header (new_msg, header); - tny_header_set_from (TNY_HEADER (header), from); - tny_header_set_replyto (TNY_HEADER (header), from); - tny_header_set_to (TNY_HEADER (header), to); - tny_header_set_cc (TNY_HEADER (header), cc); - tny_header_set_bcc (TNY_HEADER (header), bcc); - tny_header_set_subject (TNY_HEADER (header), subject); - - content_type = get_content_type(body); - - /* Add the body of the new mail */ - add_body_part (new_msg, body, (const gchar *) content_type, - (attachments_list == NULL) ? FALSE : TRUE); - - /* Add attachments */ - add_attachments (new_msg, (GList*) attachments_list); - - /* Send mail */ + new_msg = modest_tny_msg_new (to, from, cc, bcc, subject, body, NULL); /* FIXME: attachments */ + if (!new_msg) { + g_printerr ("modest: failed to create a new msg\n"); + return; + } + modest_mail_operation_send_mail (self, transport_account, new_msg); - /* Clean */ - g_object_unref (header); - g_object_unref (new_msg); - g_free(content_type); + g_object_unref (G_OBJECT(new_msg)); } static void @@ -312,7 +273,6 @@ add_if_attachment (gpointer data, gpointer user_data) static TnyMsg * create_reply_forward_mail (TnyMsg *msg, const gchar *from, gboolean is_reply, guint type) { - TnyPlatformFactory *fact; TnyMsg *new_msg; TnyHeader *new_header, *header; gchar *new_subject; @@ -353,9 +313,7 @@ create_reply_forward_mail (TnyMsg *msg, const gchar *from, gboolean is_reply, gu 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)); - tny_msg_set_header (new_msg, new_header); + new_header = tny_msg_get_header (new_msg); tny_header_set_from (new_header, from); tny_header_set_replyto (new_header, from); @@ -391,7 +349,8 @@ modest_mail_operation_create_forward_mail (TnyMsg *msg, add_attachments (new_msg, attachments_list); /* Clean */ - if (attachments_list) g_list_free (attachments_list); + if (attachments_list) + g_list_free (attachments_list); g_object_unref (G_OBJECT (parts)); return new_msg; @@ -509,10 +468,12 @@ folder_refresh_cb (TnyFolder *folder, gboolean canceled, GError **err, gpointer g_slice_free (RefreshFolderAsyncHelper, helper); } else { 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)); + if (folder) { + g_message ("modest: refreshing folder %s", + tny_folder_get_name (folder)); + tny_folder_refresh_async (folder, folder_refresh_cb, status_update_cb, helper); + g_object_unref (G_OBJECT(folder)); // FIXME: don't unref yet + } } g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL); } @@ -547,9 +508,12 @@ update_folders_cb (TnyFolderStore *folder_store, TnyList *list, GError **err, gp /* Async refresh folders */ 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)); + if (folder) { + g_message ("modest: refreshing folder %s", tny_folder_get_name (folder)); + tny_folder_refresh_async (folder, folder_refresh_cb, + status_update_cb, helper); + } + //g_object_unref (G_OBJECT(folder)); /* FIXME -==> don't unref yet... */ } gboolean @@ -567,12 +531,17 @@ modest_mail_operation_update_account (ModestMailOperation *self, /* Get subscribed folders & refresh them */ folders = TNY_LIST (tny_simple_list_new ()); - query = tny_folder_store_query_new (); - tny_folder_store_query_add_item (query, NULL, TNY_FOLDER_STORE_QUERY_OPTION_SUBSCRIBED); + query = NULL; //tny_folder_store_query_new (); + + /* FIXME: is this needed? */ + tny_device_force_online (TNY_DEVICE(modest_runtime_get_device())); + + /* FIXME: let query be NULL: do it for all */ + //tny_folder_store_query_add_item (query, NULL, TNY_FOLDER_STORE_QUERY_OPTION_SUBSCRIBED); tny_folder_store_get_folders_async (TNY_FOLDER_STORE (store_account), folders, update_folders_cb, query, self); - g_object_unref (query); - + //g_object_unref (query); /* FIXME */ + return TRUE; } @@ -690,31 +659,40 @@ modest_mail_operation_create_folder (ModestMailOperation *self, void modest_mail_operation_remove_folder (ModestMailOperation *self, - TnyFolder *folder, - gboolean remove_to_trash) + TnyFolder *folder, + gboolean remove_to_trash) { - TnyFolderStore *folder_store; + TnyFolderStore *parent; + TnyAccount *account; + ModestMailOperationPrivate *priv; + g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); g_return_if_fail (TNY_IS_FOLDER (folder)); - /* Get folder store */ - folder_store = TNY_FOLDER_STORE (tny_folder_get_account (folder)); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); + + /* Get the account */ + account = tny_folder_get_account (folder); /* Delete folder or move to trash */ if (remove_to_trash) { - TnyFolder *trash_folder; - trash_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT(folder_store), + TnyFolder *trash_folder, *new_folder; + trash_folder = modest_tny_account_get_special_folder (account, TNY_FOLDER_TYPE_TRASH); /* TODO: error_handling */ - modest_mail_operation_move_folder (self, folder, - TNY_FOLDER_STORE (trash_folder)); + new_folder = modest_mail_operation_xfer_folder (self, folder, + TNY_FOLDER_STORE (trash_folder), TRUE); + g_object_unref (G_OBJECT (new_folder)); } else { - tny_folder_store_remove_folder (folder_store, folder, NULL); /* FIXME */ - g_object_unref (G_OBJECT (folder)); - } + parent = tny_folder_get_folder_store (folder); - /* Free instances */ - g_object_unref (G_OBJECT (folder_store)); + tny_folder_store_remove_folder (parent, folder, &(priv->error)); + CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED, ); + + if (parent) + g_object_unref (G_OBJECT (parent)); + } + g_object_unref (G_OBJECT (account)); } void @@ -739,88 +717,25 @@ modest_mail_operation_rename_folder (ModestMailOperation *self, CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED, return); } -void -modest_mail_operation_move_folder (ModestMailOperation *self, - TnyFolder *folder, - TnyFolderStore *parent) -{ - g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); - g_return_if_fail (TNY_IS_FOLDER_STORE (parent)); - g_return_if_fail (TNY_IS_FOLDER (folder)); - - modest_mail_operation_xfer_folder (self, folder, parent, TRUE); -} - -void -modest_mail_operation_copy_folder (ModestMailOperation *self, - TnyFolder *folder, - TnyFolderStore *parent) -{ - g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); - g_return_if_fail (TNY_IS_FOLDER_STORE (parent)); - g_return_if_fail (TNY_IS_FOLDER (folder)); - - modest_mail_operation_xfer_folder (self, folder, parent, FALSE); -} - -static void +TnyFolder * modest_mail_operation_xfer_folder (ModestMailOperation *self, TnyFolder *folder, TnyFolderStore *parent, gboolean delete_original) { ModestMailOperationPrivate *priv; - const gchar *folder_name; - TnyFolder *dest_folder = NULL, *child = NULL; - TnyIterator *iter = NULL; - TnyList *folders = NULL, *headers = NULL; - g_return_if_fail (TNY_IS_FOLDER (folder)); - g_return_if_fail (TNY_IS_FOLDER_STORE (parent)); + g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), NULL); + g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent), NULL); + g_return_val_if_fail (TNY_IS_FOLDER (folder), NULL); priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); - /* Create the destination folder */ - folder_name = tny_folder_get_name (folder); - dest_folder = modest_mail_operation_create_folder (self, parent, folder_name); - CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED, goto clean); - - /* Transfer messages */ - headers = TNY_LIST (tny_simple_list_new ()); - tny_folder_get_headers (folder, headers, FALSE, &(priv->error)); - CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED, goto clean); - - tny_folder_transfer_msgs (folder, headers, dest_folder, delete_original, &(priv->error)); - CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED, goto clean); - - /* Recurse children */ - folders = TNY_LIST (tny_simple_list_new ()); - tny_folder_store_get_folders (TNY_FOLDER_STORE (folder), folders, NULL, &(priv->error)); - CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED, goto clean); - - 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), - delete_original); - tny_iterator_next (iter); - g_object_unref (G_OBJECT(child)); - } - - /* Delete source folder (if needed) */ - if (delete_original) - modest_mail_operation_remove_folder (self, folder, FALSE); - - /* Clean up */ - clean: - if (dest_folder) - g_object_unref (G_OBJECT (dest_folder)); - if (headers) - g_object_unref (G_OBJECT (headers)); - if (folders) - g_object_unref (G_OBJECT (folders)); - if (iter) - g_object_unref (G_OBJECT (iter)); + return tny_folder_copy (folder, + parent, + tny_folder_get_name (folder), + delete_original, + &(priv->error)); } @@ -828,28 +743,6 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self, /* ************************** MSG ACTIONS ************************* */ /* ******************************************************************* */ -gboolean -modest_mail_operation_copy_msg (ModestMailOperation *self, - TnyHeader *header, - TnyFolder *folder) -{ - g_return_val_if_fail (TNY_IS_HEADER (header), FALSE); - g_return_val_if_fail (TNY_IS_FOLDER (folder), FALSE); - - return modest_mail_operation_xfer_msg (self, header, folder, FALSE); -} - -gboolean -modest_mail_operation_move_msg (ModestMailOperation *self, - TnyHeader *header, - TnyFolder *folder) -{ - g_return_val_if_fail (TNY_IS_HEADER (header), FALSE); - g_return_val_if_fail (TNY_IS_FOLDER (folder), FALSE); - - return modest_mail_operation_xfer_msg (self, header, folder, TRUE); -} - void modest_mail_operation_remove_msg (ModestMailOperation *self, TnyHeader *header, @@ -870,7 +763,7 @@ modest_mail_operation_remove_msg (ModestMailOperation *self, trash_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT(store_account), TNY_FOLDER_TYPE_TRASH); if (trash_folder) { - modest_mail_operation_move_msg (self, header, trash_folder); + modest_mail_operation_xfer_msg (self, header, trash_folder, TRUE); /* g_object_unref (trash_folder); */ } else { ModestMailOperationPrivate *priv; @@ -899,13 +792,20 @@ transfer_msgs_cb (TnyFolder *folder, GError **err, gpointer user_data) ModestMailOperationPrivate *priv; priv = MODEST_MAIL_OPERATION_GET_PRIVATE(user_data); - priv->done = 1; - priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; + + if (*err) { + priv->error = g_error_copy (*err); + priv->done = 0; + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + } else { + priv->done = 1; + priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; + } g_signal_emit (G_OBJECT (user_data), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL); } -static gboolean +gboolean modest_mail_operation_xfer_msg (ModestMailOperation *self, TnyHeader *header, TnyFolder *folder, @@ -915,6 +815,10 @@ modest_mail_operation_xfer_msg (ModestMailOperation *self, TnyFolder *src_folder; TnyList *headers; + g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), FALSE); + g_return_val_if_fail (TNY_IS_HEADER (header), FALSE); + g_return_val_if_fail (TNY_IS_FOLDER (folder), FALSE); + src_folder = tny_header_get_folder (header); headers = tny_simple_list_new (); @@ -925,11 +829,13 @@ modest_mail_operation_xfer_msg (ModestMailOperation *self, tny_list_prepend (headers, G_OBJECT (header)); tny_folder_transfer_msgs_async (src_folder, headers, folder, - delete_original, transfer_msgs_cb, self); + delete_original, transfer_msgs_cb, + g_object_ref(self)); /* Free */ - g_object_unref (headers); - g_object_unref (folder); + /* FIXME: don't free 'm yet */ + ///g_object_unref (headers); + ///g_object_unref (src_folder); return TRUE; } @@ -938,34 +844,6 @@ modest_mail_operation_xfer_msg (ModestMailOperation *self, /* ******************************************************************* */ /* ************************* UTILIY FUNCTIONS ************************ */ /* ******************************************************************* */ -static gboolean -is_ascii(const gchar *s) -{ - while (s[0]) { - if (s[0] & 128 || s[0] < 32) - return FALSE; - s++; - } - return TRUE; -} - -static char * -get_content_type(const gchar *s) -{ - GString *type; - - type = g_string_new("text/plain"); - if (!is_ascii(s)) { - if (g_utf8_validate(s, -1, NULL)) { - g_string_append(type, "; charset=\"utf-8\""); - } else { - /* it should be impossible to reach this, but better safe than sorry */ - g_warning("invalid utf8 in message"); - g_string_append(type, "; charset=\"latin1\""); - } - } - return g_string_free(type, FALSE); -} static void add_attachments (TnyMsg *msg, GList *attachments_list) @@ -975,15 +853,14 @@ add_attachments (TnyMsg *msg, GList *attachments_list) const gchar *attachment_content_type; const gchar *attachment_filename; TnyStream *attachment_stream; - TnyPlatformFactory *fact; - fact = modest_tny_platform_factory_get_instance (); for (pos = (GList *)attachments_list; pos; pos = pos->next) { old_attachment = pos->data; attachment_filename = tny_mime_part_get_filename (old_attachment); attachment_stream = tny_mime_part_get_stream (old_attachment); - attachment_part = tny_platform_factory_new_mime_part (fact); + attachment_part = tny_platform_factory_new_mime_part + (modest_runtime_get_platform_factory()); attachment_content_type = tny_mime_part_get_content_type (old_attachment); @@ -999,45 +876,3 @@ add_attachments (TnyMsg *msg, GList *attachments_list) } } - -static TnyMimePart * -add_body_part (TnyMsg *msg, - const gchar *body, - const gchar *content_type, - gboolean has_attachments) -{ - TnyMimePart *text_body_part = NULL; - TnyStream *text_body_stream; - TnyPlatformFactory *fact; - - fact = modest_tny_platform_factory_get_instance (); - - /* Create the stream */ - text_body_stream = TNY_STREAM (tny_camel_stream_new - (camel_stream_mem_new_with_buffer - (body, strlen(body)))); - - /* Create body part if needed */ - if (has_attachments) - text_body_part = tny_platform_factory_new_mime_part (fact); - else - text_body_part = TNY_MIME_PART(msg); - - /* Construct MIME part */ - tny_stream_reset (text_body_stream); - tny_mime_part_construct_from_stream (text_body_part, - text_body_stream, - content_type); - tny_stream_reset (text_body_stream); - - /* Add part if needed */ - if (has_attachments) { - tny_mime_part_add_part (TNY_MIME_PART (msg), text_body_part); - g_object_unref (G_OBJECT(text_body_part)); - } - - /* Clean */ - g_object_unref (text_body_stream); - - return text_body_part; -}