* Add initial values for security picker and auth picker.

pmo-trunk-r6120

diff --git a/src/hildon2/modest-connection-specific-smtp-edit-window.c b/src/hildon2/modest-connection-specific-smtp-edit-window.c
index f18dfa6..cda04ec 100644 (file)
--- a/src/hildon2/modest-connection-specific-smtp-edit-window.c
+++ b/src/hildon2/modest-connection-specific-smtp-edit-window.c
@@ -439,7 +439,7 @@ modest_connection_specific_smtp_edit_window_set_connection (
 
        if (server_settings) 
        {
-               
+               /* Setting known values */
                if (priv->account_name)
                        g_free (priv->account_name);
                priv->account_name = g_strdup (modest_server_account_settings_get_account_name (server_settings));

diff --git a/src/hildon2/modest-secureauth-picker.c b/src/hildon2/modest-secureauth-picker.c
index 7b15cdb..44af40b 100644 (file)
--- a/src/hildon2/modest-secureauth-picker.c
+++ b/src/hildon2/modest-secureauth-picker.c
@@ -171,6 +171,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)));
+                       
+               }
        }       
 }
 

diff --git a/src/hildon2/modest-serversecurity-picker.c b/src/hildon2/modest-serversecurity-picker.c
index 9fbe520..2ba5c7d 100644 (file)
--- a/src/hildon2/modest-serversecurity-picker.c
+++ b/src/hildon2/modest-serversecurity-picker.c
@@ -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);