* make dragging of headers to folders work again

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

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index feffc54..a3a2f03 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;
@@ -750,8 +750,10 @@ modest_mail_operation_send_new_mail_cb (ModestMailOperation *self,
        modest_mail_operation_send_mail (self, info->transport_account, msg);
 
        /* 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);
+       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;
@@ -759,6 +761,10 @@ modest_mail_operation_send_new_mail_cb (ModestMailOperation *self,
                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_INVALID)
+                       g_warning ("%s: BUG: folder of type TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
+               
                if (folder_type == TNY_FOLDER_TYPE_OUTBOX) 
                        src_folder = outbox_folder;
                else 
@@ -1829,7 +1835,7 @@ new_name_valid_if_local_account (ModestMailOperationPrivate *priv,
                priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
                g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
                             MODEST_MAIL_OPERATION_ERROR_FOLDER_EXISTS,
-                            _("ckdg_ib_folder_already_exists"));
+                            _CS("ckdg_ib_folder_already_exists"));
                return FALSE;
        } else
                return TRUE;
@@ -2410,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);
 
@@ -2588,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);