* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "modest-mail-operation.h"
-/* include other impl specific header files */
#include <string.h>
#include <stdarg.h>
#include <tny-mime-part.h>
#include "modest-tny-platform-factory.h"
#include "modest-marshal.h"
#include "modest-error.h"
+#include "modest-mail-operation.h"
#define KB 1024
GObject *source;
GError *error;
ErrorCheckingUserCallback error_checking;
+ gpointer error_checking_user_data;
ModestMailOperationStatus status;
ModestMailOperationTypeOperation op_type;
};
priv = MODEST_MAIL_OPERATION_GET_PRIVATE(obj);
- priv->account = NULL;
+ priv->account = NULL;
priv->status = MODEST_MAIL_OPERATION_STATUS_INVALID;
priv->op_type = MODEST_MAIL_OPERATION_TYPE_UNKNOWN;
priv->error = NULL;
- priv->error_checking = NULL;
priv->done = 0;
priv->total = 0;
priv->source = NULL;
+ priv->error_checking = NULL;
+ priv->error_checking_user_data = NULL;
}
static void
ModestMailOperation*
modest_mail_operation_new_with_error_handling (ModestMailOperationTypeOperation op_type,
GObject *source,
- ErrorCheckingUserCallback error_handler)
+ ErrorCheckingUserCallback error_handler,
+ gpointer user_data)
{
ModestMailOperation *obj;
ModestMailOperationPrivate *priv;
priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
g_return_if_fail(priv->status != MODEST_MAIL_OPERATION_STATUS_SUCCESS);
- if (priv->error_checking == NULL)
- return;
- priv->error_checking (priv->source, self);
+ if (priv->error_checking != NULL)
+ priv->error_checking (self, priv->error_checking_user_data);
}
priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
- /* TODO: Tinymail does not support cancel operation */
-/* tny_account_cancel (); */
+ /* cancel current operation in account */
+ tny_account_cancel (priv->account);
/* Set new status */
priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED;
priv->account = g_object_ref (transport_account);
send_queue = TNY_SEND_QUEUE (modest_runtime_get_send_queue (transport_account));
- if (!TNY_IS_SEND_QUEUE(send_queue))
- g_printerr ("modest: could not find send queue for account\n");
- else {
- GError *err = NULL;
- tny_send_queue_add (send_queue, msg, &err);
- if (err) {
- g_printerr ("modest: error adding msg to send queue: %s\n",
- err->message);
- g_error_free (err);
- } else {
- /* g_message ("modest: message added to send queue"); */
- }
+ if (!TNY_IS_SEND_QUEUE(send_queue)) {
+ g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+ MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
+ "modest: could not find send queue for account\n");
+ } else {
+ tny_send_queue_add (send_queue, msg, &(priv->error));
}
/* Notify about operation end */
TnyMsg *msg = NULL;
TnyFolder *folder = NULL;
ModestMailOperationPrivate *priv = NULL;
- GError *err = NULL;
g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
g_return_if_fail (TNY_IS_TRANSPORT_ACCOUNT (transport_account));
msg = modest_tny_msg_new_html_plain (to, from, cc, bcc, subject, html_body, plain_body, (GSList *) attachments_list);
}
if (!msg) {
- g_printerr ("modest: failed to create a new msg\n");
- goto cleanup;
+ g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+ MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED,
+ "modest: failed to create a new msg\n");
+ goto end;
}
folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (transport_account), TNY_FOLDER_TYPE_DRAFTS);
if (!folder) {
- g_printerr ("modest: failed to find Drafts folder\n");
- goto cleanup;
+ g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+ MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
+ "modest: failed to create a new msg\n");
+ goto end;
}
- tny_folder_add_msg (folder, msg, &err);
- if (err) {
- g_printerr ("modest: error adding msg to Drafts folder: %s",
- err->message);
- g_error_free (err);
- goto cleanup;
- }
-
- modest_mail_operation_notify_end (self);
+ tny_folder_add_msg (folder, msg, &(priv->error));
+ if (priv->error)
+ goto end;
- /* Free */
-cleanup:
+end:
if (msg)
g_object_unref (G_OBJECT(msg));
if (folder)
g_object_unref (G_OBJECT(folder));
+
+ modest_mail_operation_notify_end (self);
}
typedef struct
TnyIterator *iter = NULL;
TnyFolderStoreQuery *query = NULL;
ModestMailOperationPrivate *priv;
+ ModestTnySendQueue *send_queue;
info = (UpdateAccountInfo *) thr_user_data;
priv = MODEST_MAIL_OPERATION_GET_PRIVATE(info->mail_op);
g_object_unref (priv->account);
priv->account = g_object_ref (info->transport_account);
- ModestTnySendQueue *send_queue = modest_runtime_get_send_queue
- (info->transport_account);
-
- timeout = g_timeout_add (250, idle_notify_progress, info->mail_op);
- modest_tny_send_queue_try_to_send (send_queue);
- g_source_remove (timeout);
-
- g_object_unref (G_OBJECT(send_queue));
+ send_queue = modest_runtime_get_send_queue (info->transport_account);
+ if (send_queue) {
+ timeout = g_timeout_add (250, idle_notify_progress, info->mail_op);
+ modest_tny_send_queue_try_to_send (send_queue);
+ g_source_remove (timeout);
+ } else {
+ g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+ MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED,
+ "cannot create a send queue for %s\n",
+ tny_account_get_name (TNY_ACCOUNT (info->transport_account)));
+ priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+ }
/* Check if the operation was a success */
if (!priv->error) {
TnyFolderStore *parent,
const gchar *name)
{
- ModestTnyFolderRules rules;
ModestMailOperationPrivate *priv;
TnyFolder *new_folder = NULL;
- gboolean can_create = FALSE;
g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent), NULL);
g_return_val_if_fail (name, NULL);
priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
- /* Get account and set it into mail_operation */
- priv->account = tny_folder_get_account (TNY_FOLDER(parent));
-
/* Check parent */
- if (!TNY_IS_FOLDER (parent)) {
- /* Set status failed and set an error */
- priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
- g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
- MODEST_MAIL_OPERATION_ERROR_BAD_PARAMETER,
- _("mail_in_ui_folder_create_error"));
- } else {
+ if (TNY_IS_FOLDER (parent)) {
/* Check folder rules */
- rules = modest_tny_folder_get_rules (TNY_FOLDER (parent));
+ ModestTnyFolderRules rules = modest_tny_folder_get_rules (TNY_FOLDER (parent));
if (rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) {
/* Set status failed and set an error */
priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
_("mail_in_ui_folder_create_error"));
- }
- else
- can_create = TRUE;
+ }
}
- if (can_create) {
+ if (!priv->error) {
/* Create the folder */
new_folder = tny_folder_store_create_folder (parent, name, &(priv->error));
CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED);
+ if (!priv->error)
+ priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
}
/* Notify about operation end */
tny_iterator_next (iter);
}
+ /* Set operation status */
+ if (priv->status == MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS)
+ priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+
/* Notify about operation end */
g_idle_add (notify_update_account_queue, info->mail_op);
GetFullMsgsInfo *info = NULL;
gboolean size_ok = TRUE;
gint max_size;
- GError *error = NULL;
TnyIterator *iter = NULL;
g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
/* Get msg size limit */
max_size = modest_conf_get_int (modest_runtime_get_conf (),
MODEST_CONF_MSG_SIZE_LIMIT,
- &error);
- if (error) {
- g_clear_error (&error);
+ &(priv->error));
+ if (priv->error) {
+ g_clear_error (&(priv->error));
max_size = G_MAXINT;
} else {
max_size = max_size * KB;
priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
/* FIXME: the error msg is different for pop */
g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
- MODEST_MAIL_OPERATION_ERROR_BAD_PARAMETER,
- _("emev_ni_ui_imap_msg_sizelimit_error"));
+ MODEST_MAIL_OPERATION_ERROR_SIZE_LIMIT,
+ _("emev_ni_ui_imap_msg_size_exceed_error"));
/* Remove from queue and free resources */
modest_mail_operation_notify_end (self);
if (notify)
projects / modest / blobdiff