* src/maemo/modest-main-window.c:

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

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index 22f3c38..136aab3 100644 (file)
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -563,7 +563,10 @@ modest_mail_operation_send_mail (ModestMailOperation *self,
                /* TODO: connect to the msg-sent in order to know when
                   the mail operation is finished */
 
-               tny_send_queue_add (send_queue, msg, &(priv->error));
+/*             tny_send_queue_add (send_queue, msg, &(priv->error)); */
+               modest_tny_send_queue_add (MODEST_TNY_SEND_QUEUE(send_queue), 
+                                          msg, 
+                                          &(priv->error));
 
                /* TODO: we're setting always success, do the check in
                   the handler */
@@ -1844,9 +1847,7 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
        folder_name = tny_folder_get_name (folder);
 
        /* Set the error msg */
-       error_msg = (delete_original) ? 
-               _("mail_in_ui_folder_move_target_error") : 
-               _("mail_in_ui_folder_copy_target_error");
+       error_msg = _("mail_in_ui_folder_move_target_error");
 
        /* Get account and set it into mail_operation */
        priv->account = modest_tny_folder_get_account (TNY_FOLDER(folder));
@@ -2765,10 +2766,7 @@ on_refresh_folder (TnyFolder   *folder,
 
                /* This is not a GDK lock because we are a Tinymail callback and
                 * Tinymail already acquires the Gdk lock */
-
-               /* no gdk_threads_enter (), CHECKED */
                helper->user_callback (self, folder, helper->user_data);
-               /* no gdk_threads_leave (), CHECKED */
        }
 
  out:
@@ -2807,13 +2805,8 @@ on_refresh_folder_status_update (GObject *obj,
 
        /* This is not a GDK lock because we are a Tinymail callback and
         * Tinymail already acquires the Gdk lock */
-
-       /* no gdk_threads_enter (), CHECKED */
-
        g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
 
-       /* no gdk_threads_leave (), CHECKED */
-
        g_slice_free (ModestMailOperationState, state);
 }