This patch addapts modest to the new API for TnyHeader in tinymail
[modest] / src / modest-ui-actions.c
index 6d48497..9290abe 100644 (file)
@@ -427,7 +427,7 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
                        msg = g_strdup_printf (_("mcen_nc_unable_to_delete_n_messages"), 
                                               opened_headers);
 
-                       modest_platform_run_information_dialog (GTK_WINDOW (win), (const gchar *) msg);
+                       modest_platform_run_information_dialog (GTK_WINDOW (win), (const gchar *) msg, FALSE);
                        
                        g_free (msg);
                        g_object_unref (header_list);
@@ -440,7 +440,10 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
                iter = tny_list_create_iterator (header_list);
                header = TNY_HEADER (tny_iterator_get_current (iter));
                if (header) {
-                       desc = g_strdup_printf ("%s", tny_header_get_subject (header)); 
+                       gchar *subject;
+                       subject = tny_header_dup_subject (header);
+                       desc = g_strdup_printf ("%s", subject); 
+                       g_free (subject);
                        g_object_unref (header);
                }
 
@@ -813,6 +816,13 @@ typedef struct {
        GtkWidget *banner;
 } OpenMsgBannerInfo;
 
+typedef struct {
+       GtkTreeModel *model;
+       TnyList *headers;
+       OpenMsgBannerInfo *banner_info;
+       GHashTable *row_refs_per_header;
+} OpenMsgHelper;
+
 gboolean
 open_msg_banner_idle (gpointer userdata)
 {
@@ -844,13 +854,13 @@ open_msg_cb (ModestMailOperation *mail_op,
        gchar *account = NULL;
        TnyFolder *folder;
        gboolean open_in_editor = FALSE;
-       OpenMsgBannerInfo *banner_info = (OpenMsgBannerInfo *) user_data;
+       OpenMsgHelper *helper = (OpenMsgHelper *) user_data;
        
        /* Do nothing if there was any problem with the mail
           operation. The error will be shown by the error_handler of
           the mail operation */
        if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg))
-               goto banner_cleanup;
+               return;
 
        parent_win = (ModestWindow *) modest_mail_operation_get_source (mail_op);
        folder = tny_header_get_folder (header);
@@ -900,13 +910,14 @@ open_msg_cb (ModestMailOperation *mail_op,
        
        if (open_in_editor) {
                ModestAccountMgr *mgr = modest_runtime_get_account_mgr ();
-               const gchar *from_header = NULL;
+               gchar *from_header = NULL;
 
-               from_header = tny_header_get_from (header);
+               from_header = tny_header_dup_from (header);
 
                /* we cannot edit without a valid account... */
                if (!modest_account_mgr_has_accounts(mgr, TRUE)) {
                        if (!modest_ui_actions_run_account_setup_wizard(parent_win))
+                               g_free (from_header);
                                goto cleanup;
                }
                
@@ -924,6 +935,7 @@ open_msg_cb (ModestMailOperation *mail_op,
                                }
                                g_free (from);
                        }
+                       g_free (from_header);
                        g_slist_foreach (accounts, (GFunc) g_free, NULL);
                        g_slist_free (accounts);
                }
@@ -936,31 +948,12 @@ open_msg_cb (ModestMailOperation *mail_op,
                gchar *uid = modest_tny_folder_get_header_unique_id (header);
                
                if (MODEST_IS_MAIN_WINDOW (parent_win)) {
-                       GtkWidget *header_view;
-                       GtkTreeSelection *sel;
-                       GList *sel_list = NULL;
-                       GtkTreeModel *model;
-                       
-                       header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(parent_win),
-                                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
+                       GtkTreeRowReference *row_reference;
 
-                       sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view));
-                       sel_list = gtk_tree_selection_get_selected_rows (sel, &model);
-
-                       if (sel_list != NULL) {
-                               GtkTreeRowReference *row_reference;
-
-                               row_reference = gtk_tree_row_reference_new (model, (GtkTreePath *) sel_list->data);
-                               g_list_foreach (sel_list, (GFunc) gtk_tree_path_free, NULL);
-                               g_list_free (sel_list);
+                       row_reference = (GtkTreeRowReference *) g_hash_table_lookup (helper->row_refs_per_header, header);
                                
-                               win = modest_msg_view_window_new_with_header_model (
-                                               msg, account, (const gchar*) uid,
-                                               model, row_reference);
-                               gtk_tree_row_reference_free (row_reference);
-                       } else {
-                               win = modest_msg_view_window_new_for_attachment (msg, account, (const gchar*) uid);
-                       }
+                       win = modest_msg_view_window_new_with_header_model (msg, account, (const gchar*) uid,
+                                                                           helper->model, row_reference);
                } else {
                        win = modest_msg_view_window_new_for_attachment (msg, account, (const gchar*) uid);
                }
