X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-utils.c;h=d578895b75c69a64ba4196d3b0614290efc2c998;hb=7c4e1d91c85274250affb5446c5abfe21acaac6d;hp=b2bdaa3e71faeefa895d7c6c161243b550255d45;hpb=76380df99326d051264ab09a5e6ea192076bd4a9;p=modest diff --git a/src/modest-utils.c b/src/modest-utils.c index b2bdaa3..d578895 100644 --- a/src/modest-utils.c +++ b/src/modest-utils.c @@ -37,9 +37,6 @@ #include #include #include -#include -#include -#include #include #include #include "modest-utils.h" @@ -49,11 +46,11 @@ #include "modest-text-utils.h" #include #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 #endif #include @@ -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, ¤t_sort_colid, ¤t_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); } @@ -858,44 +852,12 @@ modest_utils_open_mcc_mapping_file (void) return result; } -/* cluster mcc's, based on the list - * http://en.wikipedia.org/wiki/Mobile_country_code - */ -static int -effective_mcc (gint mcc) -{ - switch (mcc) { - case 405: return 404; /* india */ - case 441: return 440; /* japan */ - case 348: /* NOTE: see below */ - case 235: return 234; /* united kingdom */ - case 289: return 282; /* georgia */ - case 549: /* NOTE: see below */ - case 311: - case 312: - case 313: - case 314: - case 315: - case 316: return 310; /* united states */ - default: return mcc; - } - /* NOTE: 348 for UK and 549 for US are not correct, but we do - a workaround here as changing operator-wizard package is - more difficult */ -} - /* each line is of the form: xxx logical_id NOTE: this function is NOT re-entrant, the out-param country are static strings that should NOT be freed. and will change when calling this function again - - also note, this function will return the "effective mcc", which - is the normalized mcc for a country - ie. even if the there - are multiple entries for the United States with various mccs, - this function will always return 310, even if the real mcc parsed - would be 314. see the 'effective_mcc' function above. */ static int parse_mcc_mapping_line (const char* line, char** country) @@ -932,7 +894,7 @@ parse_mcc_mapping_line (const char* line, char** country) mcc[2] = g_utf8_get_char (iter); mcc[3] = '\0'; - return effective_mcc ((int) strtol ((const char*)mcc, NULL, 10)); + return (int) strtol ((const char*)mcc, NULL, 10); } #define MCC_FILE_MAX_LINE_LEN 128 /* max length of a line in MCC file */ @@ -967,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; @@ -992,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);