/* Cancel the mail operation. We need to wrap it between this
start/stop operations to allow following calls to the
account */
- if (priv->account)
- tny_account_cancel (priv->account);
+ g_return_val_if_fail (priv->account, FALSE);
+ tny_account_cancel (priv->account);
return canceled;
}
info->from = g_strdup (from);
info->to = g_strdup (to);
info->cc = g_strdup (cc);
+ info->bcc = g_strdup (bcc);
info->subject = g_strdup (subject);
info->plain_body = g_strdup (plain_body);
info->html_body = g_strdup (html_body);
gpointer userdata)
{
SendNewMailInfo *info = (SendNewMailInfo *) userdata;
- TnyFolder *folder;
+ TnyFolder *draft_folder = NULL;
+ TnyFolder *outbox_folder = NULL;
TnyHeader *header;
if (!msg) {
/* Call mail operation */
modest_mail_operation_send_mail (self, info->transport_account, msg);
- folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (info->transport_account), TNY_FOLDER_TYPE_DRAFTS);
- if (folder) {
- if (info->draft_msg != NULL) {
- header = tny_msg_get_header (info->draft_msg);
- /* Note: This can fail (with a warning) if the message is not really already in a folder,
- * because this function requires it to have a UID. */
- tny_folder_remove_msg (folder, header, NULL);
- tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED);
- tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
- g_object_unref (header);
- }
+ /* Remove old mail from its source folder */
+ draft_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (info->transport_account), TNY_FOLDER_TYPE_DRAFTS);
+ outbox_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (info->transport_account), TNY_FOLDER_TYPE_OUTBOX);
+ if (info->draft_msg != NULL) {
+ TnyFolder *folder = NULL;
+ TnyFolder *src_folder = NULL;
+ TnyFolderType folder_type;
+ folder = tny_msg_get_folder (info->draft_msg);
+ if (folder == NULL) goto end;
+ folder_type = modest_tny_folder_guess_folder_type (folder);
+ if (folder_type == TNY_FOLDER_TYPE_OUTBOX)
+ src_folder = outbox_folder;
+ else
+ src_folder = draft_folder;
+
+ /* Note: This can fail (with a warning) if the message is not really already in a folder,
+ * because this function requires it to have a UID. */
+ header = tny_msg_get_header (info->draft_msg);
+ tny_folder_remove_msg (src_folder, header, NULL);
+ tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED);
+ tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
+ g_object_unref (header);
+ g_object_unref (folder);
}
end:
if (info->draft_msg)
g_object_unref (info->draft_msg);
+ if (draft_folder)
+ g_object_unref (draft_folder);
+ if (outbox_folder)
+ g_object_unref (outbox_folder);
if (info->transport_account)
g_object_unref (info->transport_account);
g_slice_free (SendNewMailInfo, info);
TnyMsg *msg,
gpointer userdata)
{
+ TnyFolder *src_folder = NULL;
TnyFolder *folder = NULL;
TnyHeader *header = NULL;
ModestMailOperationPrivate *priv = NULL;
if (info->draft_msg != NULL) {
header = tny_msg_get_header (info->draft_msg);
+ src_folder = tny_header_get_folder (header);
/* Remove the old draft expunging it */
- tny_folder_remove_msg (folder, header, NULL);
+ tny_folder_remove_msg (src_folder, header, NULL);
tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED);
tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
- tny_folder_sync (folder, FALSE, &(priv->error)); /* FALSE --> don't expunge */
+ tny_folder_sync (src_folder, TRUE, &(priv->error)); /* expunge */
g_object_unref (header);
}
end:
if (folder)
g_object_unref (G_OBJECT(folder));
+ if (src_folder)
+ g_object_unref (G_OBJECT(src_folder));
if (info->edit_window)
g_object_unref (G_OBJECT(info->edit_window));
if (info->draft_msg)
while (!tny_iterator_is_done (iter)) {
TnyFolderStore *folder = (TnyFolderStore*) tny_iterator_get_current (iter);
-
- tny_list_prepend (all_folders, G_OBJECT (folder));
- recurse_folders (folder, query, all_folders);
- g_object_unref (G_OBJECT (folder));
+ if (folder) {
+ tny_list_prepend (all_folders, G_OBJECT (folder));
+ recurse_folders (folder, query, all_folders);
+ g_object_unref (G_OBJECT (folder));
+ }
tny_iterator_next (iter);
}
priv->account = g_object_ref (info->account);
/*
- * for POP3, we do a logout-login upon send/receive -- many POP-servers (like Gmail) do not
- * show any updates unless we do that
+ * Previousl, we did this for POP3, to do a logout-login upon send/receive,
+ * because many POP-servers (like Gmail) do not
+ * show any updates unless we do that.
+ * But that didn't work with gmail anyway,
+ * and tinymail now takes care of this itself by disconnecting
+ * automatically after using the connection.
*/
- if (!first_time && TNY_IS_CAMEL_POP_STORE_ACCOUNT(priv->account))
+ /*
+ if (!first_time && TNY_IS_CAMEL_POP_STORE_ACCOUNT (priv->account))
tny_camel_pop_store_account_reconnect (TNY_CAMEL_POP_STORE_ACCOUNT(priv->account));
+ */
/* Get all the folders. We can do it synchronously because
we're already running in a different thread than the UI */
iter = tny_list_create_iterator (all_folders);
while (!tny_iterator_is_done (iter)) {
TnyFolderStore *folder = TNY_FOLDER_STORE (tny_iterator_get_current (iter));
-
- recurse_folders (folder, query, all_folders);
+ if (folder) {
+ recurse_folders (folder, query, all_folders);
+ g_object_unref (folder);
+ }
tny_iterator_next (iter);
}
g_object_unref (G_OBJECT (iter));
g_object_unref (observer);
observer = NULL;
- g_object_unref (G_OBJECT (folder));
+ if (folder)
+ g_object_unref (G_OBJECT (folder));
+
if (priv->error)
priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
trash_folder = modest_tny_account_get_special_folder (account,
TNY_FOLDER_TYPE_TRASH);
/* TODO: error_handling */
- modest_mail_operation_xfer_folder (self, folder,
+ if (trash_folder) {
+ modest_mail_operation_xfer_folder (self, folder,
TNY_FOLDER_STORE (trash_folder),
TRUE, NULL, NULL);
+ g_object_unref (trash_folder);
+ }
} else {
TnyFolderStore *parent = tny_folder_get_folder_store (folder);
{
if (TNY_IS_ACCOUNT (into) &&
modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (into)) &&
- modest_tny_local_folders_account_extra_folder_exists (MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (into),
- new_name)) {
+ modest_tny_local_folders_account_folder_name_in_use (MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (into),
+ new_name)) {
priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
parent_rules = modest_tny_folder_get_rules (TNY_FOLDER (parent));
/* The moveable restriction is applied also to copy operation */
- if ((!TNY_IS_FOLDER_STORE (parent)) || (rules & MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE)) {
+ if ((gpointer) parent == (gpointer) folder ||
+ (!TNY_IS_FOLDER_STORE (parent)) ||
+ (rules & MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE)) {
printf("DEBUG: %s: Not allowing the move.\n", __FUNCTION__);
/* Set status failed and set an error */
priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
"Error trying to get a message. No folder found for header");
}
- g_object_unref (header);
+
+ if (header)
+ g_object_unref (header);
+
tny_iterator_next (iter);
}
if (tny_list_get_length (header_list) >= 1) {
iter = tny_list_create_iterator (header_list);
header = TNY_HEADER (tny_iterator_get_current (iter));
- folder = tny_header_get_folder (header);
- priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder));
- g_object_unref (header);
- g_object_unref (folder);
+ if (header) {
+ folder = tny_header_get_folder (header);
+ if (folder) {
+ priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder));
+
+ g_object_unref (folder);
+ }
+
+ g_object_unref (header);
+ }
if (tny_list_get_length (header_list) == 1) {
g_object_unref (iter);
if (iter != NULL) {
while (!tny_iterator_is_done (iter) && size_ok) {
header = TNY_HEADER (tny_iterator_get_current (iter));
- if (tny_header_get_message_size (header) >= max_size)
- size_ok = FALSE;
- g_object_unref (header);
+ if (header) {
+ if (tny_header_get_message_size (header) >= max_size)
+ size_ok = FALSE;
+ g_object_unref (header);
+ }
+
tny_iterator_next (iter);
}
g_object_unref (iter);
XferMsgsAsynUserCallback user_callback,
gpointer user_data)
{
- ModestMailOperationPrivate *priv;
- TnyIterator *iter;
- TnyFolder *src_folder;
- XFerMsgAsyncHelper *helper;
- TnyHeader *header;
- ModestTnyFolderRules rules;
+ ModestMailOperationPrivate *priv = NULL;
+ TnyIterator *iter = NULL;
+ TnyFolder *src_folder = NULL;
+ XFerMsgAsyncHelper *helper = NULL;
+ TnyHeader *header = NULL;
+ ModestTnyFolderRules rules = 0;
const gchar *id1 = NULL;
const gchar *id2 = NULL;
gboolean same_folder = FALSE;
/* Get source folder */
iter = tny_list_create_iterator (headers);
header = TNY_HEADER (tny_iterator_get_current (iter));
- src_folder = tny_header_get_folder (header);
- g_object_unref (header);
+ if (header) {
+ src_folder = tny_header_get_folder (header);
+ g_object_unref (header);
+ }
+
g_object_unref (iter);
/* Check folder source and destination */
}
/* Free */
-/* g_object_unref (helper->mail_op); */
g_slice_free (RefreshAsyncHelper, helper);
/* Notify about operation end */
/* Create the helper */
helper = g_slice_new0 (RefreshAsyncHelper);
- helper->mail_op = g_object_ref (self);
+ helper->mail_op = self;
helper->user_callback = user_callback;
helper->user_data = user_data;
projects / modest / blobdiff