@@ -985,46 +978,43 @@ cleanup:
        g_free(account);
        g_object_unref (parent_win);
        g_object_unref (folder);
-banner_cleanup:
-       if (banner_info) {
-               g_free (banner_info->message);
-               if (banner_info->idle_handler > 0) {
-                       g_source_remove (banner_info->idle_handler);
-                       banner_info->idle_handler = 0;
-               }
-               if (banner_info->banner != NULL) {
-                       gtk_widget_destroy (banner_info->banner);
-                       g_object_unref (banner_info->banner);
-                       banner_info->banner = NULL;
-               }
-               g_slice_free (OpenMsgBannerInfo, banner_info);
+}
+
+static gboolean
+is_memory_full_error (GError *error)
+{
+       if (error->code == TNY_SYSTEM_ERROR_MEMORY ||
+           error->code == TNY_IO_ERROR_WRITE ||
+           error->code == TNY_IO_ERROR_READ) {
+               return TRUE;
+       } else {
+               return FALSE;
        }
 }
 
 void
 modest_ui_actions_disk_operations_error_handler (ModestMailOperation *mail_op,
-                                                   gpointer user_data)
+                                                gpointer user_data)
 {
        const GError *error;
        GObject *win = NULL;
+       ModestMailOperationStatus status;
 
        win = modest_mail_operation_get_source (mail_op);
        error = modest_mail_operation_get_error (mail_op);
+       status = modest_mail_operation_get_status (mail_op);
 
-       /* Show error */
-       if (error->code == TNY_SYSTEM_ERROR_MEMORY ||
-           error->code == TNY_IO_ERROR_WRITE ||
-           error->code == TNY_IO_ERROR_READ) {
-               ModestMailOperationStatus st = modest_mail_operation_get_status (mail_op);
-               /* If the mail op has been cancelled then it's not an error: don't show any message */
-               if (st != MODEST_MAIL_OPERATION_STATUS_CANCELED) {
+       /* If the mail op has been cancelled then it's not an error:
+          don't show any message */
+       if (status != MODEST_MAIL_OPERATION_STATUS_CANCELED) {
+               if (is_memory_full_error ((GError *) error)) {
                        modest_platform_information_banner ((GtkWidget *) win,
                                                            NULL, dgettext("ke-recv",
                                                                           "cerm_device_memory_full"));
+               } else if (user_data) {
+                       modest_platform_information_banner ((GtkWidget *) win, 
+                                                           NULL, user_data);
                }
-       } else if (user_data) {
-               modest_platform_information_banner ((GtkWidget *) win, 
-                                                   NULL, user_data);
        }
 
        if (win)
@@ -1083,6 +1073,31 @@ foreach_unregister_headers (gpointer data,
 }
 
 static void
+open_msgs_helper_destroyer (gpointer user_data)
+{
+       OpenMsgHelper *helper = (OpenMsgHelper *) user_data;
+
+       if (helper->banner_info) {
+               g_free (helper->banner_info->message);
+               if (helper->banner_info->idle_handler > 0) {
+                       g_source_remove (helper->banner_info->idle_handler);
+                       helper->banner_info->idle_handler = 0;
+               }
+               if (helper->banner_info->banner != NULL) {
+                       gtk_widget_destroy (helper->banner_info->banner);
+                       g_object_unref (helper->banner_info->banner);
+                       helper->banner_info->banner = NULL;
+               }
+               g_slice_free (OpenMsgBannerInfo, helper->banner_info);
+               helper->banner_info = NULL;
+       }
+       g_object_unref (helper->model);
+       g_object_unref (helper->headers);
+       g_hash_table_destroy (helper->row_refs_per_header);
+       g_slice_free (OpenMsgHelper, helper);
+}
+
+static void
 open_msgs_performer(gboolean canceled, 
                    GError *err,
                    GtkWindow *parent_window,
@@ -1096,15 +1111,25 @@ open_msgs_performer(gboolean canceled,
        TnyList *not_opened_headers;
        TnyConnectionStatus status;
        gboolean show_open_draft = FALSE;
-       OpenMsgBannerInfo *banner_info = NULL;
+       OpenMsgHelper *helper = NULL;
 
-       not_opened_headers = TNY_LIST (user_data);
+       helper = (OpenMsgHelper *) user_data;
+       not_opened_headers = helper->headers;
 
        status = tny_account_get_connection_status (account);
        if (err || canceled) {
                /* Unregister the already registered headers */
                tny_list_foreach (not_opened_headers, foreach_unregister_headers, 
                                  modest_runtime_get_window_mgr ());
+               /* Free the helper */
+               open_msgs_helper_destroyer (helper);
+
+               /* In memory full conditions we could get this error here */
+               if (err && is_memory_full_error (err)) {
+                       modest_platform_information_banner ((GtkWidget *) parent_window,
+                                                           NULL, dgettext("ke-recv",
+                                                                          "cerm_device_memory_full"));
+               }
                goto clean;
        }
 
@@ -1123,8 +1148,10 @@ open_msgs_performer(gboolean canceled,
                } else if (proto == MODEST_PROTOCOL_STORE_IMAP) {
                        TnyIterator *iter = tny_list_create_iterator (not_opened_headers);
                        TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
+                       gchar *subject = tny_header_dup_subject (header);
                        error_msg = g_strdup_printf (_("emev_ni_ui_imap_message_not_available_in_server"),
-                                                    tny_header_get_subject (header));
+                                                    subject);
+                       g_free (subject);
                        g_object_unref (header);
                        g_object_unref (iter);
                } else {
@@ -1156,23 +1183,23 @@ open_msgs_performer(gboolean canceled,
                                         mail_op);
 
        if (show_open_draft) {
-               banner_info = g_slice_new (OpenMsgBannerInfo);
-               banner_info->message = g_strdup (_("mail_ib_opening_draft_message"));
-               banner_info->banner = NULL;
-               banner_info->idle_handler = g_timeout_add (500, open_msg_banner_idle, banner_info);
+               helper->banner_info = g_slice_new (OpenMsgBannerInfo);
+               helper->banner_info->message = g_strdup (_("mail_ib_opening_draft_message"));
+               helper->banner_info->banner = NULL;
+               helper->banner_info->idle_handler = g_timeout_add (500, open_msg_banner_idle, 
+                                                                  helper->banner_info);
        }
 
        modest_mail_operation_get_msgs_full (mail_op,
                                             not_opened_headers,
                                             open_msg_cb,
-                                            banner_info,
-                                            NULL);
+                                            helper,
+                                            open_msgs_helper_destroyer);
 
        /* Frees */
  clean:
        if (mail_op)
                g_object_unref (mail_op);
-       g_object_unref (not_opened_headers);
        g_object_unref (account);
 }
 
@@ -1190,6 +1217,12 @@ open_msgs_from_headers (TnyList *headers, ModestWindow *win)
        TnyHeaderFlags flags = 0;
        TnyAccount *account;
        gint uncached_msgs = 0;
+       GtkWidget *header_view;
+       GtkTreeModel *model;
+       GHashTable *refs_for_headers;
+       OpenMsgHelper *helper;
+       GtkTreeSelection *sel;
+       GList *sel_list = NULL, *sel_list_iter = NULL;
                
        g_return_if_fail (headers != NULL);
 
@@ -1209,11 +1242,23 @@ open_msgs_from_headers (TnyList *headers, ModestWindow *win)
        if (!account)
                return;
 
+       /* Get the selections, we need to get the references to the
+          rows here because the treeview/model could dissapear (the
+          user might want to select another folder)*/
+       header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
+                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
+       sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view));
+       model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
+       sel_list = gtk_tree_selection_get_selected_rows (sel, &model);
+       refs_for_headers = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, 
+                                                 (GDestroyNotify) gtk_tree_row_reference_free);
+
        /* Look if we already have a message view for each header. If
           true, then remove the header from the list of headers to
           open */
