Only handle zoom keys in message view window (fixes NB#144441, NB#150401).
[modest] / src / modest-ui-actions.c
index 2bd5d6d..cca3c78 100644 (file)
@@ -77,6 +77,8 @@
 #include <tny-device.h>
 #include <tny-merge-folder.h>
 #include <widgets/modest-toolkit-utils.h>
+#include <tny-camel-bs-msg.h>
+#include <tny-camel-bs-mime-part.h>
 
 #include <gtkhtml/gtkhtml.h>
 
@@ -104,6 +106,7 @@ typedef struct _ReplyForwardHelper {
        gchar *mailbox;
        GtkWidget *parent_window;
        TnyHeader *header;
+       TnyList *parts;
 } ReplyForwardHelper;
 
 typedef struct _MoveToHelper {
@@ -226,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
@@ -253,6 +258,7 @@ 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>",
@@ -271,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));
@@ -373,6 +381,7 @@ modest_ui_actions_on_edit_mode_delete_message (ModestWindow *win)
        gint response;
        ModestWindowMgr *mgr;
        gboolean retval = TRUE;
+       GtkWindow *toplevel;
 
        g_return_val_if_fail (MODEST_IS_WINDOW(win), FALSE);
 
@@ -403,8 +412,8 @@ 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),
-                                                           message);
+       toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win);
+       response = modest_platform_run_confirmation_dialog (toplevel, message);
 
        if (response == GTK_RESPONSE_OK) {
                GtkTreeSelection *sel = NULL;
@@ -564,14 +573,16 @@ 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));
        }
 }
 
@@ -690,10 +701,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;
        }
 
