* Reverted some changes committed by mistake

pmo-diablo-r5265

diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c
index a3fe625..27990e9 100644 (file)
--- a/src/maemo/modest-platform.c
+++ b/src/maemo/modest-platform.c
@@ -1974,12 +1974,7 @@ on_account_went_online (TnyCamelAccount *account, gboolean canceled, GError *err
        /* Now it's really time to callback to the caller. If going online didn't succeed,
         * err will be set. We don't free it, Tinymail does that! If a cancel happened,
         * canceled will be set. Etcetera etcetera. */
-
-       if (tny_account_get_connection_status (TNY_ACCOUNT (account)) == TNY_CONNECTION_STATUS_CONNECTED)
-               g_debug ("------------ %s %s CONECTADA", __FUNCTION__, tny_account_get_name (TNY_ACCOUNT (account)));
-       else
-               g_debug ("------------ %s %s NO conectada", __FUNCTION__, tny_account_get_name (TNY_ACCOUNT (account)));
-       
+       
        if (info->callback) {
                info->callback (canceled, err, info->parent_window, info->account, info->user_data);
        }

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index e3be664..e01d8e8 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -497,10 +497,7 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
                modest_window_disable_dimming (MODEST_WINDOW(win));
 
                /* Remove each header. If it's a view window header_view == NULL */
-               mail_op = modest_mail_operation_new_with_error_handling ((GObject *) win,
-                                       modest_ui_actions_disk_operations_error_handler, 
-                                       g_strdup (_("mail_ib_file_operation_failed")),
-                                       g_free);
+               mail_op = modest_mail_operation_new ((GObject *) win);
                modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
                                                 mail_op);
                modest_mail_operation_remove_msgs (mail_op, header_list, FALSE);