+       sel_list_iter = sel_list;
        not_opened_headers = tny_simple_list_new ();
-       while (!tny_iterator_is_done (iter)) {
+       while (!tny_iterator_is_done (iter) && sel_list_iter) {
 
                ModestWindow *window = NULL;
                TnyHeader *header = NULL;
@@ -1229,27 +1274,39 @@ open_msgs_from_headers (TnyList *headers, ModestWindow *win)
                /* Do not open again the message and present the
                   window to the user */
                if (found) {
-                       if (window)
+                       if (window) {
                                gtk_window_present (GTK_WINDOW (window));
-                       else
+                       } else {
                                /* the header has been registered already, we don't do
                                 * anything but wait for the window to come up*/
                                g_debug ("header %p already registered, waiting for window", header);
+                       }
                } else {
+                       GtkTreeRowReference *row_reference;
+
                        tny_list_append (not_opened_headers, G_OBJECT (header));
+                       /* Create a new row reference and add it to the hash table */
+                       row_reference = gtk_tree_row_reference_new (model, (GtkTreePath *) sel_list_iter->data);
+                       g_hash_table_insert (refs_for_headers, header, row_reference);
                }
 
                if (header)
                        g_object_unref (header);
 
+               /* Go to next */
                tny_iterator_next (iter);
+               sel_list_iter = g_list_next (sel_list_iter);
        }
        g_object_unref (iter);
        iter = NULL;
+       g_list_foreach (sel_list, (GFunc) gtk_tree_path_free, NULL);
+       g_list_free (sel_list);
 
        /* Open each message */
-       if (tny_list_get_length (not_opened_headers) == 0)
+       if (tny_list_get_length (not_opened_headers) == 0) {
+               g_hash_table_destroy (refs_for_headers);
                goto cleanup;
+       }
        
        /* If some messages would have to be downloaded, ask the user to 
         * make a connection. It's generally easier to do this here (in the mainloop) 
@@ -1270,8 +1327,10 @@ open_msgs_from_headers (TnyList *headers, ModestWindow *win)
                                                                                             uncached_msgs));
 
                                /* End if the user does not want to continue */
-                               if (response == GTK_RESPONSE_CANCEL)
+                               if (response == GTK_RESPONSE_CANCEL) {
+                                       g_hash_table_destroy (refs_for_headers);
                                        goto cleanup;
+                               }
                        }
                }
        }
