separated UI code from prefs_common.c and prefs_account.c.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@533 ee746299-78ed-0310-b773-934348b2243d

1 files changed, 88 insertions, 2192 deletions

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 8cd55299..825f85df 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -25,8 +25,6 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -34,493 +32,130 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include "main.h"
 #include "prefs.h"
-#include "prefs_ui.h"
 #include "prefs_account.h"
 #include "prefs_customheader.h"
 #include "prefs_common.h"
 #include "account.h"
-#include "mainwindow.h"
-#include "manage_window.h"
-#include "foldersel.h"
-#include "inc.h"
-#include "menu.h"
-#include "gtkutils.h"
 #include "utils.h"
-#include "alertpanel.h"
 #include "smtp.h"
 #include "imap.h"
 
-static gboolean cancelled;
-
 static PrefsAccount tmp_ac_prefs;
 
-static PrefsDialog dialog;
-
-static struct Basic {
-	GtkWidget *acname_entry;
-	GtkWidget *default_chkbtn;
-
-	GtkWidget *name_entry;
-	GtkWidget *addr_entry;
-	GtkWidget *org_entry;
-
-	GtkWidget *serv_frame;
-	GtkWidget *serv_table;
-	GtkWidget *protocol_optmenu;
-	GtkWidget *recvserv_label;
-	GtkWidget *smtpserv_label;
-	GtkWidget *nntpserv_label;
-	GtkWidget *recvserv_entry;
-	GtkWidget *smtpserv_entry;
-	GtkWidget *nntpserv_entry;
-	GtkWidget *nntpauth_chkbtn;
-	GtkWidget *uid_label;
-	GtkWidget *pass_label;
-	GtkWidget *uid_entry;
-	GtkWidget *pass_entry;
-} basic;
-
-static struct Receive {
-	GtkWidget *pop3_frame;
-	GtkWidget *use_apop_chkbtn;
-	GtkWidget *rmmail_chkbtn;
-	GtkWidget *leave_time_entry;
-	GtkWidget *getall_chkbtn;
-	GtkWidget *size_limit_chkbtn;
-	GtkWidget *size_limit_entry;
-	GtkWidget *filter_on_recv_chkbtn;
-	GtkWidget *inbox_label;
-	GtkWidget *inbox_entry;
-	GtkWidget *inbox_btn;
-
-	GtkWidget *imap_frame;
-	GtkWidget *imap_auth_type_optmenu;
-
-	GtkWidget *nntp_frame;
-	GtkWidget *maxarticle_spinbtn;
-	GtkObject *maxarticle_spinbtn_adj;
-
-	GtkWidget *recvatgetall_chkbtn;
-} receive;
-
-static struct Send {
-	GtkWidget *date_chkbtn;
-	GtkWidget *msgid_chkbtn;
-
-	GtkWidget *customhdr_chkbtn;
-
-	GtkWidget *smtp_auth_chkbtn;
-	GtkWidget *smtp_auth_type_optmenu;
-	GtkWidget *smtp_uid_entry;
-	GtkWidget *smtp_pass_entry;
-	/* GtkWidget *pop_bfr_smtp_chkbtn; */
-} p_send;
-
-static struct Compose {
-	GtkWidget *sigfile_radiobtn;
-	GtkWidget *sigpath_entry;
-
-	GtkWidget *autocc_chkbtn;
-	GtkWidget *autocc_entry;
-	GtkWidget *autobcc_chkbtn;
-	GtkWidget *autobcc_entry;
-	GtkWidget *autoreplyto_chkbtn;
-	GtkWidget *autoreplyto_entry;
-} compose;
-
-#if USE_GPGME
-static struct Privacy {
-	GtkWidget *default_sign_chkbtn;
-	GtkWidget *default_encrypt_chkbtn;
-	GtkWidget *encrypt_reply_chkbtn;
-	GtkWidget *ascii_armored_chkbtn;
-	GtkWidget *clearsign_chkbtn;
-	GtkWidget *defaultkey_radiobtn;
-	GtkWidget *emailkey_radiobtn;
-	GtkWidget *customkey_radiobtn;
-	GtkWidget *customkey_entry;
-} privacy;
-#endif /* USE_GPGME */
-
-#if USE_SSL
-static struct SSLPrefs {
-	GtkWidget *pop_frame;
-	GtkWidget *pop_nossl_radiobtn;
-	GtkWidget *pop_ssltunnel_radiobtn;
-	GtkWidget *pop_starttls_radiobtn;
-
-	GtkWidget *imap_frame;
-	GtkWidget *imap_nossl_radiobtn;
-	GtkWidget *imap_ssltunnel_radiobtn;
-	GtkWidget *imap_starttls_radiobtn;
-
-	GtkWidget *nntp_frame;
-	GtkWidget *nntp_nossl_radiobtn;
-	GtkWidget *nntp_ssltunnel_radiobtn;
-
-	GtkWidget *send_frame;
-	GtkWidget *smtp_nossl_radiobtn;
-	GtkWidget *smtp_ssltunnel_radiobtn;
-	GtkWidget *smtp_starttls_radiobtn;
-
-	GtkWidget *use_nonblocking_ssl_chkbtn;
-} ssl;
-#endif /* USE_SSL */
-
-static struct Advanced {
-	GtkWidget *smtpport_chkbtn;
-	GtkWidget *smtpport_entry;
-	GtkWidget *popport_hbox;
-	GtkWidget *popport_chkbtn;
-	GtkWidget *popport_entry;
-	GtkWidget *imapport_hbox;
-	GtkWidget *imapport_chkbtn;
-	GtkWidget *imapport_entry;
-	GtkWidget *nntpport_hbox;
-	GtkWidget *nntpport_chkbtn;
-	GtkWidget *nntpport_entry;
-	GtkWidget *domain_chkbtn;
-	GtkWidget *domain_entry;
-
-	GtkWidget *imap_frame;
-	GtkWidget *imapdir_entry;
-
-	GtkWidget *sent_folder_chkbtn;
-	GtkWidget *sent_folder_entry;
-	GtkWidget *draft_folder_chkbtn;
-	GtkWidget *draft_folder_entry;
-	GtkWidget *trash_folder_chkbtn;
-	GtkWidget *trash_folder_entry;
-} advanced;
-
-static void prefs_account_protocol_set_data_from_optmenu(PrefParam *pparam);
-static void prefs_account_protocol_set_optmenu		(PrefParam *pparam);
-static void prefs_account_protocol_activated		(GtkMenuItem *menuitem);
-
-static void prefs_account_imap_auth_type_set_data_from_optmenu
-							(PrefParam *pparam);
-static void prefs_account_imap_auth_type_set_optmenu	(PrefParam *pparam);
-static void prefs_account_smtp_auth_type_set_data_from_optmenu
-							(PrefParam *pparam);
-static void prefs_account_smtp_auth_type_set_optmenu	(PrefParam *pparam);
-
-static void prefs_account_enum_set_data_from_radiobtn	(PrefParam *pparam);
-static void prefs_account_enum_set_radiobtn		(PrefParam *pparam);
-
-#if USE_GPGME
-static void prefs_account_ascii_armored_warning		(GtkWidget *widget);
-#endif /* USE_GPGME */
-
 static PrefParam param[] = {
 	/* Basic */
-	{"account_name", NULL, &tmp_ac_prefs.account_name, P_STRING,
-	 P_WID(&basic.acname_entry),
-	 prefs_set_data_from_entry, prefs_set_entry},
-
-	{"is_default", "FALSE", &tmp_ac_prefs.is_default, P_BOOL,
-	 P_WID(&basic.default_chkbtn),
-	 prefs_set_data_from_toggle, prefs_set_toggle},
-
-	{"name", NULL, &tmp_ac_prefs.name, P_STRING,
-	 P_WID(&basic.name_entry), prefs_set_data_from_entry, prefs_set_entry},
-
-	{"address", NULL, &tmp_ac_prefs.address, P_STRING,
-	 P_WID(&basic.addr_entry), prefs_set_data_from_entry, prefs_set_entry},
-
-	{"organization", NULL, &tmp_ac_prefs.organization, P_STRING,
-	 P_WID(&basic.org_entry), prefs_set_data_from_entry, prefs_set_entry},
-
-	{"protocol", NULL, &tmp_ac_prefs.protocol, P_ENUM,
-	 P_WID(&basic.protocol_optmenu),
-	 prefs_account_protocol_set_data_from_optmenu,
-	 prefs_account_protocol_set_optmenu},
-
-	{"receive_server", NULL, &tmp_ac_prefs.recv_server, P_STRING,
-	 P_WID(&basic.recvserv_entry),
-	 prefs_set_data_from_entry, prefs_set_entry},
-
-	{"smtp_server", NULL, &tmp_ac_prefs.smtp_server, P_STRING,
-	 P_WID(&basic.smtpserv_entry),
-	 prefs_set_data_from_entry, prefs_set_entry},
-
-	{"nntp_server", NULL, &tmp_ac_prefs.nntp_server, P_STRING,
-	 P_WID(&basic.nntpserv_entry),
-	 prefs_set_data_from_entry, prefs_set_entry},
-
-	{"use_nntp_auth", "FALSE", &tmp_ac_prefs.use_nntp_auth, P_BOOL,
-	 P_WID(&basic.nntpauth_chkbtn),
-	 prefs_set_data_from_toggle, prefs_set_toggle},
-
-	{"user_id", "ENV_USER", &tmp_ac_prefs.userid, P_STRING,
-	 P_WID(&basic.uid_entry), prefs_set_data_from_entry, prefs_set_entry},
-
-	{"password", NULL, &tmp_ac_prefs.passwd, P_STRING,
-	 P_WID(&basic.pass_entry), prefs_set_data_from_entry, prefs_set_entry},
-
-	{"inbox", "inbox", &tmp_ac_prefs.inbox, P_STRING,
-	 P_WID(&receive.inbox_entry),
-	 prefs_set_data_from_entry, prefs_set_entry},
+	{"account_name", NULL, &tmp_ac_prefs.account_name, P_STRING},
+	{"is_default", "FALSE", &tmp_ac_prefs.is_default, P_BOOL},
+	{"name", NULL, &tmp_ac_prefs.name, P_STRING},
+	{"address", NULL, &tmp_ac_prefs.address, P_STRING},
+	{"organization", NULL, &tmp_ac_prefs.organization, P_STRING},
+	{"protocol", NULL, &tmp_ac_prefs.protocol, P_ENUM},
+	{"receive_server", NULL, &tmp_ac_prefs.recv_server, P_STRING},
+	{"smtp_server", NULL, &tmp_ac_prefs.smtp_server, P_STRING},
+	{"nntp_server", NULL, &tmp_ac_prefs.nntp_server, P_STRING},
+	{"use_nntp_auth", "FALSE", &tmp_ac_prefs.use_nntp_auth, P_BOOL},
+	{"user_id", "ENV_USER", &tmp_ac_prefs.userid, P_STRING},
+	{"password", NULL, &tmp_ac_prefs.passwd, P_STRING},
+	{"inbox", "inbox", &tmp_ac_prefs.inbox, P_STRING},
 
 	/* Receive */
-	{"use_apop_auth", "FALSE", &tmp_ac_prefs.use_apop_auth, P_BOOL,
-	 P_WID(&receive.use_apop_chkbtn),
-	 prefs_set_data_from_toggle, prefs_set_toggle},
-
-	{"remove_mail", "TRUE", &tmp_ac_prefs.rmmail, P_BOOL,
-	 P_WID(&receive.rmmail_chkbtn),
-	 prefs_set_data_from_toggle, prefs_set_toggle},
-
-	{"message_leave_time", "0", &tmp_ac_prefs.msg_leave_time, P_INT,
-	 P_WID(&receive.leave_time_entry),
-	 prefs_set_data_from_entry, prefs_set_entry},
-
-	{"get_all_mail", "FALSE", &tmp_ac_prefs.getall, P_BOOL,
-	 P_WID(&receive.getall_chkbtn),
-	 prefs_set_data_from_toggle, prefs_set_toggle},
-
-	{"enable_size_limit", "FALSE", &tmp_ac_prefs.enable_size_limit, P_BOOL,
-	 P_WID(&receive.size_limit_chkbtn),
-	 prefs_set_data_from_toggle, prefs_set_toggle},
-	{"size_limit", "1024", &tmp_ac_prefs.size_limit, P_INT,
-	 P_WID(&receive.size_limit_entry),
-	 prefs_set_data_from_entry, prefs_set_entry},
-
-	{"filter_on_receive", "TRUE", &tmp_ac_prefs.filter_on_recv, P_BOOL,
-	 P_WID(&receive.filter_on_recv_chkbtn),
-	 prefs_set_data_from_toggle, prefs_set_toggle},
-
-	{"imap_auth_method", "0", &tmp_ac_prefs.imap_auth_type, P_ENUM,
-	 P_WID(&receive.imap_auth_type_optmenu),
-	 prefs_account_imap_auth_type_set_data_from_optmenu,
-	 prefs_account_imap_auth_type_set_optmenu},
-
-	{"max_nntp_articles", "300", &tmp_ac_prefs.max_nntp_articles, P_INT,
-	 P_WID(&receive.maxarticle_spinbtn),
-	 prefs_set_data_from_spinbtn, prefs_set_spinbtn},
-
-	{"receive_at_get_all", "TRUE", &tmp_ac_prefs.recv_at_getall, P_BOOL,
-	 P_WID(&receive.recvatgetall_chkbtn),
-	 prefs_set_data_from_toggle, prefs_set_toggle},
+	{"use_apop_auth", "FALSE", &tmp_ac_prefs.use_apop_auth, P_BOOL},
+	{"remove_mail", "TRUE", &tmp_ac_prefs.rmmail, P_BOOL},
+	{"message_leave_time", "0", &tmp_ac_prefs.msg_leave_time, P_INT},
+	{"get_all_mail", "FALSE", &tmp_ac_prefs.getall, P_BOOL},
+	{"enable_size_limit", "FALSE", &tmp_ac_prefs.enable_size_limit, P_BOOL},
+	{"size_limit", "1024", &tmp_ac_prefs.size_limit, P_INT},
+	{"filter_on_receive", "TRUE", &tmp_ac_prefs.filter_on_recv, P_BOOL},
+	{"imap_auth_method", "0", &tmp_ac_prefs.imap_auth_type, P_ENUM},
+	{"max_nntp_articles", "300", &tmp_ac_prefs.max_nntp_articles, P_INT},
+	{"receive_at_get_all", "TRUE", &tmp_ac_prefs.recv_at_getall, P_BOOL},
 
 	/* Send */
-	{"add_date", "TRUE", &tmp_ac_prefs.add_date, P_BOOL,
-	 P_WID(&p_send.date_chkbtn),
-	 prefs_set_data_from_toggle, prefs_set_toggle},
-
-	{"generate_msgid", "TRUE", &tmp_ac_prefs.gen_msgid, P_BOOL,
-	 P_WID(&p_send.msgid_chkbtn),
-	 prefs_set_data_from_toggle, prefs_set_toggle},
-
-	{"add_custom_header", "FALSE", &tmp_ac_prefs.add_customhdr, P_BOOL,
-	 P_WID(&p_send.customhdr_chkbtn),
-	 prefs_set_data_from_toggle, prefs_set_toggle},
-
-	{"use_smtp_auth", "FALSE", &tmp_ac_prefs.use_smtp_auth, P_BOOL,
-	 P_WID(&p_send.smtp_auth_chkbtn),
-	 prefs_set_data_from_toggle, prefs_set_toggle},
-
-	{"smtp_auth_method", "0", &tmp_ac_prefs.smtp_auth_type, P_ENUM,
-	 P_WID(&p_send.smtp_auth_type_optmenu),
-	 prefs_account_smtp_auth_type_set_data_from_optmenu,
-	 prefs_account_smtp_auth_type_set_optmenu},
-
-	{"smtp_user_id", NULL, &tmp_ac_prefs.smtp_userid, P_STRING,
-	 P_WID(&p_send.smtp_uid_entry),
-	 prefs_set_data_from_entry, prefs_set_entry},
-	{"smtp_password", NULL, &tmp_ac_prefs.smtp_passwd, P_STRING,
-	 P_WID(&p_send.smtp_pass_entry),
-	 prefs_set_data_from_entry, prefs_set_entry},
-
-	{"pop_before_smtp", "FALSE", &tmp_ac_prefs.pop_before_smtp, P_BOOL,
-	 NULL, NULL, NULL},
-#if 0
-	 P_WID(&p_send.pop_bfr_smtp_chkbtn),
-	 prefs_set_data_from_toggle, prefs_set_toggle},
-#endif
+	{"add_date", "TRUE", &tmp_ac_prefs.add_date, P_BOOL},
+	{"generate_msgid", "TRUE", &tmp_ac_prefs.gen_msgid, P_BOOL},
+	{"add_custom_header", "FALSE", &tmp_ac_prefs.add_customhdr, P_BOOL},
+	{"use_smtp_auth", "FALSE", &tmp_ac_prefs.use_smtp_auth, P_BOOL},
+	{"smtp_auth_method", "0", &tmp_ac_prefs.smtp_auth_type, P_ENUM},
+	{"smtp_user_id", NULL, &tmp_ac_prefs.smtp_userid, P_STRING},
+	{"smtp_password", NULL, &tmp_ac_prefs.smtp_passwd, P_STRING},
+	{"pop_before_smtp", "FALSE", &tmp_ac_prefs.pop_before_smtp, P_BOOL},
 
 	/* Compose */
