#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-text-utils.h>
-#include <modest-tny-msg-actions.h>
+#include "modest-text-utils.h"
+#include "modest-tny-msg-actions.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_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,
- gboolean cancelled,
+static void folder_refresh_cb (TnyFolder *folder,
+ gboolean canceled,
GError **err,
gpointer user_data);
-static void add_attachments (TnyMsg *msg,
- const GList *attachments_list);
+static void update_folders_cb (TnyFolderStore *self,
+ TnyList *list,
+ GError **err,
+ gpointer user_data);
+static void add_attachments (TnyMsg *msg,
+ GList *attachments_list);
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);
-/* list my signals */
-enum {
- /* MY_SIGNAL_1, */
- /* MY_SIGNAL_2, */
- LAST_SIGNAL
+enum _ModestMailOperationSignals
+{
+ PROGRESS_CHANGED_SIGNAL,
+
+ NUM_SIGNALS
};
typedef struct _ModestMailOperationPrivate ModestMailOperationPrivate;
struct _ModestMailOperationPrivate {
+ guint done;
+ guint total;
ModestMailOperationStatus status;
GError *error;
};
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);
/* globals */
static GObjectClass *parent_class = NULL;
-/* uncomment the following if you have defined any signals */
-/* static guint signals[LAST_SIGNAL] = {0}; */
+static guint signals[NUM_SIGNALS] = {0};
GType
modest_mail_operation_get_type (void)
g_type_class_add_private (gobject_class, sizeof(ModestMailOperationPrivate));
- /* signal definitions go here, e.g.: */
-/* signals[MY_SIGNAL_1] = */
-/* g_signal_new ("my_signal_1",....); */
-/* signals[MY_SIGNAL_2] = */
-/* g_signal_new ("my_signal_2",....); */
-/* etc. */
+ /**
+ * 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),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (ModestMailOperationClass, progress_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
}
static void
priv = MODEST_MAIL_OPERATION_GET_PRIVATE(obj);
- priv->status = MODEST_MAIL_OPERATION_STATUS_INVALID;
- priv->error = NULL;
+ priv->status = MODEST_MAIL_OPERATION_STATUS_INVALID;
+ priv->error = NULL;
+ priv->done = 0;
+ priv->total = 0;
}
static 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,
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);
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);
(attachments_list == NULL) ? FALSE : TRUE);
/* Add attachments */
- add_attachments (new_msg, attachments_list);
+ add_attachments (new_msg, (GList*) attachments_list);
- /* Send mail */
+ /* Send mail */
tny_transport_account_send (transport_account, new_msg, NULL); /* FIXME */
/* Clean */
g_free(content_type);
}
-/**
- * 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,
- ModestMailOperationForwardType forward_type)
+static void
+add_if_attachment (gpointer data, gpointer user_data)
{
- TnyMsg *new_msg;
- TnyHeader *new_header, *header;
- gchar *new_subject, *new_body, *content_type;
- TnyMimePart *text_body_part = NULL;
+ TnyMimePart *part;
GList *attachments_list;
- TnyList *parts;
- TnyIterator *iter;
- /* Create new objects */
- new_msg = TNY_MSG (tny_camel_msg_new ());
- new_header = TNY_HEADER (tny_camel_header_new ());
+ part = TNY_MIME_PART (data);
+ attachments_list = (GList *) user_data;
+
+ if (tny_mime_part_is_attachment (part))
+ attachments_list = g_list_prepend (attachments_list, part);
+}
+
+
+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 */
header = tny_msg_get_header (msg);
+ body = modest_tny_msg_actions_find_body_part (msg, TRUE);
+
+ /* TODO: select the formatter from account prefs */
+ formatter = modest_formatter_new ("text/plain");
+
+ /* Format message body */
+ if (is_reply) {
+ switch (type) {
+ case MODEST_MAIL_OPERATION_REPLY_TYPE_CITE:
+ default:
+ new_msg = modest_formatter_cite (formatter, body, header);
+ break;
+ case MODEST_MAIL_OPERATION_REPLY_TYPE_QUOTE:
+ new_msg = modest_formatter_quote (formatter, body, header);
+ break;
+ }
+ } else {
+ switch (type) {
+ case MODEST_MAIL_OPERATION_FORWARD_TYPE_INLINE:
+ default:
+ new_msg = modest_formatter_inline (formatter, body, header);
+ break;
+ case MODEST_MAIL_OPERATION_FORWARD_TYPE_ATTACHMENT:
+ new_msg = modest_formatter_attach (formatter, body, header);
+ break;
+ }
+ }
+ g_object_unref (G_OBJECT (formatter));
/* 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);
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),
- _("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);
- /* Get body from original msg */
- new_body = (gchar *) modest_tny_msg_actions_find_body (msg, FALSE);
- if (!new_body) {
- g_object_unref (new_msg);
- return NULL;
- }
- content_type = get_content_type(new_body);
-
- /* Create the list of attachments */
- parts = TNY_LIST (tny_simple_list_new());
- tny_mime_part_get_parts (TNY_MIME_PART (msg), parts);
- iter = tny_list_create_iterator (parts);
- attachments_list = NULL;
+ /* Clean */
+ g_object_unref (G_OBJECT (new_header));
+ g_object_unref (G_OBJECT (header));
- while (!tny_iterator_is_done(iter)) {
- TnyMimePart *part;
+ return new_msg;
+}
- part = TNY_MIME_PART (tny_iterator_get_current (iter));
- if (tny_mime_part_is_attachment (part))
- attachments_list = g_list_prepend (attachments_list, part);
+TnyMsg*
+modest_mail_operation_create_forward_mail (TnyMsg *msg,
+ const gchar *from,
+ ModestMailOperationForwardType forward_type)
+{
+ TnyMsg *new_msg;
+ TnyList *parts = NULL;
+ GList *attachments_list = NULL;
- tny_iterator_next (iter);
- }
+ new_msg = create_reply_forward_mail (msg, from, FALSE, forward_type);
/* Add attachments */
+ parts = TNY_LIST (tny_simple_list_new());
+ tny_mime_part_get_parts (TNY_MIME_PART (msg), parts);
+ tny_list_foreach (parts, add_if_attachment, attachments_list);
add_attachments (new_msg, attachments_list);
- switch (forward_type) {
- TnyMimePart *attachment_part;
- gchar *inlined_text;
-
- case MODEST_MAIL_OPERATION_FORWARD_TYPE_INLINE:
- /* Prepend "Original message" text */
- inlined_text = (gchar *)
- modest_text_utils_inlined_text (tny_header_get_from (header),
- tny_header_get_date_sent (header),
- tny_header_get_to (header),
- tny_header_get_subject (header),
- (const gchar*) new_body);
- g_free (new_body);
- new_body = inlined_text;
-
- /* Add body part */
- add_body_part (new_msg, new_body,
- (const gchar *) content_type,
- (tny_list_get_length (parts) > 0) ? TRUE : FALSE);
-
- break;
- case MODEST_MAIL_OPERATION_FORWARD_TYPE_ATTACHMENT:
- attachment_part = add_body_part (new_msg, new_body,
- (const gchar *) content_type, TRUE);
-
- /* Set the subject as the name of the attachment */
- tny_mime_part_set_filename (attachment_part, tny_header_get_subject (header));
-
- break;
- }
-
/* Clean */
if (attachments_list) g_list_free (attachments_list);
- g_object_unref (parts);
- if (text_body_part) g_free (text_body_part);
- g_free (content_type);
- g_free (new_body);
+ 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,
{
TnyMsg *new_msg;
TnyHeader *new_header, *header;
- gchar *new_subject, *new_body, *content_type, *quoted;
- TnyMimePart *text_body_part;
+ const gchar* reply_to;
- /* Create new objects */
- new_msg = TNY_MSG (tny_camel_msg_new ());
- new_header = TNY_HEADER (tny_camel_header_new ());
- header = tny_msg_get_header (msg);
+ new_msg = create_reply_forward_mail (msg, from, TRUE, reply_type);
/* Fill the header */
- tny_msg_set_header (new_msg, new_header);
- tny_header_set_to (new_header, tny_header_get_from (header));
- tny_header_set_from (new_header, from);
+ header = tny_msg_get_header (msg);
+ new_header = tny_msg_get_header (new_msg);
+ reply_to = tny_header_get_replyto (header);
+ 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) {
gchar *new_cc = NULL;
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);
break;
}
- /* Change the subject */
- new_subject = (gchar*) modest_text_utils_derived_subject (tny_header_get_subject(header),
- _("Re:"));
- tny_header_set_subject (new_header, (const gchar *) new_subject);
- g_free (new_subject);
+ /* Clean */
+ g_object_unref (G_OBJECT (new_header));
+ g_object_unref (G_OBJECT (header));
- /* Get body from original msg */
- new_body = (gchar*) modest_tny_msg_actions_find_body (msg, FALSE);
- if (!new_body) {
- g_object_unref (new_msg);
- return NULL;
+ return new_msg;
+}
+
+static void
+status_update_cb (TnyFolder *folder, const gchar *what, gint status, gint oftotal, gpointer user_data)
+{
+ 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 *self = NULL;
+ ModestMailOperationPrivate *priv = NULL;
+ RefreshFolderAsyncHelper *helper;
+
+ 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);
+ helper->failed++;
+ } else if (canceled) {
+ 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++;
}
- content_type = get_content_type(new_body);
-
- switch (reply_type) {
- gchar *cited_text;
-
- case MODEST_MAIL_OPERATION_REPLY_TYPE_CITE:
- /* Prepend "Original message" text */
- cited_text = (gchar *) modest_text_utils_cited_text (tny_header_get_from (header),
- tny_header_get_date_sent (header),
- (const gchar*) new_body);
- g_free (new_body);
- new_body = cited_text;
- break;
- case MODEST_MAIL_OPERATION_REPLY_TYPE_QUOTE:
- /* FIXME: replace 80 with a value from ModestConf */
- quoted = (gchar*) modest_text_utils_quote (new_body,
- tny_header_get_from (header),
- tny_header_get_date_sent (header),
- 80);
- g_free (new_body);
- new_body = quoted;
- break;
+
+ if (priv->done == priv->total)
+ priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+ else if ((priv->done + helper->canceled + helper->failed) == priv->total)
+ if (helper->failed == priv->total)
+ priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+ 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 {
+ tny_folder_refresh_async (TNY_FOLDER (tny_iterator_get_current (helper->iter)),
+ folder_refresh_cb,
+ status_update_cb,
+ helper);
}
- /* Add body part */
- text_body_part = add_body_part (new_msg, new_body,
- (const gchar *) content_type, TRUE);
+ g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL);
+}
- /* Clean */
-/* g_free (text_body_part); */
- g_free (content_type);
- g_free (new_body);
- return new_msg;
+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;
+
+ 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);
}
-void
-modest_mail_operation_update_account (ModestMailOperation *mail_op,
+gboolean
+modest_mail_operation_update_account (ModestMailOperation *self,
TnyStoreAccount *store_account)
{
- TnyStoreAccount *storage_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 (storage_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);
- /* Async refresh folders */
- 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, 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 *self)
+{
+ ModestMailOperationPrivate *priv;
+
+ g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), 0);
+
+ priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+ return priv->done;
+}
+
+guint
+modest_mail_operation_get_task_total (ModestMailOperation *self)
+{
+ ModestMailOperationPrivate *priv;
+
+ g_return_val_if_fail (MODEST_IS_MAIL_OPERATION (self), 0);
+
+ priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+ return priv->total;
+}
+
+gboolean
+modest_mail_operation_is_finished (ModestMailOperation *self)
+{
+ ModestMailOperationPrivate *priv;
+ gboolean retval = FALSE;
+
+ if (!MODEST_IS_MAIL_OPERATION (self)) {
+ g_warning ("%s: invalid parametter", G_GNUC_FUNCTION);
+ return retval;
+ }
+
+ priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+
+ if (priv->status == MODEST_MAIL_OPERATION_STATUS_SUCCESS ||
+ priv->status == MODEST_MAIL_OPERATION_STATUS_FAILED ||
+ priv->status == MODEST_MAIL_OPERATION_STATUS_CANCELED ||
+ priv->status == MODEST_MAIL_OPERATION_STATUS_FINISHED_WITH_ERRORS) {
+ retval = TRUE;
+ } else {
+ retval = FALSE;
+ }
+
+ return retval;
}
/* ******************************************************************* */
TnyFolder *
-modest_mail_operation_create_folder (ModestMailOperation *mail_op,
+modest_mail_operation_create_folder (ModestMailOperation *self,
TnyFolderStore *parent,
const gchar *name)
{
/* Subscribe to folder */
if (!tny_folder_is_subscribed (new_folder)) {
- store_account = tny_folder_get_account (TNY_FOLDER (parent));
+ store_account = TNY_STORE_ACCOUNT (tny_folder_get_account (TNY_FOLDER (parent)));
tny_store_account_subscribe (store_account, new_folder);
g_object_unref (G_OBJECT (store_account));
}
}
void
-modest_mail_operation_remove_folder (ModestMailOperation *mail_op,
+modest_mail_operation_remove_folder (ModestMailOperation *self,
TnyFolder *folder,
gboolean remove_to_trash)
{
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 {
}
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)
}
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)
/* 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 */
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);
/* 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 (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;
/* ******************************************************************* */
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)
{
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 {
}
static void
-modest_mail_operation_xfer_msg (ModestMailOperation *mail_op,
+modest_mail_operation_xfer_msg (ModestMailOperation *self,
TnyHeader *header,
TnyFolder *folder,
gboolean delete_original)
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;
- priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
-}
-
static void
-status_update_cb (TnyFolder *folder, const gchar *what, gint status, gpointer user_data)
-{
- /* TODO: update main window progress bar */
-}
-
-static void
-folder_refresh_cb (TnyFolder *folder, gboolean cancelled, GError **err, gpointer user_data)
-{
- if (cancelled) {
- ModestMailOperation *mail_op;
- ModestMailOperationPrivate *priv;
-
- mail_op = MODEST_MAIL_OPERATION (user_data);
- priv = MODEST_MAIL_OPERATION_GET_PRIVATE(mail_op);
-
- priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELLED;
- }
-}
-
-static void
-add_attachments (TnyMsg *msg, const GList *attachments_list)
+add_attachments (TnyMsg *msg, GList *attachments_list)
{
GList *pos;
TnyMimePart *attachment_part, *old_attachment;
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);
{
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
/* 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);
projects / modest / blobdiff