@@ -817,8 +828,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);
@@ -1115,7 +1129,7 @@ modest_ui_actions_disk_operations_error_handler (ModestMailOperation *mail_op,
                } else if (error->domain == MODEST_MAIL_OPERATION_ERROR &&
                           error->code == MODEST_MAIL_OPERATION_ERROR_FILE_IO) {
                        modest_platform_information_banner ((GtkWidget *) win,
-                                                           NULL, _CS ("sfil_ni_unable_to_open_file_not_found"));
+                                                           NULL, _CS_UNABLE_TO_OPEN_FILE_NOT_FOUND);
                } else if (user_data) {
                        modest_platform_information_banner ((GtkWidget *) win,
                                                            NULL, user_data);
@@ -1376,7 +1390,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
@@ -1392,9 +1407,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 */
@@ -1489,7 +1505,8 @@ static ReplyForwardHelper*
 create_reply_forward_helper (ReplyForwardAction action,
                             ModestWindow *win,
                             guint reply_forward_type,
-                            TnyHeader *header)
+                            TnyHeader *header,
+                            TnyList *parts)
 {
        ReplyForwardHelper *rf_helper = NULL;
        const gchar *active_acc = modest_window_get_active_account (win);
@@ -1504,6 +1521,10 @@ create_reply_forward_helper (ReplyForwardAction action,
                g_strdup (active_acc) :
                modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
        rf_helper->mailbox = g_strdup (active_mailbox);
+       if (parts)
+               rf_helper->parts = g_object_ref (parts);
+       else
+               rf_helper->parts = NULL;
 
        /* Note that window could be destroyed just AFTER calling
           register_window so we must ensure that this pointer does
@@ -1525,6 +1546,8 @@ free_reply_forward_helper (gpointer data)
        g_free (helper->mailbox);
        if (helper->header)
                g_object_unref (helper->header);
+       if (helper->parts)
+               g_object_unref (helper->parts);
        if (helper->parent_window)
                g_object_weak_unref (G_OBJECT (helper->parent_window),
                                     rf_helper_window_closed, helper);
@@ -1683,21 +1706,23 @@ 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
@@ -1723,12 +1748,80 @@ reply_forward_performer (gboolean canceled,
                                                                 modest_ui_actions_disk_operations_error_handler,
                                                                 NULL, NULL);
        modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
-       modest_mail_operation_get_msg (mail_op, rf_helper->header, TRUE, reply_forward_cb, rf_helper);
+       modest_mail_operation_get_msg_and_parts (mail_op, rf_helper->header, rf_helper->parts, TRUE, reply_forward_cb, rf_helper);
 
        /* Frees */
        g_object_unref(mail_op);
 }
 
+static gboolean
+all_parts_retrieved (TnyMimePart *part)
+{
+       if (!TNY_IS_CAMEL_BS_MIME_PART (part)) {
+               return TRUE;
+       } else {
+               TnyList *pending_parts;
+               TnyIterator *iterator;
+               gboolean all_retrieved = TRUE;
+
+               pending_parts = TNY_LIST (tny_simple_list_new ());
+               tny_mime_part_get_parts (part, pending_parts);
+               iterator = tny_list_create_iterator (pending_parts);
+               while (all_retrieved && !tny_iterator_is_done (iterator)) {
+                       TnyMimePart *child;
+
+                       child = TNY_MIME_PART (tny_iterator_get_current (iterator));
+
+                       if (tny_camel_bs_mime_part_is_fetched (TNY_CAMEL_BS_MIME_PART (child))) {
+                               all_retrieved = all_parts_retrieved (TNY_MIME_PART (child));
+                       } else {
+                               all_retrieved = FALSE;
+                       }
+
+                       g_object_unref (child);
+                       tny_iterator_next (iterator);
+               }
+               g_object_unref (iterator);
+               g_object_unref (pending_parts);
+               return all_retrieved;
+       }
+}
+
+static void
+forward_pending_parts_helper (TnyMimePart *part, TnyList *list)
+{
+       TnyList *parts;
+       TnyIterator *iterator;
+
+       if (!tny_camel_bs_mime_part_is_fetched (TNY_CAMEL_BS_MIME_PART (part))) {
+               tny_list_append (list, G_OBJECT (part));
+       }
+       parts = TNY_LIST (tny_simple_list_new ());
+       tny_mime_part_get_parts (part, parts);
+       for (iterator = tny_list_create_iterator (parts); 
+            !tny_iterator_is_done (iterator);
+            tny_iterator_next (iterator)) {
+               TnyMimePart *child;
+
+               child = TNY_MIME_PART (tny_iterator_get_current (iterator));
+               forward_pending_parts_helper (child, list);
+               g_object_unref (child);
+       }
+       g_object_unref (iterator);
+       g_object_unref (parts);
+}
+
+static TnyList *
+forward_pending_parts (TnyMsg *msg)
+{
+       TnyList *result = TNY_LIST (tny_simple_list_new ());
+       if (TNY_IS_CAMEL_BS_MIME_PART (msg)) {
+               forward_pending_parts_helper (TNY_MIME_PART (msg), result);
+       }
+
+       return result;
+}
+
 /*
  * Common code for the reply and forward actions
  */
@@ -1767,13 +1860,59 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
                msg = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW(win));
                header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win));
 
-               if (msg && header) {
+               if (msg && header && (action != ACTION_FORWARD || all_parts_retrieved (TNY_MIME_PART (msg)))) {
                        /* Create helper */
                        rf_helper = create_reply_forward_helper (action, win,
-                                                                reply_forward_type, header);
+                                                                reply_forward_type, header, NULL);
                        reply_forward_cb (NULL, header, FALSE, msg, NULL, rf_helper);
                } else {
-                       g_warning("%s: no message or header found in viewer\n", __FUNCTION__);
+                       gboolean do_download = TRUE;
+
+                       if (msg && header && action == ACTION_FORWARD) {
+                               /* Not all parts retrieved. Then we have to retrieve them all before
+                                * 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 */
+                                       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));
+
+                                       /* End if the user does not want to continue */
+                                       if (response == GTK_RESPONSE_CANCEL)
+                                               do_download = FALSE;
+                               }
+
+                               if (do_download) {
+                                       TnyList *pending_parts;
+                                       TnyFolder *folder;
+                                       TnyAccount *account;
+                                       GtkWindow *toplevel;
+
+                                       /* Create helper */
+                                       pending_parts = forward_pending_parts (msg);
+                                       rf_helper = create_reply_forward_helper (action, win,
+                                                                                reply_forward_type, header, pending_parts);
+                                       g_object_unref (pending_parts);
+
+                                       folder = tny_header_get_folder (header);
+                                       account = tny_folder_get_account (folder);
+                                       toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win);
+                                       modest_platform_connect_and_perform (toplevel,
+                                                                            TRUE, account,
+                                                                            reply_forward_performer,
+                                                                            rf_helper);
+                                       g_object_unref (folder);
+                                       g_object_unref (account);
+                               }
+
+                       } else {
+                               g_warning("%s: no message or header found in viewer\n", __FUNCTION__);
+                       }
                }
 
                if (msg)