-	{"signature_type", "0", &tmp_ac_prefs.sig_type, P_ENUM,
-	 P_WID(&compose.sigfile_radiobtn),
-	 prefs_account_enum_set_data_from_radiobtn,
-	 prefs_account_enum_set_radiobtn},
+	{"signature_type", "0", &tmp_ac_prefs.sig_type, P_ENUM},
 	{"signature_path", "~" G_DIR_SEPARATOR_S DEFAULT_SIGNATURE,
-	 &tmp_ac_prefs.sig_path, P_STRING,
-	 P_WID(&compose.sigpath_entry),
-	 prefs_set_data_from_entry, prefs_set_entry},
-
-	{"set_autocc", "FALSE", &tmp_ac_prefs.set_autocc, P_BOOL,
-	 P_WID(&compose.autocc_chkbtn),
-	 prefs_set_data_from_toggle, prefs_set_toggle},
-
-	{"auto_cc", NULL, &tmp_ac_prefs.auto_cc, P_STRING,
-	 P_WID(&compose.autocc_entry),
-	 prefs_set_data_from_entry, prefs_set_entry},
-
-	{"set_autobcc", "FALSE", &tmp_ac_prefs.set_autobcc, P_BOOL,
-	 P_WID(&compose.autobcc_chkbtn),
-	 prefs_set_data_from_toggle, prefs_set_toggle},
-
-	{"auto_bcc", NULL, &tmp_ac_prefs.auto_bcc, P_STRING,
-	 P_WID(&compose.autobcc_entry),
-	 prefs_set_data_from_entry, prefs_set_entry},
-
-	{"set_autoreplyto", "FALSE", &tmp_ac_prefs.set_autoreplyto, P_BOOL,
-	 P_WID(&compose.autoreplyto_chkbtn),
-	 prefs_set_data_from_toggle, prefs_set_toggle},
-
-	{"auto_replyto", NULL, &tmp_ac_prefs.auto_replyto, P_STRING,
-	 P_WID(&compose.autoreplyto_entry),
-	 prefs_set_data_from_entry, prefs_set_entry},
+	 &tmp_ac_prefs.sig_path, P_STRING},
+	{"set_autocc", "FALSE", &tmp_ac_prefs.set_autocc, P_BOOL},
+	{"auto_cc", NULL, &tmp_ac_prefs.auto_cc, P_STRING},
+	{"set_autobcc", "FALSE", &tmp_ac_prefs.set_autobcc, P_BOOL},
+	{"auto_bcc", NULL, &tmp_ac_prefs.auto_bcc, P_STRING},
+	{"set_autoreplyto", "FALSE", &tmp_ac_prefs.set_autoreplyto, P_BOOL},
+	{"auto_replyto", NULL, &tmp_ac_prefs.auto_replyto, P_STRING},
 
 #if USE_GPGME
 	/* Privacy */
-	{"default_sign", "FALSE", &tmp_ac_prefs.default_sign, P_BOOL,
-	 P_WID(&privacy.default_sign_chkbtn),
-	 prefs_set_data_from_toggle, prefs_set_toggle},
-	{"default_encrypt", "FALSE", &tmp_ac_prefs.default_encrypt, P_BOOL,
-	 P_WID(&privacy.default_encrypt_chkbtn),
-	 prefs_set_data_from_toggle, prefs_set_toggle},
-	{"encrypt_reply", "TRUE", &tmp_ac_prefs.encrypt_reply, P_BOOL,
-	 P_WID(&privacy.encrypt_reply_chkbtn),
-	 prefs_set_data_from_toggle, prefs_set_toggle},
-	{"ascii_armored", "FALSE", &tmp_ac_prefs.ascii_armored, P_BOOL,
-	 P_WID(&privacy.ascii_armored_chkbtn),
-	 prefs_set_data_from_toggle, prefs_set_toggle},
-	{"clearsign", "FALSE", &tmp_ac_prefs.clearsign, P_BOOL,
-	 P_WID(&privacy.clearsign_chkbtn),
-	 prefs_set_data_from_toggle, prefs_set_toggle},
-	{"sign_key", NULL, &tmp_ac_prefs.sign_key, P_ENUM,
-	 P_WID(&privacy.defaultkey_radiobtn),
-	 prefs_account_enum_set_data_from_radiobtn,
-	 prefs_account_enum_set_radiobtn},
-	{"sign_key_id", NULL, &tmp_ac_prefs.sign_key_id, P_STRING,
-	 P_WID(&privacy.customkey_entry),
-	 prefs_set_data_from_entry, prefs_set_entry},
+	{"default_sign", "FALSE", &tmp_ac_prefs.default_sign, P_BOOL},
+	{"default_encrypt", "FALSE", &tmp_ac_prefs.default_encrypt, P_BOOL},
+	{"encrypt_reply", "TRUE", &tmp_ac_prefs.encrypt_reply, P_BOOL},
+	{"ascii_armored", "FALSE", &tmp_ac_prefs.ascii_armored, P_BOOL},
+	{"clearsign", "FALSE", &tmp_ac_prefs.clearsign, P_BOOL},
+	{"sign_key", NULL, &tmp_ac_prefs.sign_key, P_ENUM},
+	{"sign_key_id", NULL, &tmp_ac_prefs.sign_key_id, P_STRING},
 #endif /* USE_GPGME */
 
 #if USE_SSL
 	/* SSL */
-	{"ssl_pop", "0", &tmp_ac_prefs.ssl_pop, P_ENUM,
-	 P_WID(&ssl.pop_nossl_radiobtn),
-	 prefs_account_enum_set_data_from_radiobtn,
-	 prefs_account_enum_set_radiobtn},
-	{"ssl_imap", "0", &tmp_ac_prefs.ssl_imap, P_ENUM,
-	 P_WID(&ssl.imap_nossl_radiobtn),
-	 prefs_account_enum_set_data_from_radiobtn,
-	 prefs_account_enum_set_radiobtn},
-	{"ssl_nntp", "0", &tmp_ac_prefs.ssl_nntp, P_ENUM,
-	 P_WID(&ssl.nntp_nossl_radiobtn),
-	 prefs_account_enum_set_data_from_radiobtn,
-	 prefs_account_enum_set_radiobtn},
-	{"ssl_smtp", "0", &tmp_ac_prefs.ssl_smtp, P_ENUM,
-	 P_WID(&ssl.smtp_nossl_radiobtn),
-	 prefs_account_enum_set_data_from_radiobtn,
-	 prefs_account_enum_set_radiobtn},
-
-	{"use_nonblocking_ssl", "1", &tmp_ac_prefs.use_nonblocking_ssl, P_BOOL,
-	 P_WID(&ssl.use_nonblocking_ssl_chkbtn),
-	 prefs_set_data_from_toggle, prefs_set_toggle},
+	{"ssl_pop", "0", &tmp_ac_prefs.ssl_pop, P_ENUM},
+	{"ssl_imap", "0", &tmp_ac_prefs.ssl_imap, P_ENUM},
+	{"ssl_nntp", "0", &tmp_ac_prefs.ssl_nntp, P_ENUM},
+	{"ssl_smtp", "0", &tmp_ac_prefs.ssl_smtp, P_ENUM},
+	{"use_nonblocking_ssl", "1", &tmp_ac_prefs.use_nonblocking_ssl, P_BOOL},
 #endif /* USE_SSL */
 
 	/* Advanced */
-	{"set_smtpport", "FALSE", &tmp_ac_prefs.set_smtpport, P_BOOL,
-	 P_WID(&advanced.smtpport_chkbtn),
-	 prefs_set_data_from_toggle, prefs_set_toggle},
-
-	{"smtp_port", "25", &tmp_ac_prefs.smtpport, P_USHORT,
-	 P_WID(&advanced.smtpport_entry),
-	 prefs_set_data_from_entry, prefs_set_entry},
-
-	{"set_popport", "FALSE", &tmp_ac_prefs.set_popport, P_BOOL,
-	 P_WID(&advanced.popport_chkbtn),
-	 prefs_set_data_from_toggle, prefs_set_toggle},
-
-	{"pop_port", "110", &tmp_ac_prefs.popport, P_USHORT,
-	 P_WID(&advanced.popport_entry),
-	 prefs_set_data_from_entry, prefs_set_entry},
-
-	{"set_imapport", "FALSE", &tmp_ac_prefs.set_imapport, P_BOOL,
-	 P_WID(&advanced.imapport_chkbtn),
-	 prefs_set_data_from_toggle, prefs_set_toggle},
-
-	{"imap_port", "143", &tmp_ac_prefs.imapport, P_USHORT,
-	 P_WID(&advanced.imapport_entry),
-	 prefs_set_data_from_entry, prefs_set_entry},
-
-	{"set_nntpport", "FALSE", &tmp_ac_prefs.set_nntpport, P_BOOL,
-	 P_WID(&advanced.nntpport_chkbtn),
-	 prefs_set_data_from_toggle, prefs_set_toggle},
-
-	{"nntp_port", "119", &tmp_ac_prefs.nntpport, P_USHORT,
-	 P_WID(&advanced.nntpport_entry),
-	 prefs_set_data_from_entry, prefs_set_entry},
-
-	{"set_domain", "FALSE", &tmp_ac_prefs.set_domain, P_BOOL,
-	 P_WID(&advanced.domain_chkbtn),
-	 prefs_set_data_from_toggle, prefs_set_toggle},
-
-	{"domain", NULL, &tmp_ac_prefs.domain, P_STRING,
-	 P_WID(&advanced.domain_entry),
-	 prefs_set_data_from_entry, prefs_set_entry},
-
-	{"imap_directory", NULL, &tmp_ac_prefs.imap_dir, P_STRING,
-	 P_WID(&advanced.imapdir_entry),
-	 prefs_set_data_from_entry, prefs_set_entry},
-
-	{"set_sent_folder", "FALSE", &tmp_ac_prefs.set_sent_folder, P_BOOL,
-	 P_WID(&advanced.sent_folder_chkbtn),
-	 prefs_set_data_from_toggle, prefs_set_toggle},
-	{"sent_folder", NULL, &tmp_ac_prefs.sent_folder, P_STRING,
-	 P_WID(&advanced.sent_folder_entry),
-	 prefs_set_data_from_entry, prefs_set_entry},
-
-	{"set_draft_folder", "FALSE", &tmp_ac_prefs.set_draft_folder, P_BOOL,
-	 P_WID(&advanced.draft_folder_chkbtn),
-	 prefs_set_data_from_toggle, prefs_set_toggle},
-	{"draft_folder", NULL, &tmp_ac_prefs.draft_folder, P_STRING,
-	 P_WID(&advanced.draft_folder_entry),
-	 prefs_set_data_from_entry, prefs_set_entry},
+	{"set_smtpport", "FALSE", &tmp_ac_prefs.set_smtpport, P_BOOL},
+	{"smtp_port", "25", &tmp_ac_prefs.smtpport, P_USHORT},
+	{"set_popport", "FALSE", &tmp_ac_prefs.set_popport, P_BOOL},
+	{"pop_port", "110", &tmp_ac_prefs.popport, P_USHORT},
+	{"set_imapport", "FALSE", &tmp_ac_prefs.set_imapport, P_BOOL},
+	{"imap_port", "143", &tmp_ac_prefs.imapport, P_USHORT},
+	{"set_nntpport", "FALSE", &tmp_ac_prefs.set_nntpport, P_BOOL},
+	{"nntp_port", "119", &tmp_ac_prefs.nntpport, P_USHORT},
+	{"set_domain", "FALSE", &tmp_ac_prefs.set_domain, P_BOOL},
+	{"domain", NULL, &tmp_ac_prefs.domain, P_STRING},
+	{"imap_directory", NULL, &tmp_ac_prefs.imap_dir, P_STRING},
+	{"set_sent_folder", "FALSE", &tmp_ac_prefs.set_sent_folder, P_BOOL},
+	{"sent_folder", NULL, &tmp_ac_prefs.sent_folder, P_STRING},
+	{"set_draft_folder", "FALSE", &tmp_ac_prefs.set_draft_folder, P_BOOL},
+	{"draft_folder", NULL, &tmp_ac_prefs.draft_folder, P_STRING},
+	{"set_trash_folder", "FALSE", &tmp_ac_prefs.set_trash_folder, P_BOOL},
+	{"trash_folder", NULL, &tmp_ac_prefs.trash_folder, P_STRING},
+
+	{NULL, NULL, NULL, P_OTHER}
+};
 