@@ -1289,14 +1348,23 @@ open_msgs_from_headers (TnyList *headers, ModestWindow *win)
        g_object_unref (iter_not_opened);
        iter_not_opened = NULL;
 
+       /* Create the helper. We need to get a reference to the model
+          here because it could change while the message is readed
+          (the user could switch between folders) */
+       helper = g_slice_new (OpenMsgHelper);
+       helper->model = g_object_ref (model);
+       helper->headers = g_object_ref (not_opened_headers);
+       helper->row_refs_per_header = refs_for_headers;
+       helper->banner_info = NULL;
+
        /* Connect to the account and perform */
        if (uncached_msgs > 0) {
                modest_platform_connect_and_perform ((GtkWindow *) win, TRUE, g_object_ref (account), 
-                                                    open_msgs_performer, g_object_ref (not_opened_headers));
+                                                    open_msgs_performer, helper);
        } else {
                /* Call directly the performer, do not need to connect */
-               open_msgs_performer (FALSE, NULL, (GtkWindow *) win, g_object_ref (account),
-                                    g_object_ref (not_opened_headers));
+               open_msgs_performer (FALSE, NULL, (GtkWindow *) win, 
+                                    g_object_ref (account), helper);
        }
 cleanup:
        /* Clean */
@@ -1758,6 +1826,8 @@ typedef struct {
        ModestWindow *win;
        gchar *account_name;
        gboolean poke_status;
+       gboolean interactive;
+       ModestMailOperation *mail_op;
 } SendReceiveInfo;
 
 static void
