Don't destroy the account settings window with parent.

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

diff --git a/src/hildon2/modest-country-picker.c b/src/hildon2/modest-country-picker.c
index 1a6d777..91b2088 100644 (file)
--- a/src/hildon2/modest-country-picker.c
+++ b/src/hildon2/modest-country-picker.c
@@ -269,6 +269,7 @@ modest_country_picker_load_data(ModestCountryPicker *self)
        GtkCellRenderer *renderer;
        GtkWidget *selector;
        GtkListStore *model;
+       HildonTouchSelectorColumn *column;
 
        /* Create a tree model for the combo box,
         * with a string for the name, and an int for the MCC ID.
@@ -282,9 +283,9 @@ modest_country_picker_load_data(ModestCountryPicker *self)
        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));
-       hildon_touch_selector_append_column (HILDON_TOUCH_SELECTOR (selector), GTK_TREE_MODEL (model),
-                                            renderer, "text", MODEL_COL_NAME, NULL);
+       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);
 
        /* Fill the model with rows: */
        load_from_file (self, model);
@@ -292,6 +293,8 @@ 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_picker_button_set_selector (HILDON_PICKER_BUTTON (self), HILDON_TOUCH_SELECTOR (selector));
+
        g_object_unref (model);
 }