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

diff --git a/src/modest-utils.c b/src/modest-utils.c
index 278d035..d578895 100644
--- a/src/modest-utils.c
+++ b/src/modest-utils.c
@@ -37,9 +37,6 @@
 #include <tny-camel-account.h>
 #include <tny-status.h>
 #include <tny-camel-send-queue.h>
-#include <tny-camel-transport-account.h>
-#include <tny-camel-imap-store-account.h>
-#include <tny-camel-pop-store-account.h>
 #include <locale.h>
 #include <modest-defs.h>
 #include "modest-utils.h"
@@ -49,11 +46,11 @@
 #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"
-#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 +419,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 +533,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;
@@ -551,18 +548,12 @@ launch_sort_headers_dialog (GtkWindow *parent_window,
 	gint attachments_sort_id;
 	gint priority_sort_id;
 	GtkTreeSortable *sortable;
+	GtkTreeModel *filter;
 
 	/* 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;
 
@@ -623,7 +614,8 @@ launch_sort_headers_dialog (GtkWindow *parent_window,
 	sort_ids[sort_key] = TNY_HEADER_FLAG_PRIORITY_MASK;
 	priority_sort_id = sort_key;
 	
-	sortable = GTK_TREE_SORTABLE (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)));
+	filter = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
+	sortable = GTK_TREE_SORTABLE (gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter)));
 	/* Launch dialogs */
 	if (!gtk_tree_sortable_get_sort_column_id (sortable,
 						   &current_sort_colid, &current_sort_type)) {
@@ -683,17 +675,19 @@ 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;
+	GtkWindow *toplevel;
 
 	/* Build dialog */
-	dialog = modest_platform_create_sort_dialog (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) {
@@ -828,7 +822,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);
 }
@@ -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);