Fixed compilation warnings
[modest] / src / modest-ui-actions.c
index 021a1bb..781b52c 100644 (file)
@@ -35,6 +35,7 @@
 #include <glib/gprintf.h>
 #include <string.h>
 #include <modest-runtime.h>
+#include <modest-defs.h>
 #include <modest-tny-folder.h>
 #include <modest-tny-msg.h>
 #include <modest-tny-account.h>
@@ -54,6 +55,7 @@
 #include <hildon/hildon-gtk.h>
 #include <modest-header-window.h>
 #include <modest-folder-window.h>
+#include <modest-maemo-utils.h>
 #endif
 
 #ifdef MODEST_PLATFORM_MAEMO
@@ -223,14 +225,47 @@ modest_ui_actions_run_account_setup_wizard (ModestWindow *win)
        wizard = GTK_WINDOW (modest_platform_get_account_settings_wizard ());
        modest_window_mgr_set_modal (modest_runtime_get_window_mgr(), GTK_WINDOW (wizard), (GtkWindow *) win);
 
+#ifndef MODEST_TOOLKIT_HILDON2
        /* always present a main window in the background 
         * we do it here, so we cannot end up with two wizards (as this
         * function might be called in modest_window_mgr_get_main_window as well */
-       if (!win) 
+       if (!win)
                win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(),
                                                         TRUE);  /* create if not existent */
+#else
+       if (!win) {
+               GList *window_list;
+               ModestWindowMgr *mgr;
+
+               mgr = modest_runtime_get_window_mgr ();
+
+               window_list = modest_window_mgr_get_window_list (mgr);
+               if (window_list == NULL) {
+                       ModestWindow *old_win;
+                       win = MODEST_WINDOW (modest_accounts_window_new ());
+                       if (modest_window_mgr_register_window (mgr, win, NULL)) {
+                               gtk_widget_show_all (GTK_WIDGET (win));
+                       } else {
+                               gtk_widget_destroy (GTK_WIDGET (win));
+                               win = NULL;
+                       }
+
+                       old_win = win;
+                       win = MODEST_WINDOW (modest_folder_window_new (NULL));
+                       if (modest_window_mgr_register_window (mgr, win, NULL)) {
+                               gtk_widget_show_all (GTK_WIDGET (win));
+                       } else {
+                               gtk_widget_destroy (GTK_WIDGET (win));
+                               win = old_win;
+                       }
+               } else {
+                       g_list_free (window_list);
+               }
+       }
+#endif
 
-       gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (win));
+       if (win)
+               gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (win));
 
        /* make sure the mainwindow is visible. We need to present the
           wizard again to give it the focus back. show_all are needed
@@ -881,14 +916,30 @@ modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op,
 
                if (error && ((error->code == TNY_SERVICE_ERROR_NO_SUCH_MESSAGE) ||
                              error->code == TNY_SERVICE_ERROR_MESSAGE_NOT_AVAILABLE)) {
-                       gchar *subject, *msg;
+                       gchar *subject, *msg, *format = NULL;
+                       TnyAccount *account;
                        subject = tny_header_dup_subject (header);
                        if (!subject)
-                               subject = g_strdup (_("mail_va_no_subject"));;
-                       msg = g_strdup_printf (_("emev_ni_ui_imap_message_not_available_in_server"),
-                                              subject);
+                               subject = g_strdup (_("mail_va_no_subject"));
+
+                       account = modest_mail_operation_get_account (mail_op);
+                       if (account) {
+                               ModestProtocol *protocol;
+                               ModestProtocolType proto;
+                               proto = modest_tny_account_get_protocol_type (account);
+                               protocol = modest_protocol_registry_get_protocol_by_type (modest_runtime_get_protocol_registry (), proto);
+                               if (protocol)
+                                 format = modest_protocol_get_translation (protocol, MODEST_PROTOCOL_TRANSLATION_MSG_NOT_AVAILABLE, subject);
+                               g_object_unref (account);
+                       }
+
+                       if (!format)
+                               format = g_strdup (_("emev_ni_ui_imap_message_not_available_in_server"));
+
+                       msg = g_strdup_printf (format, subject);
                        modest_platform_run_information_dialog (NULL, msg, FALSE);
                        g_free (msg);
+                       g_free (format);
                        g_free (subject);
                }
 
@@ -995,7 +1046,6 @@ get_info_from_header (TnyHeader *header, gboolean *is_draft, gboolean *can_open)
                                           outbox which is not in
                                           failed state */
                                        *can_open = FALSE;