-	{"set_trash_folder", "FALSE", &tmp_ac_prefs.set_trash_folder, P_BOOL,
-	 P_WID(&advanced.trash_folder_chkbtn),
-	 prefs_set_data_from_toggle, prefs_set_toggle},
-	{"trash_folder", NULL, &tmp_ac_prefs.trash_folder, P_STRING,
-	 P_WID(&advanced.trash_folder_entry),
-	 prefs_set_data_from_entry, prefs_set_entry},
+static gint prefs_account_get_new_id(void);
 
-	{NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
-};
 
-static gint prefs_account_get_new_id		(void);
+PrefsAccount *prefs_account_get_tmp_prefs(void)
+{
+	return &tmp_ac_prefs;
+}
 
-static void prefs_account_create		(void);
-static void prefs_account_basic_create		(void);
-static void prefs_account_receive_create	(void);
-static void prefs_account_send_create		(void);
-static void prefs_account_compose_create	(void);
-#if USE_GPGME
-static void prefs_account_privacy_create	(void);
-#endif /* USE_GPGME */
-#if USE_SSL
-static void prefs_account_ssl_create		(void);
-#endif /* USE_SSL */
-static void prefs_account_advanced_create	(void);
+void prefs_account_set_tmp_prefs(PrefsAccount *ac_prefs)
+{
+	tmp_ac_prefs = *ac_prefs;
+}
 
-static void prefs_account_select_folder_cb	(GtkWidget	*widget,
-						 gpointer	 data);
-static void prefs_account_edit_custom_header	(void);
+void prefs_account_apply_tmp_prefs(PrefsAccount *ac_prefs)
+{
+	*ac_prefs = tmp_ac_prefs;
+}
 
-static gint prefs_account_deleted		(GtkWidget	*widget,
-						 GdkEventAny	*event,
-						 gpointer	 data);
-static gboolean prefs_account_key_pressed	(GtkWidget	*widget,
-						 GdkEventKey	*event,
-						 gpointer	 data);
-static void prefs_account_ok			(void);
-static gint prefs_account_apply			(void);
-static void prefs_account_cancel		(void);
+PrefParam *prefs_account_get_params(void)
+{
+	return param;
+}
 
 PrefsAccount *prefs_account_new(void)
 {
@@ -623,1742 +258,3 @@ static gint prefs_account_get_new_id(void)
 
 	return last_id + 1;
 }
