version and bug fix info update for this testing image

[modest] / src / hildon2 / modest-default-account-settings-dialog.c

diff --git a/src/hildon2/modest-default-account-settings-dialog.c b/src/hildon2/modest-default-account-settings-dialog.c
index f0c19a3..ae5b991 100644 (file)
--- a/src/hildon2/modest-default-account-settings-dialog.c
+++ b/src/hildon2/modest-default-account-settings-dialog.c
@@ -521,12 +521,14 @@ create_page_user_details (ModestDefaultAccountSettingsDialog *self)
        box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
        title_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
        value_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-        
+ 
        /* The name widgets: */
        priv->entry_user_name = GTK_WIDGET (modest_validating_entry_new ());
 
        /* Auto-capitalization is the default, so let's turn it off: */
-       hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_user_name), HILDON_GTK_INPUT_MODE_FULL);
+       hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_user_name),
+                                        HILDON_GTK_INPUT_MODE_FULL |
+                                        HILDON_GTK_INPUT_MODE_AUTOCAP);
        /* Set max length as in the UI spec:
         * The UI spec seems to want us to show a dialog if we hit the maximum. */
        gtk_entry_set_max_length (GTK_ENTRY (priv->entry_user_name), 64);
@@ -1153,9 +1155,6 @@ modest_default_account_settings_dialog_load_settings (ModestAccountSettingsDialo
        priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (dialog);
        protocol_registry = modest_runtime_get_protocol_registry ();
 
-       incoming_account = modest_account_settings_get_store_settings (settings);
-       outgoing_account = modest_account_settings_get_transport_settings (settings);
-
        account_name = modest_account_settings_get_account_name (settings);
 
        /* Save the account name so we can refer to it later: */
@@ -1194,6 +1193,7 @@ modest_default_account_settings_dialog_load_settings (ModestAccountSettingsDialo
        hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->checkbox_leave_messages), 
                                        modest_account_settings_get_leave_messages_on_server (settings));
 
+       incoming_account = modest_account_settings_get_store_settings (settings);
        if (incoming_account) {
                const gchar *username, *password, *hostname, *proto_str, *account_title;
                gchar *proto_name, *title;
@@ -1425,10 +1425,11 @@ enable_buttons (ModestDefaultAccountSettingsDialog *self)
 {
        gboolean enable_ok = TRUE;
        ModestProtocolRegistry *protocol_registry;
+       ModestSecurityOptionsView *sec_view;
        ModestDefaultAccountSettingsDialogPrivate *priv;
 
        priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);
-       
+
        /* The account details title is mandatory: */
        if (entry_is_empty(priv->entry_account_title))
                enable_ok = FALSE;
@@ -1436,7 +1437,7 @@ enable_buttons (ModestDefaultAccountSettingsDialog *self)
        /* The user details username is mandatory: */
        if (enable_ok && entry_is_empty(priv->entry_user_username))
                enable_ok = FALSE;
-               
+
        /* The user details email address is mandatory: */
        if (enable_ok && entry_is_empty (priv->entry_user_email))
                enable_ok = FALSE;
@@ -1445,12 +1446,22 @@ enable_buttons (ModestDefaultAccountSettingsDialog *self)
        if (enable_ok && entry_is_empty(priv->entry_incomingserver))
                enable_ok = FALSE;
 
+       sec_view = MODEST_SECURITY_OPTIONS_VIEW (priv->incoming_security);
+       if (enable_ok &&
+           modest_security_options_view_has_missing_mandatory_data (sec_view))
+               enable_ok = FALSE;
+
        /* The custom outgoing server is mandatory: */
        if (enable_ok && entry_is_empty(priv->entry_outgoingserver))
                enable_ok = FALSE;
 
+       sec_view = MODEST_SECURITY_OPTIONS_VIEW (priv->outgoing_security);
+       if (enable_ok &&
+           modest_security_options_view_has_missing_mandatory_data (sec_view))
+               enable_ok = FALSE;
+
        protocol_registry = modest_runtime_get_protocol_registry ();
-                       
+
        /* Enable the buttons, 
         * identifying them via their associated response codes:
         */