2005-10-16 [colin] 1.9.15cvs63
[claws.git] / src / wizard.c
index b0734b35dff8d5e2e27cb0deeb71f017f0bddc6e..164b46a1a5340aa58a99dd39e8ca44f9f4dad8d8 100644 (file)
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * 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>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkvbox.h>
@@ -41,9 +47,9 @@
 #  include "config.h"
 #endif
 
-#include "intl.h"
 #include "utils.h"
 #include "gtk/menu.h"
+#include "account.h"
 #include "prefs_account.h"
 #include "mainwindow.h"
 #include "stock_pixmap.h"
@@ -52,6 +58,8 @@
 #ifdef USE_OPENSSL                     
 #include "ssl.h"
 #endif
+#include "prefs_common.h"
+
 typedef enum
 {
        GO_BACK,
@@ -77,9 +85,14 @@ typedef struct
        GtkWidget *smtp_server;
 
        GtkWidget *recv_type;
+       GtkWidget *recv_label;
        GtkWidget *recv_server;
        GtkWidget *recv_username;
        GtkWidget *recv_password;
+       GtkWidget *recv_username_label;
+       GtkWidget *recv_password_label;
+       GtkWidget *recv_imap_label;
+       GtkWidget *recv_imap_subdir;
 
 #ifdef USE_OPENSSL
        GtkWidget *smtp_use_ssl;
@@ -88,24 +101,144 @@ typedef struct
        
        gboolean create_mailbox;
        gboolean finished;
+       gboolean result;
+
 } WizardWindow;
 
