X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=e0068b3d2a988559502284ffb214f94b43b24294;hp=72acc997f7a4a147062f83bbe9e89a8307f20025;hb=b09daad954384d34091b51a04eda7fd3a57a5f22;hpb=4890451afdc3b006fd724d86035c517478c1aaf2 diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c index 72acc99..e0068b3 100644 --- a/src/modest-mail-operation.c +++ b/src/modest-mail-operation.c @@ -35,10 +35,7 @@ #include #include #include -#include -#include #include -#include #include #include #include @@ -48,35 +45,27 @@ #include "modest-tny-platform-factory.h" #include "modest-marshal.h" #include "modest-formatter.h" +#include "modest-error.h" /* 'private'/'protected' functions */ static void modest_mail_operation_class_init (ModestMailOperationClass *klass); static void modest_mail_operation_init (ModestMailOperation *obj); static void modest_mail_operation_finalize (GObject *obj); -#define MODEST_ERROR modest_error_quark () - -typedef enum _ModestMailOperationErrorCode ModestMailOperationErrorCode; -enum _ModestMailOperationErrorCode { - MODEST_MAIL_OPERATION_ERROR_BAD_ACCOUNT, - MODEST_MAIL_OPERATION_ERROR_MISSING_PARAMETER, - MODEST_MAIL_OPERATION_ERROR_OPERATION_CANCELED, - - MODEST_MAIL_OPERATION_NUM_ERROR_CODES -}; - -static void set_error (ModestMailOperation *mail_operation, - ModestMailOperationErrorCode error_code, - const gchar *fmt, ...); -static void status_update_cb (TnyFolder *folder, +static void status_update_cb (TnyFolder *folder, const gchar *what, gint status, + gint oftotal, gpointer user_data); -static void folder_refresh_cb (TnyFolder *folder, +static void folder_refresh_cb (TnyFolder *folder, gboolean canceled, GError **err, gpointer user_data); -static void add_attachments (TnyMsg *msg, +static void update_folders_cb (TnyFolderStore *self, + TnyList *list, + GError **err, + gpointer user_data); +static void add_attachments (TnyMsg *msg, GList *attachments_list); @@ -86,17 +75,17 @@ static TnyMimePart * add_body_part (TnyMsg *msg, gboolean has_attachments); -static void modest_mail_operation_xfer_folder (ModestMailOperation *mail_op, +static void modest_mail_operation_xfer_folder (ModestMailOperation *self, TnyFolder *folder, TnyFolderStore *parent, gboolean delete_original); -static void modest_mail_operation_xfer_msg (ModestMailOperation *mail_op, +static void modest_mail_operation_xfer_msg (ModestMailOperation *self, TnyHeader *header, TnyFolder *folder, gboolean delete_original); -static TnyFolder * modest_mail_operation_find_trash_folder (ModestMailOperation *mail_op, +static TnyFolder * modest_mail_operation_find_trash_folder (ModestMailOperation *self, TnyStoreAccount *store_account); @@ -109,11 +98,8 @@ enum _ModestMailOperationSignals typedef struct _ModestMailOperationPrivate ModestMailOperationPrivate; struct _ModestMailOperationPrivate { - guint failed; - guint canceled; guint done; guint total; - GMutex *cb_lock; ModestMailOperationStatus status; GError *error; }; @@ -121,6 +107,15 @@ struct _ModestMailOperationPrivate { MODEST_TYPE_MAIL_OPERATION, \ ModestMailOperationPrivate)) +typedef struct _RefreshFolderAsyncHelper +{ + ModestMailOperation *mail_op; + TnyIterator *iter; + guint failed; + guint canceled; + +} RefreshFolderAsyncHelper; + /* some utility functions */ static char * get_content_type(const gchar *s); static gboolean is_ascii(const gchar *s); @@ -165,7 +160,13 @@ modest_mail_operation_class_init (ModestMailOperationClass *klass) g_type_class_add_private (gobject_class, sizeof(ModestMailOperationPrivate)); - /* signal definitions go here, e.g.: */ + /** + * ModestMailOperation::progress-changed + * @self: the #MailOperation that emits the signal + * @user_data: user data set when the signal handler was connected + * + * Emitted when the progress of a mail operation changes + */ signals[PROGRESS_CHANGED_SIGNAL] = g_signal_new ("progress_changed", G_TYPE_FROM_CLASS (gobject_class), @@ -186,10 +187,7 @@ modest_mail_operation_init (ModestMailOperation *obj) priv->status = MODEST_MAIL_OPERATION_STATUS_INVALID; priv->error = NULL; priv->done = 0; - priv->failed = 0; - priv->canceled = 0; priv->total = 0; - priv->cb_lock = g_mutex_new (); } static void @@ -204,8 +202,6 @@ modest_mail_operation_finalize (GObject *obj) priv->error = NULL; } - g_mutex_free (priv->cb_lock); - G_OBJECT_CLASS(parent_class)->finalize (obj); } @@ -217,18 +213,18 @@ modest_mail_operation_new (void) void -modest_mail_operation_send_mail (ModestMailOperation *mail_op, +modest_mail_operation_send_mail (ModestMailOperation *self, TnyTransportAccount *transport_account, TnyMsg* msg) { - g_return_if_fail (MODEST_IS_MAIL_OPERATION (mail_op)); + g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account)); tny_transport_account_send (transport_account, msg, NULL); /* FIXME */ } void -modest_mail_operation_send_new_mail (ModestMailOperation *mail_op, +modest_mail_operation_send_new_mail (ModestMailOperation *self, TnyTransportAccount *transport_account, const gchar *from, const gchar *to, @@ -238,24 +234,29 @@ modest_mail_operation_send_new_mail (ModestMailOperation *mail_op, 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 (mail_op)); + g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account)); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); + /* Check parametters */ if (to == NULL) { - set_error (mail_op, - MODEST_MAIL_OPERATION_ERROR_MISSING_PARAMETER, - _("Error trying to send a mail. You need to set almost one a recipient")); + 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")); return; } /* Create new msg */ - new_msg = TNY_MSG (tny_camel_msg_new ()); - header = TNY_HEADER (tny_camel_header_new ()); + 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); @@ -301,6 +302,7 @@ 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; @@ -339,14 +341,16 @@ create_reply_forward_mail (TnyMsg *msg, const gchar *from, gboolean is_reply, gu g_object_unref (G_OBJECT (formatter)); /* Fill the header */ - new_header = TNY_HEADER (tny_camel_header_new ()); - tny_msg_set_header (new_msg, new_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); tny_header_set_from (new_header, from); tny_header_set_replyto (new_header, from); /* Change the subject */ - new_subject = (gchar *) modest_text_utils_derived_subject (tny_header_get_subject(header), - (is_reply) ? _("Re:") : _("Fwd:")); + new_subject = + (gchar *) modest_text_utils_derived_subject (tny_header_get_subject(header), + (is_reply) ? _("Re:") : _("Fwd:")); tny_header_set_subject (new_header, (const gchar *) new_subject); g_free (new_subject); @@ -357,15 +361,6 @@ create_reply_forward_mail (TnyMsg *msg, const gchar *from, gboolean is_reply, gu return new_msg; } -/** - * modest_mail_operation_create_forward_mail: - * @msg: a valid #TnyMsg instance - * @forward_type: the type of forwarded message - * - * creates a forwarded message from an existing one - * - * Returns: a new #TnyMsg, or NULL in case of error - **/ TnyMsg* modest_mail_operation_create_forward_mail (TnyMsg *msg, const gchar *from, @@ -390,16 +385,6 @@ modest_mail_operation_create_forward_mail (TnyMsg *msg, return new_msg; } -/** - * modest_mail_operation_create_reply_mail: - * @msg: a valid #TnyMsg instance - * @reply_type: the format of the new message - * @reply_mode: the mode of reply, to the sender only, to a mail list or to all - * - * creates a new message to reply to an existing one - * - * Returns: Returns: a new #TnyMsg, or NULL in case of error - **/ TnyMsg* modest_mail_operation_create_reply_mail (TnyMsg *msg, const gchar *from, @@ -441,10 +426,12 @@ modest_mail_operation_create_reply_mail (TnyMsg *msg, if (cc) g_string_append_printf (tmp, ",%s",cc); if (bcc) g_string_append_printf (tmp, ",%s",bcc); - /* Remove my own address from the cc list */ + /* Remove my own address from the cc list. TODO: + remove also the To: of the new message, needed due + to the new reply_to feature */ new_cc = (gchar *) modest_text_utils_remove_address ((const gchar *) tmp->str, - (const gchar *) from); + from); /* FIXME: remove also the mails from the new To: */ tny_header_set_cc (new_header, new_cc); @@ -462,162 +449,186 @@ modest_mail_operation_create_reply_mail (TnyMsg *msg, } static void -status_update_cb (TnyFolder *folder, const gchar *what, gint status, gpointer user_data) +status_update_cb (TnyFolder *folder, const gchar *what, gint status, gint oftotal, gpointer user_data) { - g_print ("%s status: %d\n", what, status); + g_print ("%s status: %d, of total %d\n", what, status, oftotal); } static void folder_refresh_cb (TnyFolder *folder, gboolean canceled, GError **err, gpointer user_data) { - ModestMailOperation *mail_op = NULL; + ModestMailOperation *self = NULL; ModestMailOperationPrivate *priv = NULL; + RefreshFolderAsyncHelper *helper; - mail_op = MODEST_MAIL_OPERATION (user_data); - priv = MODEST_MAIL_OPERATION_GET_PRIVATE(mail_op); - - g_mutex_lock (priv->cb_lock); + helper = (RefreshFolderAsyncHelper *) user_data; + self = MODEST_MAIL_OPERATION (helper->mail_op); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); if ((canceled && *err) || *err) { priv->error = g_error_copy (*err); - priv->failed++; + helper->failed++; } else if (canceled) { - priv->canceled++; - set_error (mail_op, - MODEST_MAIL_OPERATION_ERROR_OPERATION_CANCELED, - _("Error trying to refresh folder %s. Operation canceled"), - tny_folder_get_name (folder)); + helper->canceled++; + g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, + MODEST_MAIL_OPERATION_ERROR_OPERATION_CANCELED, + _("Error trying to refresh folder %s. Operation canceled"), + tny_folder_get_name (folder)); } else { priv->done++; } if (priv->done == priv->total) priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS; - else if ((priv->done + priv->canceled + priv->failed) == priv->total) - if (priv->failed == priv->total) + else if ((priv->done + helper->canceled + helper->failed) == priv->total) + if (helper->failed == priv->total) priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; - else if (priv->failed == priv->total) + else if (helper->failed == priv->total) priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED; else priv->status = MODEST_MAIL_OPERATION_STATUS_FINISHED_WITH_ERRORS; - g_mutex_unlock (priv->cb_lock); + tny_iterator_next (helper->iter); + if (tny_iterator_is_done (helper->iter)) { + TnyList *list; + list = tny_iterator_get_list (helper->iter); + g_object_unref (G_OBJECT (helper->iter)); + g_object_unref (G_OBJECT (list)); + g_slice_free (RefreshFolderAsyncHelper, helper); + } else { + tny_folder_refresh_async (TNY_FOLDER (tny_iterator_get_current (helper->iter)), + folder_refresh_cb, + status_update_cb, + helper); + } + g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL); +} + + +static void +update_folders_cb (TnyFolderStore *folder_store, TnyList *list, GError **err, gpointer user_data) +{ + ModestMailOperation *self; + ModestMailOperationPrivate *priv; + TnyList *folders; + RefreshFolderAsyncHelper *helper; + + self = MODEST_MAIL_OPERATION (user_data); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); + + if (*err) { + priv->error = g_error_copy (*err); + priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; + return; + } + + priv->total = tny_list_get_length (list); + priv->done = 0; + priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; - g_signal_emit (G_OBJECT (mail_op), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL); + helper = g_slice_new0 (RefreshFolderAsyncHelper); + helper->mail_op = self; + helper->iter = tny_list_create_iterator (list); + helper->failed = 0; + helper->canceled = 0; + + /* Async refresh folders */ + tny_folder_refresh_async (TNY_FOLDER (tny_iterator_get_current (helper->iter)), + folder_refresh_cb, + status_update_cb, + helper); } gboolean -modest_mail_operation_update_account (ModestMailOperation *mail_op, +modest_mail_operation_update_account (ModestMailOperation *self, TnyStoreAccount *store_account) { ModestMailOperationPrivate *priv; TnyList *folders; - TnyIterator *ifolders; - TnyFolder *cur_folder; TnyFolderStoreQuery *query; - g_return_if_fail (MODEST_IS_MAIL_OPERATION (mail_op)); - g_return_if_fail (TNY_IS_STORE_ACCOUNT(store_account)); + g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), FALSE); + g_return_val_if_fail (TNY_IS_STORE_ACCOUNT(store_account), FALSE); - priv = MODEST_MAIL_OPERATION_GET_PRIVATE(mail_op); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self); - /* Get subscribed folders */ + /* 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); - tny_folder_store_get_folders (TNY_FOLDER_STORE (store_account), - folders, query, NULL); /* FIXME */ + tny_folder_store_get_folders_async (TNY_FOLDER_STORE (store_account), + folders, update_folders_cb, query, self); g_object_unref (query); - - ifolders = tny_list_create_iterator (folders); - priv->total = tny_list_get_length (folders); - priv->done = 0; - priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS; - - gint i =0; - /* Async refresh folders. Reference the mail_op because - tinymail destroys the user_data */ - for (tny_iterator_first (ifolders); - !tny_iterator_is_done (ifolders); - tny_iterator_next (ifolders)) { - - cur_folder = TNY_FOLDER (tny_iterator_get_current (ifolders)); - tny_folder_refresh_async (cur_folder, folder_refresh_cb, - status_update_cb, g_object_ref (mail_op)); - } - - g_object_unref (ifolders); return TRUE; } ModestMailOperationStatus -modest_mail_operation_get_status (ModestMailOperation *mail_op) +modest_mail_operation_get_status (ModestMailOperation *self) { ModestMailOperationPrivate *priv; -/* g_return_val_if_fail (mail_op, MODEST_MAIL_OPERATION_STATUS_INVALID); */ -/* g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (mail_op), */ -/* MODEST_MAIL_OPERATION_STATUS_INVALID); */ + g_return_val_if_fail (self, MODEST_MAIL_OPERATION_STATUS_INVALID); + g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), + MODEST_MAIL_OPERATION_STATUS_INVALID); - priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_op); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); return priv->status; } const GError * -modest_mail_operation_get_error (ModestMailOperation *mail_op) +modest_mail_operation_get_error (ModestMailOperation *self) { ModestMailOperationPrivate *priv; -/* g_return_val_if_fail (mail_op, NULL); */ -/* g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (mail_op), NULL); */ + g_return_val_if_fail (self, NULL); + g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), NULL); - priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_op); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); return priv->error; } -void -modest_mail_operation_cancel (ModestMailOperation *mail_op) +gboolean +modest_mail_operation_cancel (ModestMailOperation *self) { /* TODO */ + return TRUE; } guint -modest_mail_operation_get_task_done (ModestMailOperation *mail_op) +modest_mail_operation_get_task_done (ModestMailOperation *self) { ModestMailOperationPrivate *priv; - g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (mail_op), 0); + g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), 0); - priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_op); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); return priv->done; } guint -modest_mail_operation_get_task_total (ModestMailOperation *mail_op) +modest_mail_operation_get_task_total (ModestMailOperation *self) { ModestMailOperationPrivate *priv; - g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (mail_op), 0); + g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), 0); - priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_op); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); return priv->total; } gboolean -modest_mail_operation_is_finished (ModestMailOperation *mail_op) +modest_mail_operation_is_finished (ModestMailOperation *self) { ModestMailOperationPrivate *priv; gboolean retval = FALSE; - if (!MODEST_IS_MAIL_OPERATION (mail_op)) { + if (!MODEST_IS_MAIL_OPERATION (self)) { g_warning ("%s: invalid parametter", G_GNUC_FUNCTION); return retval; } - priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_op); - - g_mutex_lock (priv->cb_lock); + priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); if (priv->status == MODEST_MAIL_OPERATION_STATUS_SUCCESS || priv->status == MODEST_MAIL_OPERATION_STATUS_FAILED || @@ -627,7 +638,6 @@ modest_mail_operation_is_finished (ModestMailOperation *mail_op) } else { retval = FALSE; } - g_mutex_unlock (priv->cb_lock); return retval; } @@ -638,7 +648,7 @@ modest_mail_operation_is_finished (ModestMailOperation *mail_op) TnyFolder * -modest_mail_operation_create_folder (ModestMailOperation *mail_op, +modest_mail_operation_create_folder (ModestMailOperation *self, TnyFolderStore *parent, const gchar *name) { @@ -664,7 +674,7 @@ modest_mail_operation_create_folder (ModestMailOperation *mail_op, } void -modest_mail_operation_remove_folder (ModestMailOperation *mail_op, +modest_mail_operation_remove_folder (ModestMailOperation *self, TnyFolder *folder, gboolean remove_to_trash) { @@ -679,11 +689,11 @@ modest_mail_operation_remove_folder (ModestMailOperation *mail_op, if (remove_to_trash) { TnyFolder *trash_folder; - trash_folder = modest_mail_operation_find_trash_folder (mail_op, + trash_folder = modest_mail_operation_find_trash_folder (self, TNY_STORE_ACCOUNT (folder_store)); /* TODO: error_handling */ - modest_mail_operation_move_folder (mail_op, + modest_mail_operation_move_folder (self, folder, TNY_FOLDER_STORE (trash_folder)); } else { @@ -696,12 +706,13 @@ modest_mail_operation_remove_folder (ModestMailOperation *mail_op, } void -modest_mail_operation_rename_folder (ModestMailOperation *mail_op, +modest_mail_operation_rename_folder (ModestMailOperation *self, TnyFolder *folder, const gchar *name) { - g_return_if_fail (MODEST_IS_MAIL_OPERATION (mail_op)); + g_return_if_fail (MODEST_IS_MAIL_OPERATION (self)); g_return_if_fail (TNY_IS_FOLDER_STORE (folder)); + g_return_if_fail (name); /* FIXME: better error handling */ if (strrchr (name, '/') != NULL) @@ -712,31 +723,31 @@ modest_mail_operation_rename_folder (ModestMailOperation *mail_op, } void -modest_mail_operation_move_folder (ModestMailOperation *mail_op, +modest_mail_operation_move_folder (ModestMailOperation *self, TnyFolder *folder, TnyFolderStore *parent) { - g_return_if_fail (MODEST_IS_MAIL_OPERATION (mail_op)); + 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 (mail_op, folder, parent, TRUE); + modest_mail_operation_xfer_folder (self, folder, parent, TRUE); } void -modest_mail_operation_copy_folder (ModestMailOperation *mail_op, +modest_mail_operation_copy_folder (ModestMailOperation *self, TnyFolder *folder, TnyFolderStore *parent) { - g_return_if_fail (MODEST_IS_MAIL_OPERATION (mail_op)); + 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 (mail_op, folder, parent, FALSE); + modest_mail_operation_xfer_folder (self, folder, parent, FALSE); } static void -modest_mail_operation_xfer_folder (ModestMailOperation *mail_op, +modest_mail_operation_xfer_folder (ModestMailOperation *self, TnyFolder *folder, TnyFolderStore *parent, gboolean delete_original) @@ -751,7 +762,7 @@ modest_mail_operation_xfer_folder (ModestMailOperation *mail_op, /* Create the destination folder */ folder_name = tny_folder_get_name (folder); - dest_folder = modest_mail_operation_create_folder (mail_op, + dest_folder = modest_mail_operation_create_folder (self, parent, folder_name); /* Transfer messages */ @@ -767,7 +778,7 @@ modest_mail_operation_xfer_folder (ModestMailOperation *mail_op, while (!tny_iterator_is_done (iter)) { child = TNY_FOLDER (tny_iterator_get_current (iter)); - modest_mail_operation_xfer_folder (mail_op, child, + modest_mail_operation_xfer_folder (self, child, TNY_FOLDER_STORE (dest_folder), delete_original); tny_iterator_next (iter); @@ -775,7 +786,7 @@ modest_mail_operation_xfer_folder (ModestMailOperation *mail_op, /* Delete source folder (if needed) */ if (delete_original) - modest_mail_operation_remove_folder (mail_op, folder, FALSE); + modest_mail_operation_remove_folder (self, folder, FALSE); /* Clean up */ g_object_unref (G_OBJECT (dest_folder)); @@ -784,8 +795,11 @@ modest_mail_operation_xfer_folder (ModestMailOperation *mail_op, g_object_unref (G_OBJECT (iter)); } + +/* FIXME: this method should be rewritten when the policy for the + Trash folder becomes clearer */ static TnyFolder * -modest_mail_operation_find_trash_folder (ModestMailOperation *mail_op, +modest_mail_operation_find_trash_folder (ModestMailOperation *self, TnyStoreAccount *store_account) { TnyList *folders; @@ -826,29 +840,29 @@ modest_mail_operation_find_trash_folder (ModestMailOperation *mail_op, /* ******************************************************************* */ void -modest_mail_operation_copy_msg (ModestMailOperation *mail_op, +modest_mail_operation_copy_msg (ModestMailOperation *self, TnyHeader *header, TnyFolder *folder) { g_return_if_fail (TNY_IS_HEADER (header)); g_return_if_fail (TNY_IS_FOLDER (folder)); - modest_mail_operation_xfer_msg (mail_op, header, folder, FALSE); + modest_mail_operation_xfer_msg (self, header, folder, FALSE); } void -modest_mail_operation_move_msg (ModestMailOperation *mail_op, +modest_mail_operation_move_msg (ModestMailOperation *self, TnyHeader *header, TnyFolder *folder) { g_return_if_fail (TNY_IS_HEADER (header)); g_return_if_fail (TNY_IS_FOLDER (folder)); - modest_mail_operation_xfer_msg (mail_op, header, folder, TRUE); + modest_mail_operation_xfer_msg (self, header, folder, TRUE); } void -modest_mail_operation_remove_msg (ModestMailOperation *mail_op, +modest_mail_operation_remove_msg (ModestMailOperation *self, TnyHeader *header, gboolean remove_to_trash) { @@ -864,9 +878,9 @@ modest_mail_operation_remove_msg (ModestMailOperation *mail_op, TnyStoreAccount *store_account; store_account = TNY_STORE_ACCOUNT (tny_folder_get_account (folder)); - trash_folder = modest_mail_operation_find_trash_folder (mail_op, store_account); + trash_folder = modest_mail_operation_find_trash_folder (self, store_account); - modest_mail_operation_move_msg (mail_op, header, trash_folder); + modest_mail_operation_move_msg (self, header, trash_folder); g_object_unref (G_OBJECT (store_account)); } else { @@ -879,7 +893,7 @@ modest_mail_operation_remove_msg (ModestMailOperation *mail_op, } static void -modest_mail_operation_xfer_msg (ModestMailOperation *mail_op, +modest_mail_operation_xfer_msg (ModestMailOperation *self, TnyHeader *header, TnyFolder *folder, gboolean delete_original) @@ -943,32 +957,6 @@ modest_error_quark (void) return err_q; } - -static void -set_error (ModestMailOperation *mail_op, - ModestMailOperationErrorCode error_code, - const gchar *fmt, ...) -{ - ModestMailOperationPrivate *priv; - GError* error; - va_list args; - gchar* orig; - - priv = MODEST_MAIL_OPERATION_GET_PRIVATE(mail_op); - - va_start (args, fmt); - - orig = g_strdup_vprintf(fmt, args); - error = g_error_new (MODEST_ERROR, error_code, orig); - - va_end (args); - - if (priv->error) - g_object_unref (priv->error); - - priv->error = error; -} - static void add_attachments (TnyMsg *msg, GList *attachments_list) { @@ -977,13 +965,15 @@ 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_MIME_PART (tny_camel_mime_part_new (camel_mime_part_new())); + attachment_part = tny_platform_factory_new_mime_part (fact); attachment_content_type = tny_mime_part_get_content_type (old_attachment); @@ -1008,6 +998,9 @@ add_body_part (TnyMsg *msg, { 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 @@ -1016,8 +1009,7 @@ add_body_part (TnyMsg *msg, /* Create body part if needed */ if (has_attachments) - text_body_part = - TNY_MIME_PART (tny_camel_mime_part_new (camel_mime_part_new())); + text_body_part = tny_platform_factory_new_mime_part (fact); else text_body_part = TNY_MIME_PART(msg);