2005-10-08 [colin] 1.9.15cvs24

[claws.git] / src / wizard.c

diff --git a/src/wizard.c b/src/wizard.c
index aad17528c0bf957e5c0b03a1403688a89977dd8a..da101a2d555cf926d90a42695461229340d199dd 100644 (file)
--- a/src/wizard.c
+++ b/src/wizard.c
@@ -17,6 +17,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include "defs.h"
 
 #include <glib.h>
@@ -98,7 +103,7 @@ typedef struct
 
 } WizardWindow;
 
-static void wizard_write_config(WizardWindow *wizard)
+static gboolean wizard_write_config(WizardWindow *wizard)
 {
        gboolean mailbox_ok = FALSE;
        PrefsAccount *prefs_account = prefs_account_new();
@@ -113,8 +118,16 @@ static void wizard_write_config(WizardWindow *wizard)
        if (wizard->create_mailbox && prefs_account->protocol != A_IMAP4) {
                mailbox_ok = setup_write_mailbox_path(wizard->mainwin, 
                                gtk_entry_get_text(GTK_ENTRY(wizard->mailbox_name)));
+       } else
+               mailbox_ok = TRUE;
+
+       if (!mailbox_ok) {
+               gtk_notebook_set_current_page (
+                       GTK_NOTEBOOK(wizard->notebook), 
+                       4);
+               return FALSE;
        }
-
+       
        if (prefs_account->protocol != A_LOCAL)
                prefs_account->account_name = g_strdup_printf("%s@%s",
                                gtk_entry_get_text(GTK_ENTRY(wizard->recv_username)),
@@ -167,6 +180,8 @@ static void wizard_write_config(WizardWindow *wizard)
        prefs_account_write_config_all(account_list);
        prefs_account_free(prefs_account);
        account_read_config_all();
+       
+       return TRUE;
 }
 
 static GtkWidget* create_page (WizardWindow *wizard, const char * title)
@@ -514,6 +529,7 @@ wizard_response_cb (GtkDialog * dialog, int response, gpointer data)
        }
        
        num_pages = g_slist_length(wizard->pages);
+
        current_page = gtk_notebook_get_current_page (
                                GTK_NOTEBOOK(wizard->notebook));
        if (response == CANCEL)
@@ -524,7 +540,11 @@ wizard_response_cb (GtkDialog * dialog, int response, gpointer data)
        }
        else if (response == FINISHED)
        {
-               wizard_write_config(wizard);
+               if (!wizard_write_config(wizard)) {
+                       current_page = gtk_notebook_get_current_page (
+                                       GTK_NOTEBOOK(wizard->notebook));
+                       goto set_sens;
+               }
                wizard->finished = TRUE;
                wizard->result = TRUE;
                gtk_widget_destroy (GTK_WIDGET(dialog));
@@ -557,7 +577,7 @@ wizard_response_cb (GtkDialog * dialog, int response, gpointer data)
                                        current_page);
                        }
                }
-
+set_sens:
                gtk_dialog_set_response_sensitive (dialog, GO_BACK, 
                                current_page > 0);
                gtk_dialog_set_response_sensitive (dialog, GO_FORWARD,