-static void wizard_write_config(WizardWindow *wizard)
+static void initialize_fonts(WizardWindow *wizard)
+{
+       GtkWidget *widget = wizard->email;
+       gint size = pango_font_description_get_size(
+                       widget->style->font_desc)
+                     /PANGO_SCALE;
+       gchar *tmp, *new;
+       
+       tmp = g_strdup(prefs_common.textfont);
+       if (strrchr(tmp, ' ')) {
+               *(strrchr(tmp, ' ')) = '\0';
+               new = g_strdup_printf("%s %d", tmp, size);
+               g_free(prefs_common.textfont);
+               prefs_common.textfont = new;
+       }
+       g_free(tmp);
+       
+       tmp = g_strdup(prefs_common.smallfont);
+       if (strrchr(tmp, ' ')) {
+               *(strrchr(tmp, ' ')) = '\0';
+               new = g_strdup_printf("%s %d", tmp, size);
+               g_free(prefs_common.smallfont);
+               prefs_common.smallfont = new;
+       }
+       g_free(tmp);
+       
+       tmp = g_strdup(prefs_common.normalfont);
+       if (strrchr(tmp, ' ')) {
+               *(strrchr(tmp, ' ')) = '\0';
+               new = g_strdup_printf("%s %d", tmp, size);
+               g_free(prefs_common.normalfont);
+               prefs_common.normalfont = new;
+       }
+       g_free(tmp);
+}
+
+static void write_welcome_email(WizardWindow *wizard)
+{
+       gchar buf_date[64];
+       gchar *body=NULL;
+       const gchar *mailbox = gtk_entry_get_text(GTK_ENTRY(wizard->mailbox_name));
+       Folder *folder = folder_find_from_path(mailbox);
+       FolderItem *inbox = folder ? folder->inbox:NULL;
+       gchar *file = get_tmp_file();
+       
+       get_rfc822_date(buf_date, sizeof(buf_date));
+
+       body = g_strdup_printf(
+               "From: Sylpheed-Claws Team <sylpheed-claws-users@lists.sf.net>\n"
+               "To: %s <%s>\n"
+               "Date: %s\n"
+               "Subject: Welcome to Sylpheed-Claws.\n"
+               "\n"
+               "Welcome to Sylpheed-Claws\n"
+               "-------------------------\n"
+               "\n"
+               "Now that you have set up your account you can fetch your\n"
+               "mail by clicking the 'Get All' button at the left of the\n"
+               "toolbar.\n"
+               "\n"
+               "You can change your Account Preferences by using the menu\n"
+               "entry '/Configuration/Preferences for current account'\n"
+               "and change the general Preferences by using\n"
+               "'/Configuration/Preferences'.\n"
+               "\n"
+               "You can find futher information in the Sylpheed-Claws manual,\n"
+               "which can be accessed by using the menu entry '/Help/Manual'\n"
+               "or online at the URL given below.\n"
+               "\n"
+               "Useful URLs\n"
+               "-----------\n"
+               "Homepage:      <http://claws.sylpheed.org>\n"
+               "Manual:        <http://claws.sylpheed.org/manual/>\n"
+               "FAQ:          <http://claws.sylpheed.org/faq.php>\n"
+               "Themes:        <http://claws.sylpheed.org/themes.php>\n"
+               "Mailing Lists: <http://claws.sylpheed.org/MLs.php>\n"
+               "\n"
+               "LICENSE\n"
+               "-------\n"
+               "Sylpheed-Claws is free software, released under the terms\n"
+               "of the GNU General Public License, version 2 or later, as\n"
+               "published by the Free Software Foundation, 51 Franklin Street,\n"
+               "Fifth Floor, Boston, MA 02110-1301, USA. The license can be\n"
+               "found at <http://www.gnu.org/licenses/gpl.html>.\n"
+               "\n"
+               "DONATIONS\n"
+               "---------\n"
+               "If you wish to donate to the Sylpheed-Claws project you can do\n"
+               "so at <https://sourceforge.net/donate/index.php?group_id=25528>.",             
+               gtk_entry_get_text(GTK_ENTRY(wizard->full_name)),
+               gtk_entry_get_text(GTK_ENTRY(wizard->email)),
+               buf_date);
+       
+       if (inbox && inbox->total_msgs == 0
+        && str_write_to_file(body, file) >= 0) {
+               MsgFlags flags = { MSG_UNREAD|MSG_NEW, 0};
+               folder_item_add_msg(inbox, file, &flags, FALSE);
+       }
+       g_free(body);
+       g_unlink(file); 
+}
+static gboolean wizard_write_config(WizardWindow *wizard)
 {
        gboolean mailbox_ok = FALSE;
        PrefsAccount *prefs_account = prefs_account_new();
        GList *account_list = NULL;
        GtkWidget *menu, *menuitem;
-       int tmp;
        
-       if (wizard->create_mailbox) {
+       menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(wizard->recv_type));
+       menuitem = gtk_menu_get_active(GTK_MENU(menu));
+       prefs_account->protocol = GPOINTER_TO_INT
+                       (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
+       
+       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;
        }
-
-       prefs_account->account_name = g_strdup_printf("%s@%s",
+       
+       if (prefs_account->protocol != A_LOCAL)
+               prefs_account->account_name = g_strdup_printf("%s@%s",
                                gtk_entry_get_text(GTK_ENTRY(wizard->recv_username)),
                                gtk_entry_get_text(GTK_ENTRY(wizard->recv_server)));
+       else
+               prefs_account->account_name = g_strdup_printf("%s",
+                               gtk_entry_get_text(GTK_ENTRY(wizard->recv_server)));
+
        prefs_account->name = g_strdup(
                                gtk_entry_get_text(GTK_ENTRY(wizard->full_name)));
        prefs_account->address = g_strdup(
@@ -114,31 +247,48 @@ static void wizard_write_config(WizardWindow *wizard)
                                gtk_entry_get_text(GTK_ENTRY(wizard->organization)));
        prefs_account->smtp_server = g_strdup(
                                gtk_entry_get_text(GTK_ENTRY(wizard->smtp_server)));
-       prefs_account->recv_server = g_strdup(
+
+       if (prefs_account->protocol != A_LOCAL)
+               prefs_account->recv_server = g_strdup(
                                gtk_entry_get_text(GTK_ENTRY(wizard->recv_server)));
+       else
+               prefs_account->local_mbox = g_strdup(
+                               gtk_entry_get_text(GTK_ENTRY(wizard->recv_server)));
+
        prefs_account->userid = g_strdup(
                                gtk_entry_get_text(GTK_ENTRY(wizard->recv_username)));
        prefs_account->passwd = g_strdup(
                                gtk_entry_get_text(GTK_ENTRY(wizard->recv_password)));
 
-       menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(wizard->recv_type));
-       menuitem = gtk_menu_get_active(GTK_MENU(menu));
-       prefs_account->protocol = GPOINTER_TO_INT
-                       (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
-
 #ifdef USE_OPENSSL                     
        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wizard->smtp_use_ssl)))
                prefs_account->ssl_smtp = SSL_TUNNEL;