@@ -1767,12 +1837,21 @@ do_send_receive_performer (gboolean canceled,
                           TnyAccount *account, 
                           gpointer user_data)
 {
-       ModestMailOperation *mail_op;
        SendReceiveInfo *info;
 
        info = (SendReceiveInfo *) user_data;
 
        if (err || canceled) {
+               /* In memory full conditions we could get this error here */
+               if (err && is_memory_full_error (err)) {
+                       modest_platform_information_banner ((GtkWidget *) parent_window,
+                                                           NULL, dgettext("ke-recv",
+                                                                          "cerm_device_memory_full"));
+               }
+               if (info->mail_op) {
+                       modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (),
+                                                           info->mail_op);
+               }
                goto clean;
        }
 
@@ -1780,25 +1859,21 @@ do_send_receive_performer (gboolean canceled,
        if (info->win && MODEST_IS_MAIN_WINDOW (info->win)) {
                modest_main_window_notify_send_receive_initied (MODEST_MAIN_WINDOW (info->win));
        }
-       
-       mail_op = modest_mail_operation_new_with_error_handling ((info->win) ? G_OBJECT (info->win) : NULL,
-                                                                modest_ui_actions_send_receive_error_handler,
-                                                                NULL, NULL);
 
        if (info->win && MODEST_IS_MAIN_WINDOW (info->win))
-               g_signal_connect (G_OBJECT(mail_op), "operation-finished", 
+               g_signal_connect (G_OBJECT (info->mail_op), "operation-finished", 
                                  G_CALLBACK (on_send_receive_finished), 
                                  info->win);
 
        /* Send & receive. */
-       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
-       modest_mail_operation_update_account (mail_op, info->account_name, info->poke_status,
+       modest_mail_operation_update_account (info->mail_op, info->account_name, info->poke_status, info->interactive,
                                              (info->win) ? retrieve_all_messages_cb : NULL, 
                                              new_messages_arrived, info->win);
-       g_object_unref (G_OBJECT (mail_op));
        
  clean:
        /* Frees */
+       if (info->mail_op)
+               g_object_unref (G_OBJECT (info->mail_op));
        if (info->account_name)
                g_free (info->account_name);
        if (info->win)
@@ -1818,6 +1893,7 @@ void
 modest_ui_actions_do_send_receive (const gchar *account_name, 
                                   gboolean force_connection,
                                   gboolean poke_status,
+                                  gboolean interactive,
                                   ModestWindow *win)
 {
        gchar *acc_name = NULL;
@@ -1846,8 +1922,16 @@ modest_ui_actions_do_send_receive (const gchar *account_name,
        info->account_name = acc_name;
        info->win = (win) ? g_object_ref (win) : NULL;
        info->poke_status = poke_status;
+       info->interactive = interactive;
        info->account = modest_tny_account_store_get_server_account (acc_store, acc_name,
                                                                     TNY_ACCOUNT_TYPE_STORE);
+       /* We need to create the operation here, because otherwise it
+          could happen that the queue emits the queue-empty signal
+          while we're trying to connect the account */
+       info->mail_op = modest_mail_operation_new_with_error_handling ((info->win) ? G_OBJECT (info->win) : NULL,
+                                                                      modest_ui_actions_disk_operations_error_handler,
+                                                                      NULL, NULL);
+       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), info->mail_op);
 
        /* Invoke the connect and perform */
        modest_platform_connect_and_perform ((win) ? GTK_WINDOW (win) : NULL, 
@@ -1935,7 +2019,8 @@ modest_ui_actions_cancel_send (GtkAction *action,  ModestWindow *win)
 void
 modest_ui_actions_do_send_receive_all (ModestWindow *win, 
                                       gboolean force_connection,
-                                      gboolean poke_status)
+                                      gboolean poke_status,
+                                      gboolean interactive)
 {
        GSList *account_names, *iter;
 
@@ -1946,7 +2031,7 @@ modest_ui_actions_do_send_receive_all (ModestWindow *win,
        while (iter) {                  
                modest_ui_actions_do_send_receive ((const char*) iter->data, 
                                                   force_connection, 
-                                                  poke_status, win);
+                                                  poke_status, interactive, win);
                iter = g_slist_next (iter);
        }
 
@@ -1989,7 +2074,7 @@ modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win)
        
        /* Refresh the active account. Force the connection if needed
           and poke the status of all folders */
-       modest_ui_actions_do_send_receive (NULL, TRUE, TRUE, win);
+       modest_ui_actions_do_send_receive (NULL, TRUE, TRUE, TRUE, win);
 }
 
 
@@ -2148,6 +2233,7 @@ folder_refreshed_cb (ModestMailOperation *mail_op,
        if (tny_folder_get_all_count (folder) == 0)
                modest_main_window_set_contents_style (win,
                                                       MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY);
+
 }
 
 void 
@@ -2221,7 +2307,8 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view,
                }
        }
 