-
-PrefsAccount *prefs_account_open(PrefsAccount *ac_prefs)
-{
-	gboolean new_account = FALSE;
-
-	debug_print(_("Opening account preferences window...\n"));
-
-	inc_lock();
-
-	cancelled = FALSE;
-
-	if (!ac_prefs) {
-		ac_prefs = prefs_account_new();
-		new_account = TRUE;
-	}
-
-	if (!dialog.window) {
-		prefs_account_create();
-	}
-
-	gtkut_box_set_reverse_order(GTK_BOX(dialog.confirm_area),
-				    !prefs_common.comply_gnome_hig);
-	manage_window_set_transient(GTK_WINDOW(dialog.window));
-	gtk_notebook_set_current_page(GTK_NOTEBOOK(dialog.notebook), 0);
-	gtk_widget_grab_focus(dialog.ok_btn);
-
-	tmp_ac_prefs = *ac_prefs;
-
-	if (new_account) {
-		PrefsAccount *def_ac;
-		gchar *buf;
-
-		prefs_set_dialog_to_default(param);
-		buf = g_strdup_printf(_("Account%d"), ac_prefs->account_id);
-		gtk_entry_set_text(GTK_ENTRY(basic.acname_entry), buf);
-		g_free(buf);
-		def_ac = account_get_default();
-		if (def_ac) {
-			gtk_entry_set_text(GTK_ENTRY(basic.name_entry),
-					   def_ac->name ? def_ac->name : "");
-			gtk_entry_set_text(GTK_ENTRY(basic.addr_entry),
-					   def_ac->address ? def_ac->address : "");
-			gtk_entry_set_text(GTK_ENTRY(basic.org_entry),
-					   def_ac->organization ? def_ac->organization : "");
-		}
-		menu_set_sensitive_all
-			(GTK_MENU_SHELL
-				(gtk_option_menu_get_menu
-					(GTK_OPTION_MENU
-						(basic.protocol_optmenu))),
-			 TRUE);
-		gtk_window_set_title(GTK_WINDOW(dialog.window),
-				     _("Preferences for new account"));
-		gtk_widget_hide(dialog.apply_btn);
-	} else {
-		prefs_set_dialog(param);
-		gtk_window_set_title(GTK_WINDOW(dialog.window),
-				     _("Account preferences"));
-		gtk_widget_show(dialog.apply_btn);
-	}
-
-	gtk_widget_show(dialog.window);
-	gtk_main();
-	gtk_widget_hide(dialog.window);
-
-	inc_unlock();
-
-	if (cancelled && new_account) {
-		g_free(ac_prefs);
-		return NULL;
-	} else {
-		*ac_prefs = tmp_ac_prefs;
-		return ac_prefs;
-	}
-}
-
-static void prefs_account_create(void)
-{
-	gint page = 0;
-
-	debug_print(_("Creating account preferences window...\n"));
-
-	/* create dialog */
-	prefs_dialog_create(&dialog);
-	g_signal_connect(G_OBJECT(dialog.window), "delete_event",
-			 G_CALLBACK(prefs_account_deleted), NULL);
-	g_signal_connect(G_OBJECT(dialog.window), "key_press_event",
-			 G_CALLBACK(prefs_account_key_pressed), NULL);
-	MANAGE_WINDOW_SIGNALS_CONNECT(dialog.window);
-
-	g_signal_connect(G_OBJECT(dialog.ok_btn), "clicked",
-	 		 G_CALLBACK(prefs_account_ok), NULL);
-	g_signal_connect(G_OBJECT(dialog.apply_btn), "clicked",
-			 G_CALLBACK(prefs_account_apply), NULL);
-	g_signal_connect(G_OBJECT(dialog.cancel_btn), "clicked",
-			 G_CALLBACK(prefs_account_cancel), NULL);
-
-	prefs_account_basic_create();
-	SET_NOTEBOOK_LABEL(dialog.notebook, _("Basic"), page++);
-	prefs_account_receive_create();
-	SET_NOTEBOOK_LABEL(dialog.notebook, _("Receive"), page++);
-	prefs_account_send_create();
-	SET_NOTEBOOK_LABEL(dialog.notebook, _("Send"), page++);
-	prefs_account_compose_create();
-	SET_NOTEBOOK_LABEL(dialog.notebook, _("Compose"), page++);
-#if USE_GPGME
-	prefs_account_privacy_create();
-	SET_NOTEBOOK_LABEL(dialog.notebook, _("Privacy"), page++);
-#endif /* USE_GPGME */
-#if USE_SSL
-	prefs_account_ssl_create();
-	SET_NOTEBOOK_LABEL(dialog.notebook, _("SSL"), page++);
-#endif /* USE_SSL */
-	prefs_account_advanced_create();
-	SET_NOTEBOOK_LABEL(dialog.notebook, _("Advanced"), page++);
-}
-
-#define SET_ACTIVATE(menuitem) \
-{ \
-	g_signal_connect(G_OBJECT(menuitem), "activate", \
-			 G_CALLBACK(prefs_account_protocol_activated), NULL); \
-}
-
-static void prefs_account_basic_create(void)
-{
-	GtkWidget *vbox1;
-	GtkWidget *hbox;
-	GtkWidget *label;
-	GtkWidget *acname_entry;
-	GtkWidget *default_chkbtn;
-	GtkWidget *frame1;
-	GtkWidget *table1;
-	GtkWidget *name_entry;
-	GtkWidget *addr_entry;
-	GtkWidget *org_entry;
-
-	GtkWidget *serv_frame;
-	GtkWidget *vbox2;
-	GtkWidget *optmenu;
-	GtkWidget *optmenu_menu;
-	GtkWidget *menuitem;
-	GtkWidget *serv_table;
-	GtkWidget *recvserv_label;
-	GtkWidget *smtpserv_label;
-	GtkWidget *nntpserv_label;
-	GtkWidget *recvserv_entry;
-	GtkWidget *smtpserv_entry;
-	GtkWidget *nntpserv_entry;
-	GtkWidget *nntpauth_chkbtn;
-	GtkWidget *uid_label;
-	GtkWidget *pass_label;
-	GtkWidget *uid_entry;
-	GtkWidget *pass_entry;
-
-	vbox1 = gtk_vbox_new (FALSE, VSPACING);
-	gtk_widget_show (vbox1);
-	gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
-
-	hbox = gtk_hbox_new (FALSE, 8);
-	gtk_widget_show (hbox);
-	gtk_box_pack_start (GTK_BOX (vbox1), hbox, FALSE, FALSE, 0);
-
-	label = gtk_label_new (_("Name of this account"));
-	gtk_widget_show (label);
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-	acname_entry = gtk_entry_new ();
-	gtk_widget_show (acname_entry);
-	gtk_widget_set_size_request (acname_entry, DEFAULT_ENTRY_WIDTH, -1);
-	gtk_box_pack_start (GTK_BOX (hbox), acname_entry, TRUE, TRUE, 0);
-
-	default_chkbtn = gtk_check_button_new_with_label (_("Set as default"));
-	gtk_widget_show (default_chkbtn);
-	gtk_box_pack_end (GTK_BOX (hbox), default_chkbtn, FALSE, FALSE, 0);
-
-	PACK_FRAME (vbox1, frame1, _("Personal information"));
-
-	table1 = gtk_table_new (3, 2, FALSE);
-	gtk_widget_show (table1);
-	gtk_container_add (GTK_CONTAINER (frame1), table1);
-	gtk_container_set_border_width (GTK_CONTAINER (table1), 8);
-	gtk_table_set_row_spacings (GTK_TABLE (table1), VSPACING_NARROW);
-	gtk_table_set_col_spacings (GTK_TABLE (table1), 8);
-
-	label = gtk_label_new (_("Full name"));
-	gtk_widget_show (label);
-	gtk_table_attach (GTK_TABLE (table1), label, 0, 1, 0, 1,
-			  GTK_FILL, 0, 0, 0);
-	gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
-
-	label = gtk_label_new (_("Mail address"));
-	gtk_widget_show (label);
-	gtk_table_attach (GTK_TABLE (table1), label, 0, 1, 1, 2,
-			  GTK_FILL, 0, 0, 0);
-	gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
-
-	label = gtk_label_new (_("Organization"));
-	gtk_widget_show (label);
-	gtk_table_attach (GTK_TABLE (table1), label, 0, 1, 2, 3,
-			  GTK_FILL, 0, 0, 0);
-	gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5);
-
-	name_entry = gtk_entry_new ();
-	gtk_widget_show (name_entry);
-	gtk_table_attach (GTK_TABLE (table1), name_entry, 1, 2, 0, 1,
-			  GTK_EXPAND | GTK_SHRINK | GTK_FILL,
-			  GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
-
-	addr_entry = gtk_entry_new ();
-	gtk_widget_show (addr_entry);
-	gtk_table_attach (GTK_TABLE (table1), addr_entry, 1, 2, 1, 2,
-			  GTK_EXPAND | GTK_SHRINK | GTK_FILL,
-			  GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
-
-	org_entry = gtk_entry_new ();
-	gtk_widget_show (org_entry);
-	gtk_table_attach (GTK_TABLE (table1), org_entry, 1, 2, 2, 3,
-			  GTK_EXPAND | GTK_SHRINK | GTK_FILL,
-			  GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
-
-	PACK_FRAME (vbox1, serv_frame, _("Server information"));
-
-	vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
-	gtk_widget_show (vbox2);
-	gtk_container_add (GTK_CONTAINER (serv_frame), vbox2);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
-
-	hbox = gtk_hbox_new (FALSE, 8);
-	gtk_widget_show (hbox);
-	gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
-
-	label = gtk_label_new (_("Protocol"));
-	gtk_widget_show (label);
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-	optmenu = gtk_option_menu_new ();
-	gtk_widget_show (optmenu);
-	gtk_box_pack_start (GTK_BOX (hbox), optmenu, FALSE, FALSE, 0);
-
-	optmenu_menu = gtk_menu_new ();
-
-	MENUITEM_ADD (optmenu_menu, menuitem, _("POP3"),  A_POP3);
-	SET_ACTIVATE (menuitem);
-	MENUITEM_ADD (optmenu_menu, menuitem, _("IMAP4"), A_IMAP4);
-	SET_ACTIVATE (menuitem);
-	MENUITEM_ADD (optmenu_menu, menuitem, _("News (NNTP)"), A_NNTP);
-	SET_ACTIVATE (menuitem);
-	MENUITEM_ADD (optmenu_menu, menuitem, _("None (local)"), A_LOCAL);
-	SET_ACTIVATE (menuitem);
-
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu), optmenu_menu);
-
-	serv_table = gtk_table_new (6, 4, FALSE);
-	gtk_widget_show (serv_table);
-	gtk_box_pack_start (GTK_BOX (vbox2), serv_table, FALSE, FALSE, 0);
-	gtk_table_set_row_spacings (GTK_TABLE (serv_table), VSPACING_NARROW);
-	gtk_table_set_row_spacing (GTK_TABLE (serv_table), 3, 0);
-	gtk_table_set_col_spacings (GTK_TABLE (serv_table), 8);
-
-	nntpauth_chkbtn = gtk_check_button_new_with_label
-		(_("This server requires authentication"));
-	gtk_widget_show (nntpauth_chkbtn);
-	gtk_table_attach (GTK_TABLE (serv_table), nntpauth_chkbtn, 0, 4, 4, 5,
-			  GTK_FILL, 0, 0, 0);
-
-	nntpserv_entry = gtk_entry_new ();
-	gtk_widget_show (nntpserv_entry);
-	gtk_table_attach (GTK_TABLE (serv_table), nntpserv_entry, 1, 4, 0, 1,
-			  GTK_EXPAND | GTK_SHRINK | GTK_FILL,
-			  GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
-	gtk_table_set_row_spacing (GTK_TABLE (serv_table), 0, 0);
-
-	recvserv_entry = gtk_entry_new ();
-	gtk_widget_show (recvserv_entry);
-	gtk_table_attach (GTK_TABLE (serv_table), recvserv_entry, 1, 4, 1, 2,
-			  GTK_EXPAND | GTK_SHRINK | GTK_FILL,
-			  GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
-
-	smtpserv_entry = gtk_entry_new ();
-	gtk_widget_show (smtpserv_entry);
-	gtk_table_attach (GTK_TABLE (serv_table), smtpserv_entry, 1, 4, 2, 3,
-			  GTK_EXPAND | GTK_SHRINK | GTK_FILL,
-			  GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
-
-	uid_entry = gtk_entry_new ();
-	gtk_widget_show (uid_entry);
-	gtk_widget_set_size_request (uid_entry, DEFAULT_ENTRY_WIDTH, -1);
-	gtk_table_attach (GTK_TABLE (serv_table), uid_entry, 1, 2, 5, 6,
-			  GTK_EXPAND | GTK_SHRINK | GTK_FILL,
-			  GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
-
-	pass_entry = gtk_entry_new ();
-	gtk_widget_show (pass_entry);
-	gtk_widget_set_size_request (pass_entry, DEFAULT_ENTRY_WIDTH, -1);
-	gtk_table_attach (GTK_TABLE (serv_table), pass_entry, 3, 4, 5, 6,
-			  GTK_EXPAND | GTK_SHRINK | GTK_FILL,
-			  GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
-	gtk_entry_set_visibility (GTK_ENTRY (pass_entry), FALSE);
-
-	nntpserv_label = gtk_label_new (_("News server"));
-	gtk_widget_show (nntpserv_label);
-	gtk_table_attach (GTK_TABLE (serv_table), nntpserv_label, 0, 1, 0, 1,
-			  GTK_FILL, 0, 0, 0);
-	gtk_misc_set_alignment (GTK_MISC (nntpserv_label), 1, 0.5);
-
-	recvserv_label = gtk_label_new (_("Server for receiving"));
-	gtk_widget_show (recvserv_label);
-	gtk_table_attach (GTK_TABLE (serv_table), recvserv_label, 0, 1, 1, 2,
-			  GTK_FILL, 0, 0, 0);
-	gtk_misc_set_alignment (GTK_MISC (recvserv_label), 1, 0.5);
-
-	smtpserv_label = gtk_label_new (_("SMTP server (send)"));
-	gtk_widget_show (smtpserv_label);
-	gtk_table_attach (GTK_TABLE (serv_table), smtpserv_label, 0, 1, 2, 3,
-			  GTK_FILL, 0, 0, 0);
-	gtk_misc_set_alignment (GTK_MISC (smtpserv_label), 1, 0.5);
-	gtk_table_set_row_spacing (GTK_TABLE (serv_table), 2, 0);
-
-	uid_label = gtk_label_new (_("User ID"));
-	gtk_widget_show (uid_label);
-	gtk_table_attach (GTK_TABLE (serv_table), uid_label, 0, 1, 5, 6,
-			  GTK_FILL, 0, 0, 0);
-	gtk_misc_set_alignment (GTK_MISC (uid_label), 1, 0.5);
-
-	pass_label = gtk_label_new (_("Password"));
-	gtk_widget_show (pass_label);
-	gtk_table_attach (GTK_TABLE (serv_table), pass_label, 2, 3, 5, 6,
-			  0, 0, 0, 0);
-
-	SET_TOGGLE_SENSITIVITY (nntpauth_chkbtn, uid_label);
-	SET_TOGGLE_SENSITIVITY (nntpauth_chkbtn, pass_label);
-	SET_TOGGLE_SENSITIVITY (nntpauth_chkbtn, uid_entry);
-	SET_TOGGLE_SENSITIVITY (nntpauth_chkbtn, pass_entry);
-
-	basic.acname_entry   = acname_entry;
-	basic.default_chkbtn = default_chkbtn;
-
-	basic.name_entry = name_entry;
-	basic.addr_entry = addr_entry;
-	basic.org_entry  = org_entry;
-
-	basic.serv_frame       = serv_frame;
-	basic.serv_table       = serv_table;
-	basic.protocol_optmenu = optmenu;
-	basic.recvserv_label   = recvserv_label;
-	basic.recvserv_entry   = recvserv_entry;
-	basic.smtpserv_label   = smtpserv_label;
-	basic.smtpserv_entry   = smtpserv_entry;
-	basic.nntpserv_label   = nntpserv_label;
-	basic.nntpserv_entry   = nntpserv_entry;
-	basic.nntpauth_chkbtn  = nntpauth_chkbtn;
-	basic.uid_label        = uid_label;
-	basic.pass_label       = pass_label;
-	basic.uid_entry        = uid_entry;
-	basic.pass_entry       = pass_entry;
-}
-
-static void prefs_account_receive_create(void)
-{
-	GtkWidget *vbox1;
-	GtkWidget *frame1;
-	GtkWidget *vbox2;
-	GtkWidget *use_apop_chkbtn;
-	GtkWidget *rmmail_chkbtn;
-	GtkWidget *hbox_spc;
-	GtkWidget *leave_time_label;
-	GtkWidget *leave_time_entry;
-	GtkWidget *getall_chkbtn;
-	GtkWidget *hbox1;
-	GtkWidget *size_limit_chkbtn;
-	GtkWidget *size_limit_entry;
-	GtkWidget *label;
-	GtkWidget *filter_on_recv_chkbtn;
-	GtkWidget *vbox3;
-	GtkWidget *inbox_label;
-	GtkWidget *inbox_entry;
-	GtkWidget *inbox_btn;
-
-	GtkWidget *imap_frame;
-	GtkWidget *optmenu;
-	GtkWidget *optmenu_menu;
-	GtkWidget *menuitem;
-
-	GtkWidget *nntp_frame;
-	GtkWidget *maxarticle_label;
-	GtkWidget *maxarticle_spinbtn;
-	GtkObject *maxarticle_spinbtn_adj;
-	GtkWidget *maxarticle_desc_label;
-
-	GtkWidget *recvatgetall_chkbtn;
-
-	vbox1 = gtk_vbox_new (FALSE, VSPACING);
-	gtk_widget_show (vbox1);
-	gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
-
-	PACK_FRAME (vbox1, frame1, _("POP3"));
-
-	vbox2 = gtk_vbox_new (FALSE, 0);
-	gtk_widget_show (vbox2);
-	gtk_container_add (GTK_CONTAINER (frame1), vbox2);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
-
-	PACK_CHECK_BUTTON (vbox2, use_apop_chkbtn,
-			   _("Use secure authentication (APOP)"));
-
-	PACK_CHECK_BUTTON (vbox2, rmmail_chkbtn,
-			   _("Remove messages on server when received"));
-
-	hbox1 = gtk_hbox_new (FALSE, 8);
-	gtk_widget_show (hbox1);
-	gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
-
-	hbox_spc = gtk_hbox_new (FALSE, 0);
-	gtk_widget_show (hbox_spc);
-	gtk_box_pack_start (GTK_BOX (hbox1), hbox_spc, FALSE, FALSE, 0);
-	gtk_widget_set_size_request (hbox_spc, 12, -1);
-
-	leave_time_label = gtk_label_new (_("Remove after"));
-	gtk_widget_show (leave_time_label);
-	gtk_box_pack_start (GTK_BOX (hbox1), leave_time_label, FALSE, FALSE, 0);
-
-	leave_time_entry = gtk_entry_new ();
-	gtk_widget_show (leave_time_entry);
-	gtk_widget_set_size_request (leave_time_entry, 64, -1);
-	gtk_box_pack_start (GTK_BOX (hbox1), leave_time_entry, FALSE, FALSE, 0);
-
-	leave_time_label = gtk_label_new (_("days"));
-	gtk_widget_show (leave_time_label);
-	gtk_box_pack_start (GTK_BOX (hbox1), leave_time_label, FALSE, FALSE, 0);
-
-	SET_TOGGLE_SENSITIVITY (rmmail_chkbtn, hbox1);
-
-	PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
-
-	hbox1 = gtk_hbox_new (FALSE, 8);
-	gtk_widget_show (hbox1);
-	gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
-
-	hbox_spc = gtk_hbox_new (FALSE, 0);
-	gtk_widget_show (hbox_spc);
-	gtk_box_pack_start (GTK_BOX (hbox1), hbox_spc, FALSE, FALSE, 0);
-	gtk_widget_set_size_request (hbox_spc, 12, -1);
-
-	leave_time_label = gtk_label_new (_("(0 days: remove immediately)"));
-	gtk_widget_show (leave_time_label);
-	gtk_box_pack_start (GTK_BOX (hbox1), leave_time_label, FALSE, FALSE, 0);
-
-	SET_TOGGLE_SENSITIVITY (rmmail_chkbtn, hbox1);
-
-	PACK_CHECK_BUTTON (vbox2, getall_chkbtn,
-			   _("Download all messages on server"));
-
-	hbox1 = gtk_hbox_new (FALSE, 8);
-	gtk_widget_show (hbox1);
-	gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
-
-	PACK_CHECK_BUTTON (hbox1, size_limit_chkbtn, _("Receive size limit"));
-
-	size_limit_entry = gtk_entry_new ();
-	gtk_widget_show (size_limit_entry);
-	gtk_widget_set_size_request (size_limit_entry, 64, -1);
-	gtk_box_pack_start (GTK_BOX (hbox1), size_limit_entry, FALSE, FALSE, 0);
-
-	label = gtk_label_new (_("KB"));
-	gtk_widget_show (label);
-	gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
-
-	SET_TOGGLE_SENSITIVITY (size_limit_chkbtn, size_limit_entry);
-
-	PACK_CHECK_BUTTON (vbox2, filter_on_recv_chkbtn,
-			   _("Filter messages on receiving"));
-
-	PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
-
-	hbox1 = gtk_hbox_new (FALSE, 8);
-	gtk_widget_show (hbox1);
-	gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
-
-	inbox_label = gtk_label_new (_("Default inbox"));
-	gtk_widget_show (inbox_label);
-	gtk_box_pack_start (GTK_BOX (hbox1), inbox_label, FALSE, FALSE, 0);
-
-	inbox_entry = gtk_entry_new ();
-	gtk_widget_show (inbox_entry);
-	gtk_widget_set_size_request (inbox_entry, DEFAULT_ENTRY_WIDTH, -1);
-	gtk_box_pack_start (GTK_BOX (hbox1), inbox_entry, TRUE, TRUE, 0);
-
-	inbox_btn = gtk_button_new_with_label (_(" Select... "));
-	gtk_widget_show (inbox_btn);
-	gtk_box_pack_start (GTK_BOX (hbox1), inbox_btn, FALSE, FALSE, 0);
-	g_signal_connect (G_OBJECT (inbox_btn), "clicked",
-			  G_CALLBACK (prefs_account_select_folder_cb),
-			  inbox_entry);
-
-	PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
-
-	PACK_SMALL_LABEL
-		(vbox2, label, 
-		 _("Unfiltered messages will be stored in this folder."));
-
-	PACK_FRAME (vbox1, imap_frame, _("IMAP4"));
-
-	vbox2 = gtk_vbox_new (FALSE, 0);
-	gtk_widget_show (vbox2);
-	gtk_container_add (GTK_CONTAINER (imap_frame), vbox2);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
-
-	hbox1 = gtk_hbox_new (FALSE, 8);
-	gtk_widget_show (hbox1);
-	gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
-
-	label = gtk_label_new (_("Authentication method"));
-	gtk_widget_show (label);
-	gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
-
-	optmenu = gtk_option_menu_new ();
-	gtk_widget_show (optmenu);
-	gtk_box_pack_start (GTK_BOX (hbox1), optmenu, FALSE, FALSE, 0);
-
-	optmenu_menu = gtk_menu_new ();
-
-	MENUITEM_ADD (optmenu_menu, menuitem, _("Automatic"), 0);
-	MENUITEM_ADD (optmenu_menu, menuitem, "LOGIN", IMAP_AUTH_LOGIN);
-	MENUITEM_ADD (optmenu_menu, menuitem, "CRAM-MD5", IMAP_AUTH_CRAM_MD5);
-
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu), optmenu_menu);
-
-	PACK_FRAME (vbox1, nntp_frame, _("News"));
-
-	vbox2 = gtk_vbox_new (FALSE, 0);
-	gtk_widget_show (vbox2);
-	gtk_container_add (GTK_CONTAINER (nntp_frame), vbox2);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
-
-	hbox1 = gtk_hbox_new (FALSE, 8);
-	gtk_widget_show (hbox1);
-	gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
-
-	maxarticle_label = gtk_label_new
-		(_("Maximum number of articles to download"));
-	gtk_widget_show (maxarticle_label);
-	gtk_box_pack_start (GTK_BOX (hbox1), maxarticle_label, FALSE, FALSE, 0);
-	gtk_label_set_justify (GTK_LABEL (maxarticle_label), GTK_JUSTIFY_LEFT);
-
-	maxarticle_spinbtn_adj =
-		gtk_adjustment_new (300, 0, 10000, 10, 100, 100);
-	maxarticle_spinbtn = gtk_spin_button_new
-		(GTK_ADJUSTMENT (maxarticle_spinbtn_adj), 10, 0);
-	gtk_widget_show (maxarticle_spinbtn);
-	gtk_box_pack_start (GTK_BOX (hbox1), maxarticle_spinbtn,
-			    FALSE, FALSE, 0);
-	gtk_widget_set_size_request (maxarticle_spinbtn, 64, -1);
-	gtk_spin_button_set_numeric
-		(GTK_SPIN_BUTTON (maxarticle_spinbtn), TRUE);
-
-	PACK_SMALL_LABEL (vbox2, maxarticle_desc_label,
-			  _("No limit if 0 is specified."));
-
-	PACK_CHECK_BUTTON
-		(vbox1, recvatgetall_chkbtn,
-		 _("`Get all' checks for new messages on this account"));
-
-	receive.pop3_frame            = frame1;
-	receive.use_apop_chkbtn       = use_apop_chkbtn;
-	receive.rmmail_chkbtn         = rmmail_chkbtn;
-	receive.leave_time_entry      = leave_time_entry;
-	receive.getall_chkbtn         = getall_chkbtn;
-	receive.size_limit_chkbtn     = size_limit_chkbtn;
-	receive.size_limit_entry      = size_limit_entry;
-	receive.filter_on_recv_chkbtn = filter_on_recv_chkbtn;
-	receive.inbox_label           = inbox_label;
-	receive.inbox_entry           = inbox_entry;
-	receive.inbox_btn             = inbox_btn;
-
-	receive.imap_frame             = imap_frame;
-	receive.imap_auth_type_optmenu = optmenu;
-
-	receive.nntp_frame             = nntp_frame;
-	receive.maxarticle_spinbtn     = maxarticle_spinbtn;
-	receive.maxarticle_spinbtn_adj = maxarticle_spinbtn_adj;
-
-	receive.recvatgetall_chkbtn = recvatgetall_chkbtn;
-}
-
-static void prefs_account_send_create(void)
-{
-	GtkWidget *vbox1;
-	GtkWidget *vbox2;
-	GtkWidget *frame;
-	GtkWidget *date_chkbtn;
-	GtkWidget *msgid_chkbtn;
-	GtkWidget *hbox;
-	GtkWidget *customhdr_chkbtn;
-	GtkWidget *customhdr_edit_btn;
-	GtkWidget *vbox3;
-	GtkWidget *smtp_auth_chkbtn;
-	GtkWidget *optmenu;
-	GtkWidget *optmenu_menu;
-	GtkWidget *menuitem;
-	GtkWidget *vbox4;
-	GtkWidget *hbox_spc;
-	GtkWidget *label;
-	GtkWidget *smtp_uid_entry;
-	GtkWidget *smtp_pass_entry;
-	GtkWidget *vbox_spc;
-	/* GtkWidget *pop_bfr_smtp_chkbtn; */
-
-	vbox1 = gtk_vbox_new (FALSE, VSPACING);
-	gtk_widget_show (vbox1);
-	gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
-
-	PACK_FRAME (vbox1, frame, _("Header"));
-
-	vbox2 = gtk_vbox_new (FALSE, 0);
-	gtk_widget_show (vbox2);
-	gtk_container_add (GTK_CONTAINER (frame), vbox2);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
-
-	PACK_CHECK_BUTTON (vbox2, date_chkbtn, _("Add Date header field"));
-	PACK_CHECK_BUTTON (vbox2, msgid_chkbtn, _("Generate Message-ID"));
-
-	hbox = gtk_hbox_new (FALSE, 12);
-	gtk_widget_show (hbox);
-	gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
-
-	PACK_CHECK_BUTTON (hbox, customhdr_chkbtn,
-			   _("Add user-defined header"));
-
-	customhdr_edit_btn = gtk_button_new_with_label (_(" Edit... "));
-	gtk_widget_show (customhdr_edit_btn);
-	gtk_box_pack_start (GTK_BOX (hbox), customhdr_edit_btn,
-			    FALSE, FALSE, 0);
-	g_signal_connect (G_OBJECT (customhdr_edit_btn), "clicked",
-			  G_CALLBACK (prefs_account_edit_custom_header),
-			  NULL);
-
-	SET_TOGGLE_SENSITIVITY (customhdr_chkbtn, customhdr_edit_btn);
-
-	PACK_FRAME (vbox1, frame, _("Authentication"));
-
-	vbox3 = gtk_vbox_new (FALSE, 0);
-	gtk_widget_show (vbox3);
-	gtk_container_add (GTK_CONTAINER (frame), vbox3);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8);
-
-	PACK_CHECK_BUTTON (vbox3, smtp_auth_chkbtn,
-		_("SMTP Authentication (SMTP AUTH)"));
-
-	vbox4 = gtk_vbox_new (FALSE, 0);
-	gtk_widget_show (vbox4);
-	gtk_box_pack_start (GTK_BOX (vbox3), vbox4, FALSE, FALSE, 0);
-
-	hbox = gtk_hbox_new (FALSE, 8);
-	gtk_widget_show (hbox);
-	gtk_box_pack_start (GTK_BOX (vbox4), hbox, FALSE, FALSE, 0);
-
-	hbox_spc = gtk_hbox_new (FALSE, 0);
-	gtk_widget_show (hbox_spc);
-	gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
-	gtk_widget_set_size_request (hbox_spc, 12, -1);
-
-	label = gtk_label_new (_("Authentication method"));
-	gtk_widget_show (label);
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-	optmenu = gtk_option_menu_new ();
-	gtk_widget_show (optmenu);
-	gtk_box_pack_start (GTK_BOX (hbox), optmenu, FALSE, FALSE, 0);
-
-	optmenu_menu = gtk_menu_new ();
-
-	MENUITEM_ADD (optmenu_menu, menuitem, _("Automatic"), 0);
-	MENUITEM_ADD (optmenu_menu, menuitem, "PLAIN", SMTPAUTH_PLAIN);
-	MENUITEM_ADD (optmenu_menu, menuitem, "LOGIN", SMTPAUTH_LOGIN);
-	MENUITEM_ADD (optmenu_menu, menuitem, "CRAM-MD5", SMTPAUTH_CRAM_MD5);
-	MENUITEM_ADD (optmenu_menu, menuitem, "DIGEST-MD5", SMTPAUTH_DIGEST_MD5);
-	gtk_widget_set_sensitive (menuitem, FALSE);
-
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu), optmenu_menu);
-
-	PACK_VSPACER(vbox4, vbox_spc, VSPACING_NARROW_2);
-
-	hbox = gtk_hbox_new (FALSE, 8);
-	gtk_widget_show (hbox);
-	gtk_box_pack_start (GTK_BOX (vbox4), hbox, FALSE, FALSE, 0);
-
-	hbox_spc = gtk_hbox_new (FALSE, 0);
-	gtk_widget_show (hbox_spc);
-	gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
-	gtk_widget_set_size_request (hbox_spc, 12, -1);
-
-	label = gtk_label_new (_("User ID"));
-	gtk_widget_show (label);
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-	smtp_uid_entry = gtk_entry_new ();
-	gtk_widget_show (smtp_uid_entry);
-	gtk_widget_set_size_request (smtp_uid_entry, DEFAULT_ENTRY_WIDTH, -1);
-	gtk_box_pack_start (GTK_BOX (hbox), smtp_uid_entry, TRUE, TRUE, 0);
-
-	label = gtk_label_new (_("Password"));
-	gtk_widget_show (label);
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-	smtp_pass_entry = gtk_entry_new ();
-	gtk_widget_show (smtp_pass_entry);
-	gtk_widget_set_size_request (smtp_pass_entry, DEFAULT_ENTRY_WIDTH, -1);
-	gtk_box_pack_start (GTK_BOX (hbox), smtp_pass_entry, TRUE, TRUE, 0);
-	gtk_entry_set_visibility (GTK_ENTRY (smtp_pass_entry), FALSE);
-
-	PACK_VSPACER(vbox4, vbox_spc, VSPACING_NARROW_2);
-
-	hbox = gtk_hbox_new (FALSE, 8);
-	gtk_widget_show (hbox);
-	gtk_box_pack_start (GTK_BOX (vbox4), hbox, FALSE, FALSE, 0);
-
-	hbox_spc = gtk_hbox_new (FALSE, 0);
-	gtk_widget_show (hbox_spc);
-	gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
-	gtk_widget_set_size_request (hbox_spc, 12, -1);
-
-	label = gtk_label_new
-		(_("If you leave these entries empty, the same "
-		   "user ID and password as receiving will be used."));
-	gtk_widget_show (label);
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-	gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-	gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-	gtkut_widget_set_small_font_size (label);
-
-	SET_TOGGLE_SENSITIVITY (smtp_auth_chkbtn, vbox4);
-
-#if 0
-	PACK_CHECK_BUTTON (vbox3, pop_bfr_smtp_chkbtn,
-		_("Authenticate with POP3 before sending"));
-	gtk_widget_set_sensitive(pop_bfr_smtp_chkbtn, FALSE);
-#endif
-
-	p_send.date_chkbtn      = date_chkbtn;
-	p_send.msgid_chkbtn     = msgid_chkbtn;
-	p_send.customhdr_chkbtn = customhdr_chkbtn;
-
-	p_send.smtp_auth_chkbtn       = smtp_auth_chkbtn;
-	p_send.smtp_auth_type_optmenu = optmenu;
-	p_send.smtp_uid_entry         = smtp_uid_entry;
-	p_send.smtp_pass_entry        = smtp_pass_entry;
-	/* p_send.pop_bfr_smtp_chkbtn    = pop_bfr_smtp_chkbtn; */
-}
-
-static void prefs_account_compose_create(void)
-{
-	GtkWidget *vbox1;
-	GtkWidget *sig_vbox;
-	GtkWidget *sig_hbox;
-	GtkWidget *sigfile_radiobtn;
-	GtkWidget *sigcmd_radiobtn;
-	GtkWidget *sigpath_entry;
-	GtkWidget *frame;
-	GtkWidget *table;
-	GtkWidget *autocc_chkbtn;
-	GtkWidget *autocc_entry;
-	GtkWidget *autobcc_chkbtn;
-	GtkWidget *autobcc_entry;
-	GtkWidget *autoreplyto_chkbtn;
-	GtkWidget *autoreplyto_entry;
-
-	vbox1 = gtk_vbox_new (FALSE, VSPACING);
-	gtk_widget_show (vbox1);
-	gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
-
-	PACK_FRAME (vbox1, frame, _("Signature"));
-
-	sig_vbox = gtk_vbox_new (FALSE, VSPACING_NARROW_2);
-	gtk_widget_show (sig_vbox);
-	gtk_container_add (GTK_CONTAINER (frame), sig_vbox);
-	gtk_container_set_border_width (GTK_CONTAINER (sig_vbox), 8);
-
-	sig_hbox = gtk_hbox_new (FALSE, 8);
-	gtk_widget_show (sig_hbox);
-	gtk_box_pack_start (GTK_BOX (sig_vbox), sig_hbox, FALSE, FALSE, 0);
-
-	sigfile_radiobtn = gtk_radio_button_new_with_label (NULL, _("File"));
-	gtk_widget_show (sigfile_radiobtn);
-	gtk_box_pack_start (GTK_BOX (sig_hbox), sigfile_radiobtn,
-			    FALSE, FALSE, 0);
-	g_object_set_data (G_OBJECT (sigfile_radiobtn), MENU_VAL_ID,
-			   GINT_TO_POINTER (SIG_FILE));
-
-	sigcmd_radiobtn = gtk_radio_button_new_with_label_from_widget
-		(GTK_RADIO_BUTTON(sigfile_radiobtn), _("Command output"));
-	gtk_widget_show (sigcmd_radiobtn);
-	gtk_box_pack_start (GTK_BOX (sig_hbox), sigcmd_radiobtn,
-			    FALSE, FALSE, 0);
-	g_object_set_data (G_OBJECT (sigcmd_radiobtn), MENU_VAL_ID,
-			   GINT_TO_POINTER (SIG_COMMAND));
-
-	sigpath_entry = gtk_entry_new ();
-	gtk_widget_show (sigpath_entry);
-	gtk_box_pack_start (GTK_BOX (sig_vbox), sigpath_entry, TRUE, TRUE, 0);
-
-	PACK_FRAME (vbox1, frame, _("Automatically set the following addresses"));
-
-	table =  gtk_table_new (3, 2, FALSE);
-	gtk_widget_show (table);
-	gtk_container_add (GTK_CONTAINER (frame), table);
-	gtk_container_set_border_width (GTK_CONTAINER (table), 8);
-	gtk_table_set_row_spacings (GTK_TABLE (table), VSPACING_NARROW_2);
-	gtk_table_set_col_spacings (GTK_TABLE (table), 8);
-
-	autocc_chkbtn = gtk_check_button_new_with_label (_("Cc"));
-	gtk_widget_show (autocc_chkbtn);
-	gtk_table_attach (GTK_TABLE (table), autocc_chkbtn, 0, 1, 0, 1,
-			  GTK_FILL, 0, 0, 0);
-
-	autocc_entry = gtk_entry_new ();
-	gtk_widget_show (autocc_entry);
-	gtk_table_attach (GTK_TABLE (table), autocc_entry, 1, 2, 0, 1,
-			  GTK_EXPAND | GTK_SHRINK | GTK_FILL,
-			  GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
-
-	SET_TOGGLE_SENSITIVITY (autocc_chkbtn, autocc_entry);
-
-	autobcc_chkbtn = gtk_check_button_new_with_label (_("Bcc"));
-	gtk_widget_show (autobcc_chkbtn);
-	gtk_table_attach (GTK_TABLE (table), autobcc_chkbtn, 0, 1, 1, 2,
-			  GTK_FILL, 0, 0, 0);
-
-	autobcc_entry = gtk_entry_new ();
-	gtk_widget_show (autobcc_entry);
-	gtk_table_attach (GTK_TABLE (table), autobcc_entry, 1, 2, 1, 2,
-			  GTK_EXPAND | GTK_SHRINK | GTK_FILL,
-			  GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
-
-	SET_TOGGLE_SENSITIVITY (autobcc_chkbtn, autobcc_entry);
-
-	autoreplyto_chkbtn = gtk_check_button_new_with_label (_("Reply-To"));
-	gtk_widget_show (autoreplyto_chkbtn);
-	gtk_table_attach (GTK_TABLE (table), autoreplyto_chkbtn, 0, 1, 2, 3,
-			  GTK_FILL, 0, 0, 0);
-
-	autoreplyto_entry = gtk_entry_new ();
-	gtk_widget_show (autoreplyto_entry);
-	gtk_table_attach (GTK_TABLE (table), autoreplyto_entry, 1, 2, 2, 3,
-			  GTK_EXPAND | GTK_SHRINK | GTK_FILL,
-			  GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
-
-	SET_TOGGLE_SENSITIVITY (autoreplyto_chkbtn, autoreplyto_entry);
-
-
-	compose.sigfile_radiobtn = sigfile_radiobtn;
-	compose.sigpath_entry    = sigpath_entry;
-
-	compose.autocc_chkbtn      = autocc_chkbtn;
-	compose.autocc_entry       = autocc_entry;
-	compose.autobcc_chkbtn     = autobcc_chkbtn;
-	compose.autobcc_entry      = autobcc_entry;
-	compose.autoreplyto_chkbtn = autoreplyto_chkbtn;
-	compose.autoreplyto_entry  = autoreplyto_entry;
-}
-
-#if USE_GPGME
-static void prefs_account_privacy_create(void)
-{
-	GtkWidget *vbox1;
-	GtkWidget *frame1;
-	GtkWidget *vbox2;
-	GtkWidget *hbox1;
-	GtkWidget *label;
-	GtkWidget *default_sign_chkbtn;
-	GtkWidget *default_encrypt_chkbtn;
-	GtkWidget *encrypt_reply_chkbtn;
-	GtkWidget *ascii_armored_chkbtn;
-	GtkWidget *clearsign_chkbtn;
-	GtkWidget *defaultkey_radiobtn;
-	GtkWidget *emailkey_radiobtn;
-	GtkWidget *customkey_radiobtn;
-	GtkWidget *customkey_entry;
-
-	vbox1 = gtk_vbox_new (FALSE, VSPACING);
-	gtk_widget_show (vbox1);
-	gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
-
-	vbox2 = gtk_vbox_new (FALSE, 0);
-	gtk_widget_show (vbox2);
-	gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
-
-	PACK_CHECK_BUTTON (vbox2, default_sign_chkbtn,
-			   _("Sign message by default"));
-	PACK_CHECK_BUTTON (vbox2, default_encrypt_chkbtn,
-			   _("Encrypt message by default"));
-	PACK_CHECK_BUTTON (vbox2, encrypt_reply_chkbtn,
-			   _("Encrypt when replying to encrypted message"));
-	PACK_CHECK_BUTTON (vbox2, ascii_armored_chkbtn,
-			   _("Use ASCII-armored format for encryption"));
-	PACK_CHECK_BUTTON (vbox2, clearsign_chkbtn,
-			   _("Use clear text signature"));
-	g_signal_connect (G_OBJECT (ascii_armored_chkbtn), "toggled",
-			  G_CALLBACK (prefs_account_ascii_armored_warning),
-			  NULL);
-
-	PACK_FRAME (vbox1, frame1, _("Sign key"));
-
-	vbox2 = gtk_vbox_new (FALSE, 0);
-	gtk_widget_show (vbox2);
-	gtk_container_add (GTK_CONTAINER (frame1), vbox2);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
-
-	defaultkey_radiobtn = gtk_radio_button_new_with_label
-		(NULL, _("Use default GnuPG key"));
-	gtk_widget_show (defaultkey_radiobtn);
-	gtk_box_pack_start (GTK_BOX (vbox2), defaultkey_radiobtn,
-			    FALSE, FALSE, 0);
-	g_object_set_data (G_OBJECT (defaultkey_radiobtn), MENU_VAL_ID,
-			   GINT_TO_POINTER (SIGN_KEY_DEFAULT));
-
-	emailkey_radiobtn = gtk_radio_button_new_with_label_from_widget
-		(GTK_RADIO_BUTTON (defaultkey_radiobtn),
-		 _("Select key by your email address"));
-	gtk_widget_show (emailkey_radiobtn);
-	gtk_box_pack_start (GTK_BOX (vbox2), emailkey_radiobtn,
-			    FALSE, FALSE, 0);
-	g_object_set_data (G_OBJECT (emailkey_radiobtn), MENU_VAL_ID,
-			   GINT_TO_POINTER (SIGN_KEY_BY_FROM));
-
-	customkey_radiobtn = gtk_radio_button_new_with_label_from_widget
-		(GTK_RADIO_BUTTON (defaultkey_radiobtn),
-		 _("Specify key manually"));
-	gtk_widget_show (customkey_radiobtn);
-	gtk_box_pack_start (GTK_BOX (vbox2), customkey_radiobtn,
-			    FALSE, FALSE, 0);
-	g_object_set_data (G_OBJECT (customkey_radiobtn), MENU_VAL_ID,
-			   GINT_TO_POINTER (SIGN_KEY_CUSTOM));
-
-	hbox1 = gtk_hbox_new (FALSE, 8);
-	gtk_widget_show (hbox1);
-	gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
-
-	label = gtk_label_new ("");
-	gtk_widget_show (label);
-	gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
-	gtk_widget_set_size_request (label, 16, -1);
-
-	label = gtk_label_new (_("User or key ID:"));
-	gtk_widget_show (label);
-	gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
-
-	customkey_entry = gtk_entry_new ();
-	gtk_widget_show (customkey_entry);
-	gtk_box_pack_start (GTK_BOX (hbox1), customkey_entry,
-			    TRUE, TRUE, 0);
-
-	SET_TOGGLE_SENSITIVITY (customkey_radiobtn, customkey_entry);
-
-	privacy.default_sign_chkbtn    = default_sign_chkbtn;
-	privacy.default_encrypt_chkbtn = default_encrypt_chkbtn;
-	privacy.encrypt_reply_chkbtn   = encrypt_reply_chkbtn;
-	privacy.ascii_armored_chkbtn   = ascii_armored_chkbtn;
-	privacy.clearsign_chkbtn       = clearsign_chkbtn;
-	privacy.defaultkey_radiobtn    = defaultkey_radiobtn;
-	privacy.emailkey_radiobtn      = emailkey_radiobtn;
-	privacy.customkey_radiobtn     = customkey_radiobtn;
-	privacy.customkey_entry        = customkey_entry;
-}
-#endif /* USE_GPGME */
-
-#if USE_SSL
-
-#define CREATE_RADIO_BUTTON(box, btn, btn_p, label, data)		\
-{									\
-	btn = gtk_radio_button_new_with_label_from_widget		\
-		(GTK_RADIO_BUTTON (btn_p), label);			\
-	gtk_widget_show (btn);						\
-	gtk_box_pack_start (GTK_BOX (box), btn, FALSE, FALSE, 0);	\
-	g_object_set_data (G_OBJECT (btn), MENU_VAL_ID,			\
-			   GINT_TO_POINTER (data));			\
-}
-
-#define CREATE_RADIO_BUTTONS(box,					\
-			     btn1, btn1_label, btn1_data,		\
-			     btn2, btn2_label, btn2_data,		\
-			     btn3, btn3_label, btn3_data)		\
-{									\
-	btn1 = gtk_radio_button_new_with_label(NULL, btn1_label);	\
-	gtk_widget_show (btn1);						\
-	gtk_box_pack_start (GTK_BOX (box), btn1, FALSE, FALSE, 0);	\
-	g_object_set_data (G_OBJECT (btn1), MENU_VAL_ID,		\
-			   GINT_TO_POINTER (btn1_data));		\
-									\
-	CREATE_RADIO_BUTTON(box, btn2, btn1, btn2_label, btn2_data);	\
-	CREATE_RADIO_BUTTON(box, btn3, btn1, btn3_label, btn3_data);	\
-}
-
-static void prefs_account_ssl_create(void)
-{
-	GtkWidget *vbox1;
-
-	GtkWidget *pop_frame;
-	GtkWidget *vbox2;
-	GtkWidget *pop_nossl_radiobtn;
-	GtkWidget *pop_ssltunnel_radiobtn;
-	GtkWidget *pop_starttls_radiobtn;
-
-	GtkWidget *imap_frame;
-	GtkWidget *vbox3;
-	GtkWidget *imap_nossl_radiobtn;
-	GtkWidget *imap_ssltunnel_radiobtn;
-	GtkWidget *imap_starttls_radiobtn;
-
-	GtkWidget *nntp_frame;
-	GtkWidget *vbox4;
-	GtkWidget *nntp_nossl_radiobtn;
-	GtkWidget *nntp_ssltunnel_radiobtn;
-
-	GtkWidget *send_frame;
-	GtkWidget *vbox5;
-	GtkWidget *smtp_nossl_radiobtn;
-	GtkWidget *smtp_ssltunnel_radiobtn;
-	GtkWidget *smtp_starttls_radiobtn;
-
-	GtkWidget *vbox6;
-	GtkWidget *use_nonblocking_ssl_chkbtn;
-	GtkWidget *label;
-
-	vbox1 = gtk_vbox_new (FALSE, VSPACING);
-	gtk_widget_show (vbox1);
-	gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
-
-	PACK_FRAME (vbox1, pop_frame, _("POP3"));
-	vbox2 = gtk_vbox_new (FALSE, 0);
-	gtk_widget_show (vbox2);
-	gtk_container_add (GTK_CONTAINER (pop_frame), vbox2);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
-
-	CREATE_RADIO_BUTTONS(vbox2,
-			     pop_nossl_radiobtn,
-			     _("Don't use SSL"),
-			     SSL_NONE,
-			     pop_ssltunnel_radiobtn,
-			     _("Use SSL for POP3 connection"),
-			     SSL_TUNNEL,
-			     pop_starttls_radiobtn,
-			     _("Use STARTTLS command to start SSL session"),
-			     SSL_STARTTLS);
-
-	PACK_FRAME (vbox1, imap_frame, _("IMAP4"));
-	vbox3 = gtk_vbox_new (FALSE, 0);
-	gtk_widget_show (vbox3);
-	gtk_container_add (GTK_CONTAINER (imap_frame), vbox3);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8);
-
-	CREATE_RADIO_BUTTONS(vbox3,
-			     imap_nossl_radiobtn,
-			     _("Don't use SSL"),
-			     SSL_NONE,
-			     imap_ssltunnel_radiobtn,
-			     _("Use SSL for IMAP4 connection"),
-			     SSL_TUNNEL,
-			     imap_starttls_radiobtn,
-			     _("Use STARTTLS command to start SSL session"),
-			     SSL_STARTTLS);
-
-	PACK_FRAME (vbox1, nntp_frame, _("NNTP"));
-	vbox4 = gtk_vbox_new (FALSE, 0);
-	gtk_widget_show (vbox4);
-	gtk_container_add (GTK_CONTAINER (nntp_frame), vbox4);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox4), 8);
-
-	nntp_nossl_radiobtn =
-		gtk_radio_button_new_with_label (NULL, _("Don't use SSL"));
-	gtk_widget_show (nntp_nossl_radiobtn);
-	gtk_box_pack_start (GTK_BOX (vbox4), nntp_nossl_radiobtn,
-			    FALSE, FALSE, 0);
-	g_object_set_data (G_OBJECT (nntp_nossl_radiobtn), MENU_VAL_ID,
-			   GINT_TO_POINTER (SSL_NONE));
-
-	CREATE_RADIO_BUTTON(vbox4, nntp_ssltunnel_radiobtn, nntp_nossl_radiobtn,
-			    _("Use SSL for NNTP connection"), SSL_TUNNEL);
-
-	PACK_FRAME (vbox1, send_frame, _("Send (SMTP)"));
-	vbox5 = gtk_vbox_new (FALSE, 0);
-	gtk_widget_show (vbox5);
-	gtk_container_add (GTK_CONTAINER (send_frame), vbox5);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox5), 8);
-
-	CREATE_RADIO_BUTTONS(vbox5,
-			     smtp_nossl_radiobtn,
-			     _("Don't use SSL"),
-			     SSL_NONE,
-			     smtp_ssltunnel_radiobtn,
-			     _("Use SSL for SMTP connection"),
-			     SSL_TUNNEL,
-			     smtp_starttls_radiobtn,
-			     _("Use STARTTLS command to start SSL session"),
-			     SSL_STARTTLS);
-
-	vbox6 = gtk_vbox_new (FALSE, 0);
-	gtk_widget_show (vbox6);
-	gtk_box_pack_start (GTK_BOX (vbox1), vbox6, FALSE, FALSE, 0);
-
-	PACK_CHECK_BUTTON(vbox6, use_nonblocking_ssl_chkbtn,
-			  _("Use non-blocking SSL"));
-	PACK_SMALL_LABEL
-		(vbox6, label,
-		 _("Turn this off if you have problems in SSL connection."));
-
-	ssl.pop_frame               = pop_frame;
-	ssl.pop_nossl_radiobtn      = pop_nossl_radiobtn;
-	ssl.pop_ssltunnel_radiobtn  = pop_ssltunnel_radiobtn;
-	ssl.pop_starttls_radiobtn   = pop_starttls_radiobtn;
-
-	ssl.imap_frame              = imap_frame;
-	ssl.imap_nossl_radiobtn     = imap_nossl_radiobtn;
-	ssl.imap_ssltunnel_radiobtn = imap_ssltunnel_radiobtn;
-	ssl.imap_starttls_radiobtn  = imap_starttls_radiobtn;
-
-	ssl.nntp_frame              = nntp_frame;
-	ssl.nntp_nossl_radiobtn     = nntp_nossl_radiobtn;
-	ssl.nntp_ssltunnel_radiobtn = nntp_ssltunnel_radiobtn;
-
-	ssl.send_frame              = send_frame;
-	ssl.smtp_nossl_radiobtn     = smtp_nossl_radiobtn;
-	ssl.smtp_ssltunnel_radiobtn = smtp_ssltunnel_radiobtn;
-	ssl.smtp_starttls_radiobtn  = smtp_starttls_radiobtn;
-
-	ssl.use_nonblocking_ssl_chkbtn = use_nonblocking_ssl_chkbtn;
-}
-
-#undef CREATE_RADIO_BUTTONS
-#undef CREATE_RADIO_BUTTON
-
-#endif /* USE_SSL */
-
-static void prefs_account_advanced_create(void)
-{
-	GtkWidget *vbox1;
-	GtkWidget *vbox2;
-	GtkWidget *hbox1;
-	GtkWidget *checkbtn_smtpport;
-	GtkWidget *entry_smtpport;
-	GtkWidget *hbox_popport;
-	GtkWidget *checkbtn_popport;
-	GtkWidget *entry_popport;
-	GtkWidget *hbox_imapport;
-	GtkWidget *checkbtn_imapport;
-	GtkWidget *entry_imapport;
-	GtkWidget *hbox_nntpport;
-	GtkWidget *checkbtn_nntpport;
-	GtkWidget *entry_nntpport;
-	GtkWidget *checkbtn_domain;
-	GtkWidget *entry_domain;
-	GtkWidget *imap_frame;
-	GtkWidget *imapdir_label;
-	GtkWidget *imapdir_entry;
-	GtkWidget *folder_frame;
-	GtkWidget *vbox3;
-	GtkWidget *table;
-	GtkWidget *sent_folder_chkbtn;
-	GtkWidget *sent_folder_entry;
-	GtkWidget *draft_folder_chkbtn;
-	GtkWidget *draft_folder_entry;
-	GtkWidget *trash_folder_chkbtn;
-	GtkWidget *trash_folder_entry;
-
-#define PACK_HBOX(hbox) \
-{ \
-	hbox = gtk_hbox_new (FALSE, 8); \
-	gtk_widget_show (hbox); \
-	gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0); \
-}
-
-#define PACK_PORT_ENTRY(box, entry) \
-{ \
-	entry = gtk_entry_new (); \
-	gtk_entry_set_max_length (GTK_ENTRY(entry), 5); \
-	gtk_widget_show (entry); \
-	gtk_box_pack_start (GTK_BOX (box), entry, FALSE, FALSE, 0); \
-	gtk_widget_set_size_request (entry, 64, -1); \
-}
-
-	vbox1 = gtk_vbox_new (FALSE, VSPACING);
-	gtk_widget_show (vbox1);
-	gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
-
-	vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW_2);
-	gtk_widget_show (vbox2);
-	gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
-
-	PACK_HBOX (hbox1);
-	PACK_CHECK_BUTTON (hbox1, checkbtn_smtpport, _("Specify SMTP port"));
-	PACK_PORT_ENTRY (hbox1, entry_smtpport);
-	SET_TOGGLE_SENSITIVITY (checkbtn_smtpport, entry_smtpport);
-
-	PACK_HBOX (hbox_popport);
-	PACK_CHECK_BUTTON (hbox_popport, checkbtn_popport,
-			   _("Specify POP3 port"));
-	PACK_PORT_ENTRY (hbox_popport, entry_popport);
-	SET_TOGGLE_SENSITIVITY (checkbtn_popport, entry_popport);
-
-	PACK_HBOX (hbox_imapport);
-	PACK_CHECK_BUTTON (hbox_imapport, checkbtn_imapport,
-			   _("Specify IMAP4 port"));
-	PACK_PORT_ENTRY (hbox_imapport, entry_imapport);
-	SET_TOGGLE_SENSITIVITY (checkbtn_imapport, entry_imapport);
-
-	PACK_HBOX (hbox_nntpport);
-	PACK_CHECK_BUTTON (hbox_nntpport, checkbtn_nntpport,
-			   _("Specify NNTP port"));
-	PACK_PORT_ENTRY (hbox_nntpport, entry_nntpport);
-	SET_TOGGLE_SENSITIVITY (checkbtn_nntpport, entry_nntpport);
-
-	PACK_HBOX (hbox1);
-	PACK_CHECK_BUTTON (hbox1, checkbtn_domain, _("Specify domain name"));
-
-	entry_domain = gtk_entry_new ();
-	gtk_widget_show (entry_domain);
-	gtk_box_pack_start (GTK_BOX (hbox1), entry_domain, TRUE, TRUE, 0);
-	SET_TOGGLE_SENSITIVITY (checkbtn_domain, entry_domain);
-
-	PACK_FRAME (vbox1, imap_frame, _("IMAP4"));
-
-	vbox3 = gtk_vbox_new (FALSE, VSPACING_NARROW);
-	gtk_widget_show (vbox3);
-	gtk_container_add (GTK_CONTAINER (imap_frame), vbox3);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8);
-
-	hbox1 = gtk_hbox_new (FALSE, 8);
-	gtk_widget_show (hbox1);
-	gtk_box_pack_start (GTK_BOX (vbox3), hbox1, FALSE, FALSE, 0);
-
-	imapdir_label = gtk_label_new (_("IMAP server directory"));
-	gtk_widget_show (imapdir_label);
-	gtk_box_pack_start (GTK_BOX (hbox1), imapdir_label, FALSE, FALSE, 0);
-
-	imapdir_entry = gtk_entry_new();
-	gtk_widget_show (imapdir_entry);
-	gtk_box_pack_start (GTK_BOX (hbox1), imapdir_entry, TRUE, TRUE, 0);
-
-#undef PACK_HBOX
-#undef PACK_PORT_ENTRY
-
-	/* special folder setting (maybe these options are redundant) */
-
-	PACK_FRAME (vbox1, folder_frame, _("Folder"));
-
-	vbox3 = gtk_vbox_new (FALSE, 0);
-	gtk_widget_show (vbox3);
-	gtk_container_add (GTK_CONTAINER (folder_frame), vbox3);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8);
-
-	table = gtk_table_new (3, 3, FALSE);
-	gtk_widget_show (table);
-	gtk_container_add (GTK_CONTAINER (vbox3), table);
-	gtk_table_set_row_spacings (GTK_TABLE (table), VSPACING_NARROW_2);
-	gtk_table_set_col_spacings (GTK_TABLE (table), 4);
-
-#define SET_CHECK_BTN_AND_ENTRY(label, chkbtn, entry, n)		\
-{									\
-	GtkWidget *button;						\
-									\
-	chkbtn = gtk_check_button_new_with_label (label);		\
-	gtk_widget_show (chkbtn);					\
-	gtk_table_attach (GTK_TABLE (table), chkbtn,			\
-			  0, 1, n, n + 1, GTK_FILL, 0, 0, 0);		\
-									\
-	entry = gtk_entry_new ();					\
-	gtk_widget_show (entry);					\
-	gtk_table_attach (GTK_TABLE (table), entry, 1, 2, n, n + 1,	\
-			  GTK_EXPAND | GTK_SHRINK | GTK_FILL,		\
-			  GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);	\
-									\
-	button = gtk_button_new_with_label (_(" ... "));		\
-	gtk_widget_show (button);					\
-	gtk_table_attach (GTK_TABLE (table), button,			\
-			  2, 3, n, n + 1, GTK_FILL, 0, 0, 0);		\
-	g_signal_connect						\
-		(G_OBJECT (button), "clicked",				\
-		 G_CALLBACK (prefs_account_select_folder_cb),		\
-		 entry);						\
-									\
-	SET_TOGGLE_SENSITIVITY (chkbtn, entry);				\
-	SET_TOGGLE_SENSITIVITY (chkbtn, button);			\
-}
-
-	SET_CHECK_BTN_AND_ENTRY(_("Put sent messages in"),
-				sent_folder_chkbtn, sent_folder_entry, 0);
-	SET_CHECK_BTN_AND_ENTRY(_("Put draft messages in"),
-				draft_folder_chkbtn, draft_folder_entry, 1);
-	SET_CHECK_BTN_AND_ENTRY(_("Put deleted messages in"),
-				trash_folder_chkbtn, trash_folder_entry, 2);
-
-	advanced.smtpport_chkbtn	= checkbtn_smtpport;
-	advanced.smtpport_entry		= entry_smtpport;
-	advanced.popport_hbox		= hbox_popport;
-	advanced.popport_chkbtn		= checkbtn_popport;
-	advanced.popport_entry		= entry_popport;
-	advanced.imapport_hbox		= hbox_imapport;
-	advanced.imapport_chkbtn	= checkbtn_imapport;
-	advanced.imapport_entry		= entry_imapport;
-	advanced.nntpport_hbox		= hbox_nntpport;
-	advanced.nntpport_chkbtn	= checkbtn_nntpport;
-	advanced.nntpport_entry		= entry_nntpport;
-	advanced.domain_chkbtn		= checkbtn_domain;
-	advanced.domain_entry		= entry_domain;
-
-	advanced.imap_frame             = imap_frame;
-	advanced.imapdir_entry          = imapdir_entry;
-
-	advanced.sent_folder_chkbtn  = sent_folder_chkbtn;
-	advanced.sent_folder_entry   = sent_folder_entry;
-	advanced.draft_folder_chkbtn = draft_folder_chkbtn;
-	advanced.draft_folder_entry  = draft_folder_entry;
-	advanced.trash_folder_chkbtn = trash_folder_chkbtn;
-	advanced.trash_folder_entry  = trash_folder_entry;
-}
-
-static gint prefs_account_deleted(GtkWidget *widget, GdkEventAny *event,
-				  gpointer data)
-{
-	prefs_account_cancel();
-	return TRUE;
-}
-
-static gboolean prefs_account_key_pressed(GtkWidget *widget, GdkEventKey *event,
-					  gpointer data)
-{
-	if (event && event->keyval == GDK_Escape)
-		prefs_account_cancel();
-	return FALSE;
-}
-
-static void prefs_account_ok(void)
-{
-	if (prefs_account_apply() == 0)
-		gtk_main_quit();
-}
-
-static gint prefs_account_apply(void)
-{
-	RecvProtocol protocol;
-	GtkWidget *menu;
-	GtkWidget *menuitem;
-
-	menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(basic.protocol_optmenu));
-	menuitem = gtk_menu_get_active(GTK_MENU(menu));
-	protocol = GPOINTER_TO_INT
-		(g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
-
-	if (*gtk_entry_get_text(GTK_ENTRY(basic.acname_entry)) == '\0') {
-		alertpanel_error(_("Account name is not entered."));
-		return -1;
-	}
-	if (*gtk_entry_get_text(GTK_ENTRY(basic.addr_entry)) == '\0') {
-		alertpanel_error(_("Mail address is not entered."));
-		return -1;
-	}
-	if ((protocol == A_POP3 || protocol == A_LOCAL) &&
-	    *gtk_entry_get_text(GTK_ENTRY(basic.smtpserv_entry)) == '\0') {
-		alertpanel_error(_("SMTP server is not entered."));
-		return -1;
-	}
-	if ((protocol == A_POP3 || protocol == A_IMAP4) &&
-	    *gtk_entry_get_text(GTK_ENTRY(basic.uid_entry)) == '\0') {
-		alertpanel_error(_("User ID is not entered."));
-		return -1;
-	}
-	if (protocol == A_POP3 &&
-	    *gtk_entry_get_text(GTK_ENTRY(basic.recvserv_entry)) == '\0') {
-		alertpanel_error(_("POP3 server is not entered."));
-		return -1;
-	}
-	if (protocol == A_IMAP4 &&
-	    *gtk_entry_get_text(GTK_ENTRY(basic.recvserv_entry)) == '\0') {
-		alertpanel_error(_("IMAP4 server is not entered."));
-		return -1;
-	}
-	if (protocol == A_NNTP &&
-	    *gtk_entry_get_text(GTK_ENTRY(basic.nntpserv_entry)) == '\0') {
-		alertpanel_error(_("NNTP server is not entered."));
-		return -1;
-	}
-
-	prefs_set_data_from_dialog(param);
-	return 0;
-}
-
-static void prefs_account_cancel(void)
-{
-	cancelled = TRUE;
-	gtk_main_quit();
-}
-
-static void prefs_account_select_folder_cb(GtkWidget *widget, gpointer data)
-{
-	FolderItem *item;
-	gchar *id;
-
-	item = foldersel_folder_sel(NULL, FOLDER_SEL_COPY, NULL);
-	if (item && item->path) {
-		id = folder_item_get_identifier(item);
-		if (id) {
-			gtk_entry_set_text(GTK_ENTRY(data), id);
-			g_free(id);
-		}
-	}
-}
-
-static void prefs_account_edit_custom_header(void)
-{
-	prefs_custom_header_open(&tmp_ac_prefs);
-}
-
-static void prefs_account_enum_set_data_from_radiobtn(PrefParam *pparam)
-{
-	GtkRadioButton *radiobtn;
-	GSList *group;
-
-	radiobtn = GTK_RADIO_BUTTON (*pparam->widget);
-	group = gtk_radio_button_get_group (radiobtn);
-	while (group != NULL) {
-		GtkToggleButton *btn = GTK_TOGGLE_BUTTON (group->data);
-		if (gtk_toggle_button_get_active (btn)) {
-			*((gint *)pparam->data) = GPOINTER_TO_INT
-				(g_object_get_data (G_OBJECT (btn),
-						    MENU_VAL_ID));
-			break;
-		}
-		group = group->next;
-	}
-}
-
-static void prefs_account_enum_set_radiobtn(PrefParam *pparam)
-{
-	GtkRadioButton *radiobtn;
-	GSList *group;
-	gpointer data;
-
-	data = GINT_TO_POINTER (*((gint *)pparam->data));
-	radiobtn = GTK_RADIO_BUTTON (*pparam->widget);
-	group = gtk_radio_button_get_group (radiobtn);
-	while (group != NULL) {
-		GtkToggleButton *btn = GTK_TOGGLE_BUTTON (group->data);
-		gpointer data1;
-
-		data1 = g_object_get_data (G_OBJECT (btn), MENU_VAL_ID);
-		if (data1 == data) {
-			gtk_toggle_button_set_active (btn, TRUE);
-			break;
-		}
-		group = group->next;
-	}
-}
-
-
-#if USE_GPGME
-static void prefs_account_ascii_armored_warning(GtkWidget *widget)
-{
-	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)) &&
-	    gtk_notebook_get_current_page(GTK_NOTEBOOK(dialog.notebook)) > 0)
-		alertpanel_warning
-			(_("It's not recommended to use the old style ASCII-armored\n"
-			   "mode for encrypted messages. It doesn't comply with the\n"
-			   "RFC 3156 - MIME Security with OpenPGP."));
-}
-#endif /* USE_GPGME */
-
-static void prefs_account_protocol_set_data_from_optmenu(PrefParam *pparam)
-{
-	GtkWidget *menu;
-	GtkWidget *menuitem;
-
-	menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(*pparam->widget));
-	menuitem = gtk_menu_get_active(GTK_MENU(menu));
-	*((RecvProtocol *)pparam->data) = GPOINTER_TO_INT
-		(g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
-}
-
-static void prefs_account_protocol_set_optmenu(PrefParam *pparam)
-{
-	RecvProtocol protocol;
-	GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
-	GtkWidget *menu;
-	GtkWidget *menuitem;
-	gint index;
-
-	protocol = *((RecvProtocol *)pparam->data);
-	index = menu_find_option_menu_index
-		(optmenu, GINT_TO_POINTER(protocol), NULL);
-	if (index < 0) return;
-	gtk_option_menu_set_history(optmenu, index);
-
-	menu = gtk_option_menu_get_menu(optmenu);
-	menu_set_insensitive_all(GTK_MENU_SHELL(menu));
-
-	menuitem = gtk_menu_get_active(GTK_MENU(menu));
-	gtk_widget_set_sensitive(menuitem, TRUE);
-	gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
-}
-
-static void prefs_account_imap_auth_type_set_data_from_optmenu(PrefParam *pparam)
-{
-	GtkWidget *menu;
-	GtkWidget *menuitem;
-
-	menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(*pparam->widget));
-	menuitem = gtk_menu_get_active(GTK_MENU(menu));
-	*((RecvProtocol *)pparam->data) = GPOINTER_TO_INT
-		(g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
-}
-
-static void prefs_account_imap_auth_type_set_optmenu(PrefParam *pparam)
-{
-	IMAPAuthType type = *((IMAPAuthType *)pparam->data);
-	GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
-	GtkWidget *menu;
-	GtkWidget *menuitem;
-
-	switch (type) {
-	case IMAP_AUTH_LOGIN:
-		gtk_option_menu_set_history(optmenu, 1);
-		break;
-	case IMAP_AUTH_CRAM_MD5:
-		gtk_option_menu_set_history(optmenu, 2);
-		break;
-	case 0:
-	default:
-		gtk_option_menu_set_history(optmenu, 0);
-	}
-
-	menu = gtk_option_menu_get_menu(optmenu);
-	menuitem = gtk_menu_get_active(GTK_MENU(menu));
-	gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
-}
-
-static void prefs_account_smtp_auth_type_set_data_from_optmenu(PrefParam *pparam)
-{
-	GtkWidget *menu;
-	GtkWidget *menuitem;
-
-	menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(*pparam->widget));
-	menuitem = gtk_menu_get_active(GTK_MENU(menu));
-	*((RecvProtocol *)pparam->data) = GPOINTER_TO_INT
-		(g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
-}
-
-static void prefs_account_smtp_auth_type_set_optmenu(PrefParam *pparam)
-{
-	SMTPAuthType type = *((SMTPAuthType *)pparam->data);
-	GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
-	GtkWidget *menu;
-	GtkWidget *menuitem;
-
-	switch (type) {
-	case SMTPAUTH_PLAIN:
-		gtk_option_menu_set_history(optmenu, 1);
-		break;
-	case SMTPAUTH_LOGIN:
-		gtk_option_menu_set_history(optmenu, 2);
-		break;
-	case SMTPAUTH_CRAM_MD5:
-		gtk_option_menu_set_history(optmenu, 3);
-		break;
-	case SMTPAUTH_DIGEST_MD5:
-		gtk_option_menu_set_history(optmenu, 4);
-		break;
-	case 0:
-	default:
-		gtk_option_menu_set_history(optmenu, 0);
-	}
-
-	menu = gtk_option_menu_get_menu(optmenu);
-	menuitem = gtk_menu_get_active(GTK_MENU(menu));
-	gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
-}
-
-static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
-{
-	RecvProtocol protocol;
-	gboolean active;
-
-	protocol = GPOINTER_TO_INT
-		(g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
-
-	switch(protocol) {
-	case A_NNTP:
-		gtk_widget_show(basic.nntpserv_label);
-		gtk_widget_show(basic.nntpserv_entry);
-		gtk_widget_show(basic.nntpauth_chkbtn);
-		gtk_widget_hide(basic.recvserv_label);
-		gtk_widget_hide(basic.recvserv_entry);
-		gtk_widget_hide(basic.smtpserv_label);
-		gtk_widget_hide(basic.smtpserv_entry);
-		active = gtk_toggle_button_get_active
-			(GTK_TOGGLE_BUTTON(basic.nntpauth_chkbtn));
-		gtk_widget_set_sensitive(basic.uid_label,  active);
-		gtk_widget_set_sensitive(basic.pass_label, active);
-		gtk_widget_set_sensitive(basic.uid_entry,  active);
-		gtk_widget_set_sensitive(basic.pass_entry, active);
-		gtk_widget_hide(receive.pop3_frame);
-		gtk_widget_hide(receive.imap_frame);
-		gtk_widget_show(receive.nntp_frame);
-		gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
-
-		if (!tmp_ac_prefs.account_name) {
-			gtk_toggle_button_set_active
-				(GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
-				 FALSE);
-		}
-
-#if USE_SSL
-		gtk_widget_hide(ssl.pop_frame);
-		gtk_widget_hide(ssl.imap_frame);
-		gtk_widget_show(ssl.nntp_frame);
-		gtk_widget_hide(ssl.send_frame);
-#endif
-		gtk_widget_hide(advanced.popport_hbox);
-		gtk_widget_hide(advanced.imapport_hbox);
-		gtk_widget_show(advanced.nntpport_hbox);
-		gtk_widget_hide(advanced.imap_frame);
-		break;
-	case A_LOCAL:
-		gtk_widget_hide(basic.nntpserv_label);
-		gtk_widget_hide(basic.nntpserv_entry);
-		gtk_widget_hide(basic.nntpauth_chkbtn);
-		gtk_widget_set_sensitive(basic.recvserv_label, FALSE);
-		gtk_widget_set_sensitive(basic.recvserv_entry, FALSE);
-		gtk_widget_show(basic.recvserv_label);
-		gtk_widget_show(basic.recvserv_entry);
-		gtk_widget_show(basic.smtpserv_label);
-		gtk_widget_show(basic.smtpserv_entry);
-		gtk_widget_set_sensitive(basic.uid_label,  FALSE);
-		gtk_widget_set_sensitive(basic.pass_label, FALSE);
-		gtk_widget_set_sensitive(basic.uid_entry,  FALSE);
-		gtk_widget_set_sensitive(basic.pass_entry, FALSE);
-		gtk_widget_hide(receive.pop3_frame);
-		gtk_widget_hide(receive.imap_frame);
-		gtk_widget_hide(receive.nntp_frame);
-		gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, FALSE);
-
-		if (!tmp_ac_prefs.account_name) {
-			gtk_toggle_button_set_active
-				(GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
-				 TRUE);
-		}
-
-#if USE_SSL
-		gtk_widget_hide(ssl.pop_frame);
-		gtk_widget_hide(ssl.imap_frame);
-		gtk_widget_hide(ssl.nntp_frame);
-		gtk_widget_show(ssl.send_frame);
-#endif
-		gtk_widget_hide(advanced.popport_hbox);
-		gtk_widget_hide(advanced.imapport_hbox);
-		gtk_widget_hide(advanced.nntpport_hbox);
-		gtk_widget_hide(advanced.imap_frame);
-		break;
-	case A_IMAP4:
-		gtk_widget_hide(basic.nntpserv_label);
-		gtk_widget_hide(basic.nntpserv_entry);
-		gtk_widget_hide(basic.nntpauth_chkbtn);
-		gtk_widget_set_sensitive(basic.recvserv_label, TRUE);
-		gtk_widget_set_sensitive(basic.recvserv_entry, TRUE);
-		gtk_widget_show(basic.recvserv_label);
-		gtk_widget_show(basic.recvserv_entry);
-		gtk_widget_show(basic.smtpserv_label);
-		gtk_widget_show(basic.smtpserv_entry);
-		gtk_widget_set_sensitive(basic.uid_label,  TRUE);
-		gtk_widget_set_sensitive(basic.pass_label, TRUE);
-		gtk_widget_set_sensitive(basic.uid_entry,  TRUE);
-		gtk_widget_set_sensitive(basic.pass_entry, TRUE);
-		gtk_widget_hide(receive.pop3_frame);
-		gtk_widget_show(receive.imap_frame);
-		gtk_widget_hide(receive.nntp_frame);
-		gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
-
-		if (!tmp_ac_prefs.account_name) {
-			gtk_toggle_button_set_active
-				(GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
-				 FALSE);
-		}
-
-#if USE_SSL
-		gtk_widget_hide(ssl.pop_frame);
-		gtk_widget_show(ssl.imap_frame);
-		gtk_widget_hide(ssl.nntp_frame);
-		gtk_widget_show(ssl.send_frame);
-#endif
-		gtk_widget_hide(advanced.popport_hbox);
-		gtk_widget_show(advanced.imapport_hbox);
-		gtk_widget_hide(advanced.nntpport_hbox);
-		gtk_widget_show(advanced.imap_frame);
-		break;
-	case A_POP3:
-	default:
-		gtk_widget_hide(basic.nntpserv_label);
-		gtk_widget_hide(basic.nntpserv_entry);
-		gtk_widget_hide(basic.nntpauth_chkbtn);
-		gtk_widget_set_sensitive(basic.recvserv_label, TRUE);
-		gtk_widget_set_sensitive(basic.recvserv_entry, TRUE);
-		gtk_widget_show(basic.recvserv_label);
-		gtk_widget_show(basic.recvserv_entry);
-		gtk_widget_show(basic.smtpserv_label);
-		gtk_widget_show(basic.smtpserv_entry);
-		gtk_widget_set_sensitive(basic.uid_label,  TRUE);
-		gtk_widget_set_sensitive(basic.pass_label, TRUE);
-		gtk_widget_set_sensitive(basic.uid_entry,  TRUE);
-		gtk_widget_set_sensitive(basic.pass_entry, TRUE);
-		gtk_widget_show(receive.pop3_frame);
-		gtk_widget_hide(receive.imap_frame);
-		gtk_widget_hide(receive.nntp_frame);
-		gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
-
-		if (!tmp_ac_prefs.account_name) {
-			gtk_toggle_button_set_active
-				(GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
-				 TRUE);
-		}
-
-#if USE_SSL
-		gtk_widget_show(ssl.pop_frame);
-		gtk_widget_hide(ssl.imap_frame);
-		gtk_widget_hide(ssl.nntp_frame);
-		gtk_widget_show(ssl.send_frame);
-#endif
-		gtk_widget_show(advanced.popport_hbox);
-		gtk_widget_hide(advanced.imapport_hbox);
-		gtk_widget_hide(advanced.nntpport_hbox);
-		gtk_widget_hide(advanced.imap_frame);
-		break;
-	}
-
-	gtk_widget_queue_resize(basic.serv_frame);
-}