-                                       g_object_unref(traccount);
                                 }
 #endif
                        }
@@ -1156,7 +1206,7 @@ check_memory_full_error (GtkWidget *parent_window, GError *err)
        else if (err->code == TNY_SYSTEM_ERROR_MEMORY)
                /* If the account was created in memory full
                   conditions then tinymail won't be able to
-                  connect so it'll return this error code */                           
+                  connect so it'll return this error code */
                modest_platform_information_banner (parent_window,
                                                    NULL, _("emev_ui_imap_inbox_select_error"));
        else
@@ -1434,7 +1484,7 @@ open_msg_from_header (TnyHeader *header, GtkTreeRowReference *rowref, ModestWind
        GtkWidget *header_view = NULL;
        OpenMsgHelper *helper;
        ModestWindow *window;
-               
+
        g_return_if_fail (header != NULL && rowref != NULL);
 
        mgr = modest_runtime_get_window_mgr ();
@@ -1451,7 +1501,7 @@ open_msg_from_header (TnyHeader *header, GtkTreeRowReference *rowref, ModestWind
 
        window = NULL;
        found = modest_window_mgr_find_registered_header (mgr, header, &window);
-               
+
        /* Do not open again the message and present the
           window to the user */
        if (found) {
@@ -2019,12 +2069,12 @@ modest_ui_actions_on_sort (GtkAction *action,
 
        if (!header_view) {
                modest_platform_information_banner (NULL, NULL, _CS("ckdg_ib_nothing_to_sort"));
-               
+
                return;
        }
 
        /* Show sorting dialog */
-       modest_utils_run_sort_dialog (GTK_WINDOW (window), MODEST_SORT_HEADERS);        
+       modest_utils_run_sort_dialog (GTK_WINDOW (window), MODEST_SORT_HEADERS);
 }
 
 static void
@@ -3333,7 +3383,7 @@ do_create_folder (GtkWindow *parent_window,
                                                        &parent_folder);
 
        if (result == GTK_RESPONSE_ACCEPT && parent_folder) {
-               CreateFolderConnect *helper = (CreateFolderConnect *) g_slice_new0 (CreateFolderHelper);
+               CreateFolderConnect *helper = (CreateFolderConnect *) g_slice_new0 (CreateFolderConnect);
                helper->folder_name = g_strdup (folder_name);
                helper->parent = g_object_ref (parent_folder);
 
@@ -3357,22 +3407,12 @@ modest_ui_actions_create_folder(GtkWidget *parent_window,
        TnyFolderStore *parent_folder;
 
 #ifdef MODEST_TOOLKIT_HILDON2
-       const gchar *active_account;
-       TnyAccount *account;
        ModestTnyAccountStore *acc_store;
 
-       /* In hildon 2.2 we use the current account as default parent */
        acc_store = modest_runtime_get_account_store ();
-       active_account = modest_window_get_active_account (MODEST_WINDOW (parent_window));
-       if (active_account) {
-               account = modest_tny_account_store_get_server_account (acc_store,
-                                                                      active_account,
-                                                                      TNY_ACCOUNT_TYPE_STORE);
-               parent_folder = TNY_FOLDER_STORE (account);
-       } else {
-               parent_folder = (TnyFolderStore *) 
-                       modest_tny_account_store_get_local_folders_account (acc_store);
-       }
+
+       parent_folder = (TnyFolderStore *) 
+               modest_tny_account_store_get_local_folders_account (acc_store);
 #else
        parent_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));
 #endif
@@ -3429,7 +3469,7 @@ modest_ui_actions_rename_folder_error_handler (ModestMailOperation *mail_op,
                   message is opened for example */
                message = _("emev_ni_internal_error");
        } else {
-               message = _("emev_ib_ui_imap_unable_to_rename");
+               message = _CS("ckdg_ib_unable_to_rename");
        }
 
        /* We don't set a parent for the dialog because the dialog
@@ -3461,7 +3501,7 @@ on_rename_folder_cb (ModestMailOperation *mail_op,
        } else {
                modest_folder_view_select_first_inbox_or_local (folder_view);
        }
-       gtk_widget_grab_focus (GTK_WIDGET (folder_view));       
+       gtk_widget_grab_focus (GTK_WIDGET (folder_view));
 }
 
 static void
@@ -3481,7 +3521,7 @@ on_rename_folder_performer (gboolean canceled,
                check_memory_full_error ((GtkWidget *) parent_window, err);
        } else {
 
-               mail_op = 
+               mail_op =
                        modest_mail_operation_new_with_error_handling (G_OBJECT(parent_window),
                                        modest_ui_actions_rename_folder_error_handler,
                                        parent_window, NULL);
@@ -3494,13 +3534,17 @@ on_rename_folder_performer (gboolean canceled,
                        folder_view = modest_main_window_get_child_widget (
                                MODEST_MAIN_WINDOW (parent_window),
                                MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
-
-                       /* Clear the headers view */
-                       sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view));
-                       gtk_tree_selection_unselect_all (sel);
-               } else {
-                       folder_view = NULL;
+               } 
+#ifdef MODEST_TOOLKIT_HILDON2
+               else if (MODEST_IS_FOLDER_WINDOW (parent_window)) {
+                       ModestFolderWindow *folder_window = (ModestFolderWindow *) parent_window;
+                       folder_view = GTK_WIDGET (modest_folder_window_get_folder_view (folder_window));
                }