@@ -1825,9 +1964,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));
@@ -1841,14 +1981,17 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
                        if (download) {
                                /* Create helper */
                                rf_helper = create_reply_forward_helper (action, win,
-                                                                        reply_forward_type, header);
+                                                                        reply_forward_type, header, NULL);
                                if (uncached_msgs > 0) {
-                                       modest_platform_connect_and_perform (GTK_WINDOW (win),
+                                       GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win);
+
+                                       modest_platform_connect_and_perform (toplevel,
                                                                             TRUE, account,
                                                                             reply_forward_performer,
                                                                             rf_helper);
                                } else {
-                                       reply_forward_performer (FALSE, NULL, GTK_WINDOW (win),
+                                       GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win);
+                                       reply_forward_performer (FALSE, NULL, toplevel,
                                                                 account, rf_helper);
                                }
                        }
@@ -1928,7 +2071,7 @@ modest_ui_actions_on_sort (GtkAction *action,
        }
 
        if (!header_view) {
-               modest_platform_information_banner (NULL, NULL, _CS("ckdg_ib_nothing_to_sort"));
+               modest_platform_information_banner (NULL, NULL, _CS_NOTHING_TO_SORT);
 
                return;
        }
@@ -2182,7 +2325,8 @@ 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,
+       GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win);
+       modest_platform_connect_and_perform (toplevel,
                                             force_connection, info->account,
                                             do_send_receive_performer, info);
 }
@@ -2353,14 +2497,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,
@@ -2370,7 +2516,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,
@@ -2384,7 +2530,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 (); */
@@ -2497,10 +2643,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;
        }
 
@@ -2697,7 +2843,7 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
                if (error->domain == MODEST_MAIL_OPERATION_ERROR &&
                    error->code == MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED) {
                        g_warning ("%s failed: %s\n", __FUNCTION__, (modest_mail_operation_get_error (mail_operation))->message);
-                       modest_platform_information_banner (NULL, NULL, _CS("sfil_ni_not_enough_memory"));
+                       modest_platform_information_banner (NULL, NULL, _CS_NOT_ENOUGH_MEMORY);
                        had_error = TRUE;
                }
        }
@@ -2993,7 +3139,7 @@ do_create_folder (GtkWindow *parent_window,
        gchar *folder_name = NULL;
        TnyFolderStore *parent_folder = NULL;
 
-       result = modest_platform_run_new_folder_dialog (GTK_WINDOW (parent_window),
+       result = modest_platform_run_new_folder_dialog (parent_window,
                                                        suggested_parent,
                                                        (gchar *) suggested_name,
                                                        &folder_name,
@@ -3032,7 +3178,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 (parent_window, parent_folder, NULL);
                g_object_unref (parent_folder);
        }
 }
@@ -3045,9 +3191,11 @@ modest_ui_actions_on_new_folder (GtkAction *action, ModestWindow *window)
 
        if (MODEST_IS_FOLDER_WINDOW (window)) {
                GtkWidget *folder_view;
+               GtkWindow *toplevel;
 
                folder_view = GTK_WIDGET (modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (window)));
-               modest_ui_actions_create_folder (GTK_WIDGET (window), folder_view, NULL);
+               toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) window);
+               modest_ui_actions_create_folder (toplevel, folder_view, NULL);
        } else {
                g_assert_not_reached ();
        }
