Remove some deprecated GTK+ symbols
[modest] / src / modest-ui-actions.c
index dd58bf9..4933688 100644 (file)
@@ -60,7 +60,6 @@
 #include "modest-utils.h"
 #include "widgets/modest-connection-specific-smtp-window.h"
 #include "widgets/modest-ui-constants.h"
-#include <widgets/modest-main-window.h>
 #include <widgets/modest-msg-view-window.h>
 #include <widgets/modest-account-view-window.h>
 #include <widgets/modest-details-dialog.h>
@@ -80,6 +79,7 @@
 #include <tny-camel-bs-msg.h>
 #include <tny-camel-bs-mime-part.h>
 
+#include <gtk/gtk.h>
 #include <gtkhtml/gtkhtml.h>
 
 #define MODEST_MOVE_TO_DIALOG_FOLDER_VIEW "move-to-dialog-folder-view"
@@ -158,7 +158,7 @@ static gboolean connect_to_get_msg (ModestWindow *win,
 
 static gboolean remote_folder_has_leave_on_server (TnyFolderStore *folder);
 
-static void     do_create_folder (GtkWindow *window,
+static void     do_create_folder (ModestWindow *window,
                                  TnyFolderStore *parent_folder,
                                  const gchar *suggested_name);
 
@@ -167,7 +167,7 @@ static TnyAccount *get_account_from_folder_store (TnyFolderStore *folder_store);
 static void modest_ui_actions_on_folder_window_move_to (GtkWidget *folder_view,
                                                        TnyFolderStore *dst_folder,
                                                        TnyList *selection,
-                                                       GtkWindow *win);
+                                                       ModestWindow *win);
 
 static void modest_ui_actions_on_window_move_to (GtkAction *action,
                                                 TnyList *list_to_move,
@@ -229,8 +229,10 @@ modest_ui_actions_run_account_setup_wizard (ModestWindow *win)
                }
        }
 
-       if (win)
-               gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (win));
+       if (win) {
+               GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win);
+               gtk_window_set_transient_for (GTK_WINDOW (wizard), toplevel);
+       }
 
        /* make sure the mainwindow is visible. We need to present the
           wizard again to give it the focus back. show_all are needed
@@ -256,13 +258,14 @@ modest_ui_actions_run_account_setup_wizard (ModestWindow *win)
 void
 modest_ui_actions_on_about (GtkAction *action, ModestWindow *win)
 {
+       GtkWindow *toplevel;
        GtkWidget *about;
        const gchar *authors[] = {
                "Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>",
                NULL
        };
        about = gtk_about_dialog_new ();
-       gtk_about_dialog_set_name (GTK_ABOUT_DIALOG(about), PACKAGE_NAME);
+       gtk_about_dialog_set_program_name (GTK_ABOUT_DIALOG(about), PACKAGE_NAME);
        gtk_about_dialog_set_version (GTK_ABOUT_DIALOG(about),PACKAGE_VERSION);
        gtk_about_dialog_set_copyright (GTK_ABOUT_DIALOG(about),
                                        _("Copyright (c) 2006, Nokia Corporation\n"
@@ -274,7 +277,9 @@ modest_ui_actions_on_about (GtkAction *action, ModestWindow *win)
                                         "uses the tinymail email framework written by Philip van Hoof"));
        gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG(about), authors);
        gtk_about_dialog_set_website (GTK_ABOUT_DIALOG(about), "http://modest.garage.maemo.org");
-       gtk_window_set_transient_for (GTK_WINDOW (about), GTK_WINDOW (win));
+
+       toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win);
+       gtk_window_set_transient_for (GTK_WINDOW (about), toplevel);
        gtk_window_set_modal (GTK_WINDOW (about), TRUE);
 
        gtk_dialog_run (GTK_DIALOG (about));
@@ -406,7 +411,7 @@ modest_ui_actions_on_edit_mode_delete_message (ModestWindow *win)
                                           tny_list_get_length(header_list)), desc);
 
        /* Confirmation dialog */
-       response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
+       response = modest_platform_run_confirmation_dialog (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (win))),
                                                            message);
 
        if (response == GTK_RESPONSE_OK) {
@@ -567,26 +572,22 @@ modest_ui_actions_on_accounts (GtkAction *action,
                return;
        } else {
                /* Show the list of accounts */
-               GtkWindow *toplevel, *account_win;
+               GtkWindow *win_toplevel, *acc_toplevel;
+               GtkWidget *account_win;
 
-               account_win = GTK_WINDOW (modest_account_view_window_new ());
-               toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (win)));
+               account_win = modest_account_view_window_new ();
+               acc_toplevel = (GtkWindow *) gtk_widget_get_toplevel (account_win);
 
                /* The accounts dialog must be modal */
