* Added a new signal that notifies about changes in the visible account id

[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 e07753b..1fadc88 100644 (file)
--- a/src/hildon2/modest-easysetup-wizard-dialog.c
+++ b/src/hildon2/modest-easysetup-wizard-dialog.c
@@ -619,33 +619,31 @@ create_page_user_details (ModestEasysetupWizardDialog *self)
        gtk_widget_show (GTK_WIDGET (box));
        g_object_unref (title_sizegroup);
        g_object_unref (value_sizegroup);
-       
+
        return GTK_WIDGET (box);
 }
 
-static GtkWidget* 
+static GtkWidget*
 create_page_complete_easysetup (ModestEasysetupWizardDialog *self)
 {
        GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
-       
+
        GtkWidget *label = gtk_label_new(_("mcen_ia_emailsetup_setup_complete"));
        gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
        gtk_widget_set_size_request (label, LABELS_WIDTH, -1);
        gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
-       /* The documentation for gtk_label_set_line_wrap() says that we must 
-        * call gtk_widget_set_size_request() with a hard-coded width, 
-        * though I wonder why gtk_label_set_max_width_chars() isn't enough. */
+
        gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
        gtk_widget_show (label);
-       
+
        label = gtk_label_new (_("mcen_ia_easysetup_complete"));
        gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
        gtk_widget_set_size_request (label, LABELS_WIDTH, -1);
-       
+
        gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
        gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
        gtk_widget_show (label);
-       
+
        gtk_widget_show (GTK_WIDGET (box));
        return GTK_WIDGET (box);
 }
@@ -1006,7 +1004,7 @@ on_button_edit_advanced_settings (GtkButton *button, gpointer user_data)
 static GtkWidget* 
 create_page_complete_custom (ModestEasysetupWizardDialog *self)
 {
-       GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
+       GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_DEFAULT);
        GtkWidget *label = gtk_label_new(_("mcen_ia_emailsetup_setup_complete"));
        GtkWidget *button_edit = gtk_button_new_with_label (_("mcen_fi_advanced_settings"));
        hildon_gtk_widget_set_theme_size (button_edit, HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
@@ -1015,20 +1013,20 @@ create_page_complete_custom (ModestEasysetupWizardDialog *self)
        gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
        gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
        gtk_widget_show (label);
-       
+
        label = gtk_label_new (_("mcen_ia_customsetup_complete"));
        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
        gtk_widget_set_size_request (label, LABELS_WIDTH, -1);
        gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
        gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
        gtk_widget_show (label);
-       
+
        gtk_widget_show (button_edit);
        gtk_box_pack_start (GTK_BOX (box), button_edit, FALSE, FALSE, MODEST_MARGIN_HALF);
-       
+
        g_signal_connect (G_OBJECT (button_edit), "clicked", 
                          G_CALLBACK (on_button_edit_advanced_settings), self);
-       
+
        gtk_widget_show (GTK_WIDGET (box));
        return GTK_WIDGET (box);
 }
@@ -1416,6 +1414,9 @@ create_subsequent_pages (ModestEasysetupWizardDialog *self)
        picker = MODEST_PROVIDER_PICKER (priv->account_serviceprovider_picker);
        id_type = modest_provider_picker_get_active_id_type (picker);
        g_object_get (self, "wizard-notebook", &notebook, NULL);
+       modest_wizard_dialog_set_response_override_handler (MODEST_WIZARD_DIALOG (self),
+                                                           NULL);
+       
 
        if (id_type == MODEST_PROVIDER_PICKER_ID_OTHER) {
                /* "Other..." was selected: */
@@ -1473,12 +1474,17 @@ create_subsequent_pages (ModestEasysetupWizardDialog *self)
                                ModestPairList *tabs;
                                GSList *tmp;
                                gboolean first_page = TRUE;
+                               ModestWizardDialogResponseOverrideFunc response_override;
 
                                /* Remember the last selected plugin protocol */
                                priv->last_plugin_protocol_selected = proto_type;
 
                                /* Get tabs */
                                tabs = modest_account_protocol_get_easysetupwizard_tabs (MODEST_ACCOUNT_PROTOCOL (protocol));
+                               response_override = modest_account_protocol_get_wizard_response_override 
+                                       (MODEST_ACCOUNT_PROTOCOL (protocol));
+                               modest_wizard_dialog_set_response_override_handler (MODEST_WIZARD_DIALOG (self),
+                                                                                   response_override);
                                tmp = (GSList *) tabs;
                                while (tmp) {
                                        ModestPair *pair = (ModestPair *) tmp->data;
@@ -1492,12 +1498,14 @@ create_subsequent_pages (ModestEasysetupWizardDialog *self)
                                        }
 
                                        /* Connect signals */
-                                       priv->missing_data_signals = 
-                                               modest_signal_mgr_connect (priv->missing_data_signals, 
-                                                                          G_OBJECT (pair->second), 
-                                                                          "missing-mandatory-data",
-                                                                          G_CALLBACK (on_missing_mandatory_data), 
-                                                                          self);
+                                       if (MODEST_IS_EASYSETUP_WIZARD_PAGE (pair->second)) {
+                                               priv->missing_data_signals = 
+                                                       modest_signal_mgr_connect (priv->missing_data_signals, 
+                                                                                  G_OBJECT (pair->second), 
+                                                                                  "missing-mandatory-data",
+                                                                                  G_CALLBACK (on_missing_mandatory_data), 
+                                                                                  self);
+                                       }
 
                                        g_free (pair->first);
                                        tmp = g_slist_next (tmp);
@@ -1879,7 +1887,7 @@ save_to_settings (ModestEasysetupWizardDialog *self)
        /* Get details from the specified presets: */
        id_type = modest_provider_picker_get_active_id_type (picker);
        provider_id = modest_provider_picker_get_active_provider_id (picker);
-               
+
        /* Let the plugin save the settings. We do a return in order
           to save an indentation level */
        if (id_type == MODEST_PROVIDER_PICKER_ID_PLUGIN_PROTOCOL) {
@@ -1934,20 +1942,20 @@ save_to_settings (ModestEasysetupWizardDialog *self)
                ModestProtocolType store_provider_server_type;
                gboolean store_provider_use_alternate_port;
                /* Use presets: */
-               store_hostname = modest_presets_get_server (priv->presets, provider_id, 
+               store_hostname = modest_presets_get_server (priv->presets, provider_id,
                                                            TRUE /* store */);
-               
+
                store_provider_server_type = modest_presets_get_info_server_type (priv->presets,
-                                                                        provider_id, 
+                                                                        provider_id,
                                                                         TRUE /* store */);
                store_security  = modest_presets_get_info_server_security (priv->presets,
-                                                                                   provider_id, 
-                                                                                   TRUE /* store */);
+                                                                          provider_id,
+                                                                          TRUE /* store */);
                store_auth_protocol  = modest_presets_get_info_server_auth (priv->presets,
-                                                                                    provider_id, 
-                                                                                    TRUE /* store */);
+                                                                           provider_id,
+                                                                           TRUE /* store */);
                store_provider_use_alternate_port  = modest_presets_get_info_server_use_alternate_port (priv->presets,
-                                                                                                       provider_id, 
+                                                                                                       provider_id,
                                                                                                        TRUE /* store */);
 
                /* We don't check for SMTP here as that is impossible for an incoming server. */