@@ -3073,14 +3221,14 @@ modest_ui_actions_rename_folder_error_handler (ModestMailOperation *mail_op,
                message = g_strdup_printf (_KR("cerm_device_memory_full"), "");
        } else if (error->domain == MODEST_MAIL_OPERATION_ERROR &&
                   error->code == MODEST_MAIL_OPERATION_ERROR_FOLDER_EXISTS) {
-               message = _CS("ckdg_ib_folder_already_exists");
+               message = _CS_FOLDER_ALREADY_EXISTS;
        } else if (error->domain == TNY_ERROR_DOMAIN &&
                   error->code == TNY_SERVICE_ERROR_STATE) {
                /* This means that the folder is already in use (a
                   message is opened for example */
                message = _("emev_ni_internal_error");
        } else {
-               message = _CS("ckdg_ib_unable_to_rename");
+               message = _CS_UNABLE_TO_RENAME;
        }
 
        /* We don't set a parent for the dialog because the dialog
@@ -3210,10 +3358,11 @@ modest_ui_actions_on_edit_mode_rename_folder (ModestWindow *window)
                if (response != GTK_RESPONSE_ACCEPT || strlen (folder_name) == 0) {
                        do_rename = FALSE;
                } else {
+                       GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) 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 (toplevel, TRUE,
                                        folder, on_rename_folder_performer, rename_folder_data);
                }
        }
@@ -3226,8 +3375,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);
@@ -3297,9 +3447,12 @@ delete_folder (ModestWindow *window, gboolean move_to_trash)
        GtkWidget *folder_view;
        gint response;
        gchar *message;
+       GtkWindow *toplevel;
 
        g_return_val_if_fail (MODEST_IS_WINDOW(window), FALSE);
 
+       toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) window);
+
        if (MODEST_IS_FOLDER_WINDOW (window)) {
                folder_view = GTK_WIDGET (modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (window)));
        } else {
@@ -3315,7 +3468,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 (toplevel,
                                                        _("mail_in_ui_folder_delete_error"),
                                                        FALSE);
                g_object_unref (G_OBJECT (folder));
@@ -3325,7 +3478,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 (toplevel,
                                                            (const gchar *) message);
        g_free (message);
 
@@ -3337,7 +3490,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 (toplevel,
                                                               TRUE,
                                                               TNY_FOLDER_STORE (account),
                                                               on_delete_folder_cb, info);
@@ -3418,7 +3571,7 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
                gtk_dialog_new_with_buttons (_("mail_ti_password_protected"),
                                             NULL,
                                             GTK_DIALOG_MODAL,
-                                            _HL("wdgt_bd_done"),
+                                            _HL_DONE,
                                             GTK_RESPONSE_ACCEPT,
                                             NULL);
        gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox),
@@ -3620,7 +3773,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);
@@ -3672,7 +3825,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;
@@ -3722,7 +3875,7 @@ modest_ui_actions_on_copy (GtkAction *action,
 
                if (num_of_unc_msgs == 0 || continue_download) {
                        modest_platform_information_banner (
-                                       NULL, NULL, _CS("mcen_ib_getting_items"));
+                                       NULL, NULL, _CS_GETTING_ITEMS);
                        modest_header_view_copy_selection (
                                        MODEST_HEADER_VIEW (focused_widget));
                } else
@@ -3737,7 +3890,7 @@ modest_ui_actions_on_copy (GtkAction *action,
        /* Show information banner if there was a copy to clipboard */
        if(copied)
                modest_platform_information_banner (
-                               NULL, NULL, _CS("ecoc_ib_edwin_copied"));
+                               NULL, NULL, _CS_COPIED);
 }
 
 void
