X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-serversecurity-picker.c;h=5f5d9f1dc48d4bb45b612a5c01eb95d99fb4c3c1;hp=9fbe52036cd9aa1b63446994646b2150d8259ad5;hb=03f20a5e06f43b43765ca16f2ac482eb558ed845;hpb=51372832576ac3b1423ee599cc5b142aabdebd42

diff --git a/src/hildon2/modest-serversecurity-picker.c b/src/hildon2/modest-serversecurity-picker.c
index 9fbe520..5f5d9f1 100644
--- a/src/hildon2/modest-serversecurity-picker.c
+++ b/src/hildon2/modest-serversecurity-picker.c
@@ -92,7 +92,7 @@ modest_serversecurity_picker_init (ModestServersecurityPicker *self)
 }
 
 static gchar *
-touch_selector_print_func (HildonTouchSelector *selector)
+touch_selector_print_func (HildonTouchSelector *selector, gpointer userdata)
 {
 	GtkTreeIter iter;
 	if (hildon_touch_selector_get_selected (HILDON_TOUCH_SELECTOR (selector), 0, &iter)) {
@@ -134,7 +134,7 @@ modest_serversecurity_picker_new (HildonSizeType size,
 					     renderer, "text", MODEL_COL_NAME, NULL);
 
 	hildon_touch_selector_set_model (HILDON_TOUCH_SELECTOR (selector), 0, GTK_TREE_MODEL (priv->model));
-	hildon_touch_selector_set_print_func (HILDON_TOUCH_SELECTOR (selector), touch_selector_print_func);
+	hildon_touch_selector_set_print_func (HILDON_TOUCH_SELECTOR (selector), (HildonTouchSelectorPrintFunc) touch_selector_print_func);
 
 	hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (self), HILDON_TOUCH_SELECTOR (selector));
 
@@ -149,6 +149,7 @@ void modest_serversecurity_picker_fill (ModestServersecurityPicker *picker, Mode
 {
 	ModestServersecurityPickerPrivate *priv;
 	ModestProtocol *protocol;
+	GtkWidget *selector;
 
 	priv = MODEST_SERVERSECURITY_PICKER_GET_PRIVATE (picker);
 	priv->protocol = protocol_type; /* Remembered for later. */
@@ -163,6 +164,10 @@ void modest_serversecurity_picker_fill (ModestServersecurityPicker *picker, Mode
 	gtk_list_store_append (liststore, &iter);
 	/* TODO: This logical ID is not in the .po file: */
 	gtk_list_store_set (liststore, &iter, MODEL_COL_ID, (gint) MODEST_PROTOCOLS_CONNECTION_NONE, MODEL_COL_NAME, _("mcen_fi_advsetup_other_security_none"), -1);
+	selector = GTK_WIDGET (hildon_picker_button_get_selector (HILDON_PICKER_BUTTON (picker)));
+	hildon_touch_selector_select_iter (HILDON_TOUCH_SELECTOR (selector), 0, &iter, TRUE);
+	hildon_button_set_value (HILDON_BUTTON (picker), 
+				 hildon_touch_selector_get_current_text (HILDON_TOUCH_SELECTOR (selector)));
 	
 	gtk_list_store_append (liststore, &iter);
 	gtk_list_store_set (liststore, &iter, MODEL_COL_ID, (gint)MODEST_PROTOCOLS_CONNECTION_TLS, MODEL_COL_NAME, _("mcen_fi_advsetup_other_security_normal"), -1);