/* Go to the first tab (Country separator) */
tab = g_utf8_strrchr (line, -1, '\t');
+ if (!tab)
+ return 0;
+
*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';
+ /* Replace by end of string. We need to use strlen, because
+ g_utf8_strrchr expects bytes and not UTF8 characters */
+ final = g_utf8_strrchr (tab, strlen (tab) + 1, '\n');
+ if (G_LIKELY (final))
+ *final = '\0';
+ else
+ tab[strlen(tab) - 1] = '\0';
/* Get MCC code */
mcc[0] = g_utf8_get_char (line);
priv->locale_mcc = 0;
}
+static gchar *
+country_picker_print_func (HildonTouchSelector *selector, gpointer userdata)
+{
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ gchar *text = NULL;
+
+ /* Always pick the selected country from the tree view and
+ never from the entry */
+ model = hildon_touch_selector_get_model (selector, 0);
+ if (hildon_touch_selector_get_selected (selector, 0, &iter)) {
+ gint column;
+ GtkWidget *entry;
+ const gchar *entry_text;
+
+ column = hildon_touch_selector_entry_get_text_column (HILDON_TOUCH_SELECTOR_ENTRY (selector));
+ gtk_tree_model_get (model, &iter, column, &text, -1);
+
+ entry = GTK_WIDGET (hildon_touch_selector_entry_get_entry (HILDON_TOUCH_SELECTOR_ENTRY (selector)));
+ entry_text = hildon_entry_get_text (HILDON_ENTRY (entry));
+ if (entry_text != NULL && text != NULL && strcmp (entry_text, text)) {
+ hildon_entry_set_text (HILDON_ENTRY (entry), text);
+ }
+ }
+ return text;
+}
+
void
modest_country_picker_load_data(ModestCountryPicker *self)
{
g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
selector = hildon_touch_selector_entry_new ();
+ hildon_touch_selector_set_print_func (HILDON_TOUCH_SELECTOR (selector), (HildonTouchSelectorPrintFunc) country_picker_print_func);
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);
0, GTK_TREE_MODEL (model));
hildon_touch_selector_entry_set_text_column (HILDON_TOUCH_SELECTOR_ENTRY (selector),
MODEL_COL_NAME);
+ hildon_touch_selector_entry_set_input_mode (HILDON_TOUCH_SELECTOR_ENTRY (selector),
+ HILDON_GTK_INPUT_MODE_ALPHA |
+ HILDON_GTK_INPUT_MODE_AUTOCAP);
hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (self), HILDON_TOUCH_SELECTOR (selector));