-       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wizard->smtp_use_ssl)))
+       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wizard->recv_use_ssl))) {
                if (prefs_account->protocol == A_IMAP4)
                        prefs_account->ssl_imap = SSL_TUNNEL;
                else
                        prefs_account->ssl_pop = SSL_TUNNEL;
+       }
 #endif
+       if (prefs_account->protocol == A_IMAP4) {
+               gchar *directory = gtk_editable_get_chars(
+                       GTK_EDITABLE(wizard->recv_imap_subdir), 0, -1);
+               if (directory && strlen(directory)) {
+                       prefs_account->imap_dir = g_strdup(directory);
+               }
+               g_free(directory);
+       }
 
        account_list = g_list_append(account_list, prefs_account);
        prefs_account_write_config_all(account_list);
        prefs_account_free(prefs_account);
+       account_read_config_all();
+
+       initialize_fonts(wizard);
+       if (wizard->create_mailbox && prefs_account->protocol != A_IMAP4)
+               write_welcome_email(wizard);
+       
+       return TRUE;
 }
 
 static GtkWidget* create_page (WizardWindow *wizard, const char * title)
@@ -171,31 +321,18 @@ static GtkWidget* create_page (WizardWindow *wizard, const char * title)
 
        /* pack space */
        w = gtk_alignment_new (0, 0, 0, 0);
-       gtk_widget_set_usize (w, 0, 6);
+       gtk_widget_set_size_request (w, 0, 6);
        gtk_box_pack_start (GTK_BOX(vbox), w, FALSE, FALSE, 0);
 
        return vbox;
 }
 
-static GtkWidget*
-create_page_with_text (WizardWindow *wizard, const char * title, 
-                       const char * text)
-{
-       GtkWidget *label;
-       GtkWidget *page;
-       
-       page = create_page (wizard, title);
-       label = gtk_label_new (text);
-       gtk_box_pack_start (GTK_BOX(page), label, TRUE, TRUE, 0);
-
-       return page;
-}
-
 #define GTK_TABLE_ADD_ROW_AT(table,text,entry,i) {                           \
        GtkWidget *label = gtk_label_new(text);                               \
        gtk_table_attach(GTK_TABLE(table), label,                             \
                         0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            \
-       gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);                      \
+       if (GTK_IS_MISC(label))                                               \
+               gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);              \
        gtk_table_attach(GTK_TABLE(table), entry,                             \
                         1,2,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            \
 }
@@ -217,6 +354,60 @@ static gchar *get_default_email_addr(void)
        return result;
 }
 
+static gchar *get_default_server(WizardWindow * wizard, const gchar *type)
+{
+       gchar *domain_name = g_strdup(get_domain_name());
+       gchar *result;
+       
+       if (strchr(domain_name, '.') != strrchr(domain_name, '.')
+       && strlen(strchr(domain_name, '.')) > 6) {
+               gchar *tmp = g_strdup(strchr(domain_name, '.')+1);
+               g_free(domain_name);
+               domain_name = tmp;
+       } else if (strchr(domain_name, '.') == NULL) {
+               /* only hostname found, use email suffix */
+               gchar *mail;
+               mail = gtk_editable_get_chars(GTK_EDITABLE(wizard->email), 0, -1);
+
+               if (strlen (mail) && strstr(mail, "@")) {
+                       g_free(domain_name);
+                       domain_name = g_strdup(strstr(mail, "@")+1);
+               }
+               g_free(mail);
+       }
+       result = g_strdup_printf("%s.%s",
+                               type, domain_name);
+       g_free(domain_name);
+       return result;
+}
+
+static void wizard_email_changed(GtkWidget *widget, gpointer data)
+{
+       WizardWindow *wizard = (WizardWindow *)data;
+       RecvProtocol protocol;
+       gchar *text;
+       protocol = GPOINTER_TO_INT
+               (g_object_get_data(G_OBJECT(wizard->recv_type), MENU_VAL_ID));
+       
+       text = get_default_server(wizard, "smtp");
+       gtk_entry_set_text(GTK_ENTRY(wizard->smtp_server), text);
+       g_free(text);
+
+       if (protocol == A_POP3) {
+               text = get_default_server(wizard, "pop");
+               gtk_entry_set_text(GTK_ENTRY(wizard->recv_server), text);
+               g_free(text);
+       } else if (protocol == A_IMAP4) {
+               text = get_default_server(wizard, "imap");
+               gtk_entry_set_text(GTK_ENTRY(wizard->recv_server), text);
+               g_free(text);
+       } else if (protocol == A_LOCAL) {
+               gchar *mbox = g_strdup_printf("/var/mail/%s", g_get_user_name());
+               gtk_entry_set_text(GTK_ENTRY(wizard->recv_server), mbox);
+               g_free(mbox);
+       }
+}
+
 static GtkWidget* user_page (WizardWindow * wizard)
 {
        GtkWidget *table = gtk_table_new(3,2, FALSE);
@@ -242,13 +433,15 @@ static GtkWidget* user_page (WizardWindow * wizard)
        GTK_TABLE_ADD_ROW_AT(table, _("Your organization:"), 
                             wizard->organization, i); i++;
        
+       g_signal_connect(G_OBJECT(wizard->email), "changed",
+                        G_CALLBACK(wizard_email_changed),
+                        wizard);
        return table;
 }
 
 static GtkWidget* mailbox_page (WizardWindow * wizard)
 {
        GtkWidget *table = gtk_table_new(1,2, FALSE);
-       gchar *text;
        gint i = 0;
        
        gtk_table_set_row_spacings(GTK_TABLE(table), 4);
@@ -262,22 +455,6 @@ static GtkWidget* mailbox_page (WizardWindow * wizard)
        return table;
 }
 
