X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-serversecurity-picker.c;h=2ba5c7d4a1970f2a8f49acaf55c9d67b836a0995;hb=eb89c87526744f082e02f90e62a733c76b79b28d;hp=267f6e18c56fc3f0217770a782a63accac61a185;hpb=71af7294c7147e8a1acf8b8e655e7005127fc2bd;p=modest

diff --git a/src/hildon2/modest-serversecurity-picker.c b/src/hildon2/modest-serversecurity-picker.c
index 267f6e1..2ba5c7d 100644
--- a/src/hildon2/modest-serversecurity-picker.c
+++ b/src/hildon2/modest-serversecurity-picker.c
@@ -107,7 +107,8 @@ touch_selector_print_func (HildonTouchSelector *selector)
 }
 
 ModestServersecurityPicker*
-modest_serversecurity_picker_new (void)
+modest_serversecurity_picker_new (HildonSizeType size,
+				  HildonButtonArrangement arrangement)
 {
 	ModestServersecurityPicker *self;
 	ModestServersecurityPickerPrivate *priv;
@@ -115,8 +116,8 @@ modest_serversecurity_picker_new (void)
 	GtkWidget *selector;
 
 	self = g_object_new (MODEST_TYPE_SERVERSECURITY_PICKER, 
-			     "arrangement", HILDON_BUTTON_ARRANGEMENT_VERTICAL,
-			     "size", HILDON_SIZE_AUTO,
+			     "arrangement", arrangement,
+			     "size", size,
 			     NULL);
 	priv = MODEST_SERVERSECURITY_PICKER_GET_PRIVATE (self);
 
@@ -148,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. */
@@ -162,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);