-       /* Update toolbar dimming state */
+       /* Update dimming state */
+       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (main_window));
        modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window));
 }
 
@@ -2825,6 +2912,12 @@ create_folder_performer (gboolean canceled,
        TnyFolderStore *parent_folder = TNY_FOLDER_STORE (user_data);
 
        if (canceled || err) {
+               /* In memory full conditions we could get this error here */
+               if (err && is_memory_full_error (err)) {
+                       modest_platform_information_banner ((GtkWidget *) parent_window,
+                                                           NULL, dgettext("ke-recv",
+                                                                          "cerm_device_memory_full"));
+               }
                goto frees;
        }
 
@@ -2872,7 +2965,6 @@ static void
 modest_ui_actions_rename_folder_error_handler (ModestMailOperation *mail_op,
                                               gpointer user_data)
 {
-       ModestMainWindow *window = MODEST_MAIN_WINDOW (user_data);
        const GError *error = NULL;
        const gchar *message = NULL;
        
@@ -2886,12 +2978,12 @@ modest_ui_actions_rename_folder_error_handler (ModestMailOperation *mail_op,
                message = _CS("ckdg_ib_folder_already_exists");
                break;
        default:
-               g_warning ("%s: BUG: unexpected error:[%d]: %s", __FUNCTION__,
-                          error->code, error->message);
-               return;
+               message = _("emev_ib_ui_imap_unable_to_rename");
        }
 
-       modest_platform_information_banner (GTK_WIDGET (window), NULL, message);
+       /* We don't set a parent for the dialog because the dialog
+          will be destroyed so the banner won't appear */
+       modest_platform_information_banner (NULL, NULL, message);
 }
 
 typedef struct {
@@ -2904,9 +2996,15 @@ on_rename_folder_cb (ModestMailOperation *mail_op,
                     TnyFolder *new_folder,
                     gpointer user_data)
 {
-       /* Select now */
-       modest_folder_view_select_folder (MODEST_FOLDER_VIEW (user_data),
-                                         new_folder, FALSE);
+       ModestFolderView *folder_view;
+
+       folder_view = MODEST_FOLDER_VIEW (user_data);
+       /* Note that if the rename fails new_folder will be NULL */
+       if (new_folder) {
+               modest_folder_view_select_folder (folder_view, new_folder, FALSE);
+       } else {
+               modest_folder_view_select_first_inbox_or_local (folder_view);
+       }
 }
 
 static void
@@ -2921,7 +3019,14 @@ on_rename_folder_performer (gboolean canceled,
        GtkWidget *folder_view = NULL;
        RenameFolderInfo *data = (RenameFolderInfo*)user_data;
 
-       if (!canceled && (err == NULL) && MODEST_IS_MAIN_WINDOW(parent_window)) {
+       if (canceled || err) {
+               /* In memory full conditions we could get this error here */
+               if (err && is_memory_full_error (err)) {
+                       modest_platform_information_banner ((GtkWidget *) parent_window,
+                                                           NULL, dgettext("ke-recv",
+                                                                          "cerm_device_memory_full"));
+               }
+       } else if (MODEST_IS_MAIN_WINDOW(parent_window)) {
 
                folder_view = modest_main_window_get_child_widget (
                                MODEST_MAIN_WINDOW (parent_window),
@@ -2945,9 +3050,9 @@ on_rename_folder_performer (gboolean canceled,
                                                     (const gchar *) (data->new_name),
                                                     on_rename_folder_cb,
                                                     folder_view);
+               g_object_unref (mail_op);
        }
 
-       g_object_unref (mail_op);
        g_free (data->new_name);
        g_free (data);
 }
@@ -3012,7 +3117,8 @@ modest_ui_actions_delete_folder_error_handler (ModestMailOperation *mail_op,
        GObject *win = modest_mail_operation_get_source (mail_op);
 
        modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL,
-                                               _("mail_in_ui_folder_delete_error"));
+                                               _("mail_in_ui_folder_delete_error"),
+                                               FALSE);
        g_object_unref (win);
 }
 
@@ -3084,7 +3190,8 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash)
        /* Show an error if it's an account */
        if (!TNY_IS_FOLDER (folder)) {
                modest_platform_run_information_dialog (GTK_WINDOW (main_window),
-                                                       _("mail_in_ui_folder_delete_error"));
+                                                       _("mail_in_ui_folder_delete_error"),
+                                                       FALSE);
                g_object_unref (G_OBJECT (folder));
                return;
        }