+#endif
+
+               /* Clear the folders view */
+               sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view));
+               gtk_tree_selection_unselect_all (sel);
 
                /* Actually rename the folder */
                modest_mail_operation_rename_folder (mail_op,
@@ -3508,10 +3552,10 @@ on_rename_folder_performer (gboolean canceled,
                                                     (const gchar *) (data->new_name),
                                                     on_rename_folder_cb,
                                                     folder_view);
-               g_object_unref (data->folder);
                g_object_unref (mail_op);
        }
 
+       g_object_unref (data->folder);
        g_free (data->new_name);
        g_free (data);
 }
@@ -3674,6 +3718,9 @@ delete_folder (ModestWindow *window, gboolean move_to_trash)
 
        folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
 
+       if (!folder)
+               return FALSE;
+
        /* Show an error if it's an account */
        if (!TNY_IS_FOLDER (folder)) {
                modest_platform_run_information_dialog (GTK_WINDOW (window),
@@ -3683,7 +3730,7 @@ delete_folder (ModestWindow *window, gboolean move_to_trash)
                return FALSE;
        }
 
-       /* Ask the user */      
+       /* Ask the user */
        message =  g_strdup_printf (_("mcen_nc_delete_folder_text"), 
                                    tny_folder_get_name (TNY_FOLDER (folder)));
        response = modest_platform_run_confirmation_dialog (GTK_WINDOW (window),
@@ -3746,11 +3793,19 @@ password_dialog_check_field (GtkEditable *editable,
        const gchar *value;
        gboolean any_value_empty = FALSE;
 
+#ifdef MODEST_TOOLKIT_HILDON2
+       value = hildon_entry_get_text (HILDON_ENTRY (fields->username));
+#else
        value = gtk_entry_get_text (GTK_ENTRY (fields->username));
+#endif
        if ((value == NULL) || value[0] == '\0') {
                any_value_empty = TRUE;
        }
+#ifdef MODEST_TOOLKIT_HILDON2
+       value = hildon_entry_get_text (HILDON_ENTRY (fields->password));
+#else
        value = gtk_entry_get_text (GTK_ENTRY (fields->password));
+#endif
        if ((value == NULL) || value[0] == '\0') {
                any_value_empty = TRUE;
        }
@@ -3789,6 +3844,8 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
                                             _HL("wdgt_bd_done"),
                                             GTK_RESPONSE_ACCEPT,
                                             NULL);
+       gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 
+                                       HILDON_MARGIN_DOUBLE);
 #else
        GtkWidget *dialog =
                gtk_dialog_new_with_buttons (_("mail_ti_password_protected"),
@@ -3825,19 +3882,27 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
        }
 
        gchar *txt = g_strdup_printf (_("mail_ia_password_info"), server_name);
-       gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), gtk_label_new(txt),
-                           FALSE, FALSE, 0);
+       GtkWidget *label = gtk_label_new (txt);
+       gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
        g_free (txt);
        g_free (server_name);
