X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodest-utils.c;h=0d176951277d17d8b9d1b97c92f89f72ad699c30;hb=8d9fe597cc27dab628e0e7ff18d08e11c58f45ec;hp=4d169be9c69bc210c95ca349583cd8e0ef8fe232;hpb=065cc5176174fc4b74e6036b7cd7f54ccba1eb92;p=modest

diff --git a/src/modest-utils.c b/src/modest-utils.c
index 4d169be..0d17695 100644
--- a/src/modest-utils.c
+++ b/src/modest-utils.c
@@ -53,6 +53,9 @@
 #include "modest-widget-memory.h"
 #include "widgets/modest-sort-criterium-view.h"
 #include "widgets/modest-header-window.h"
+#ifdef MODEST_TOOLKIT_GTK
+#include <modest-gtk-window-mgr.h>
+#endif
 #include <langinfo.h>
 
 GQuark
@@ -420,9 +423,9 @@ void
 modest_utils_show_dialog_and_forget (GtkWindow *parent_window,
 				     GtkDialog *dialog)
 {
-	g_return_if_fail (GTK_IS_WINDOW(parent_window));
 	g_return_if_fail (GTK_IS_DIALOG(dialog));
 
+	g_return_if_fail (GTK_IS_WINDOW(parent_window));
 	gtk_window_set_transient_for (GTK_WINDOW (dialog), parent_window);
 
 	/* Destroy the dialog when it is closed: */
@@ -534,7 +537,7 @@ checked_modest_sort_criterium_view_add_sort_key (ModestSortCriteriumView *view,
 }
 
 static void
-launch_sort_headers_dialog (GtkWindow *parent_window,
+launch_sort_headers_dialog (ModestWindow *parent_window,
 			    GtkDialog *dialog)
 {
 	ModestHeaderView *header_view = NULL;
@@ -674,13 +677,13 @@ launch_sort_headers_dialog (GtkWindow *parent_window,
 }
 
 void
-modest_utils_run_sort_dialog (GtkWindow *parent_window,
+modest_utils_run_sort_dialog (ModestWindow *parent_window,
 			      ModestSortDialogType type)
 {
 	GtkWidget *dialog = NULL;
 
 	/* Build dialog */
-	dialog = modest_platform_create_sort_dialog (parent_window);
+	dialog = modest_platform_create_sort_dialog (gtk_widget_get_toplevel (GTK_WIDGET (parent_window)));
 	if (dialog == NULL)
 		return;
 	modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),