-               modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (account_win), (GtkWindow *) win);
-               modest_utils_show_dialog_and_forget (toplevel, GTK_DIALOG (account_win));
+               win_toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win);
+               modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), acc_toplevel, win_toplevel);
+               modest_utils_show_dialog_and_forget (win_toplevel, GTK_DIALOG (account_win));
        }
 }
 
 void
 modest_ui_actions_on_smtp_servers (GtkAction *action, ModestWindow *win)
 {
-       /* This is currently only implemented for Maemo,
-        * because it requires an API (libconic) to detect different connection
-        * possiblities.
-        */
-#ifndef MODEST_TOOLKIT_GTK /* Defined in config.h */
-
        /* Create the window if necessary: */
        GtkWidget *specific_window = GTK_WIDGET (modest_connection_specific_smtp_window_new ());
        modest_connection_specific_smtp_window_fill_with_connections (
@@ -597,7 +598,6 @@ modest_ui_actions_on_smtp_servers (GtkAction *action, ModestWindow *win)
        modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
                                     GTK_WINDOW (specific_window), (GtkWindow *) win);
        gtk_widget_show (specific_window);
-#endif /* !MODEST_TOOLKIT_GTK */
 }
 
 static guint64
@@ -693,10 +693,10 @@ modest_ui_actions_compose_msg(ModestWindow *win,
        }
 
        if (expected_size > MODEST_MAX_ATTACHMENT_SIZE) {
-               modest_platform_run_information_dialog (
-                       GTK_WINDOW(win),
-                       _("mail_ib_error_attachment_size"),
-                       TRUE);
+               GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win);
+               modest_platform_run_information_dialog (toplevel,
+                                                       _("mail_ib_error_attachment_size"),
+                                                       TRUE);
                return;
        }
 
@@ -739,11 +739,29 @@ modest_ui_actions_compose_msg(ModestWindow *win,
                                                   MODEST_TEXT_UTILS_SIGNATURE_MARKER,
                                                   "\n", signature, NULL) : g_strdup(body_str);
        } else {
-               body = use_signature ? g_strconcat("\n", MODEST_TEXT_UTILS_SIGNATURE_MARKER,
-                                                  "\n", signature, NULL) : g_strdup("");
+
+               gchar *gray_color_markup = NULL, *color_begin = NULL, *color_end = NULL;
+               GdkColor color;
+
+               if (win && gtk_style_lookup_color (gtk_widget_get_style ((GtkWidget *) win),
+                                                  "SecondaryTextColor", &color))
+                       gray_color_markup = modest_text_utils_get_color_string (&color);
+               if (!gray_color_markup)
+                       gray_color_markup = g_strdup ("#babababababa");
+
+               color_begin = g_strdup_printf ("<font color=\"%s\">", gray_color_markup);
+               color_end = "</font>";
+
+               body = use_signature ? g_strconcat("<br/>\n", color_begin,
+                                               MODEST_TEXT_UTILS_SIGNATURE_MARKER, "<br/>\n",
+                                               signature, color_end, NULL) : g_strdup("");
+
+               g_free (gray_color_markup);
+               g_free (color_begin);
        }
 
