2007-04-29 Murray Cumming <murrayc@murrayc.com>

[modest] / src / maemo / easysetup / modest-easysetup-wizard.c

diff --git a/src/maemo/easysetup/modest-easysetup-wizard.c b/src/maemo/easysetup/modest-easysetup-wizard.c
index 7a8361e..716d794 100644 (file)
--- a/src/maemo/easysetup/modest-easysetup-wizard.c
+++ b/src/maemo/easysetup/modest-easysetup-wizard.c
@@ -192,7 +192,7 @@ static GtkWidget* create_caption_new_with_asterix(ModestEasysetupWizardDialog *s
 static GtkWidget*
 create_page_welcome (ModestEasysetupWizardDialog *self)
 {
-       GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF);
+       GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
        GtkWidget *label = gtk_label_new(_("mcen_ia_emailsetup_intro"));
        gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
        gtk_widget_show (label);
@@ -250,7 +250,7 @@ on_entry_max (ModestValidatingEntry *self, gpointer user_data)
 static GtkWidget*
 create_page_account_details (ModestEasysetupWizardDialog *self)
 {
-       GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF);
+       GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
        GtkWidget *label = gtk_label_new(_("mcen_ia_accountdetails"));
        gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, MODEST_MARGIN_HALF);
        gtk_widget_show (label);
@@ -383,7 +383,7 @@ create_page_account_details (ModestEasysetupWizardDialog *self)
 static GtkWidget*
 create_page_user_details (ModestEasysetupWizardDialog *self)
 {
-       GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF);
+       GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
        
        /* Create a size group to be used by all captions.
         * Note that HildonCaption does not create a default size group if we do not specify one.
@@ -472,7 +472,7 @@ create_page_user_details (ModestEasysetupWizardDialog *self)
 
 static GtkWidget* create_page_complete_easysetup (ModestEasysetupWizardDialog *self)
 {
-       GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF);
+       GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
        GtkWidget *label = gtk_label_new(_("mcen_ia_emailsetup_setup_complete"));
        gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
        gtk_widget_show (label);
@@ -524,7 +524,7 @@ static void on_combo_servertype_changed(GtkComboBox *combobox, gpointer user_dat
            
 static GtkWidget* create_page_custom_incoming (ModestEasysetupWizardDialog *self)
 {
-       GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF);
+       GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
        
        /* Create a size group to be used by all captions.
         * Note that HildonCaption does not create a default size group if we do not specify one.
@@ -633,7 +633,7 @@ on_button_outgoing_smtp_servers (GtkButton *button, gpointer user_data)
 
 static GtkWidget* create_page_custom_outgoing (ModestEasysetupWizardDialog *self)
 {
-       GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF);
+       GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
        
        /* Create a size group to be used by all captions.
         * Note that HildonCaption does not create a default size group if we do not specify one.
@@ -742,7 +742,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_HALF);
+       GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
        GtkWidget *label = gtk_label_new(_("mcen_ia_emailsetup_setup_complete"));
        gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
        gtk_widget_show (label);
@@ -1177,14 +1177,17 @@ modest_easysetup_wizard_dialog_class_init (ModestEasysetupWizardDialogClass *kla
 static void
 show_error (GtkWindow *parent_window, const gchar* text)
 {
+       GtkDialog *dialog = GTK_DIALOG (hildon_note_new_information (parent_window, text));
+       /*
        GtkDialog *dialog = GTK_DIALOG (gtk_message_dialog_new (parent_window,
                (GtkDialogFlags)0,
                 GTK_MESSAGE_ERROR,
                 GTK_BUTTONS_OK,
                 text ));
+       */
                 
-                gtk_dialog_run (dialog);
-                gtk_widget_destroy (GTK_WIDGET (dialog));
+       gtk_dialog_run (dialog);
+       gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 
 /** Attempt to create the account from the information that the user has entered.