+       gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), label,
+                           FALSE, FALSE, 0);
        server_name = NULL;
 
        /* username: */
        gchar *initial_username = modest_account_mgr_get_server_account_username (
                modest_runtime_get_account_mgr(), server_account_name);
 
+#ifdef MODEST_TOOLKIT_HILDON2
+       GtkWidget *entry_username = hildon_entry_new (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
+       if (initial_username)
+               hildon_entry_set_text (HILDON_ENTRY (entry_username), initial_username);
+#else
        GtkWidget *entry_username = gtk_entry_new ();
        if (initial_username)
                gtk_entry_set_text (GTK_ENTRY (entry_username), initial_username);
+#endif
        /* Dim this if a connection has ever succeeded with this username,
         * as per the UI spec: */
        /* const gboolean username_known =  */
@@ -3859,8 +3924,14 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
         * We use GTK_SIZE_GROUP_HORIZONTAL, so that the widths are the same. */
        GtkSizeGroup *sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
+#ifdef MODEST_TOOLKIT_HILDON2
+       GtkWidget *caption = modest_maemo_utils_create_captioned (sizegroup, NULL, 
+                                                                 _("mail_fi_username"), FALSE,
+                                                                 entry_username);
+#else
        GtkWidget *caption = hildon_caption_new (sizegroup, 
                _("mail_fi_username"), entry_username, NULL, HILDON_CAPTION_MANDATORY);
+#endif
        gtk_widget_show (entry_username);
        gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), caption, 
                FALSE, FALSE, MODEST_MARGIN_HALF);
@@ -3871,7 +3942,11 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
 #endif /* !MODEST_TOOLKIT_GTK */
 
        /* password: */
+#ifdef MODEST_TOOLKIT_HILDON2
+       GtkWidget *entry_password = hildon_entry_new (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
+#else
        GtkWidget *entry_password = gtk_entry_new ();
+#endif
        gtk_entry_set_visibility (GTK_ENTRY(entry_password), FALSE);
        /* gtk_entry_set_invisible_char (GTK_ENTRY(entry_password), "*"); */
 
@@ -3880,8 +3955,14 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
        hildon_gtk_entry_set_input_mode (GTK_ENTRY (entry_password),
                HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE);
 
+#ifdef MODEST_TOOLKIT_HILDON2
+       caption = modest_maemo_utils_create_captioned (sizegroup, NULL,
+                                                      _("mail_fi_password"), FALSE,
+                                                      entry_password);
+#else
        caption = hildon_caption_new (sizegroup,
                _("mail_fi_password"), entry_password, NULL, HILDON_CAPTION_MANDATORY);
+#endif
        gtk_widget_show (entry_password);
        gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), caption,
                FALSE, FALSE, MODEST_MARGIN_HALF);