@@ -3300,6 +3407,7 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
                        if (cancel)
                                *cancel   = FALSE;                      
                } else {
+                       /* Set parent to NULL or the banner will disappear with its parent dialog */
                        modest_platform_information_banner(NULL, NULL, _("mail_ib_login_cancelled"));
                        completed = TRUE;
                        if (username)
@@ -4475,34 +4583,11 @@ modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op,
 
        /* Show notification dialog */
        win = modest_mail_operation_get_source (mail_op);
-       modest_platform_run_information_dialog ((GtkWindow *) win, _("mail_in_ui_folder_move_target_error"));
+       modest_platform_run_information_dialog ((GtkWindow *) win, _("mail_in_ui_folder_move_target_error"), FALSE);
        if (win)
                g_object_unref (win);
 }
 
-void
-modest_ui_actions_send_receive_error_handler (ModestMailOperation *mail_op, 
-                                             gpointer user_data)
-{
-       GObject *win = modest_mail_operation_get_source (mail_op);
-       const GError *error = modest_mail_operation_get_error (mail_op);
-
-       g_return_if_fail (error != NULL);
-       if (error->message != NULL)             
-               g_printerr ("modest: %s\n", error->message);
-       else
-               g_printerr ("modest: unkonw error on send&receive operation");
-
-       /* Show error message */
-/*     if (modest_mail_operation_get_id (mail_op) == MODEST_MAIL_OPERATION_TYPE_RECEIVE) */
-/*             modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL, */
-/*                                                     _CS("sfil_ib_unable_to_receive")); */
-/*     else  */
-/*             modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL, */
-/*                                                     _CS("sfil_ib_unable_to_send")); */
-       g_object_unref (win);
-}
-
 static void
 open_msg_for_purge_cb (ModestMailOperation *mail_op, 
                       TnyHeader *header, 
@@ -4745,8 +4830,14 @@ xfer_messages_performer  (gboolean canceled,
        gboolean dst_is_pop = FALSE;
 
        if (canceled || err) {
-               /* Show the proper error message */
-               modest_ui_actions_on_account_connection_error (parent_window, account);
+               if (err && is_memory_full_error (err)) {
+                       modest_platform_information_banner ((GtkWidget *) parent_window,
+                                                           NULL, dgettext("ke-recv",
+                                                                          "cerm_device_memory_full"));
+               } else {
+                       /* Show the proper error message */
+                       modest_ui_actions_on_account_connection_error (parent_window, account);
+               }
                g_object_unref (dst_folder);
                return;
        }
@@ -4867,21 +4958,21 @@ on_move_folder_cb (gboolean canceled, GError *err, GtkWindow *parent_window,
        /*                      modest_folder_view_select_folder (MODEST_FOLDER_VIEW(folder_view), */
        /*                                                        TNY_FOLDER (src_folder), TRUE); */
 
+       modest_folder_view_select_folder (MODEST_FOLDER_VIEW(info->folder_view),
+                                         TNY_FOLDER (info->dst_folder), TRUE);
        modest_mail_operation_xfer_folder (mail_op,
                        TNY_FOLDER (info->src_folder),
                        info->dst_folder,
                        info->delete_original, 
                        folder_move_to_cb, 
                        helper);
+       g_object_unref (G_OBJECT (info->src_folder));
 
-       if (modest_mail_operation_get_status (mail_op) == MODEST_MAIL_OPERATION_STATUS_SUCCESS) {       
-               modest_folder_view_select_folder (MODEST_FOLDER_VIEW(info->folder_view),
-                                                 TNY_FOLDER (info->dst_folder), TRUE);
-       }
+       /* if (modest_mail_operation_get_status (mail_op) == MODEST_MAIL_OPERATION_STATUS_SUCCESS) {        */
+       /* } */
        
        /* Unref mail operation */
        g_object_unref (G_OBJECT (mail_op));
-       g_object_unref (G_OBJECT (info->src_folder));
        g_object_unref (G_OBJECT (info->dst_folder));
        g_free (user_data);
 }
@@ -5212,6 +5303,11 @@ retrieve_msg_contents_performer (gboolean canceled,
        TnyList *headers = TNY_LIST (user_data);
 
        if (err || canceled) {
+               if (err && is_memory_full_error (err)) {
+                       modest_platform_information_banner ((GtkWidget *) parent_window,
+                                                           NULL, dgettext("ke-recv",
+                                                                          "cerm_device_memory_full"));
+               }
                goto out;
        }
 
@@ -5462,21 +5558,20 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self,
        TnyTransportAccount *server_account;
        gchar *message = NULL;
 
-       /* Don't show anything if the user cancelled something */
-       if (err->code == TNY_SYSTEM_ERROR_CANCEL)
+       /* Don't show anything if the user cancelled something or the send receive request is not
+        * interactive */
+       if (err->code == TNY_SYSTEM_ERROR_CANCEL ||
+           !modest_tny_send_queue_get_requested_send_receive (MODEST_TNY_SEND_QUEUE (self)))
                return;
 
+
        /* Get the server name: */
        server_account = 
                TNY_TRANSPORT_ACCOUNT (tny_camel_send_queue_get_transport_account (TNY_CAMEL_SEND_QUEUE (self)));
-       if (server_account) {
-               server_name = tny_account_get_hostname (TNY_ACCOUNT (server_account));
-                       
-               g_object_unref (server_account);
-               server_account = NULL;
-       }
-       
-       g_return_if_fail (server_name);
+       if (server_account)
+               server_name = tny_account_get_hostname (TNY_ACCOUNT (server_account));          
+       else
+               g_return_if_reached ();
 
        /* Show the appropriate message text for the GError: */
        switch (err->code) {
@@ -5487,7 +5582,7 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self,
                message = g_strdup_printf (_("emev_ni_ui_smtp_authentication_fail_error"), server_name);
                break;
        case TNY_SERVICE_ERROR_SEND:
-               message = g_strdup (_("emev_ib_ui_smtp_send_error"));
+               message = g_strdup (dgettext("hildon-common-strings", "sfil_ib_unable_to_send"));
                break;
        case TNY_SERVICE_ERROR_UNAVAILABLE:
                message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name);
@@ -5495,7 +5590,7 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self,
        default:
                g_warning ("%s: unexpected ERROR %d",
                           __FUNCTION__, err->code);
-               message = g_strdup (_("emev_ib_ui_smtp_send_error"));
+               message = g_strdup (dgettext("hildon-common-strings", "sfil_ib_unable_to_send"));
                break;  
        }
        
@@ -5503,8 +5598,9 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self,
           should show the Accounts Settings dialog or the Connection
           specific SMTP server window */
 
-       modest_platform_run_information_dialog (NULL, message);
+       modest_platform_run_information_dialog (NULL, message, FALSE);
        g_free (message);
+       g_object_unref (server_account);
 }
 
 void
@@ -5588,7 +5684,7 @@ modest_ui_actions_on_account_connection_error (GtkWindow *parent_window,
        }
 
        if (error_note) {
-               modest_platform_run_information_dialog (parent_window, error_note);
+               modest_platform_run_information_dialog (parent_window, error_note, FALSE);
                g_free (error_note);
        }
 }
@@ -5630,8 +5726,11 @@ modest_ui_actions_get_msg_already_deleted_error_msg (ModestWindow *win)
        if (proto == MODEST_PROTOCOL_STORE_POP) {
                msg = g_strdup (_("emev_ni_ui_pop3_msg_recv_error"));
        } else if (proto == MODEST_PROTOCOL_STORE_IMAP) {
+               gchar *subject;
+               subject = tny_header_dup_subject (header);
                msg = g_strdup_printf (_("emev_ni_ui_imap_message_not_available_in_server"), 
-                                      tny_header_get_subject (header));
+                                      subject);
+               g_free (subject);
        } else {
                msg = g_strdup_printf (_("mail_ni_ui_folder_get_msg_folder_error"));
        }