-static gchar *get_default_server(const gchar *type)
-{
-       gchar *domain_name = g_strdup(get_domain_name());
-       gchar *result;
-       if (strchr(domain_name, '.') != strrchr(domain_name, '.')
-       && strlen(strchr(domain_name, '.')) > 6) {
-               gchar *tmp = g_strdup(strchr(domain_name, '.')+1);
-               g_free(domain_name);
-               domain_name = tmp;
-       }
-       result = g_strdup_printf("%s.%s",
-                               type, domain_name);
-       g_free(domain_name);
-       return result;
-}
-
 static GtkWidget* smtp_page (WizardWindow * wizard)
 {
        GtkWidget *table = gtk_table_new(1,2, FALSE);
@@ -288,7 +465,7 @@ static GtkWidget* smtp_page (WizardWindow * wizard)
        gtk_table_set_col_spacings(GTK_TABLE(table), 8);
 
        wizard->smtp_server = gtk_entry_new();
-       text = get_default_server("smtp");
+       text = get_default_server(wizard, "smtp");
        gtk_entry_set_text(GTK_ENTRY(wizard->smtp_server), text);
        g_free(text);
        GTK_TABLE_ADD_ROW_AT(table, _("SMTP server address:"), 
@@ -305,13 +482,38 @@ static void wizard_protocol_changed(GtkMenuItem *menuitem, gpointer data)
                (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
        
        if (protocol == A_POP3) {
-               text = get_default_server("pop");
+               text = get_default_server(wizard, "pop");
                gtk_entry_set_text(GTK_ENTRY(wizard->recv_server), text);
+               gtk_widget_hide(wizard->recv_imap_label);
+               gtk_widget_hide(wizard->recv_imap_subdir);
+               gtk_widget_show(wizard->recv_username);
+               gtk_widget_show(wizard->recv_password);
+               gtk_widget_show(wizard->recv_username_label);
+               gtk_widget_show(wizard->recv_password_label);
+               gtk_label_set_text(GTK_LABEL(wizard->recv_label), _("Server address:"));
                g_free(text);
-       } else {
-               text = get_default_server("imap");
+       } else if (protocol == A_IMAP4) {
+               text = get_default_server(wizard, "imap");
                gtk_entry_set_text(GTK_ENTRY(wizard->recv_server), text);
+               gtk_widget_show(wizard->recv_imap_label);
+               gtk_widget_show(wizard->recv_imap_subdir);
+               gtk_widget_show(wizard->recv_username);
+               gtk_widget_show(wizard->recv_password);
+               gtk_widget_show(wizard->recv_username_label);
+               gtk_widget_show(wizard->recv_password_label);
+               gtk_label_set_text(GTK_LABEL(wizard->recv_label), _("Server address:"));
                g_free(text);
+       } else if (protocol == A_LOCAL) {
+               gchar *mbox = g_strdup_printf("/var/mail/%s", g_get_user_name());
+               gtk_entry_set_text(GTK_ENTRY(wizard->recv_server), mbox);
+               g_free(mbox);
+               gtk_label_set_text(GTK_LABEL(wizard->recv_label), _("Local mailbox:"));
+               gtk_widget_hide(wizard->recv_imap_label);
+               gtk_widget_hide(wizard->recv_imap_subdir);
+               gtk_widget_hide(wizard->recv_username);
+               gtk_widget_hide(wizard->recv_password);
+               gtk_widget_hide(wizard->recv_username_label);
+               gtk_widget_hide(wizard->recv_password_label);
        }
 }
 
@@ -336,26 +538,61 @@ static GtkWidget* recv_page (WizardWindow * wizard)
        g_signal_connect(G_OBJECT(menuitem), "activate",
                         G_CALLBACK(wizard_protocol_changed),
                         wizard);
+       MENUITEM_ADD (menu, menuitem, _("Local mbox file"), A_LOCAL);
+       g_signal_connect(G_OBJECT(menuitem), "activate",
+                        G_CALLBACK(wizard_protocol_changed),
+                        wizard);
+
        gtk_option_menu_set_menu (GTK_OPTION_MENU (wizard->recv_type), menu);
        GTK_TABLE_ADD_ROW_AT(table, _("Server type:"), 
                             wizard->recv_type, i); i++;
 
        wizard->recv_server = gtk_entry_new();
-       text = get_default_server("pop");
+       text = get_default_server(wizard, "pop");
        gtk_entry_set_text(GTK_ENTRY(wizard->recv_server), text);
        g_free(text);
-       GTK_TABLE_ADD_ROW_AT(table, _("Server address:"), 
-                            wizard->recv_server, i); i++;
+       
+       wizard->recv_label = gtk_label_new(_("Server address:"));
+       gtk_table_attach(GTK_TABLE(table), wizard->recv_label,                        
+                        0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            
+       if (GTK_IS_MISC(wizard->recv_label))                                                  
+               gtk_misc_set_alignment(GTK_MISC(wizard->recv_label), 1, 0.5);         
+       gtk_table_attach(GTK_TABLE(table), wizard->recv_server,       
+                        1,2,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            
+       i++;
        
        wizard->recv_username = gtk_entry_new();
-       gtk_entry_set_text(GTK_ENTRY(wizard->recv_username), g_get_user_name());
-       GTK_TABLE_ADD_ROW_AT(table, _("Username:"), 
-                            wizard->recv_username, i); i++;
+       wizard->recv_username_label = gtk_label_new(_("Username:"));
+       gtk_table_attach(GTK_TABLE(table), wizard->recv_username_label,                               
+                        0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            
+       if (GTK_IS_MISC(wizard->recv_username_label))                                                 
+               gtk_misc_set_alignment(GTK_MISC(wizard->recv_username_label), 1, 0.5);        
+       gtk_table_attach(GTK_TABLE(table), wizard->recv_username,             
+                        1,2,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            
+       i++;
        
        wizard->recv_password = gtk_entry_new();
+       wizard->recv_password_label = gtk_label_new(_("Password:"));
+       gtk_table_attach(GTK_TABLE(table), wizard->recv_password_label,                               
+                        0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            
+       if (GTK_IS_MISC(wizard->recv_password_label))                                                 
+               gtk_misc_set_alignment(GTK_MISC(wizard->recv_password_label), 1, 0.5);        
+       gtk_table_attach(GTK_TABLE(table), wizard->recv_password,             
+                        1,2,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            
        gtk_entry_set_visibility(GTK_ENTRY(wizard->recv_password), FALSE);
-       GTK_TABLE_ADD_ROW_AT(table, _("Password:"), 
-                            wizard->recv_password, i); i++;
+       i++;
+       
+       wizard->recv_imap_subdir = gtk_entry_new();
+       wizard->recv_imap_label = gtk_label_new(_("IMAP server directory:"));
+       
+       gtk_table_attach(GTK_TABLE(table), wizard->recv_imap_label,                           
+                        0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            
+       if (GTK_IS_MISC(wizard->recv_imap_label))                                                     
+               gtk_misc_set_alignment(GTK_MISC(wizard->recv_imap_label), 1, 0.5);            
+       gtk_table_attach(GTK_TABLE(table), wizard->recv_imap_subdir,          
+                        1,2,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            
+
+       i++;
        
        return table;
 }
@@ -364,7 +601,6 @@ static GtkWidget* recv_page (WizardWindow * wizard)
 static GtkWidget* ssl_page (WizardWindow * wizard)
 {
        GtkWidget *table = gtk_table_new(2,2, FALSE);
-       gchar *text;
        gint i = 0;
        
        gtk_table_set_row_spacings(GTK_TABLE(table), 4);
@@ -374,13 +610,11 @@ static GtkWidget* ssl_page (WizardWindow * wizard)
                                        _("Use SSL to connect to SMTP server"));
        gtk_table_attach(GTK_TABLE(table), wizard->smtp_use_ssl,      
                         0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0); i++;
-       gtk_misc_set_alignment(GTK_MISC(wizard->smtp_use_ssl), 0, 0.5);
        
        wizard->recv_use_ssl = gtk_check_button_new_with_label(
                                        _("Use SSL to connect to receiving server"));
        gtk_table_attach(GTK_TABLE(table), wizard->recv_use_ssl,      
                         0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
-       gtk_misc_set_alignment(GTK_MISC(wizard->recv_use_ssl), 0, 0.5);
        
        return table;
 }
@@ -391,18 +625,34 @@ wizard_response_cb (GtkDialog * dialog, int response, gpointer data)
 {
        WizardWindow * wizard = (WizardWindow *)data;
        int current_page, num_pages;
+       GtkWidget *menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(wizard->recv_type));
+       GtkWidget *menuitem = gtk_menu_get_active(GTK_MENU(menu));
+       gint protocol = GPOINTER_TO_INT
+                       (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
+       gboolean skip_mailbox_page = FALSE;
+       
+       if (protocol == A_IMAP4) {
+               skip_mailbox_page = TRUE;
+       }
        
        num_pages = g_slist_length(wizard->pages);
+
        current_page = gtk_notebook_get_current_page (
                                GTK_NOTEBOOK(wizard->notebook));
        if (response == CANCEL)
        {
+               wizard->result = FALSE;
                wizard->finished = TRUE;
                gtk_widget_destroy (GTK_WIDGET(dialog));
        }
        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->result = TRUE;
                wizard->finished = TRUE;
                gtk_widget_destroy (GTK_WIDGET(dialog));
        }
@@ -410,35 +660,59 @@ wizard_response_cb (GtkDialog * dialog, int response, gpointer data)
        {
                if (response == GO_BACK)
                {
-                       if (current_page > 0)
+                       if (current_page > 0) {
+                               current_page--;
+                               if (current_page == 4 && skip_mailbox_page) {
+                                       /* mailbox */
+                                       current_page--;
+                               }
                                gtk_notebook_set_current_page (
                                        GTK_NOTEBOOK(wizard->notebook), 
-                                       --current_page);
+                                       current_page);
+                       }
                }
                else if (response == GO_FORWARD)
                {
-                       if (current_page < (num_pages-1))
+                       if (current_page < (num_pages-1)) {
+                               current_page++;
+                               if (current_page == 4 && skip_mailbox_page) {
+                                       /* mailbox */
+                                       current_page++;
+                               }
                                gtk_notebook_set_current_page (
                                        GTK_NOTEBOOK(wizard->notebook), 
-                                       ++current_page);
+                                       current_page);
+                       }
                }
-
+set_sens:
                gtk_dialog_set_response_sensitive (dialog, GO_BACK, 
                                current_page > 0);
                gtk_dialog_set_response_sensitive (dialog, GO_FORWARD, 
                                current_page < (num_pages - 1));
                gtk_dialog_set_response_sensitive (dialog, FINISHED, 
                                current_page == (num_pages - 1));
+               gtk_dialog_set_response_sensitive (dialog, CANCEL, 
+                               current_page != (num_pages - 1));
        }
 }
 
+static gint wizard_close_cb(GtkWidget *widget, GdkEventAny *event,
+                                gpointer data)
+{
+       WizardWindow *wizard = (WizardWindow *)data;
+       wizard->result = FALSE;
+       wizard->finished = TRUE;
+       
+       return FALSE;
+}
 
 gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) {
        WizardWindow *wizard = g_new0(WizardWindow, 1);
        GtkWidget *page;
        GtkWidget *widget;
        gchar     *text;
-       GSList     *cur;
+       GSList    *cur;
+       gboolean   result;
        
        wizard->mainwin = mainwin;
        wizard->create_mailbox = create_mailbox;
@@ -475,7 +749,7 @@ gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) {
        
        wizard->pages = NULL;
        
-/*welcome page */
+/*welcome page: 0 */
        page = create_page(wizard, _("Welcome to Sylpheed-Claws."));
        
        wizard->pages = g_slist_append(wizard->pages, page);
@@ -494,48 +768,71 @@ gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) {
        gtk_box_pack_start (GTK_BOX(page), widget, FALSE, FALSE, 0);
        g_free(text);
 
-/* user page */
+/* user page: 1 */
        widget = create_page (wizard, _("About You"));
        gtk_box_pack_start (GTK_BOX(widget), user_page(wizard), FALSE, FALSE, 0);
        wizard->pages = g_slist_append(wizard->pages, widget);
 
-/* mailbox page */
-       if (create_mailbox) {
-               widget = create_page (wizard, _("Saving mail on disk"));
-               gtk_box_pack_start (GTK_BOX(widget), mailbox_page(wizard), FALSE, FALSE, 0);
-               wizard->pages = g_slist_append(wizard->pages, widget);
-       }
-/*smtp page */
+/*smtp page: 2 */
        widget = create_page (wizard, _("Sending mail"));
        gtk_box_pack_start (GTK_BOX(widget), smtp_page(wizard), FALSE, FALSE, 0);
        wizard->pages = g_slist_append(wizard->pages, widget);
 
-/* recv+auth page */
+/* recv+auth page: 3 */
        widget = create_page (wizard, _("Receiving mail"));
        gtk_box_pack_start (GTK_BOX(widget), recv_page(wizard), FALSE, FALSE, 0);
        wizard->pages = g_slist_append(wizard->pages, widget);
 
-/* ssl page */
+/* mailbox page: 4 */
+       if (create_mailbox) {
+               widget = create_page (wizard, _("Saving mail on disk"));
+               gtk_box_pack_start (GTK_BOX(widget), mailbox_page(wizard), FALSE, FALSE, 0);
+               wizard->pages = g_slist_append(wizard->pages, widget);
+       }
+/* ssl page: 5 */
 #ifdef USE_OPENSSL
        widget = create_page (wizard, _("Security"));
        gtk_box_pack_start (GTK_BOX(widget), ssl_page(wizard), FALSE, FALSE, 0);
        wizard->pages = g_slist_append(wizard->pages, widget);
 #endif
+
+/* done page: 6 */
+       page = create_page(wizard, _("Configuration finished."));
+       
+       wizard->pages = g_slist_append(wizard->pages, page);
+       widget = stock_pixmap_widget(wizard->window, 
+                               STOCK_PIXMAP_SYLPHEED_LOGO);
+
+       gtk_box_pack_start (GTK_BOX(page), widget, FALSE, FALSE, 0);
        
+       text = g_strdup(_("Sylpheed-Claws is now ready to run.\n\n"
+                         "Click Save to start."));
+       widget = gtk_label_new(text);
+       gtk_box_pack_start (GTK_BOX(page), widget, FALSE, FALSE, 0);
+       g_free(text);
+
+
        for (cur = wizard->pages; cur && cur->data; cur = cur->next) {
                gtk_notebook_append_page (GTK_NOTEBOOK(wizard->notebook), 
                                          GTK_WIDGET(cur->data), NULL);
        }
        
+       g_signal_connect(G_OBJECT(wizard->window), "delete_event",
+                        G_CALLBACK(wizard_close_cb), wizard);
        gtk_widget_show_all (wizard->window);
 
+       gtk_widget_hide(wizard->recv_imap_label);
+       gtk_widget_hide(wizard->recv_imap_subdir);
+
        while (!wizard->finished)
                gtk_main_iteration();
 
+       result = wizard->result;
+       
        GTK_EVENTS_FLUSH();
 
        gtk_widget_show(mainwin->window);
        g_free(wizard);
 
-       return TRUE;
+       return result;
 }