Use the ModestWindow to create the Move to dialog instead of ModestShell

[modest] / src / modest-utils.c

diff --git a/src/modest-utils.c b/src/modest-utils.c
index 0d17695..f3820f0 100644 (file)
--- a/src/modest-utils.c
+++ b/src/modest-utils.c
@@ -49,7 +49,6 @@
 #include "modest-text-utils.h"
 #include <modest-local-folder-info.h>
 #include "widgets/modest-header-view.h"
-#include "widgets/modest-main-window.h"
 #include "modest-widget-memory.h"
 #include "widgets/modest-sort-criterium-view.h"
 #include "widgets/modest-header-window.h"
@@ -681,13 +680,15 @@ modest_utils_run_sort_dialog (ModestWindow *parent_window,
                              ModestSortDialogType type)
 {
        GtkWidget *dialog = NULL;
+       GtkWindow *toplevel;
 
        /* Build dialog */
-       dialog = modest_platform_create_sort_dialog (gtk_widget_get_toplevel (GTK_WIDGET (parent_window)));
+       toplevel = (GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (parent_window));
+       dialog = modest_platform_create_sort_dialog (toplevel);
        if (dialog == NULL)
                return;
        modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
-                                    GTK_WINDOW (dialog), parent_window);
+                                    GTK_WINDOW (dialog), toplevel);
 
        /* Fill sort keys */
        switch (type) {
@@ -822,7 +823,7 @@ modest_utils_on_entry_invalid_character (ModestValidatingEntry *self,
                show_char = "' '";
        }
        
-       message = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"), show_char);
+       message = g_strdup_printf (_CS_ILLEGAL_CHARACTERS_ENTERED, show_char);
        modest_platform_information_banner (GTK_WIDGET (self), NULL, message);
        g_free (message);
 }