* changes to use either maemo-provider-data.keyfile or modest-provider-data.keyfile

[modest] / src / modest-mail-operation.c

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index 8d8ec23..56e7c3b 100644 (file)
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -650,7 +650,7 @@ create_msg_thread (gpointer thread_data)
                if (info->attachments_list != NULL)
                        flags |= TNY_HEADER_FLAG_ATTACHMENTS;
 
-               tny_header_set_flags (header, flags);
+               tny_header_set_flag (header, flags);
                g_object_unref (G_OBJECT(header));
        } else {
                priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
@@ -1606,7 +1606,7 @@ modest_mail_operation_create_folder (ModestMailOperation *self,
                modest_tny_folder_get_account (TNY_FOLDER (parent));
 
        /* Check for already existing folder */
-       if (modest_tny_folder_has_subfolder_with_name (parent, name)) {
+       if (modest_tny_folder_has_subfolder_with_name (parent, name, TRUE)) {
                priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
                g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
                             MODEST_MAIL_OPERATION_ERROR_FOLDER_EXISTS,
@@ -1893,7 +1893,7 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
                /* Do not move a parent into a child */
                goto error;
        } else if (TNY_IS_FOLDER_STORE (parent) &&
-                  modest_tny_folder_has_subfolder_with_name (parent, folder_name)) {
+                  modest_tny_folder_has_subfolder_with_name (parent, folder_name, TRUE)) {
                /* Check that the new folder name is not used by any
                   parent subfolder */
                goto error;     
@@ -2416,8 +2416,8 @@ modest_mail_operation_remove_msg (ModestMailOperation *self,
        /* remove message from folder */
        tny_folder_remove_msg (folder, header, &(priv->error));
        if (!priv->error) {
-               tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED);
-               tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
+               tny_header_set_flag (header, TNY_HEADER_FLAG_DELETED);
+               tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN);
 
                modest_mail_operation_notify_start (self);
 
@@ -2594,8 +2594,8 @@ transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError *err, gpointer u
                iter = tny_list_create_iterator (helper->headers);
                while (!tny_iterator_is_done (iter)) {
                        header = TNY_HEADER (tny_iterator_get_current (iter));
-                       tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED);
-                       tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
+                       tny_header_set_flag (header, TNY_HEADER_FLAG_DELETED);
+                       tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN);
                        g_object_unref (header);
 
                        tny_iterator_next (iter);
@@ -2664,9 +2664,9 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self,
        TnyHeader *header = NULL;
        ModestTnyFolderRules rules = 0;
 
-       g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
-       g_return_if_fail (TNY_IS_LIST (headers));
-       g_return_if_fail (TNY_IS_FOLDER (folder));
+       g_return_if_fail (self && MODEST_IS_MAIL_OPERATION (self));
+       g_return_if_fail (headers && TNY_IS_LIST (headers));
+       g_return_if_fail (folder && TNY_IS_FOLDER (folder));
 
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
        priv->total = tny_list_get_length (headers);
@@ -2694,9 +2694,17 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self,
                src_folder = tny_header_get_folder (header);
                g_object_unref (header);
        }
-
        g_object_unref (iter);
 
+       if (src_folder == NULL) {
+               /* Notify the queue */
+               modest_mail_operation_notify_end (self);
+
+               g_warning ("%s: cannot find folder from header", __FUNCTION__);
+               return;
+       }
+
+       
        /* Check folder source and destination */
        if (src_folder == folder) {
                /* Set status failed and set an error */
@@ -2783,7 +2791,7 @@ on_refresh_folder (TnyFolder   *folder,
        }
 
        /* Free */
-       g_slice_free   (RefreshAsyncHelper, helper);
+       g_slice_free (RefreshAsyncHelper, helper);
 
        /* Notify about operation end */
        modest_mail_operation_notify_end (self);