@@ -3818,7 +3971,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)) {
@@ -3839,7 +3992,7 @@ modest_ui_actions_on_paste (GtkAction *action,
                        PasteAsAttachmentHelper *helper = g_new0 (PasteAsAttachmentHelper, 1);
                        helper->window = MODEST_MSG_EDIT_WINDOW (window);
                        helper->banner = modest_platform_animation_banner (GTK_WIDGET (window), NULL,
-                                                                          _CS("ckct_nw_pasting"));
+                                                                          _CS_PASTING);
                        modest_email_clipboard_get_data (e_clipboard, &src_folder, &data, &delete);
                        mail_op = modest_mail_operation_new (G_OBJECT (window));
                        if (helper->banner != NULL) {
@@ -3896,7 +4049,7 @@ modest_ui_actions_on_paste (GtkAction *action,
                        if (response == GTK_RESPONSE_OK) {
                                /* Launch notification */
                                inf_note = modest_platform_animation_banner (GTK_WIDGET (window), NULL,
-                                                                            _CS("ckct_nw_pasting"));
+                                                                            _CS_PASTING);
                                if (inf_note != NULL)  {
                                        gtk_window_set_modal (GTK_WINDOW(inf_note), FALSE);
                                        gtk_widget_show (GTK_WIDGET(inf_note));
@@ -3916,7 +4069,7 @@ modest_ui_actions_on_paste (GtkAction *action,
                } else if (src_folder != NULL) {
                        /* Launch notification */
                        inf_note = modest_platform_animation_banner (GTK_WIDGET (window), NULL,
-                                                                    _CS("ckct_nw_pasting"));
+                                                                    _CS_PASTING);
                        if (inf_note != NULL)  {
                                gtk_window_set_modal (GTK_WINDOW(inf_note), FALSE);
                                gtk_widget_show (GTK_WIDGET(inf_note));
@@ -3948,7 +4101,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)) {
@@ -4062,7 +4215,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
        }
 }
@@ -4080,9 +4234,6 @@ modest_ui_actions_on_change_fullscreen (GtkAction *action,
        fullscreen = modest_window_mgr_get_fullscreen_mode (mgr);
        modest_window_mgr_set_fullscreen_mode (mgr, !fullscreen);
 
-#ifndef MODEST_TOOLKIT_HILDON2
-       gtk_window_present (GTK_WINDOW (window));
-#endif
 }
 
 /*
@@ -4095,15 +4246,18 @@ headers_action_show_details (TnyHeader *header,
 
 {
        gboolean async_retrieval;
+       GtkWindow *toplevel;
        TnyMsg *msg = NULL;
 
        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;
        }
-       modest_platform_run_header_details_dialog (GTK_WINDOW (window), header, async_retrieval, msg);
+       toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) window);
+       modest_platform_run_header_details_dialog (toplevel, header, async_retrieval, msg);
        if (msg)
                g_object_unref (msg);
 }
@@ -4150,7 +4304,7 @@ modest_ui_actions_on_limit_error (GtkAction *action,
 {
        g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (win));
 
-       modest_platform_information_banner ((GtkWidget *) win, NULL, _CS("ckdg_ib_maximum_characters_reached"));
+       modest_platform_information_banner ((GtkWidget *) win, NULL, _CS_MAXIMUM_CHARACTERS_REACHED);
 
 }
 
@@ -4248,10 +4402,12 @@ on_move_to_dialog_response (GtkDialog *dialog,
        MoveToInfo *helper = NULL;
        ModestFolderView *folder_view;
        gboolean unset_edit_mode = FALSE;
+       GtkWindow *toplevel;
 
        helper = (MoveToInfo *) user_data;
 
        parent_win = (GtkWidget *) helper->win;
+       toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) parent_win);
        folder_view = MODEST_FOLDER_VIEW (g_object_get_data (G_OBJECT (dialog),
                                                             MODEST_MOVE_TO_DIALOG_FOLDER_VIEW));
        switch (response) {
@@ -4260,7 +4416,7 @@ on_move_to_dialog_response (GtkDialog *dialog,
 
        case MODEST_GTK_RESPONSE_NEW_FOLDER:
                selected = modest_folder_view_get_selected (folder_view);
-               modest_ui_actions_create_folder (GTK_WIDGET (dialog), GTK_WIDGET (folder_view), selected);
+               modest_ui_actions_create_folder ((GtkWindow *) dialog, GTK_WIDGET (folder_view), selected);
                g_object_unref (selected);
                return;
        case GTK_RESPONSE_NONE:
@@ -4277,7 +4433,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));
+                                                                   toplevel);
                } else {
                        /* if the user selected a root folder
                           (account) then do not perform any action */
@@ -4764,7 +4920,7 @@ on_move_folder_cb (gboolean canceled,
        MoveToHelper *helper = g_new0 (MoveToHelper, 1);
 #ifndef MODEST_TOOLKIT_HILDON2
        helper->banner = modest_platform_animation_banner (GTK_WIDGET (parent_window), NULL,
-                       _CS("ckct_nw_pasting"));
+                       _CS_PASTING);
        if (helper->banner != NULL)  {
                g_object_ref (helper->banner);
                gtk_widget_show (GTK_WIDGET(helper->banner));
@@ -4866,7 +5022,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);
        }
@@ -4910,12 +5066,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);
        }