@@ -3916,7 +3997,11 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
 
                if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
                        if (username) {
+#ifdef MODEST_TOOLKIT_HILDON2
+                               *username = g_strdup (hildon_entry_get_text (HILDON_ENTRY(entry_username)));
+#else
                                *username = g_strdup (gtk_entry_get_text (GTK_ENTRY(entry_username)));
+#endif
 
                                /* Note that an empty field becomes the "" string */
                                if (*username && strlen (*username) > 0) {
@@ -3942,7 +4027,11 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
                        }
 
                        if (password) {
+#ifdef MODEST_TOOLKIT_HILDON2
+                               *password = g_strdup (hildon_entry_get_text (HILDON_ENTRY(entry_password)));
+#else
                                *password = g_strdup (gtk_entry_get_text (GTK_ENTRY(entry_password)));
+#endif
 
                                /* We do not save the password in the configuration, 
                                 * because this function is only called for passwords that should 
@@ -4490,7 +4579,7 @@ modest_ui_actions_on_change_fullscreen (GtkAction *action,
  * Used by modest_ui_actions_on_details to call do_headers_action 
  */
 static void
-headers_action_show_details (TnyHeader *header, 
+headers_action_show_details (TnyHeader *header,
                             ModestWindow *window,
                             gpointer user_data)
 
@@ -4501,36 +4590,24 @@ headers_action_show_details (TnyHeader *header,
 /*
  * Show the header details in a ModestDetailsDialog widget
  */
-void     
-modest_ui_actions_on_details (GtkAction *action, 
+void
+modest_ui_actions_on_details (GtkAction *action,
                              ModestWindow *win)
 {
-       TnyList * headers_list;
-       TnyIterator *iter;
-       TnyHeader *header;              
-
        if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
                TnyMsg *msg;
+               TnyHeader *header;
 
                msg = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW (win));
                if (!msg)
                        return;
-               g_object_unref (msg);           
-
-               headers_list = get_selected_headers (win);
-               if (!headers_list)
-                       return;
-
-               iter = tny_list_create_iterator (headers_list);
 
-               header = TNY_HEADER (tny_iterator_get_current (iter));
+               header = tny_msg_get_header (msg);
                if (header) {
                        headers_action_show_details (header, win, NULL);
                        g_object_unref (header);
                }
-
-               g_object_unref (iter);
-               g_object_unref (headers_list);
+               g_object_unref (msg);
 
        } else if (MODEST_IS_MAIN_WINDOW (win)) {
                GtkWidget *folder_view, *header_view;
@@ -4824,41 +4901,58 @@ on_move_to_dialog_response (GtkDialog *dialog,
                            gint       response,
                            gpointer   user_data)
 {
-       GtkWidget *parent_win, *folder_view;
+       GtkWidget *parent_win;
        MoveToInfo *helper = NULL;
+       ModestFolderView *folder_view;
 
        helper = (MoveToInfo *) user_data;
 
        parent_win = (GtkWidget *) helper->win;
-       folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog),
-                                                    MODEST_MOVE_TO_DIALOG_FOLDER_VIEW));
+       folder_view = MODEST_FOLDER_VIEW (g_object_get_data (G_OBJECT (dialog),
+                                                            MODEST_MOVE_TO_DIALOG_FOLDER_VIEW));
 
        switch (response) {
                TnyFolderStore *dst_folder;
 
        case MODEST_GTK_RESPONSE_NEW_FOLDER:
-               modest_ui_actions_create_folder (GTK_WIDGET (parent_win), folder_view);
+               modest_ui_actions_create_folder (GTK_WIDGET (dialog), GTK_WIDGET (folder_view));
                return;
        case GTK_RESPONSE_NONE:
        case GTK_RESPONSE_CANCEL:
        case GTK_RESPONSE_DELETE_EVENT:
                break;
        case GTK_RESPONSE_OK:
-               dst_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
-               /* Do window specific stuff */
+               dst_folder = modest_folder_view_get_selected (folder_view);
+
                if (MODEST_IS_MAIN_WINDOW (parent_win)) {
+                       /* Clean list to move used for filtering */
+                       modest_folder_view_set_list_to_move (folder_view, NULL);
+
                        modest_ui_actions_on_main_window_move_to (NULL,
-                                                                 folder_view,
+                                                                 GTK_WIDGET (folder_view),
                                                                  dst_folder,
                                                                  MODEST_MAIN_WINDOW (parent_win));
 #ifdef MODEST_TOOLKIT_HILDON2
                } else if (MODEST_IS_FOLDER_WINDOW (parent_win)) {
-                       modest_ui_actions_on_folder_window_move_to (folder_view,
+                       /* Clean list to move used for filtering */
+                       modest_folder_view_set_list_to_move (folder_view, NULL);
+
+                       modest_ui_actions_on_folder_window_move_to (GTK_WIDGET (folder_view),
                                                                    dst_folder,
                                                                    helper->list,
                                                                    GTK_WINDOW (parent_win));
 #endif
                } else {
+                       /* if the user selected a root folder
+                          (account) then do not perform any action */
+                       if (TNY_IS_ACCOUNT (dst_folder)) {
+                               g_signal_stop_emission_by_name (dialog, "response");
+                               return;
+                       }
+
+                       /* Clean list to move used for filtering */
+                       modest_folder_view_set_list_to_move (folder_view, NULL);
+
                        /* Moving from headers window in edit mode */
                        modest_ui_actions_on_window_move_to (NULL, helper->list,
                                                             dst_folder, 
@@ -4882,7 +4976,8 @@ on_move_to_dialog_response (GtkDialog *dialog,
 
 static GtkWidget*
 create_move_to_dialog (GtkWindow *win,
-                      GtkWidget *folder_view)
+                      GtkWidget *folder_view,
+                      TnyList *list_to_move)
 {
        GtkWidget *dialog, *tree_view = NULL;
 
@@ -4951,6 +5046,8 @@ create_move_to_dialog (GtkWindow *win,
 
        /* Hide special folders */
        modest_folder_view_show_non_move_folders (MODEST_FOLDER_VIEW (tree_view), FALSE);
+       if (list_to_move)
+               modest_folder_view_set_list_to_move (MODEST_FOLDER_VIEW (tree_view), list_to_move);
 #ifndef MODEST_TOOLKIT_HILDON2
        modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (tree_view));
 #endif
@@ -5293,7 +5390,7 @@ modest_ui_actions_on_main_window_remove_attachments (GtkAction *action,
  * Checks if we need a connection to do the transfer and if the user
  * wants to connect to complete it
  */
-void
+static void
 modest_ui_actions_xfer_messages_check (GtkWindow *parent_window,
                                       TnyFolderStore *src_folder,
                                       TnyList *headers,
@@ -5305,8 +5402,6 @@ modest_ui_actions_xfer_messages_check (GtkWindow *parent_window,
        TnyAccount *src_account;
        gint uncached_msgs = 0;
 
-       uncached_msgs = header_list_count_uncached_msgs (headers);
-
        /* We don't need any further check if
         *
         * 1- the source folder is local OR
@@ -5328,6 +5423,7 @@ modest_ui_actions_xfer_messages_check (GtkWindow *parent_window,
         * offline, it'll take place the next time we get a
         * connection)
         */
+       uncached_msgs = header_list_count_uncached_msgs (headers);
        src_account = get_account_from_folder_store (src_folder);
        if (uncached_msgs > 0) {
                guint num_headers;
@@ -5350,11 +5446,11 @@ modest_ui_actions_xfer_messages_check (GtkWindow *parent_window,
                if (remote_folder_has_leave_on_server (src_folder) && delete_originals) {
                        const gchar *account_name;
                        gboolean leave_on_server;
-                       
+
                        account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (src_account);
                        leave_on_server = modest_account_mgr_get_leave_on_server (modest_runtime_get_account_mgr (),
                                                                                  account_name);
-                       
+
                        if (leave_on_server == TRUE) {
                                *need_connection = FALSE;
                        } else {
@@ -5373,10 +5469,19 @@ static void
 xfer_messages_error_handler (ModestMailOperation *mail_op, 
                             gpointer user_data)
 {
-       GObject *win = modest_mail_operation_get_source (mail_op);
-       modest_platform_run_information_dialog ((GtkWindow *) win, 
-                                               _("mail_in_ui_folder_move_target_error"), 
-                                               FALSE);
+       GObject *win;
+       const GError *error;
+
+       win = modest_mail_operation_get_source (mail_op);
+       error = modest_mail_operation_get_error (mail_op);
+
+       if (error && is_memory_full_error ((GError *) error))
+               modest_platform_information_banner ((GtkWidget *) win,
+                                                   NULL, _KR("cerm_device_memory_full"));
+       else
+               modest_platform_run_information_dialog ((GtkWindow *) win, 
+                                                       _("mail_in_ui_folder_move_target_error"), 
+                                                       FALSE);
        if (win)
                g_object_unref (win);
 }
@@ -5654,6 +5759,10 @@ modest_ui_actions_on_folder_window_move_to (GtkWidget *folder_view,
            !MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (dst_folder) &&
            !modest_tny_account_is_memory_card_account (TNY_ACCOUNT (dst_folder))) {
                do_xfer = FALSE;
+               /* Show an error */
+               modest_platform_run_information_dialog (win,
+                                                       _("mail_in_ui_folder_move_target_error"),
+                                                       FALSE);
        } else if (!TNY_IS_FOLDER (src_folder)) {
                g_warning ("%s: src_folder is not a TnyFolder.\n", __FUNCTION__);
                do_xfer = FALSE;
@@ -5662,7 +5771,7 @@ modest_ui_actions_on_folder_window_move_to (GtkWidget *folder_view,
        if (do_xfer) {
                MoveFolderInfo *info = g_new0 (MoveFolderInfo, 1);
                DoubleConnectionInfo *connect_info = g_slice_new (DoubleConnectionInfo);
-               
+
                info->src_folder = g_object_ref (src_folder);
                info->dst_folder = g_object_ref (dst_folder);
                info->delete_original = TRUE;
@@ -5676,6 +5785,7 @@ modest_ui_actions_on_folder_window_move_to (GtkWidget *folder_view,
                                                           TNY_FOLDER_STORE (src_folder), 
                                                           connect_info);
        }
+
        /* Frees */
        g_object_unref (src_folder);
 }
@@ -5771,27 +5881,22 @@ modest_ui_actions_on_move_to (GtkAction *action,
 gboolean 
 modest_ui_actions_on_edit_mode_move_to (ModestWindow *win)
 {
-       GtkWidget *dialog = NULL, *folder_view = NULL;
-       ModestMainWindow *main_window;
+       GtkWidget *dialog = NULL;
        MoveToInfo *helper = NULL;
        TnyList *list_to_move;
 
        g_return_val_if_fail (MODEST_IS_WINDOW (win), FALSE);
 
+#ifndef MODEST_TOOLKIT_HILDON2
        /* Get the main window if exists */
+       ModestMainWindow *main_window;
        if (MODEST_IS_MAIN_WINDOW (win))
                main_window = MODEST_MAIN_WINDOW (win);
        else
                main_window = 
                        MODEST_MAIN_WINDOW (modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
                                                                               FALSE)); /* don't create */
-
-       /* Get the folder view widget if exists */
-       if (main_window)
-               folder_view = modest_main_window_get_child_widget (main_window,
-                                                                  MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
-       else
-               folder_view = NULL;
+#endif
 
        list_to_move = modest_platform_get_list_to_move (MODEST_WINDOW (win));
 
@@ -5804,14 +5909,14 @@ modest_ui_actions_on_edit_mode_move_to (ModestWindow *win)
        }
 
        /* Create and run the dialog */
-       dialog = create_move_to_dialog (GTK_WINDOW (win), folder_view);
+       dialog = create_move_to_dialog (GTK_WINDOW (win), NULL, list_to_move);
        modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), 
                                     GTK_WINDOW (dialog), 
                                     (GtkWindow *) win);
 
        /* Create helper */
        helper = g_slice_new0 (MoveToInfo);
-       helper->list = modest_platform_get_list_to_move (MODEST_WINDOW (win));
+       helper->list = list_to_move;
        helper->win = win;
 
        /* Listen to response signal */
@@ -5860,10 +5965,12 @@ do_headers_action (ModestWindow *win,
 
        /* Trick: do a poke status in order to speed up the signaling
           of observers */
-       tny_folder_poke_status (folder);
+       if (folder) {
+               tny_folder_poke_status (folder);
+               g_object_unref (folder);
+       }
 
        /* Frees */
-       g_object_unref (folder);
        g_object_unref (iter);
        g_object_unref (headers_list);
 }
@@ -6261,7 +6368,7 @@ on_send_receive_finished (ModestMailOperation  *mail_op,
 }
 
 
-void 
+void
 modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self, 
                                                TnyHeader *header, 
                                                TnyMsg *msg, 
@@ -6283,10 +6390,10 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self,
 
 
        /* Get the server name: */
-       server_account = 
+       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));          
+               server_name = tny_account_get_hostname (TNY_ACCOUNT (server_account));
        else
                g_return_if_reached ();
 
@@ -6305,7 +6412,7 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self,
                g_warning ("%s: unexpected ERROR %d",
                           __FUNCTION__, err->code);
                message = g_strdup (_CS("sfil_ib_unable_to_send"));
-               break;  
+               break;
        }
 
        modest_platform_run_information_dialog (NULL, message, FALSE);
@@ -6319,63 +6426,70 @@ modest_ui_actions_on_send_queue_status_changed (ModestTnySendQueue *send_queue,
                                                guint status,
                                                gpointer user_data)
 {
-       ModestMainWindow *main_window = NULL;
+       ModestWindow *top_window = NULL;
        ModestWindowMgr *mgr = NULL;
-       GtkWidget *folder_view = NULL, *header_view = NULL;
-       TnyFolderStore *selected_folder = NULL;
+       GtkWidget *header_view = NULL;
+       TnyFolder *selected_folder = NULL;
        TnyFolderType folder_type;
 
        mgr = modest_runtime_get_window_mgr ();
-       main_window = MODEST_MAIN_WINDOW (modest_window_mgr_get_main_window (mgr,
-                                                                            FALSE));/* don't create */
-       if (!main_window)
+       top_window = modest_window_mgr_get_current_top (mgr);
+
+       if (!top_window)
                return;
 
-       /* Check if selected folder is OUTBOX */
-       folder_view = modest_main_window_get_child_widget (main_window,
-                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
-       header_view = modest_main_window_get_child_widget (main_window,
-                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
+#ifndef MODEST_TOOLKIT_HILDON2
+       if (MODEST_IS_MAIN_WINDOW (top_window)) {
+               header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (top_window),
+                                                                  MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
+       }
+#else
+       if (MODEST_IS_HEADER_WINDOW (top_window)) {
+               header_view = (GtkWidget *)
+                       modest_header_window_get_header_view (MODEST_HEADER_WINDOW (top_window));
+       }
+#endif
 
-       selected_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
-       if (!TNY_IS_FOLDER (selected_folder)) 
-               goto frees;
+       /* Get selected folder */
+       selected_folder = modest_header_view_get_folder (MODEST_HEADER_VIEW (header_view));
+       if (!selected_folder)
+               return;
 
        /* gtk_tree_view_column_queue_resize is only available in GTK+ 2.8 */
-#if GTK_CHECK_VERSION(2, 8, 0) 
-       folder_type = modest_tny_folder_guess_folder_type (TNY_FOLDER (selected_folder)); 
-       if (folder_type ==  TNY_FOLDER_TYPE_OUTBOX) {           
+#if GTK_CHECK_VERSION(2, 8, 0)
+       folder_type = modest_tny_folder_guess_folder_type (selected_folder);
+       if (folder_type ==  TNY_FOLDER_TYPE_OUTBOX) {
                GtkTreeViewColumn *tree_column;
 
-               tree_column = gtk_tree_view_get_column (GTK_TREE_VIEW (header_view), 
+               tree_column = gtk_tree_view_get_column (GTK_TREE_VIEW (header_view),
                                                        TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN);
                if (tree_column)
                        gtk_tree_view_column_queue_resize (tree_column);
-       }
-#else
+               }
+#else /* #if GTK_CHECK_VERSION(2, 8, 0) */
        gtk_widget_queue_draw (header_view);
-#endif         
+#endif
 
+#ifndef MODEST_TOOLKIT_HILDON2
        /* Rerun dimming rules, because the message could become deletable for example */
-       modest_window_check_dimming_rules_group (MODEST_WINDOW (main_window), 
+       modest_window_check_dimming_rules_group (MODEST_WINDOW (top_window),
                                                 MODEST_DIMMING_RULES_TOOLBAR);
-       modest_window_check_dimming_rules_group (MODEST_WINDOW (main_window), 
+       modest_window_check_dimming_rules_group (MODEST_WINDOW (top_window),
                                                 MODEST_DIMMING_RULES_MENU);
-       
+#endif
+
        /* Free */
- frees:
-       if (selected_folder != NULL)
-               g_object_unref (selected_folder);
+       g_object_unref (selected_folder);
 }
 
-void 
+void
 modest_ui_actions_on_account_connection_error (GtkWindow *parent_window,
                                               TnyAccount *account)
 {
        ModestProtocolType protocol_type;
        ModestProtocol *protocol;
        gchar *error_note = NULL;
-       
+
        protocol_type = modest_tny_account_get_protocol_type (account);
        protocol = modest_protocol_registry_get_protocol_by_type (modest_runtime_get_protocol_registry (),
                                                                  protocol_type);