Remove autofocus adjustment in widgets autofocus doesn't help

[modest] / src / hildon2 / modest-easysetup-wizard-dialog.c

diff --git a/src/hildon2/modest-easysetup-wizard-dialog.c b/src/hildon2/modest-easysetup-wizard-dialog.c
index 4d2d9ed..b47332d 100644 (file)
--- a/src/hildon2/modest-easysetup-wizard-dialog.c
+++ b/src/hildon2/modest-easysetup-wizard-dialog.c
@@ -267,27 +267,12 @@ static void
 on_caption_entry_changed (GtkEditable *editable, gpointer user_data)
 {
        ModestEasysetupWizardDialog *self;
-       gboolean mandatory, empty;
-       ModestEasysetupWizardDialogPrivate *priv;
 
        g_return_if_fail (user_data);
 
        self = MODEST_EASYSETUP_WIZARD_DIALOG (user_data);
-       priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
 
        invoke_enable_buttons_vfunc(self);
-
-       empty = !g_utf8_collate (gtk_entry_get_text (GTK_ENTRY (editable)), "");
-       mandatory = ((GtkWidget *) editable == priv->entry_account_title) ||
-               ((GtkWidget *) editable == priv->entry_user_username) || 
-               ((GtkWidget *) editable == priv->entry_user_email);
-
-       /* Show a banner & get focus */
-       if (empty && mandatory) {
-               modest_platform_information_banner ((GtkWidget *) editable, NULL, 
-                                                   _CS("ckct_ib_enter_some_text"));
-               gtk_widget_grab_focus (GTK_WIDGET (editable));
-       }
 }
 
 static void
@@ -426,7 +411,6 @@ create_page_welcome (ModestEasysetupWizardDialog *self)
        gtk_container_add (GTK_CONTAINER (align), box);
        gtk_widget_show (label);
        gtk_widget_show (GTK_WIDGET (box));
-       gtk_widget_show (align);
        return GTK_WIDGET (align);
 }
 
@@ -564,6 +548,7 @@ create_page_account_details (ModestEasysetupWizardDialog *self)
        gtk_widget_show (priv->entry_account_title);
        gtk_box_pack_start (GTK_BOX (box), priv->caption_account_title, FALSE, FALSE, 0);
        gtk_widget_show (priv->caption_account_title);
+       gtk_widget_set_no_show_all (priv->caption_account_title, TRUE);
        
        /* Prevent the use of some characters in the account title, 
         * as required by our UI specification: */
@@ -923,7 +908,7 @@ create_page_custom_incoming (ModestEasysetupWizardDialog *self)
                                                        FALSE, title_sizegroup, value_sizegroup);
        gtk_box_pack_start (GTK_BOX (box), priv->incoming_security, 
                            FALSE, FALSE, 0);
-       gtk_widget_show_all (priv->incoming_security);
+       gtk_widget_show (priv->incoming_security);
 
        /* Set default selection */
        modest_servertype_picker_set_active_servertype (
@@ -936,8 +921,6 @@ create_page_custom_incoming (ModestEasysetupWizardDialog *self)
        gtk_container_add (GTK_CONTAINER (align), box);
        
        hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), align);
-       gtk_container_set_focus_vadjustment (GTK_CONTAINER (box),
-                                            hildon_pannable_area_get_vadjustment (HILDON_PANNABLE_AREA (pannable)));
        gtk_widget_show (GTK_WIDGET (box));
        gtk_widget_show (pannable);
 
@@ -1083,8 +1066,6 @@ create_page_custom_outgoing (ModestEasysetupWizardDialog *self)
        gtk_container_add (GTK_CONTAINER (align), box);
        
        hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), align);
-       gtk_container_set_focus_vadjustment (GTK_CONTAINER (box),
-                                            hildon_pannable_area_get_vadjustment (HILDON_PANNABLE_AREA (pannable)));
        gtk_widget_show (GTK_WIDGET (box));
        gtk_widget_show (pannable);
 
@@ -1391,6 +1372,7 @@ modest_easysetup_wizard_dialog_init (ModestEasysetupWizardDialog *self)
        priv->pending_check_support = 0;
        priv->destroyed = FALSE;
        priv->page_welcome = create_page_welcome (self);
+       gtk_widget_show (priv->page_welcome);
        priv->page_account_details = create_page_account_details (self);
 
        init_user_page (priv);