@@ -4938,13 +5094,15 @@ modest_ui_actions_on_window_move_to (GtkAction *action,
        if (headers) {
                TnyHeader *header = NULL;
                TnyIterator *iter;
+               GtkWindow *toplevel;
 
                iter = tny_list_create_iterator (headers);
                header = (TnyHeader *) tny_iterator_get_current (iter);
                src_folder = tny_header_get_folder (header);
 
                /* Transfer the messages */
-               modest_ui_actions_transfer_messages_helper (GTK_WINDOW (win), src_folder,
+               toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win);
+               modest_ui_actions_transfer_messages_helper (toplevel, src_folder,
                                                            headers,
                                                            TNY_FOLDER (dst_folder));
 
@@ -4966,6 +5124,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;
 
@@ -4983,10 +5142,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);
+       toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) win);
+       dialog = create_move_to_dialog (toplevel, NULL, list_to_move);
        modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
                                     GTK_WINDOW (dialog),
-                                    (GtkWindow *) win);
+                                    toplevel);
 
        /* Create helper */
        helper = g_slice_new0 (MoveToInfo);
@@ -5120,7 +5280,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
 }
 
@@ -5323,6 +5483,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
@@ -5331,14 +5493,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
@@ -5346,8 +5509,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);
 }
 
 
@@ -5429,7 +5591,7 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self,
                                                           server_name);
                break;
        case TNY_SERVICE_ERROR_SEND:
-               message = g_strdup (_CS("sfil_ib_unable_to_send"));
+               message = g_strdup (_CS_UNABLE_TO_SEND);
                break;
        case TNY_SERVICE_ERROR_UNAVAILABLE:
                message = modest_protocol_get_translation (protocol,
@@ -5439,7 +5601,7 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self,
        default:
                g_warning ("%s: unexpected ERROR %d",
                           __FUNCTION__, err->code);
-               message = g_strdup (_CS("sfil_ib_unable_to_send"));
+               message = g_strdup (_CS_UNABLE_TO_SEND);
                break;
        }
 
@@ -5743,9 +5905,10 @@ modest_ui_actions_check_for_active_account (ModestWindow *self,
        store_conn_status = tny_account_get_connection_status (store_account);
        if (store_conn_status == TNY_CONNECTION_STATUS_CONNECTED || sending) {
                gint response;
+               GtkWindow *toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) self);
 
-               response = modest_platform_run_confirmation_dialog (GTK_WINDOW (self), 
-                                                               _("emev_nc_disconnect_account"));
+               response = modest_platform_run_confirmation_dialog (toplevel,
+                                                                   _("emev_nc_disconnect_account"));
                if (response == GTK_RESPONSE_OK) {
                        retval = TRUE;
                } else {