#include <tny-store-account.h>
#include <tny-folder-store.h>
#include <tny-folder-store-query.h>
-#include <tny-camel-msg.h>
-#include <tny-camel-header.h>
#include <tny-camel-stream.h>
-#include <tny-camel-mime-part.h>
#include <tny-simple-list.h>
#include <camel/camel-stream-mem.h>
#include <glib/gi18n.h>
-
+#include <modest-tny-account.h>
+#include <modest-tny-send-queue.h>
+#include <modest-runtime.h>
#include "modest-text-utils.h"
-#include "modest-tny-msg-actions.h"
+#include "modest-tny-msg.h"
#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);
+static void modest_mail_operation_xfer_folder (ModestMailOperation *self,
+ TnyFolder *folder,
+ TnyFolderStore *parent,
+ gboolean delete_original);
-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 *mail_op,
- TnyFolder *folder,
- TnyFolderStore *parent,
- gboolean delete_original);
-
-static void modest_mail_operation_xfer_msg (ModestMailOperation *mail_op,
- TnyHeader *header,
- TnyFolder *folder,
- gboolean delete_original);
-
-static TnyFolder * modest_mail_operation_find_trash_folder (ModestMailOperation *mail_op,
- TnyStoreAccount *store_account);
-
+static gboolean modest_mail_operation_xfer_msg (ModestMailOperation *self,
+ TnyHeader *header,
+ TnyFolder *folder,
+ gboolean delete_original);
enum _ModestMailOperationSignals
{
typedef struct _ModestMailOperationPrivate ModestMailOperationPrivate;
struct _ModestMailOperationPrivate {
- guint failed;
- guint canceled;
guint done;
guint total;
- GMutex *cb_lock;
ModestMailOperationStatus status;
GError *error;
};
+
#define MODEST_MAIL_OPERATION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_MAIL_OPERATION, \
ModestMailOperationPrivate))
-/* some utility functions */
-static char * get_content_type(const gchar *s);
-static gboolean is_ascii(const gchar *s);
+#define CHECK_EXCEPTION(priv, new_status, op) if (priv->error) {\
+ priv->status = new_status;\
+ op;\
+ }
+
+typedef struct _RefreshFolderAsyncHelper
+{
+ ModestMailOperation *mail_op;
+ TnyIterator *iter;
+ guint failed;
+ guint canceled;
+
+} RefreshFolderAsyncHelper;
/* globals */
static GObjectClass *parent_class = NULL;
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),
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
priv->error = NULL;
}
- g_mutex_free (priv->cb_lock);
-
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
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));
+ TnySendQueue *send_queue;
+
+ 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 */
+ 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 {
+ 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);
+ }
+ }
}
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,
- 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)
{
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 at least one recipient"));
return;
}
- /* Create new msg */
- new_msg = TNY_MSG (tny_camel_msg_new ());
- header = TNY_HEADER (tny_camel_header_new ());
-
- /* 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_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 */
- tny_transport_account_send (transport_account, new_msg, NULL); /* FIXME */
+ 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
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;
TnyMimePart *body;
ModestFormatter *formatter;
- /* Get body from original msg */
+ /* Get body from original msg. Always look for the text/plain
+ part of the message to create the reply/forwarded mail */
header = tny_msg_get_header (msg);
- body = modest_tny_msg_actions_find_body_part (msg, TRUE);
+ body = modest_tny_msg_find_body_part (msg, FALSE);
/* TODO: select the formatter from account prefs */
formatter = modest_formatter_new ("text/plain");
break;
}
}
- g_object_unref (G_OBJECT (formatter));
-
+ g_object_unref (G_OBJECT(formatter));
+ g_object_unref (G_OBJECT(body));
+
/* 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);
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,
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;
}
-/**
- * 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,
ModestMailOperationReplyType reply_type,
ModestMailOperationReplyMode reply_mode)
{
- TnyMsg *new_msg;
+ TnyMsg *new_msg = NULL;
TnyHeader *new_header, *header;
+ const gchar* reply_to;
+ gchar *new_cc = NULL;
+ const gchar *cc = NULL, *bcc = NULL;
+ GString *tmp = NULL;
new_msg = create_reply_forward_mail (msg, from, TRUE, reply_type);
/* Fill the header */
header = tny_msg_get_header (msg);
new_header = tny_msg_get_header (new_msg);
- tny_header_set_to (new_header, tny_header_get_from (header));
+ reply_to = tny_header_get_replyto (header);
- switch (reply_mode) {
- gchar *new_cc = NULL;
- const gchar *cc = NULL, *bcc = NULL;
- GString *tmp = NULL;
+ if (reply_to)
+ tny_header_set_to (new_header, reply_to);
+ else
+ tny_header_set_to (new_header, tny_header_get_from (header));
+ switch (reply_mode) {
case MODEST_MAIL_OPERATION_REPLY_MODE_SENDER:
/* Do not fill neither cc nor bcc */
break;
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 */
- new_cc = (gchar *)
- modest_text_utils_remove_address ((const gchar *) tmp->str,
- (const gchar *) from);
+ /* 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,
+ from);
/* FIXME: remove also the mails from the new To: */
tny_header_set_cc (new_header, new_cc);
}
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;
+ }
+ 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 {
+ 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));
+ }
+ 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;
+ RefreshFolderAsyncHelper *helper;
+ TnyFolder *folder;
+
+ 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_mutex_unlock (priv->cb_lock);
+ helper = g_slice_new0 (RefreshFolderAsyncHelper);
+ helper->mail_op = self;
+ helper->iter = tny_list_create_iterator (list);
+ helper->failed = 0;
+ helper->canceled = 0;
- g_signal_emit (G_OBJECT (mail_op), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL);
+ /* 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));
}
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 ||
} else {
retval = FALSE;
}
- g_mutex_unlock (priv->cb_lock);
return retval;
}
TnyFolder *
-modest_mail_operation_create_folder (ModestMailOperation *mail_op,
+modest_mail_operation_create_folder (ModestMailOperation *self,
TnyFolderStore *parent,
const gchar *name)
{
+ ModestMailOperationPrivate *priv;
+ TnyFolder *new_folder = NULL;
+ TnyStoreAccount *store_account;
+
g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent), NULL);
g_return_val_if_fail (name, NULL);
- TnyFolder *new_folder = NULL;
- TnyStoreAccount *store_account;
+ priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
/* Create the folder */
- new_folder = tny_folder_store_create_folder (parent, name, NULL); /* FIXME */
- if (!new_folder)
- return NULL;
+ new_folder = tny_folder_store_create_folder (parent, name, &(priv->error));
+ CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED, return NULL);
/* Subscribe to folder */
if (!tny_folder_is_subscribed (new_folder)) {
}
void
-modest_mail_operation_remove_folder (ModestMailOperation *mail_op,
+modest_mail_operation_remove_folder (ModestMailOperation *self,
TnyFolder *folder,
gboolean remove_to_trash)
{
TnyFolderStore *folder_store;
+ ModestMailOperationPrivate *priv;
+ g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
g_return_if_fail (TNY_IS_FOLDER (folder));
+ priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+
/* Get folder store */
folder_store = TNY_FOLDER_STORE (tny_folder_get_account (folder));
/* Delete folder or move to trash */
if (remove_to_trash) {
TnyFolder *trash_folder;
-
- trash_folder = modest_mail_operation_find_trash_folder (mail_op,
- TNY_STORE_ACCOUNT (folder_store));
-
+ trash_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT(folder_store),
+ TNY_FOLDER_TYPE_TRASH);
/* TODO: error_handling */
- modest_mail_operation_move_folder (mail_op,
- folder,
+ modest_mail_operation_move_folder (self, folder,
TNY_FOLDER_STORE (trash_folder));
} else {
- tny_folder_store_remove_folder (folder_store, folder, NULL); /* FIXME */
+ tny_folder_store_remove_folder (folder_store, folder, &(priv->error));
+ CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED, );
+
g_object_unref (G_OBJECT (folder));
}
}
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));
+ ModestMailOperationPrivate *priv;
+
+ g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
g_return_if_fail (TNY_IS_FOLDER_STORE (folder));
+ g_return_if_fail (name);
+
+ priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
/* FIXME: better error handling */
if (strrchr (name, '/') != NULL)
return;
/* Rename. Camel handles folder subscription/unsubscription */
- tny_folder_set_name (folder, name, NULL); /* FIXME */
+ tny_folder_set_name (folder, name, &(priv->error));
+ CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED, return);
}
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)
{
+ ModestMailOperationPrivate *priv;
const gchar *folder_name;
- TnyFolder *dest_folder, *child;
- TnyIterator *iter;
- TnyList *folders, *headers;
+ 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));
+ 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 (mail_op,
- parent, folder_name);
+ 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, NULL); /* FIXME */
- tny_folder_transfer_msgs (folder, headers, dest_folder, delete_original, NULL); /* FIXME */
+ 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, NULL ); /* FIXME */
- iter = tny_list_create_iterator (folders);
+ 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 (mail_op, child,
- TNY_FOLDER_STORE (dest_folder),
+ 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 (mail_op, folder, FALSE);
+ modest_mail_operation_remove_folder (self, folder, FALSE);
/* Clean up */
- g_object_unref (G_OBJECT (dest_folder));
- g_object_unref (G_OBJECT (headers));
- g_object_unref (G_OBJECT (folders));
- g_object_unref (G_OBJECT (iter));
+ 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));
}
-static TnyFolder *
-modest_mail_operation_find_trash_folder (ModestMailOperation *mail_op,
- TnyStoreAccount *store_account)
-{
- TnyList *folders;
- TnyIterator *iter;
- gboolean found;
- /*TnyFolderStoreQuery *query;*/
- TnyFolder *trash_folder;
-
- /* Look for Trash folder */
- folders = TNY_LIST (tny_simple_list_new ());
- tny_folder_store_get_folders (TNY_FOLDER_STORE (store_account),
- folders, NULL, NULL); /* FIXME */
- iter = tny_list_create_iterator (folders);
-
- found = FALSE;
- while (!tny_iterator_is_done (iter) && !found) {
-
- trash_folder = TNY_FOLDER (tny_iterator_get_current (iter));
- if (tny_folder_get_folder_type (trash_folder) == TNY_FOLDER_TYPE_TRASH)
- found = TRUE;
- else
- tny_iterator_next (iter);
- }
-
- /* Clean up */
- g_object_unref (G_OBJECT (folders));
- g_object_unref (G_OBJECT (iter));
-
- /* TODO: better error handling management */
- if (!found)
- return NULL;
- else
- return trash_folder;
-}
/* ******************************************************************* */
/* ************************** MSG ACTIONS ************************* */
/* ******************************************************************* */
-void
-modest_mail_operation_copy_msg (ModestMailOperation *mail_op,
+gboolean
+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));
+ g_return_val_if_fail (TNY_IS_HEADER (header), FALSE);
+ g_return_val_if_fail (TNY_IS_FOLDER (folder), FALSE);
- modest_mail_operation_xfer_msg (mail_op, header, folder, FALSE);
+ return modest_mail_operation_xfer_msg (self, header, folder, FALSE);
}
-void
-modest_mail_operation_move_msg (ModestMailOperation *mail_op,
+gboolean
+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));
+ g_return_val_if_fail (TNY_IS_HEADER (header), FALSE);
+ g_return_val_if_fail (TNY_IS_FOLDER (folder), FALSE);
- modest_mail_operation_xfer_msg (mail_op, header, folder, TRUE);
+ return 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)
{
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_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);
+/* g_object_unref (trash_folder); */
+ } else {
+ ModestMailOperationPrivate *priv;
- modest_mail_operation_move_msg (mail_op, header, trash_folder);
+ /* Set status failed and set an error */
+ priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+ priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+ g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+ MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
+ _("Error trying to delete a message. Trash folder not found"));
+ }
g_object_unref (G_OBJECT (store_account));
} else {
tny_folder_remove_msg (folder, header, NULL); /* FIXME */
- tny_folder_expunge (folder, NULL); /* FIXME */
+ tny_folder_sync(folder, TRUE, NULL); /* FIXME */
}
/* Free */
}
static void
-modest_mail_operation_xfer_msg (ModestMailOperation *mail_op,
+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;
+
+ g_signal_emit (G_OBJECT (user_data), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL);
+}
+
+static gboolean
+modest_mail_operation_xfer_msg (ModestMailOperation *self,
TnyHeader *header,
TnyFolder *folder,
gboolean delete_original)
{
+ ModestMailOperationPrivate *priv;
TnyFolder *src_folder;
TnyList *headers;
src_folder = tny_header_get_folder (header);
headers = tny_simple_list_new ();
- /* Move */
+ priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+ priv->total = 1;
+ priv->done = 0;
+ priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
+
tny_list_prepend (headers, G_OBJECT (header));
- tny_folder_transfer_msgs (src_folder, headers, folder, delete_original, NULL); /* FIXME */
+ tny_folder_transfer_msgs_async (src_folder, headers, folder,
+ delete_original, transfer_msgs_cb, self);
/* Free */
g_object_unref (headers);
g_object_unref (folder);
+
+ return TRUE;
}
/* ******************************************************************* */
/* ************************* 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 GQuark
-modest_error_quark (void)
-{
- static GQuark err_q = 0;
-
- if (err_q == 0)
- err_q = g_quark_from_static_string ("modest-error-quark");
-
- 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)
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);
}
}
-
-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;
-
- /* 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_MIME_PART (tny_camel_mime_part_new (camel_mime_part_new()));
- 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;
-}