We assume that, if we cannot write temporary file to view, it's that

[modest] / src / hildon2 / modest-country-picker.c

diff --git a/src/hildon2/modest-country-picker.c b/src/hildon2/modest-country-picker.c
index eee4ee8..26b560d 100644 (file)
--- a/src/hildon2/modest-country-picker.c
+++ b/src/hildon2/modest-country-picker.c
@@ -167,6 +167,9 @@ parse_mcc_mapping_line (const char* line,  char** country)
 
        /* 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. We need to use strlen, because
@@ -274,9 +277,17 @@ country_picker_print_func (HildonTouchSelector *selector, gpointer userdata)
        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;
 }