-       msg = modest_tny_msg_new (to_str, from_str, cc_str, bcc_str, subject_str, NULL, NULL, body, NULL, NULL, NULL);
+       msg = modest_tny_msg_new_html_plain (to_str, from_str, cc_str, bcc_str, subject_str,
+                                       NULL, NULL, body, NULL, NULL, NULL, NULL, NULL);
        if (!msg) {
                g_printerr ("modest: failed to create new msg\n");
                goto cleanup;
@@ -820,8 +838,11 @@ modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op,
                error = modest_mail_operation_get_error (mail_op);
                if (error && error->domain == MODEST_MAIL_OPERATION_ERROR &&
                    error->code == MODEST_MAIL_OPERATION_ERROR_LOW_MEMORY) {
+                       GtkWindow *toplevel = NULL;
                        GObject *source = modest_mail_operation_get_source (mail_op);
-                       modest_platform_run_information_dialog (GTK_IS_WINDOW (source) ? GTK_WINDOW (source) : NULL,
+
+                       toplevel = (GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (source));
+                       modest_platform_run_information_dialog (toplevel,
                                                                _KR("memr_ib_operation_disabled"),
                                                                TRUE);
                        g_object_unref (source);
@@ -1227,7 +1248,7 @@ open_msg_helper_destroyer (gpointer user_data)
 static void
 open_msg_performer(gboolean canceled,
                    GError *err,
-                   GtkWindow *parent_window,
+                   ModestWindow *parent_window,
                    TnyAccount *account,
                    gpointer user_data)
 {
@@ -1278,6 +1299,12 @@ open_msg_performer(gboolean canceled,
        gboolean can_open;
        gchar *account_name = get_info_from_header (helper->header, &is_draft, &can_open);
 
+       if (!g_strcmp0 (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID) ||
+           !g_strcmp0 (account_name, MODEST_MMC_ACCOUNT_ID)) {
+               g_free (account_name);
+               account_name = g_strdup (modest_window_get_active_account (MODEST_WINDOW (parent_window)));
+       }
+
        if (!can_open) {
                modest_window_mgr_unregister_header (modest_runtime_get_window_mgr (), helper->header);
                g_free (account_name);
@@ -1290,11 +1317,11 @@ open_msg_performer(gboolean canceled,
                GtkWidget *header_view;
                gchar *uid;
 
-               header_view = get_header_view_from_window (MODEST_WINDOW (parent_window));
+               header_view = get_header_view_from_window (parent_window);
                uid = modest_tny_folder_get_header_unique_id (helper->header);
                if (header_view) {
                        const gchar *mailbox = NULL;
-                       mailbox = modest_window_get_active_mailbox (MODEST_WINDOW (parent_window));
+                       mailbox = modest_window_get_active_mailbox (parent_window);
                        window = modest_msg_view_window_new_from_header_view 
                                (MODEST_HEADER_VIEW (header_view), account_name, mailbox, uid, helper->rowref);
                        if (window != NULL) {
@@ -1379,7 +1406,8 @@ open_msg_from_header (TnyHeader *header, GtkTreeRowReference *rowref, ModestWind
        if (found) {
                if (window) {
 #ifndef MODEST_TOOLKIT_HILDON2
-                       gtk_window_present (GTK_WINDOW (window));
+                       GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) window);
+                       gtk_window_present (toplevel);
 #endif
                } else {
                        /* the header has been registered already, we don't do
@@ -1395,9 +1423,10 @@ open_msg_from_header (TnyHeader *header, GtkTreeRowReference *rowref, ModestWind
                /* Allways download if we are online. */
                if (!tny_device_is_online (modest_runtime_get_device ())) {
                        gint response;
+                       GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win);
 
                        /* If ask for user permission to download the messages */
-                       response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
+                       response = modest_platform_run_confirmation_dialog (toplevel,
                                                                            _("mcen_nc_get_msg"));
 
                        /* End if the user does not want to continue */
@@ -1423,11 +1452,11 @@ open_msg_from_header (TnyHeader *header, GtkTreeRowReference *rowref, ModestWind
 
        /* Connect to the account and perform */
        if (!cached) {
-               modest_platform_connect_and_perform ((GtkWindow *) win, TRUE, g_object_ref (account),
+               modest_platform_connect_and_perform (win, TRUE, g_object_ref (account),
                                                     open_msg_performer, helper);
        } else {
                /* Call directly the performer, do not need to connect */
-               open_msg_performer (FALSE, NULL, (GtkWindow *) win,
+               open_msg_performer (FALSE, NULL, win,
                                    g_object_ref (account), helper);
        }
 cleanup:
@@ -1693,27 +1722,29 @@ connect_to_get_msg (ModestWindow *win,
                    TnyAccount *account)
 {
        GtkResponseType response;
+       GtkWindow *toplevel;
 
        /* Allways download if we are online. */
        if (tny_device_is_online (modest_runtime_get_device ()))
                return TRUE;
 
        /* If offline, then ask for user permission to download the messages */
-       response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
-                       ngettext("mcen_nc_get_msg",
-                       "mcen_nc_get_msgs",
-                       num_of_uncached_msgs));
+       toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win);
+       response = modest_platform_run_confirmation_dialog (toplevel,
+                                                           ngettext("mcen_nc_get_msg",
+                                                                    "mcen_nc_get_msgs",
+                                                                    num_of_uncached_msgs));
 
        if (response == GTK_RESPONSE_CANCEL)
                return FALSE;
 
-       return modest_platform_connect_and_wait((GtkWindow *) win, account);
+       return modest_platform_connect_and_wait(toplevel, account);
 }
 
 static void
 reply_forward_performer (gboolean canceled,
                         GError *err,
-                        GtkWindow *parent_window,
+                        ModestWindow *parent_window,
                         TnyAccount *account,
                         gpointer user_data)
 {
@@ -1858,9 +1889,11 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
                                 * creating the forward message */
                                if (!tny_device_is_online (modest_runtime_get_device ())) {
                                        gint response;
+                                       GtkWindow *toplevel;
 
                                        /* If ask for user permission to download the messages */
-                                       response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
+                                       toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win);
+                                       response = modest_platform_run_confirmation_dialog (toplevel,
                                                                                            ngettext("mcen_nc_get_msg",
                                                                                                     "mcen_nc_get_msgs",
                                                                                                     1));
@@ -1883,7 +1916,7 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
 
                                        folder = tny_header_get_folder (header);
                                        account = tny_folder_get_account (folder);
-                                       modest_platform_connect_and_perform (GTK_WINDOW (win),
+                                       modest_platform_connect_and_perform (win,
                                                                             TRUE, account,
                                                                             reply_forward_performer,
                                                                             rf_helper);
@@ -1945,9 +1978,10 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
                                /* Allways download if we are online. */
                                if (!tny_device_is_online (modest_runtime_get_device ())) {
                                        gint response;
+                                       GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win);
 
                                        /* If ask for user permission to download the messages */
-                                       response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
+                                       response = modest_platform_run_confirmation_dialog (toplevel,
                                                                                            ngettext("mcen_nc_get_msg",
                                                                                                     "mcen_nc_get_msgs",
                                                                                                     uncached_msgs));
@@ -1963,12 +1997,12 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
                                rf_helper = create_reply_forward_helper (action, win,
                                                                         reply_forward_type, header, NULL);
                                if (uncached_msgs > 0) {
-                                       modest_platform_connect_and_perform (GTK_WINDOW (win),
+                                       modest_platform_connect_and_perform (win,
                                                                             TRUE, account,
                                                                             reply_forward_performer,
                                                                             rf_helper);
                                } else {
-                                       reply_forward_performer (FALSE, NULL, GTK_WINDOW (win),
+                                       reply_forward_performer (FALSE, NULL, win,
                                                                 account, rf_helper);
                                }
                        }
@@ -2186,7 +2220,7 @@ typedef struct {
 static void
 do_send_receive_performer (gboolean canceled,
                           GError *err,
-                          GtkWindow *parent_window,
+                          ModestWindow *parent_window,
                           TnyAccount *account,
                           gpointer user_data)
 {
@@ -2302,8 +2336,7 @@ modest_ui_actions_do_send_receive (const gchar *account_name,
        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,
-                                            force_connection, info->account,
+       modest_platform_connect_and_perform (win, force_connection, info->account,
                                             do_send_receive_performer, info);
 }
 
@@ -2473,14 +2506,16 @@ modest_ui_actions_on_item_not_found (ModestHeaderView *header_view,ModestItemTyp
        GtkWidget *dialog;
        gchar *txt, *item;
        gboolean online;
+       GtkWindow *toplevel;
 
+       toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win);
        item = (type == MODEST_ITEM_TYPE_FOLDER) ? "folder" : "message";
 
        online = tny_device_is_online (modest_runtime_get_device());
 
        if (online) {
                /* already online -- the item is simply not there... */
-               dialog = gtk_message_dialog_new (GTK_WINDOW (win),
+               dialog = gtk_message_dialog_new (toplevel,
                                                 GTK_DIALOG_MODAL,
                                                 GTK_MESSAGE_WARNING,
                                                 GTK_BUTTONS_NONE,
@@ -2490,7 +2525,7 @@ modest_ui_actions_on_item_not_found (ModestHeaderView *header_view,ModestItemTyp
                gtk_dialog_run (GTK_DIALOG(dialog));
        } else {
                dialog = gtk_dialog_new_with_buttons (_("Connection requested"),
-                                                     GTK_WINDOW (win),
+                                                     toplevel,
                                                      GTK_DIALOG_MODAL,
                                                      _("mcen_bd_dialog_cancel"),
                                                      GTK_RESPONSE_REJECT,
@@ -2504,7 +2539,7 @@ modest_ui_actions_on_item_not_found (ModestHeaderView *header_view,ModestItemTyp
                gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox));
                g_free (txt);
 
-               gtk_window_set_default_size (GTK_WINDOW(dialog), 300, 300);
+               gtk_window_set_default_size ((GtkWindow *) dialog, 300, 300);
                if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
                        /* TODO: Comment about why is this commented out: */
                        /* modest_platform_connect_and_wait (); */
@@ -2617,10 +2652,10 @@ enough_space_for_message (ModestMsgEditWindow *edit_window,
         * somehow got past our checks when attaching.
         */
        if (expected_size > MODEST_MAX_ATTACHMENT_SIZE) {
-               modest_platform_run_information_dialog (
-                       GTK_WINDOW(edit_window),
-                       _("mail_ib_error_attachment_size"),
-                       TRUE);
+               GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) edit_window);
+               modest_platform_run_information_dialog (toplevel,
+                                                       _("mail_ib_error_attachment_size"),
+                                                       TRUE);
                return FALSE;
        }
 
@@ -3024,12 +3059,12 @@ do_create_folder_cb (ModestMailOperation *mail_op,
                           full memory condition */
                        modest_platform_information_banner ((GtkWidget *) source_win, NULL,
                                                            _("mail_in_ui_folder_create_error"));
-                       do_create_folder ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (source_win)),
+                       do_create_folder ((ModestWindow *) source_win,
                                          parent_folder, (const gchar *) suggested_name);
                }
 
        } else {
-               /* the 'source_win' is either the ModestMainWindow, or the 'Move to folder'-dialog
+               /* the 'source_win' is either the ModestWindow, or the 'Move to folder'-dialog
                 * FIXME: any other? */
                GtkWidget *folder_view;
 
@@ -3056,10 +3091,10 @@ typedef struct {
 
 static void
 do_create_folder_performer (gboolean canceled,
-                        GError *err,
-                        GtkWindow *parent_window,
-                        TnyAccount *account,
-                        gpointer user_data)
+                           GError *err,
+                           ModestWindow *parent_window,
+                           TnyAccount *account,
+                           gpointer user_data)
 {
        CreateFolderConnect *helper = (CreateFolderConnect *) user_data;
        ModestMailOperation *mail_op;
@@ -3105,15 +3140,17 @@ do_create_folder_performer (gboolean canceled,
 
 
 static void
-do_create_folder (GtkWindow *parent_window,
+do_create_folder (ModestWindow *parent_window,
                  TnyFolderStore *suggested_parent,
                  const gchar *suggested_name)
 {
        gint result;
        gchar *folder_name = NULL;
        TnyFolderStore *parent_folder = NULL;
+       GtkWindow *toplevel;
 
-       result = modest_platform_run_new_folder_dialog (GTK_WINDOW (parent_window),
+       toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) parent_window);
+       result = modest_platform_run_new_folder_dialog (toplevel,
                                                        suggested_parent,
                                                        (gchar *) suggested_name,
                                                        &folder_name,
@@ -3152,7 +3189,7 @@ modest_ui_actions_create_folder(GtkWindow *parent_window,
        }
 
        if (parent_folder) {
-               do_create_folder (GTK_WINDOW (parent_window), parent_folder, NULL);
+               do_create_folder (MODEST_WINDOW (parent_window), parent_folder, NULL);
                g_object_unref (parent_folder);
        }
 }
@@ -3243,7 +3280,7 @@ on_rename_folder_cb (ModestMailOperation *mail_op,
 static void
 on_rename_folder_performer (gboolean canceled,
                            GError *err,
-                           GtkWindow *parent_window,
+                           ModestWindow *parent_window,
                            TnyAccount *account,
                            gpointer user_data)
 {
@@ -3335,7 +3372,7 @@ modest_ui_actions_on_edit_mode_rename_folder (ModestWindow *window)
                        RenameFolderInfo *rename_folder_data = g_new0 (RenameFolderInfo, 1);
                        rename_folder_data->folder = g_object_ref (folder);
                        rename_folder_data->new_name = folder_name;
-                       modest_platform_connect_if_remote_and_perform (GTK_WINDOW(window), TRUE,
+                       modest_platform_connect_if_remote_and_perform (window, TRUE,
                                        folder, on_rename_folder_performer, rename_folder_data);
                }
        }
@@ -3348,8 +3385,9 @@ modest_ui_actions_delete_folder_error_handler (ModestMailOperation *mail_op,
                                               gpointer user_data)
 {
        GObject *win = modest_mail_operation_get_source (mail_op);
+       GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (win));
 
-       modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL,
+       modest_platform_run_information_dialog (toplevel,
                                                _("mail_in_ui_folder_delete_error"),
                                                FALSE);
        g_object_unref (win);
@@ -3362,17 +3400,28 @@ typedef struct {
 
 static void
 on_delete_folder_cb (gboolean canceled,
-                 GError *err,
-                 GtkWindow *parent_window,
-                 TnyAccount *account,
-                 gpointer user_data)
+                    GError *err,
+                    ModestWindow *parent_window,
+                    TnyAccount *account,
+                    gpointer user_data)
 {
        DeleteFolderInfo *info = (DeleteFolderInfo*) user_data;
        GtkWidget *folder_view;
        ModestMailOperation *mail_op;
        GtkTreeSelection *sel;
+       ModestWindow *modest_window;
 
-       if (!MODEST_IS_WINDOW(parent_window) || canceled || (err!=NULL)) {
+#ifdef MODEST_TOOLKIT_HILDON2
+       modest_window = (ModestWindow*) parent_window;
+#else
+       if (MODEST_IS_SHELL (parent_window)) {
+               modest_window = modest_shell_peek_window (MODEST_SHELL (parent_window));
+       } else {
+               modest_window = NULL;
+       }
+#endif
+
+       if (!MODEST_IS_WINDOW(modest_window) || canceled || (err!=NULL)) {
                /* Note that the connection process can fail due to
                   memory low conditions as it can not successfully
                   store the summary */
@@ -3385,8 +3434,8 @@ on_delete_folder_cb (gboolean canceled,
                return;
        }
 
-       if (MODEST_IS_FOLDER_WINDOW (parent_window)) {
-               folder_view = GTK_WIDGET (modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (parent_window)));
+       if (MODEST_IS_FOLDER_WINDOW (modest_window)) {
+               folder_view = GTK_WIDGET (modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (modest_window)));
        } else {
                g_object_unref (G_OBJECT (info->folder));
                g_free (info);
@@ -3437,7 +3486,7 @@ delete_folder (ModestWindow *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 (window),
+               modest_platform_run_information_dialog (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (window))),
                                                        _("mail_in_ui_folder_delete_error"),
                                                        FALSE);
                g_object_unref (G_OBJECT (folder));
@@ -3447,7 +3496,7 @@ delete_folder (ModestWindow *window, gboolean move_to_trash)
        /* 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),
+       response = modest_platform_run_confirmation_dialog (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (window))),
                                                            (const gchar *) message);
        g_free (message);
 
@@ -3459,7 +3508,7 @@ delete_folder (ModestWindow *window, gboolean move_to_trash)
                info->move_to_trash = move_to_trash;
 
                account = tny_folder_get_account (TNY_FOLDER (folder));
-               modest_platform_connect_if_remote_and_perform (GTK_WINDOW (window),
+               modest_platform_connect_if_remote_and_perform (window,
                                                               TRUE,
                                                               TNY_FOLDER_STORE (account),
                                                               on_delete_folder_cb, info);
@@ -3518,7 +3567,7 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
                                         gchar **password,
                                         gboolean *cancel,
                                         gboolean *remember,
-                                        ModestMainWindow *main_window)
+                                        ModestWindow *window)
 {
        g_return_if_fail(server_account_name);
        gboolean completed = FALSE;
@@ -3742,7 +3791,7 @@ modest_ui_actions_on_cut (GtkAction *action,
        GtkClipboard *clipboard;
 
        clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
-       focused_widget = gtk_window_get_focus (GTK_WINDOW (window));
+       focused_widget = gtk_container_get_focus_child ((GtkContainer *) window);
        if (GTK_IS_EDITABLE (focused_widget)) {
                gtk_editable_cut_clipboard (GTK_EDITABLE(focused_widget));
                gtk_clipboard_set_can_store (clipboard, NULL, 0);
@@ -3794,7 +3843,7 @@ modest_ui_actions_on_copy (GtkAction *action,
        gboolean copied = TRUE;
 
        clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
-       focused_widget = gtk_window_get_focus (GTK_WINDOW (window));
+       focused_widget = gtk_container_get_focus_child ((GtkContainer *) window);
 
        if (GTK_IS_LABEL (focused_widget)) {
                gchar *selection;
@@ -3940,7 +3989,7 @@ modest_ui_actions_on_paste (GtkAction *action,
        GtkWidget *inf_note = NULL;
        ModestMailOperation *mail_op = NULL;
 
-       focused_widget = gtk_window_get_focus (GTK_WINDOW (window));
+       focused_widget = gtk_container_get_focus_child ((GtkContainer *) window);
        if (GTK_IS_EDITABLE (focused_widget)) {
                gtk_editable_paste_clipboard (GTK_EDITABLE(focused_widget));
        } else if (GTK_IS_TEXT_VIEW (focused_widget)) {
@@ -4070,7 +4119,7 @@ modest_ui_actions_on_select_all (GtkAction *action,
 {
        GtkWidget *focused_widget;
 
-       focused_widget = gtk_window_get_focus (GTK_WINDOW (window));
+       focused_widget = gtk_container_get_focus_child ((GtkContainer *) window);
        if (MODEST_IS_ATTACHMENTS_VIEW (focused_widget)) {
                modest_attachments_view_select_all (MODEST_ATTACHMENTS_VIEW (focused_widget));
        } else if (GTK_IS_LABEL (focused_widget)) {
@@ -4184,7 +4233,8 @@ modest_ui_actions_on_toggle_fullscreen    (GtkToggleAction *toggle,
        if (active != fullscreen) {
                modest_window_mgr_set_fullscreen_mode (mgr, active);
 #ifndef MODEST_TOOLKIT_HILDON2
-               gtk_window_present (GTK_WINDOW (window));
+               GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) window);
+               gtk_window_present (toplevel);
 #endif
        }
 }
@@ -4220,6 +4270,7 @@ headers_action_show_details (TnyHeader *header,
        if (MODEST_IS_MSG_VIEW_WINDOW (window)) {
                async_retrieval = TRUE;
                msg = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW (window));
+               async_retrieval = !TNY_IS_CAMEL_BS_MSG (msg);
        } else {
                async_retrieval = FALSE;
        }
@@ -4398,7 +4449,7 @@ on_move_to_dialog_response (GtkDialog *dialog,
                        modest_ui_actions_on_folder_window_move_to (GTK_WIDGET (folder_view),
                                                                    dst_folder,
                                                                    helper->list,
-                                                                   GTK_WINDOW (parent_win));
+                                                                   MODEST_WINDOW (parent_win));
                } else {
                        /* if the user selected a root folder
                           (account) then do not perform any action */
@@ -4473,8 +4524,6 @@ create_move_to_dialog (GtkWindow *win,
 
                modest_folder_view_set_style (MODEST_FOLDER_VIEW (tree_view),
                                              MODEST_FOLDER_VIEW_STYLE_SHOW_ALL);
-               /* modest_folder_view_update_model (MODEST_FOLDER_VIEW (tree_view), */
-               /*                               TNY_ACCOUNT_STORE (modest_runtime_get_account_store ())); */
 
                active_account_name = modest_window_get_active_account (MODEST_WINDOW (win));
                mgr = modest_runtime_get_account_mgr ();
@@ -4669,7 +4718,7 @@ modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op,
  * wants to connect to complete it
  */
 static void
-modest_ui_actions_xfer_messages_check (GtkWindow *parent_window,
+modest_ui_actions_xfer_messages_check (ModestWindow *parent_window,
                                       TnyFolderStore *src_folder,
                                       TnyList *headers,
                                       TnyFolder *dst_folder,
@@ -4706,12 +4755,14 @@ modest_ui_actions_xfer_messages_check (GtkWindow *parent_window,
        if (uncached_msgs > 0) {
                guint num_headers;
                const gchar *msg;
+               GtkWindow *toplevel;
 
                *need_connection = TRUE;
                num_headers = tny_list_get_length (headers);
                msg = ngettext ("mcen_nc_get_msg", "mcen_nc_get_msgs", num_headers);
+               toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) parent_window);
 
-               if (modest_platform_run_confirmation_dialog (parent_window, msg) ==
+               if (modest_platform_run_confirmation_dialog (toplevel, msg) ==
                    GTK_RESPONSE_CANCEL) {
                        *do_xfer = FALSE;
                } else {
@@ -4783,11 +4834,10 @@ typedef struct {
 static void
 xfer_messages_performer  (gboolean canceled,
                          GError *err,
-                         GtkWindow *parent_window,
+                         ModestWindow *parent_window,
                          TnyAccount *account,
                          gpointer user_data)
 {
-       ModestWindow *win = MODEST_WINDOW (parent_window);
        TnyAccount *dst_account = NULL;
        gboolean dst_forbids_message_add = FALSE;
        XferMsgsHelper *helper;
@@ -4814,7 +4864,7 @@ xfer_messages_performer  (gboolean canceled,
                                                                                  MODEST_PROTOCOL_REGISTRY_STORE_FORBID_INCOMING_XFERS);
 
        if (dst_forbids_message_add) {
-               modest_platform_information_banner (GTK_WIDGET (win),
+               modest_platform_information_banner (GTK_WIDGET (parent_window),
                                                    NULL,
                                                    ngettext("mail_in_ui_folder_move_target_error",
                                                             "mail_in_ui_folder_move_targets_error",
@@ -4826,7 +4876,7 @@ xfer_messages_performer  (gboolean canceled,
 
 
        /* Perform the mail operation */
-       mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(win),
+       mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(parent_window),
                                                                 xfer_messages_error_handler,
                                                                 g_object_ref (dst_account),
                                                                 g_object_unref);
@@ -4859,7 +4909,7 @@ typedef struct {
 static void
 on_move_folder_cb (gboolean canceled,
                   GError *err,
-                  GtkWindow *parent_window,
+                  ModestWindow *parent_window,
                   TnyAccount *account,
                   gpointer user_data)
 {
@@ -4945,7 +4995,7 @@ static void
 modest_ui_actions_on_folder_window_move_to (GtkWidget *folder_view,
                                            TnyFolderStore *dst_folder,
                                            TnyList *selection,
-                                           GtkWindow *win)
+                                           ModestWindow *win)
 {
        TnyFolderStore *src_folder = NULL;
        TnyIterator *iterator;
@@ -4964,9 +5014,11 @@ modest_ui_actions_on_folder_window_move_to (GtkWidget *folder_view,
        if (TNY_IS_ACCOUNT (dst_folder) &&
            !MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (dst_folder) &&
            !modest_tny_account_is_memory_card_account (TNY_ACCOUNT (dst_folder))) {
+               GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win);
+
                do_xfer = FALSE;
                /* Show an error */
-               modest_platform_run_information_dialog (win,
+               modest_platform_run_information_dialog (toplevel,
                                                        _("mail_in_ui_folder_move_target_error"),
                                                        FALSE);
        } else if (!TNY_IS_FOLDER (src_folder)) {
@@ -4987,7 +5039,7 @@ modest_ui_actions_on_folder_window_move_to (GtkWidget *folder_view,
                connect_info->dst_account = get_account_from_folder_store (TNY_FOLDER_STORE (dst_folder));
                connect_info->data = info;
 
-               modest_platform_double_connect_and_perform(GTK_WINDOW (win), TRUE,
+               modest_platform_double_connect_and_perform(win, TRUE,
                                                           TNY_FOLDER_STORE (src_folder),
                                                           connect_info);
        }
@@ -4998,7 +5050,7 @@ modest_ui_actions_on_folder_window_move_to (GtkWidget *folder_view,
 
 
 void
-modest_ui_actions_transfer_messages_helper (GtkWindow *win,
+modest_ui_actions_transfer_messages_helper (ModestWindow *win,
                                            TnyFolder *src_folder,
                                            TnyList *headers,
                                            TnyFolder *dst_folder)
@@ -5031,12 +5083,12 @@ modest_ui_actions_transfer_messages_helper (GtkWindow *win,
                connect_info->dst_account = tny_folder_get_account (TNY_FOLDER (dst_folder));
                connect_info->data = helper;
 
-               modest_platform_double_connect_and_perform(GTK_WINDOW (win), TRUE,
+               modest_platform_double_connect_and_perform(win, TRUE,
                                                           TNY_FOLDER_STORE (src_folder),
                                                           connect_info);
        } else {
                TnyAccount *src_account = get_account_from_folder_store (TNY_FOLDER_STORE (src_folder));
-               xfer_messages_performer (FALSE, NULL, GTK_WINDOW (win),
+               xfer_messages_performer (FALSE, NULL, win,
                                         src_account, helper);
                g_object_unref (src_account);
        }
@@ -5065,7 +5117,7 @@ modest_ui_actions_on_window_move_to (GtkAction *action,
                src_folder = tny_header_get_folder (header);
 
                /* Transfer the messages */
-               modest_ui_actions_transfer_messages_helper (GTK_WINDOW (win), src_folder,
+               modest_ui_actions_transfer_messages_helper (win, src_folder,
                                                            headers,
                                                            TNY_FOLDER (dst_folder));
 
@@ -5087,6 +5139,7 @@ gboolean
 modest_ui_actions_on_edit_mode_move_to (ModestWindow *win)
 {
        GtkWidget *dialog = NULL;
+       GtkWindow *toplevel = NULL;
        MoveToInfo *helper = NULL;
        TnyList *list_to_move;
 
@@ -5104,10 +5157,11 @@ modest_ui_actions_on_edit_mode_move_to (ModestWindow *win)
        }
 
        /* Create and run the dialog */
-       dialog = create_move_to_dialog (GTK_WINDOW (win), NULL, list_to_move);
+       dialog = create_move_to_dialog (win, NULL, list_to_move);
+       toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win);
        modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
                                     GTK_WINDOW (dialog),
-                                    (GtkWindow *) win);
+                                    toplevel);
 
        /* Create helper */
        helper = g_slice_new0 (MoveToInfo);
@@ -5241,7 +5295,7 @@ modest_ui_actions_on_help (GtkAction *action,
        help_id = modest_window_mgr_get_help_id (modest_runtime_get_window_mgr(), win);
 
         if (help_id)
-                modest_platform_show_help (GTK_WINDOW (win), help_id);
+                modest_platform_show_help (win, help_id);
 #endif
 }
 
@@ -5270,7 +5324,7 @@ retrieve_contents_cb (ModestMailOperation *mail_op,
 static void
 retrieve_msg_contents_performer (gboolean canceled,
                                 GError *err,
-                                GtkWindow *parent_window,
+                                ModestWindow *parent_window,
                                 TnyAccount *account,
                                 gpointer user_data)
 {
@@ -5323,7 +5377,7 @@ modest_ui_actions_on_retrieve_msg_contents (GtkAction *action,
        g_object_unref (iter);
 
        /* Connect and perform the message retrieval */
-       modest_platform_connect_and_perform ((GtkWindow *) window, TRUE,
+       modest_platform_connect_and_perform (window, TRUE,
                                             g_object_ref (account),
                                             retrieve_msg_contents_performer,
                                             g_object_ref (headers));
@@ -5444,6 +5498,8 @@ modest_ui_actions_on_header_view_csm_menu_activated (GtkAction *action,
 void
 modest_ui_actions_on_search_messages (GtkAction *action, ModestWindow *window)
 {
+       GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) window);
+
        g_return_if_fail (MODEST_IS_WINDOW (window));
 
        /* we check for low-mem; in that case, show a warning, and don't allow
@@ -5452,14 +5508,15 @@ modest_ui_actions_on_search_messages (GtkAction *action, ModestWindow *window)
        if (modest_platform_check_memory_low (window, TRUE))
                return;
 
-       modest_platform_show_search_messages (GTK_WINDOW (window));
+       modest_platform_show_search_messages (toplevel);
 }
 
 void
 modest_ui_actions_on_open_addressbook (GtkAction *action, ModestWindow *win)
 {
-       g_return_if_fail (MODEST_IS_WINDOW (win));
+       GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win);
 
+       g_return_if_fail (MODEST_IS_WINDOW (win));
 
        /* we check for low-mem; in that case, show a warning, and don't allow
         * for the addressbook
@@ -5467,8 +5524,7 @@ modest_ui_actions_on_open_addressbook (GtkAction *action, ModestWindow *win)
        if (modest_platform_check_memory_low (win, TRUE))
                return;
 
-
-       modest_platform_show_addressbook (GTK_WINDOW (win));
+       modest_platform_show_addressbook (toplevel);
 }
 
 
@@ -5625,7 +5681,7 @@ modest_ui_actions_on_send_queue_status_changed (ModestTnySendQueue *send_queue,
 }
 
 void
-modest_ui_actions_on_account_connection_error (GtkWindow *parent_window,
+modest_ui_actions_on_account_connection_error (ModestWindow *parent_window,
                                               TnyAccount *account)
 {
        ModestProtocolType protocol_type;
@@ -5640,7 +5696,8 @@ modest_ui_actions_on_account_connection_error (GtkWindow *parent_window,
        if (error_note == NULL) {
                g_warning ("%s: This should not be reached", __FUNCTION__);
        } else {
-               modest_platform_run_information_dialog (parent_window, error_note, FALSE);
+               GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) parent_window);
+               modest_platform_run_information_dialog (toplevel, error_note, FALSE);
                g_free (error_note);
        }
 }
@@ -5752,6 +5809,9 @@ modest_ui_actions_on_delete_account (GtkWindow *parent_window,
 
                removed = modest_account_mgr_remove_account (account_mgr, account_name);
                if (removed) {
+#ifdef MODEST_TOOLKIT_HILDON2
+                       hildon_gtk_window_take_screenshot (parent_window, FALSE);
+#endif
                        /* Close all email notifications, we cannot
                           distinguish if the notification belongs to
                           this account or not, so for safety reasons
@@ -5767,7 +5827,7 @@ modest_ui_actions_on_delete_account (GtkWindow *parent_window,
 static void
 on_fetch_images_performer (gboolean canceled,
                           GError *err,
-                          GtkWindow *parent_window,
+                          ModestWindow *parent_window,
                           TnyAccount *account,
                           gpointer user_data)
 {
@@ -5788,9 +5848,9 @@ modest_ui_actions_on_fetch_images (GtkAction *action,
 {
        g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window));
 
-       modest_platform_connect_and_perform ((GtkWindow *) window, TRUE, 
+       modest_platform_connect_and_perform (window, TRUE,
                                             NULL,
-                                            on_fetch_images_performer, 
+                                            on_fetch_images_performer,
                                             g_object_ref (window));
 }
 
@@ -5865,8 +5925,8 @@ modest_ui_actions_check_for_active_account (ModestWindow *self,
        if (store_conn_status == TNY_CONNECTION_STATUS_CONNECTED || sending) {
                gint response;
 
-               response = modest_platform_run_confirmation_dialog (GTK_WINDOW (self), 
-                                                               _("emev_nc_disconnect_account"));
+               response = modest_platform_run_confirmation_dialog (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (self))), 
+                                                                   _("emev_nc_disconnect_account"));
                if (response == GTK_RESPONSE_OK) {
                        retval = TRUE;
                } else {