X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-country-picker.c;h=ee109d31985d90c6eab1e1c3f451665563b92f7b;hp=b514942806f2149f875ead8dbd9dd6206829c5b4;hb=2cea6a0efc4a3f19b153de1704da0a348081cae9;hpb=9d6ea8ae049bd224af9a21ee49c840d709d26c7e diff --git a/src/hildon2/modest-country-picker.c b/src/hildon2/modest-country-picker.c index b514942..ee109d3 100644 --- a/src/hildon2/modest-country-picker.c +++ b/src/hildon2/modest-country-picker.c @@ -35,6 +35,7 @@ #include "modest-maemo-utils.h" #include "modest-country-picker.h" +#include #include #include #include @@ -142,7 +143,7 @@ effective_mcc (gint mcc) /* 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 @@ -156,32 +157,29 @@ effective_mcc (gint mcc) static int parse_mcc_mapping_line (const char* line, char** country) { - int i, j; char mcc[4]; /* the mcc code, always 3 bytes*/ - static char my_country[128]; + gchar *iter, *tab, *final; if (!line) { *country = NULL; return 0; } - - for (i = 3, j = 0; i < 128; ++i) { - char kar = line[i]; - if (kar == '\0') - break; - else if (kar < '_') - continue; - else - my_country [j++] = kar; - } - my_country[j] = '\0'; - mcc[0] = line[0]; - mcc[1] = line[1]; - mcc[2] = line[2]; + /* Go to the first tab (Country separator) */ + tab = g_utf8_strrchr (line, -1, '\t'); + *country = g_utf8_find_next_char (tab, NULL); + + /* Replace by end of string */ + final = g_utf8_strrchr (tab, g_utf8_strlen (tab, 100) + 1, '\n'); + *final = '\0'; + + /* Get MCC code */ + mcc[0] = g_utf8_get_char (line); + iter = g_utf8_find_next_char (line, NULL); + mcc[1] = g_utf8_get_char (iter); + iter = g_utf8_find_next_char (iter, NULL); + mcc[2] = g_utf8_get_char (iter); mcc[3] = '\0'; - - *country = my_country; return effective_mcc ((int) strtol ((const char*)mcc, NULL, 10)); } @@ -193,34 +191,25 @@ static void load_from_file (ModestCountryPicker *self, GtkListStore *liststore) { ModestCountryPickerPrivate *priv = MODEST_COUNTRY_PICKER_GET_PRIVATE (self); - + gboolean translated; char line[MAX_LINE_LEN]; guint previous_mcc = 0; - gchar *territory, *fallback = NULL; - gchar *current_locale; - - /* Get the territory specified for the current locale */ - territory = nl_langinfo (_NL_ADDRESS_COUNTRY_NAME); - - /* Tricky stuff, the translations of the OSSO countries does - not always correspond to the country names in locale - databases. Add all these cases here. sergio */ - if (!strcmp (territory, "United Kingdom")) - fallback = g_strdup ("UK"); - - current_locale = setlocale (LC_ALL ,NULL); + gchar *territory; - FILE *file = modest_maemo_open_mcc_mapping_file (); + FILE *file = modest_maemo_open_mcc_mapping_file (&translated); if (!file) { g_warning("Could not open mcc_mapping file"); return; } - while (fgets (line, MAX_LINE_LEN, file) != NULL) { + /* Get the territory specified for the current locale */ + territory = nl_langinfo (_NL_ADDRESS_COUNTRY_NAME); + + while (fgets (line, MAX_LINE_LEN, file) != NULL) { int mcc; char *country = NULL; - const gchar *name_translated, *english_translation; + const gchar *name_translated; mcc = parse_mcc_mapping_line (line, &country); if (!country || mcc == 0) { @@ -235,25 +224,31 @@ load_from_file (ModestCountryPicker *self, GtkListStore *liststore) previous_mcc = mcc; if (!priv->locale_mcc) { - english_translation = dgettext ("osso-countries", country); - if (!strcmp (english_translation, territory) || - (fallback && !strcmp (english_translation, fallback))) - priv->locale_mcc = mcc; + if (translated) { + if (!g_utf8_collate (country, territory)) + priv->locale_mcc = mcc; + } else { + gchar *translation = dgettext ("osso-countries", country); + if (!g_utf8_collate (translation, territory)) + priv->locale_mcc = mcc; + } } name_translated = dgettext ("osso-countries", country); - + /* Add the row to the model: */ GtkTreeIter iter; gtk_list_store_append (liststore, &iter); gtk_list_store_set(liststore, &iter, MODEL_COL_MCC, mcc, MODEL_COL_NAME, name_translated, -1); - } + } fclose (file); + /* Fallback to Finland */ + if (!priv->locale_mcc) + priv->locale_mcc = 244; + /* Sort the items: */ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (liststore), MODEL_COL_NAME, GTK_SORT_ASCENDING); - - g_free (fallback); } static void @@ -276,14 +271,13 @@ modest_country_picker_load_data(ModestCountryPicker *self) * This must match our MODEL_COLS enum constants. */ model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT); - + /* Country column: * The ID model column in not shown in the view. */ renderer = gtk_cell_renderer_text_new (); g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL); - selector = hildon_touch_selector_new (); - hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (self), HILDON_TOUCH_SELECTOR (selector)); + selector = hildon_touch_selector_entry_new (); column = hildon_touch_selector_append_column (HILDON_TOUCH_SELECTOR (selector), GTK_TREE_MODEL (model), renderer, "text", MODEL_COL_NAME, NULL); g_object_set (G_OBJECT (column), "text-column", MODEL_COL_NAME, NULL); @@ -294,6 +288,11 @@ modest_country_picker_load_data(ModestCountryPicker *self) /* Set this _after_ loading from file, it makes loading faster */ hildon_touch_selector_set_model (HILDON_TOUCH_SELECTOR (selector), 0, GTK_TREE_MODEL (model)); + hildon_touch_selector_entry_set_text_column (HILDON_TOUCH_SELECTOR_ENTRY (selector), + MODEL_COL_NAME); + + hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (self), HILDON_TOUCH_SELECTOR (selector)); + g_object_unref (model); }