#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-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,
const gchar *what,
gint status,
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);
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),
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);
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;
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);
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,
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,
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;
helper = (RefreshFolderAsyncHelper *) user_data;
- mail_op = MODEST_MAIL_OPERATION (helper->mail_op);
- priv = MODEST_MAIL_OPERATION_GET_PRIVATE(mail_op);
+ 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++;
- set_error (mail_op,
- MODEST_MAIL_OPERATION_ERROR_OPERATION_CANCELED,
- _("Error trying to refresh folder %s. Operation canceled"),
- tny_folder_get_name (folder));
+ 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++;
}
status_update_cb,
helper);
}
- g_signal_emit (G_OBJECT (mail_op), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL);
+ g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, NULL);
}
static void
-update_folders_cb (TnyFolderStore *self, TnyList *list, GError **err, gpointer user_data)
+update_folders_cb (TnyFolderStore *folder_store, TnyList *list, GError **err, gpointer user_data)
{
- ModestMailOperation *mail_op;
+ ModestMailOperation *self;
ModestMailOperationPrivate *priv;
TnyList *folders;
RefreshFolderAsyncHelper *helper;
- mail_op = MODEST_MAIL_OPERATION (user_data);
- priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_op);
+ 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 = mail_op;
+ helper->mail_op = self;
helper->iter = tny_list_create_iterator (list);
helper->failed = 0;
helper->canceled = 0;
}
gboolean
-modest_mail_operation_update_account (ModestMailOperation *mail_op,
+modest_mail_operation_update_account (ModestMailOperation *self,
TnyStoreAccount *store_account)
{
ModestMailOperationPrivate *priv;
TnyList *folders;
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 & 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_async (TNY_FOLDER_STORE (store_account),
- folders, update_folders_cb, query, mail_op);
+ folders, update_folders_cb, query, self);
g_object_unref (query);
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);
+ priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
if (priv->status == MODEST_MAIL_OPERATION_STATUS_SUCCESS ||
priv->status == MODEST_MAIL_OPERATION_STATUS_FAILED ||
TnyFolder *
-modest_mail_operation_create_folder (ModestMailOperation *mail_op,
+modest_mail_operation_create_folder (ModestMailOperation *self,
TnyFolderStore *parent,
const gchar *name)
{
}
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;
-}
-
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);
{
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