X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-secureauth-picker.c;h=14b52f8d1d2fa3094a8425718d9390b3b6ac41a9;hb=a6ff5269ddd912e12602d34a7bc7429711e84b61;hp=103226ba11b65054d52f36b83f744a1e59a11bc8;hpb=dc31aa7811ffd978755af927b8719c8e18bac4a0;p=modest

diff --git a/src/hildon2/modest-secureauth-picker.c b/src/hildon2/modest-secureauth-picker.c
index 103226b..14b52f8 100644
--- a/src/hildon2/modest-secureauth-picker.c
+++ b/src/hildon2/modest-secureauth-picker.c
@@ -79,7 +79,7 @@ enum MODEL_COLS {
 	MODEL_COL_ID = 1 /* an int. */
 };
 
-void modest_secureauth_picker_fill (ModestSecureauthPicker *picker);
+static void modest_secureauth_picker_fill (ModestSecureauthPicker *picker);
 
 static gchar *
 touch_selector_print_func (HildonTouchSelector *selector)
@@ -105,7 +105,8 @@ modest_secureauth_picker_init (ModestSecureauthPicker *self)
 }
 
 ModestSecureauthPicker*
-modest_secureauth_picker_new (void)
+modest_secureauth_picker_new (HildonSizeType size,
+			      HildonButtonArrangement arrangement)
 {
 	ModestSecureauthPicker *self;
 	ModestSecureauthPickerPrivate *priv;
@@ -113,8 +114,8 @@ modest_secureauth_picker_new (void)
 	GtkWidget *selector;
 
 	self = g_object_new (MODEST_TYPE_SECUREAUTH_PICKER, 
-			     "arrangement", HILDON_BUTTON_ARRANGEMENT_VERTICAL,
-			     "size", HILDON_SIZE_AUTO,
+			     "arrangement", arrangement,
+			     "size", size,
 			     NULL);
 	priv = MODEST_SECUREAUTH_PICKER_GET_PRIVATE (self);
 
@@ -144,7 +145,8 @@ modest_secureauth_picker_new (void)
  * #picker: The combo box.
  * @protocol: IMAP or POP.
  */
-void modest_secureauth_picker_fill (ModestSecureauthPicker *picker)
+static void 
+modest_secureauth_picker_fill (ModestSecureauthPicker *picker)
 {	
 	ModestSecureauthPickerPrivate *priv;
 	GtkListStore *liststore;
@@ -170,6 +172,14 @@ void modest_secureauth_picker_fill (ModestSecureauthPicker *picker)
 				    MODEL_COL_ID, (gint)modest_protocol_get_type_id (protocol),
 				    MODEL_COL_NAME, modest_protocol_get_display_name (protocol),
 				    -1);
+		if (modest_protocol_get_type_id (protocol) == MODEST_PROTOCOLS_AUTH_NONE) {
+			HildonTouchSelector *selector;
+			selector = 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)));
+			
+		}
 	}	
 }