X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-utils.c;h=d611f3e06f5f8c9ccdd123a8de84d20fa238471a;hp=278d035704e9c3111bc76cd014796157e61c07d0;hb=209ebfaaa80ec59182bfc87392802609aa0de252;hpb=09e53d37e464661c23605685a1e2a4b4baf12ec4

diff --git a/src/modest-utils.c b/src/modest-utils.c
index 278d035..d611f3e 100644
--- a/src/modest-utils.c
+++ b/src/modest-utils.c
@@ -52,8 +52,9 @@
 #include "widgets/modest-main-window.h"
 #include "modest-widget-memory.h"
 #include "widgets/modest-sort-criterium-view.h"
-#ifdef MODEST_TOOLKIT_HILDON2
-#include "modest-header-window.h"
+#include "widgets/modest-header-window.h"
+#ifdef MODEST_TOOLKIT_GTK
+#include <modest-gtk-window-mgr.h>
 #endif
 #include <langinfo.h>
 
@@ -422,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: */
@@ -536,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;
@@ -553,16 +554,9 @@ launch_sort_headers_dialog (GtkWindow *parent_window,
 	GtkTreeSortable *sortable;
 
 	/* Get header window */
-#ifndef MODEST_TOOLKIT_HILDON2
-	if (MODEST_IS_MAIN_WINDOW (parent_window)) {
-		header_view = MODEST_HEADER_VIEW(modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(parent_window),
-										      MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW));
-	}
-#else
 	if (MODEST_IS_HEADER_WINDOW (parent_window)) {
 		header_view = MODEST_HEADER_VIEW (modest_header_window_get_header_view (MODEST_HEADER_WINDOW (parent_window)));
 	}
-#endif
 	if (!header_view)
 		return;
 
@@ -683,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 (modest_toolkit_utils_parent_window (GTK_WIDGET (parent_window)));
 	if (dialog == NULL)
 		return;
 	modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
@@ -935,7 +929,9 @@ modest_utils_fill_country_model (GtkTreeModel *model, gint *locale_mcc)
 	}
 
 	/* Get the territory specified for the current locale */
-	territory = nl_langinfo (_NL_ADDRESS_COUNTRY_NAME);
+	territory = nl_langinfo (_NL_IDENTIFICATION_TERRITORY);
+
+	setlocale (LC_MESSAGES, "en_GB");
 
 	while (fgets (line, MCC_FILE_MAX_LINE_LEN, file) != NULL) {
 		int mcc;
@@ -960,6 +956,8 @@ modest_utils_fill_country_model (GtkTreeModel *model, gint *locale_mcc)
 		}
 	}
 
+	setlocale (LC_MESSAGES, "");
+
 	/* Now we fill the model */
 	rewind (file);
 	country_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);