X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-country-picker.c;h=ee109d31985d90c6eab1e1c3f451665563b92f7b;hp=20b3e702ea8020e250f0fd29399913adfef55086;hb=2cea6a0efc4a3f19b153de1704da0a348081cae9;hpb=296f6db2d35c09fa6267e967399c1bc529fc61e6

diff --git a/src/hildon2/modest-country-picker.c b/src/hildon2/modest-country-picker.c
index 20b3e70..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 <hildon/hildon-touch-selector-entry.h>
 #include <gtk/gtkliststore.h>
 #include <gtk/gtkcelllayout.h>
 #include <gtk/gtkcellrenderertext.h>
@@ -226,12 +227,10 @@ load_from_file (ModestCountryPicker *self, GtkListStore *liststore)
 			if (translated) {
 				if (!g_utf8_collate (country, territory))
 					priv->locale_mcc = mcc;
-				g_debug ("'%s' || '%s' || %d", territory, country, mcc);
 			} else {
 				gchar *translation = dgettext ("osso-countries", country);
 				if (!g_utf8_collate (translation, territory))
 					priv->locale_mcc = mcc;
-				g_debug ("'%s' || '%s' || %d", territory, translation, mcc);
 			}
 		}
 		name_translated = dgettext ("osso-countries", country);
@@ -278,7 +277,7 @@ modest_country_picker_load_data(ModestCountryPicker *self)
 	renderer = gtk_cell_renderer_text_new ();
 	g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
 
-	selector = hildon_touch_selector_new ();
+	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);
@@ -289,6 +288,9 @@ 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);