New modest_platform_system_banner (show even if no windows visible)

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

diff --git a/src/hildon2/modest-serversecurity-picker.c b/src/hildon2/modest-serversecurity-picker.c
index 267f6e1..5f5d9f1 100644 (file)
--- 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)) {
@@ -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);
 
@@ -133,7 +134,7 @@ modest_serversecurity_picker_new (void)
                                             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));
 
@@ -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);