X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-country-picker.c;h=8309f92cdbdd65f166d8df995db3a2a49206ba09;hp=e2a444263994d4f3551d9332875e7b1569cae319;hb=5a383a31b2862f9ecface4a3a6fc3235754acb8f;hpb=c96b15de12c3b16bf41fdeeb00cd290df72a41c7

diff --git a/src/hildon2/modest-country-picker.c b/src/hildon2/modest-country-picker.c
index e2a4442..8309f92 100644
--- a/src/hildon2/modest-country-picker.c
+++ b/src/hildon2/modest-country-picker.c
@@ -169,9 +169,13 @@ parse_mcc_mapping_line (const char* line,  char** country)
 	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';
+	/* 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);
@@ -258,6 +262,25 @@ modest_country_picker_init (ModestCountryPicker *self)
 	priv->locale_mcc = 0;
 }
 
+static gchar *
+country_picker_print_func (HildonTouchSelector *selector)
+{
+	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;
+
+		column = hildon_touch_selector_entry_get_text_column (HILDON_TOUCH_SELECTOR_ENTRY (selector));
+		gtk_tree_model_get (model, &iter, column, &text, -1);
+	}
+	return text;
+}
+
 void
 modest_country_picker_load_data(ModestCountryPicker *self)
 {
@@ -278,6 +301,7 @@ 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), 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);