GtkWidget *getall_chkbtn;
GtkWidget *recvatgetall_chkbtn;
GtkWidget *filter_on_recv_chkbtn;
+
+ GtkWidget *imap_frame;
+ GtkWidget *imapdir_entry;
} receive;
static struct Send {
GtkWidget *autoreplyto_entry;
GtkWidget *smtp_auth_chkbtn;
+ GtkWidget *smtp_userid_entry;
+ GtkWidget *smtp_passwd_entry;
GtkWidget *pop_bfr_smtp_chkbtn;
} send;
} privacy;
#endif /* USE_GPGME */
+#if USE_SSL
+static struct SSLPrefs {
+ GtkWidget *receive_frame;
+ GtkWidget *pop_chkbtn;
+ GtkWidget *imap_chkbtn;
+
+ GtkWidget *send_frame;
+ GtkWidget *smtp_nossl_radiobtn;
+ GtkWidget *smtp_ssltunnel_radiobtn;
+ GtkWidget *smtp_sslstarttls_radiobtn;
+} 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;
} 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);
-#if USE_GPGME
-static void prefs_account_sign_key_set_data_from_radiobtn (PrefParam *pparam);
-static void prefs_account_sign_key_set_radiobtn (PrefParam *pparam);
-#endif /* USE_GPGME */
+#if USE_GPGME || USE_SSL
+static void prefs_account_enum_set_data_from_radiobtn (PrefParam *pparam);
+static void prefs_account_enum_set_radiobtn (PrefParam *pparam);
+#endif /* USE_GPGME || USE_SSL */
static void prefs_account_nntpauth_toggled(GtkToggleButton *button,
gpointer user_data);
&receive.filter_on_recv_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
+ {"imap_directory", NULL, &tmp_ac_prefs.imap_dir, P_STRING,
+ &receive.imapdir_entry, prefs_set_data_from_entry, prefs_set_entry},
+
/* Send */
{"add_date", "TRUE", &tmp_ac_prefs.add_date, P_BOOL,
&send.date_chkbtn,
&send.smtp_auth_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
+ {"smtp_user_id", "ENV_USER", &tmp_ac_prefs.smtp_userid, P_STRING,
+ &send.smtp_userid_entry, prefs_set_data_from_entry, prefs_set_entry},
+
+ {"smtp_password", NULL, &tmp_ac_prefs.smtp_passwd, P_STRING,
+ &send.smtp_passwd_entry, prefs_set_data_from_entry, prefs_set_entry},
+
{"pop_before_smtp", "FALSE", &tmp_ac_prefs.pop_before_smtp, P_BOOL,
&send.pop_bfr_smtp_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
/* Privacy */
{"sign_key", NULL, &tmp_ac_prefs.sign_key, P_ENUM,
&privacy.defaultkey_radiobtn,
- prefs_account_sign_key_set_data_from_radiobtn,
- prefs_account_sign_key_set_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,
&privacy.customkey_entry,
prefs_set_data_from_entry, prefs_set_entry},
#endif /* USE_GPGME */
+#if USE_SSL
+ /* SSL */
+ {"ssl_smtp", "0", &tmp_ac_prefs.ssl_smtp, P_ENUM,
+ &ssl.smtp_nossl_radiobtn,
+ prefs_account_enum_set_data_from_radiobtn,
+ prefs_account_enum_set_radiobtn},
+ {"ssl_pop", "FALSE", &tmp_ac_prefs.ssl_pop, P_BOOL,
+ &ssl.pop_chkbtn, prefs_set_data_from_toggle, prefs_set_toggle},
+ {"ssl_imap", "FALSE", &tmp_ac_prefs.ssl_imap, P_BOOL,
+ &ssl.imap_chkbtn, prefs_set_data_from_toggle, prefs_set_toggle},
+#endif /* USE_SSL */
+
/* Advanced */
{"set_smtpport", "FALSE", &tmp_ac_prefs.set_smtpport, P_BOOL,
&advanced.smtpport_chkbtn,
&advanced.popport_entry,
prefs_set_data_from_entry, prefs_set_entry},
+ {"set_imapport", "FALSE", &tmp_ac_prefs.set_imapport, P_BOOL,
+ &advanced.imapport_chkbtn,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+
+ {"imap_port", "143", &tmp_ac_prefs.imapport, P_USHORT,
+ &advanced.imapport_entry,
+ prefs_set_data_from_entry, prefs_set_entry},
+
+ {"set_nntpport", "FALSE", &tmp_ac_prefs.set_nntpport, P_BOOL,
+ &advanced.nntpport_chkbtn,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+
+ {"nntp_port", "119", &tmp_ac_prefs.nntpport, P_USHORT,
+ &advanced.nntpport_entry,
+ prefs_set_data_from_entry, prefs_set_entry},
+
{"set_domain", "FALSE", &tmp_ac_prefs.set_domain, P_BOOL,
&advanced.domain_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
#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);
static void prefs_account_edit_custom_header (void);
static gint prefs_account_apply (void);
static void prefs_account_cancel (void);
-#define VSPACING 12
-#define VSPACING_NARROW 4
-#define BOX_BORDER 16
-#define DEFAULT_ENTRY_WIDTH 80
-
void prefs_account_read_config(PrefsAccount *ac_prefs, const gchar *label)
{
const gchar *p = label;
{
gboolean new_account = FALSE;
+ if (prefs_rc_is_readonly(ACCOUNT_RC))
+ return ac_prefs;
+
debug_print(_("Opening account preferences window...\n"));
- inc_autocheck_timer_remove();
+ inc_lock();
cancelled = FALSE;
} else {
prefs_set_dialog(param);
gtk_window_set_title(GTK_WINDOW(dialog.window),
- _("Preferences for each account"));
+ _("Account preferences"));
gtk_widget_show(dialog.apply_btn);
}
gtk_main();
gtk_widget_hide(dialog.window);
- inc_autocheck_timer_set();
+ inc_unlock();
if (cancelled && new_account) {
g_free(ac_prefs);
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++);
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), BOX_BORDER);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
hbox = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox);
SET_ACTIVATE (menuitem);
MENUITEM_ADD (optmenu_menu, menuitem, _("None (local)"), A_LOCAL);
SET_ACTIVATE (menuitem);
- /*
- MENUITEM_ADD (optmenu_menu, menuitem, _("Local (without SMTP server)"), A_LOCAL_CMD);
- SET_ACTIVATE (menuitem);
- */
gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu), optmenu_menu);
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, 0, 0);
/* gtk_table_set_row_spacing (GTK_TABLE (serv_table), 0, 0); */
+ 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, 1, 2,
+ GTK_FILL, 0, 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_table_attach (GTK_TABLE (serv_table), recvserv_entry, 1, 4, 2, 3,
GTK_EXPAND | GTK_SHRINK | GTK_FILL,
GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
localmbox_entry = gtk_entry_new ();
gtk_widget_show (localmbox_entry);
- gtk_table_attach (GTK_TABLE (serv_table), localmbox_entry, 1, 4, 2, 3,
+ gtk_table_attach (GTK_TABLE (serv_table), localmbox_entry, 1, 4, 3, 4,
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_table_attach (GTK_TABLE (serv_table), smtpserv_entry, 1, 4, 4, 5,
GTK_EXPAND | GTK_SHRINK | GTK_FILL,
GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
mailcmd_entry = gtk_entry_new ();
gtk_widget_show (mailcmd_entry);
- gtk_table_attach (GTK_TABLE (serv_table), mailcmd_entry, 1, 4, 5, 6,
+ gtk_table_attach (GTK_TABLE (serv_table), mailcmd_entry, 1, 4, 6, 7,
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_usize (uid_entry, DEFAULT_ENTRY_WIDTH, -1);
- gtk_table_attach (GTK_TABLE (serv_table), uid_entry, 1, 2, 5, 6,
+ gtk_table_attach (GTK_TABLE (serv_table), uid_entry, 1, 2, 7, 8,
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_usize (pass_entry, DEFAULT_ENTRY_WIDTH, -1);
- gtk_table_attach (GTK_TABLE (serv_table), pass_entry, 3, 4, 5, 6,
+ gtk_table_attach (GTK_TABLE (serv_table), pass_entry, 3, 4, 7, 8,
GTK_EXPAND | GTK_SHRINK | GTK_FILL,
GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
gtk_entry_set_visibility (GTK_ENTRY (pass_entry), FALSE);
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_table_attach (GTK_TABLE (serv_table), recvserv_label, 0, 1, 2, 3,
GTK_FILL, 0, 0, 0);
gtk_misc_set_alignment (GTK_MISC (recvserv_label), 1, 0.5);
localmbox_label = gtk_label_new (_("Local mailbox file"));
gtk_widget_show (localmbox_label);
- gtk_table_attach (GTK_TABLE (serv_table), localmbox_label, 0, 1, 2, 3,
+ gtk_table_attach (GTK_TABLE (serv_table), localmbox_label, 0, 1, 3, 4,
GTK_FILL, 0, 0, 0);
gtk_misc_set_alignment (GTK_MISC (localmbox_label), 1, 0.5);
/* gtk_table_set_row_spacing (GTK_TABLE (serv_table), 2, 0); */
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_table_attach (GTK_TABLE (serv_table), smtpserv_label, 0, 1, 4, 5,
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); */
mailcmd_chkbtn = gtk_check_button_new_with_label
(_("Use mail command rather than SMTP server"));
gtk_widget_show (mailcmd_chkbtn);
- gtk_table_attach (GTK_TABLE (serv_table), mailcmd_chkbtn, 0, 4, 4, 5,
+ gtk_table_attach (GTK_TABLE (serv_table), mailcmd_chkbtn, 0, 4, 5, 6,
GTK_EXPAND | GTK_FILL,
0, 0, TABLE_YPAD);
gtk_signal_connect(GTK_OBJECT(mailcmd_chkbtn), "toggled",
mailcmd_label = gtk_label_new (_("command to send mails"));
gtk_widget_show (mailcmd_label);
- gtk_table_attach (GTK_TABLE (serv_table), mailcmd_label, 0, 1, 5, 6,
+ gtk_table_attach (GTK_TABLE (serv_table), mailcmd_label, 0, 1, 6, 7,
GTK_FILL, 0, 0, 0);
gtk_misc_set_alignment (GTK_MISC (mailcmd_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_table_attach (GTK_TABLE (serv_table), uid_label, 0, 1, 7, 8,
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,
+ gtk_table_attach (GTK_TABLE (serv_table), pass_label, 2, 3, 7, 8,
0, 0, 0, 0);
SET_TOGGLE_SENSITIVITY (nntpauth_chkbtn, uid_label);
GtkWidget *getall_chkbtn;
GtkWidget *recvatgetall_chkbtn;
GtkWidget *filter_on_recv_chkbtn;
+ GtkWidget *frame2;
+ GtkWidget *hbox1;
+ GtkWidget *imapdir_label;
+ GtkWidget *imapdir_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), BOX_BORDER);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
PACK_FRAME (vbox1, frame1, _("POP3"));
- vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ 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, rmmail_chkbtn,
_("Remove messages on server when received"));
PACK_CHECK_BUTTON (vbox2, getall_chkbtn,
- _("Receive all messages on server"));
+ _("Download all messages on server"));
PACK_CHECK_BUTTON
(vbox2, recvatgetall_chkbtn,
- _("`Receive all' checks for new mail on this account"));
+ _("`Get all' checks for new mail on this account"));
PACK_CHECK_BUTTON (vbox2, filter_on_recv_chkbtn,
_("Filter messages on receiving"));
+ PACK_FRAME (vbox1, frame2, _("IMAP4"));
+
+ vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ gtk_widget_show (vbox2);
+ gtk_container_add (GTK_CONTAINER (frame2), 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);
+
+ 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);
+
receive.pop3_frame = frame1;
receive.rmmail_chkbtn = rmmail_chkbtn;
receive.getall_chkbtn = getall_chkbtn;
receive.recvatgetall_chkbtn = recvatgetall_chkbtn;
receive.filter_on_recv_chkbtn = filter_on_recv_chkbtn;
+
+ receive.imap_frame = frame2;
+ receive.imapdir_entry = imapdir_entry;
}
static void prefs_account_send_create(void)
GtkWidget *frame3;
GtkWidget *vbox3;
GtkWidget *smtp_auth_chkbtn;
+ GtkWidget *smtp_auth_hbox;
+ GtkWidget *label;
+ GtkWidget *uid_label;
+ GtkWidget *smtp_userid_entry;
+ GtkWidget *pass_label;
+ GtkWidget *smtp_passwd_entry;
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), BOX_BORDER);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
PACK_FRAME (vbox1, frame, _("Header"));
- vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ 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);
gtk_widget_show (table);
gtk_container_add (GTK_CONTAINER (frame2), table);
gtk_container_set_border_width (GTK_CONTAINER (table), 8);
- gtk_table_set_row_spacings (GTK_TABLE (table), VSPACING_NARROW);
+ 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"));
PACK_FRAME (vbox1, frame3, _("Authentication"));
- vbox3 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ vbox3 = gtk_vbox_new (FALSE, 0);
gtk_widget_show (vbox3);
gtk_container_add (GTK_CONTAINER (frame3), vbox3);
gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8);
PACK_CHECK_BUTTON (vbox3, smtp_auth_chkbtn,
_("SMTP Authentication (SMTP AUTH)"));
+
+ smtp_auth_hbox = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (smtp_auth_hbox);
+ gtk_box_pack_start (GTK_BOX (vbox3), smtp_auth_hbox, FALSE, FALSE, 0);
+
+ label = gtk_label_new ("");
+ gtk_widget_show (label);
+ gtk_box_pack_start (GTK_BOX (smtp_auth_hbox), label, FALSE, FALSE, 0);
+ gtk_widget_set_usize (label, 16, -1);
+
+ uid_label = gtk_label_new (_("User ID"));
+ gtk_widget_show (uid_label);
+ gtk_box_pack_start (GTK_BOX (smtp_auth_hbox), uid_label,
+ FALSE, FALSE, 0);
+ gtk_misc_set_alignment (GTK_MISC (uid_label), 1, 0.5);
+ SET_TOGGLE_SENSITIVITY (smtp_auth_chkbtn, uid_label);
+
+ smtp_userid_entry = gtk_entry_new ();
+ gtk_widget_show (smtp_userid_entry);
+ gtk_widget_set_usize (smtp_userid_entry, DEFAULT_ENTRY_WIDTH, -1);
+ gtk_box_pack_start (GTK_BOX (smtp_auth_hbox), smtp_userid_entry,
+ TRUE, TRUE, 0);
+ SET_TOGGLE_SENSITIVITY (smtp_auth_chkbtn, smtp_userid_entry);
+
+ pass_label = gtk_label_new (_("Password"));
+ gtk_widget_show (pass_label);
+ gtk_box_pack_start (GTK_BOX (smtp_auth_hbox), pass_label,
+ FALSE, FALSE, 0);
+ SET_TOGGLE_SENSITIVITY (smtp_auth_chkbtn, pass_label);
+
+ smtp_passwd_entry = gtk_entry_new ();
+ gtk_widget_show (smtp_passwd_entry);
+ gtk_widget_set_usize (smtp_passwd_entry, DEFAULT_ENTRY_WIDTH, -1);
+ gtk_box_pack_start (GTK_BOX (smtp_auth_hbox), smtp_passwd_entry,
+ TRUE, TRUE, 0);
+ gtk_entry_set_visibility (GTK_ENTRY (smtp_passwd_entry), FALSE);
+ SET_TOGGLE_SENSITIVITY (smtp_auth_chkbtn, smtp_passwd_entry);
+
PACK_CHECK_BUTTON (vbox3, pop_bfr_smtp_chkbtn,
_("Authenticate with POP3 before sending"));
gtk_widget_set_sensitive(pop_bfr_smtp_chkbtn, FALSE);
send.autoreplyto_entry = autoreplyto_entry;
send.smtp_auth_chkbtn = smtp_auth_chkbtn;
+ send.smtp_userid_entry = smtp_userid_entry;
+ send.smtp_passwd_entry = smtp_passwd_entry;
send.pop_bfr_smtp_chkbtn = 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), BOX_BORDER);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
hbox = gtk_hbox_new (FALSE, 8);
gtk_widget_show (hbox);
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), BOX_BORDER);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
PACK_FRAME (vbox1, frame1, _("Sign key"));
}
#endif /* USE_GPGME */
+#if USE_SSL
+static void prefs_account_ssl_create(void)
+{
+ GtkWidget *vbox1;
+
+ GtkWidget *receive_frame;
+ GtkWidget *vbox2;
+ GtkWidget *pop_chkbtn;
+ GtkWidget *imap_chkbtn;
+
+ GtkWidget *send_frame;
+ GtkWidget *vbox3;
+ GtkWidget *smtp_nossl_radiobtn;
+ GtkWidget *smtp_ssltunnel_radiobtn;
+ GtkWidget *smtp_sslstarttls_radiobtn;
+
+ 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, receive_frame, _("Receive"));
+
+ vbox2 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox2);
+ gtk_container_add (GTK_CONTAINER (receive_frame), vbox2);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
+
+ PACK_CHECK_BUTTON (vbox2, pop_chkbtn,
+ _("Use SSL for POP3 connection"));
+ PACK_CHECK_BUTTON (vbox2, imap_chkbtn,
+ _("Use SSL for IMAP4 connection"));
+
+ PACK_FRAME (vbox1, send_frame, _("Send (SMTP)"));
+
+ vbox3 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox3);
+ gtk_container_add (GTK_CONTAINER (send_frame), vbox3);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8);
+
+ smtp_nossl_radiobtn =
+ gtk_radio_button_new_with_label(NULL, _("Don't use SSL"));
+ gtk_widget_show (smtp_nossl_radiobtn);
+ gtk_box_pack_start (GTK_BOX (vbox3), smtp_nossl_radiobtn,
+ FALSE, FALSE, 0);
+ gtk_object_set_user_data (GTK_OBJECT (smtp_nossl_radiobtn),
+ GINT_TO_POINTER (SSL_SMTP_NONE));
+
+ smtp_ssltunnel_radiobtn = gtk_radio_button_new_with_label_from_widget
+ (GTK_RADIO_BUTTON (smtp_nossl_radiobtn),
+ _("Use SSL for SMTP connection"));
+ gtk_widget_show (smtp_ssltunnel_radiobtn);
+ gtk_box_pack_start (GTK_BOX (vbox3), smtp_ssltunnel_radiobtn,
+ FALSE, FALSE, 0);
+ gtk_object_set_user_data (GTK_OBJECT (smtp_ssltunnel_radiobtn),
+ GINT_TO_POINTER (SSL_SMTP_TUNNEL));
+
+ smtp_sslstarttls_radiobtn = gtk_radio_button_new_with_label_from_widget
+ (GTK_RADIO_BUTTON (smtp_nossl_radiobtn),
+ _("Use STARTTLS command to start SSL session"));
+ gtk_widget_show (smtp_sslstarttls_radiobtn);
+ gtk_box_pack_start (GTK_BOX (vbox3), smtp_sslstarttls_radiobtn,
+ FALSE, FALSE, 0);
+ gtk_object_set_user_data (GTK_OBJECT (smtp_sslstarttls_radiobtn),
+ GINT_TO_POINTER (SSL_SMTP_STARTTLS));
+
+ ssl.receive_frame = receive_frame;
+ ssl.pop_chkbtn = pop_chkbtn;
+ ssl.imap_chkbtn = imap_chkbtn;
+
+ ssl.send_frame = send_frame;
+ ssl.smtp_nossl_radiobtn = smtp_nossl_radiobtn;
+ ssl.smtp_ssltunnel_radiobtn = smtp_ssltunnel_radiobtn;
+ ssl.smtp_sslstarttls_radiobtn = smtp_sslstarttls_radiobtn;
+}
+#endif /* USE_SSL */
+
static void prefs_account_advanced_create(void)
{
GtkWidget *vbox1;
GtkWidget *hbox1;
GtkWidget *checkbtn_smtpport;
GtkWidget *entry_smtpport;
- GtkWidget *hbox2;
+ GtkWidget *hbox_popport;
GtkWidget *checkbtn_popport;
GtkWidget *entry_popport;
- GtkWidget *hbox3;
+ GtkWidget *hbox_imapport;
+ GtkWidget *checkbtn_imapport;
+ GtkWidget *entry_imapport;
+ GtkWidget *hbox_nntpport;
+ GtkWidget *checkbtn_nntpport;
+ GtkWidget *entry_nntpport;
GtkWidget *checkbtn_domain;
GtkWidget *entry_domain;
+#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_with_max_length (5); \
+ gtk_widget_show (entry); \
+ gtk_box_pack_start (GTK_BOX (box), entry, FALSE, FALSE, 0); \
+ gtk_widget_set_usize (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), BOX_BORDER);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
- vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW_2);
gtk_widget_show (vbox2);
gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
- hbox1 = gtk_hbox_new (FALSE, 8);
- gtk_widget_show (hbox1);
- gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
-
+ PACK_HBOX (hbox1);
PACK_CHECK_BUTTON (hbox1, checkbtn_smtpport, _("Specify SMTP port"));
-
- entry_smtpport = gtk_entry_new_with_max_length (5);
- gtk_widget_show (entry_smtpport);
- gtk_box_pack_start (GTK_BOX (hbox1), entry_smtpport, FALSE, FALSE, 0);
- gtk_widget_set_usize (entry_smtpport, 64, -1);
- SET_TOGGLE_SENSITIVITY(checkbtn_smtpport, entry_smtpport);
-
- hbox2 = gtk_hbox_new (FALSE, 8);
- gtk_widget_show (hbox2);
- gtk_box_pack_start (GTK_BOX (vbox2), hbox2, FALSE, FALSE, 0);
-
- PACK_CHECK_BUTTON (hbox2, checkbtn_popport, _("Specify POP3 port"));
-
- entry_popport = gtk_entry_new_with_max_length (5);
- gtk_widget_show (entry_popport);
- gtk_box_pack_start (GTK_BOX (hbox2), entry_popport, FALSE, FALSE, 0);
- gtk_widget_set_usize (entry_popport, 64, -1);
- SET_TOGGLE_SENSITIVITY(checkbtn_popport, entry_popport);
-
- hbox3 = gtk_hbox_new (FALSE, 8);
- gtk_widget_show (hbox3);
- gtk_box_pack_start (GTK_BOX (vbox2), hbox3, FALSE, FALSE, 0);
-
- PACK_CHECK_BUTTON (hbox3, checkbtn_domain, _("Specify domain name"));
+ 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 (hbox3), entry_domain, TRUE, TRUE, 0);
- SET_TOGGLE_SENSITIVITY(checkbtn_domain, entry_domain);
+ gtk_box_pack_start (GTK_BOX (hbox1), entry_domain, TRUE, TRUE, 0);
+ SET_TOGGLE_SENSITIVITY (checkbtn_domain, entry_domain);
+
+#undef PACK_HBOX
+#undef PACK_PORT_ENTRY
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;
}
prefs_custom_header_open(&tmp_ac_prefs);
}
-#if USE_GPGME
-
-static void prefs_account_sign_key_set_data_from_radiobtn(PrefParam *pparam)
+#if USE_GPGME || USE_SSL
+static void prefs_account_enum_set_data_from_radiobtn(PrefParam *pparam)
{
GtkRadioButton *radiobtn;
GSList *group;
while (group != NULL) {
GtkToggleButton *btn = GTK_TOGGLE_BUTTON (group->data);
if (gtk_toggle_button_get_active (btn)) {
- *((SignKeyType *)pparam->data) = GPOINTER_TO_INT
+ *((gint *)pparam->data) = GPOINTER_TO_INT
(gtk_object_get_user_data (GTK_OBJECT (btn)));
break;
}
}
}
-static void prefs_account_sign_key_set_radiobtn(PrefParam *pparam)
+static void prefs_account_enum_set_radiobtn(PrefParam *pparam)
{
GtkRadioButton *radiobtn;
GSList *group;
gpointer data;
- data = GINT_TO_POINTER (*((RecvProtocol *)pparam->data));
+ data = GINT_TO_POINTER (*((gint *)pparam->data));
radiobtn = GTK_RADIO_BUTTON (*pparam->widget);
group = gtk_radio_button_group (radiobtn);
while (group != NULL) {
break;
*/
default:
+ break;
}
menu = gtk_option_menu_get_menu(optmenu);
{
RecvProtocol protocol;
gboolean active;
+ gint auth;
protocol = GPOINTER_TO_INT
(gtk_object_get_user_data(GTK_OBJECT(menuitem)));
gtk_widget_set_sensitive(basic.inbox_entry, FALSE);
gtk_widget_show(basic.nntpserv_label);
gtk_widget_show(basic.nntpserv_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 0, VSPACING_NARROW);
gtk_widget_set_sensitive(basic.nntpauth_chkbtn, TRUE);
gtk_widget_show(basic.nntpauth_chkbtn);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 1, VSPACING_NARROW);
gtk_widget_hide(basic.recvserv_label);
gtk_widget_hide(basic.recvserv_entry);
- gtk_widget_hide(basic.smtpserv_label);
- gtk_widget_hide(basic.smtpserv_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 2, 0);
+ gtk_widget_show(basic.smtpserv_label);
+ gtk_widget_show(basic.smtpserv_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 4, VSPACING_NARROW);
gtk_widget_hide(basic.localmbox_label);
gtk_widget_hide(basic.localmbox_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 3, 0);
gtk_widget_hide(basic.mailcmd_label);
gtk_widget_hide(basic.mailcmd_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 6, 0);
gtk_widget_hide(basic.mailcmd_chkbtn);
-/* gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table), 3, 0); */
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 5, 0);
+ gtk_widget_show(basic.uid_label);
+ gtk_widget_show(basic.pass_label);
+ gtk_widget_show(basic.uid_entry);
+ gtk_widget_show(basic.pass_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 7, VSPACING_NARROW);
+
+ 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);
+
/* update userid/passwd sensitive state */
prefs_account_nntpauth_toggled
(GTK_TOGGLE_BUTTON(basic.nntpauth_chkbtn), NULL);
gtk_widget_set_sensitive(receive.pop3_frame, FALSE);
+ gtk_widget_set_sensitive(receive.imap_frame, FALSE);
+#if USE_SSL
+ gtk_widget_set_sensitive(ssl.receive_frame, FALSE);
+ gtk_widget_set_sensitive(ssl.pop_chkbtn, FALSE);
+ gtk_widget_set_sensitive(ssl.imap_chkbtn, FALSE);
+ gtk_widget_set_sensitive(ssl.send_frame, FALSE);
+#endif
+ gtk_widget_hide(advanced.popport_hbox);
+ gtk_widget_hide(advanced.imapport_hbox);
+ gtk_widget_show(advanced.nntpport_hbox);
break;
case A_LOCAL:
gtk_widget_set_sensitive(basic.inbox_label, TRUE);
gtk_widget_set_sensitive(basic.inbox_entry, TRUE);
gtk_widget_hide(basic.nntpserv_label);
gtk_widget_hide(basic.nntpserv_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 0, 0);
gtk_widget_set_sensitive(basic.nntpauth_chkbtn, FALSE);
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_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 1, 0);
+ gtk_widget_hide(basic.recvserv_label);
+ gtk_widget_hide(basic.recvserv_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 2, 0);
gtk_widget_show(basic.smtpserv_label);
gtk_widget_show(basic.smtpserv_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 4, VSPACING_NARROW);
gtk_widget_show(basic.localmbox_label);
gtk_widget_show(basic.localmbox_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 3, VSPACING_NARROW);
gtk_widget_show(basic.mailcmd_label);
gtk_widget_show(basic.mailcmd_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 6, VSPACING_NARROW);
gtk_widget_show(basic.mailcmd_chkbtn);
-/* gtk_table_set_row_spacing */
-/* (GTK_TABLE (basic.serv_table), 3, VSPACING_NARROW); */
- 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_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 5, VSPACING_NARROW);
+ gtk_widget_hide(basic.uid_label);
+ gtk_widget_hide(basic.pass_label);
+ gtk_widget_hide(basic.uid_entry);
+ gtk_widget_hide(basic.pass_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 7, 0);
+
+ 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_set_sensitive(receive.pop3_frame, FALSE);
+ gtk_widget_set_sensitive(receive.imap_frame, FALSE);
prefs_account_mailcmd_toggled
(GTK_TOGGLE_BUTTON(basic.mailcmd_chkbtn), NULL);
+
+#if USE_SSL
+ gtk_widget_set_sensitive(ssl.receive_frame, FALSE);
+ gtk_widget_set_sensitive(ssl.pop_chkbtn, FALSE);
+ gtk_widget_set_sensitive(ssl.imap_chkbtn, FALSE);
+ gtk_widget_set_sensitive(ssl.send_frame, TRUE);
+#endif
+ gtk_widget_hide(advanced.popport_hbox);
+ gtk_widget_hide(advanced.imapport_hbox);
+ gtk_widget_hide(advanced.nntpport_hbox);
break;
- /*
- case A_LOCAL_CMD:
- gtk_widget_set_sensitive(basic.inbox_label, TRUE);
- gtk_widget_set_sensitive(basic.inbox_entry, TRUE);
- 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_hide(basic.recvserv_label);
- gtk_widget_hide(basic.recvserv_entry);
- gtk_widget_hide(basic.smtpserv_label);
- gtk_widget_hide(basic.smtpserv_entry);
- gtk_widget_show(basic.localmbox_label);
- gtk_widget_show(basic.localmbox_entry);
- gtk_widget_show(basic.mailcmd_label);
- gtk_widget_show(basic.mailcmd_entry);
- gtk_widget_hide(basic.mailcmd_chkbtn);
- gtk_table_set_row_spacing
- (GTK_TABLE (basic.serv_table), 3, VSPACING_NARROW);
- 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_set_sensitive(receive.pop3_frame, FALSE);
- break;
- */
case A_IMAP4:
- gtk_widget_set_sensitive(basic.inbox_label, TRUE);
- gtk_widget_set_sensitive(basic.inbox_entry, TRUE);
+ gtk_widget_set_sensitive(basic.inbox_label, FALSE);
+ gtk_widget_set_sensitive(basic.inbox_entry, FALSE);
gtk_widget_hide(basic.nntpserv_label);
gtk_widget_hide(basic.nntpserv_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 0, 0);
gtk_widget_set_sensitive(basic.nntpauth_chkbtn, FALSE);
gtk_widget_hide(basic.nntpauth_chkbtn);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 1, 0);
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_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 2, VSPACING_NARROW);
gtk_widget_show(basic.smtpserv_label);
gtk_widget_show(basic.smtpserv_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 4, VSPACING_NARROW);
gtk_widget_hide(basic.localmbox_label);
gtk_widget_hide(basic.localmbox_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 3, 0);
gtk_widget_hide(basic.mailcmd_label);
gtk_widget_hide(basic.mailcmd_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 6, 0);
gtk_widget_hide(basic.mailcmd_chkbtn);
-/* gtk_table_set_row_spacing */
-/* (GTK_TABLE (basic.serv_table), 3, VSPACING_NARROW); */
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 5, 0);
+ gtk_widget_show(basic.uid_label);
+ gtk_widget_show(basic.pass_label);
+ gtk_widget_show(basic.uid_entry);
+ gtk_widget_show(basic.pass_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 7, VSPACING_NARROW);
+
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_set_sensitive(receive.pop3_frame, FALSE);
+ gtk_widget_set_sensitive(receive.imap_frame, TRUE);
gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
gtk_widget_set_sensitive(basic.smtpserv_label, TRUE);
+
+#if USE_SSL
+ gtk_widget_set_sensitive(ssl.receive_frame, TRUE);
+ gtk_widget_set_sensitive(ssl.pop_chkbtn, FALSE);
+ gtk_widget_set_sensitive(ssl.imap_chkbtn, TRUE);
+ gtk_widget_set_sensitive(ssl.send_frame, TRUE);
+#endif
+ gtk_widget_hide(advanced.popport_hbox);
+ gtk_widget_show(advanced.imapport_hbox);
+ gtk_widget_hide(advanced.nntpport_hbox);
break;
case A_POP3:
default:
gtk_widget_set_sensitive(basic.inbox_label, TRUE);
gtk_widget_set_sensitive(basic.inbox_entry, TRUE);
- gtk_widget_set_sensitive(basic.nntpauth_chkbtn, FALSE);
gtk_widget_hide(basic.nntpserv_label);
gtk_widget_hide(basic.nntpserv_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 0, 0);
gtk_widget_set_sensitive(basic.nntpauth_chkbtn, FALSE);
gtk_widget_hide(basic.nntpauth_chkbtn);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 1, 0);
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_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 2, VSPACING_NARROW);
gtk_widget_show(basic.smtpserv_label);
gtk_widget_show(basic.smtpserv_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 4, VSPACING_NARROW);
gtk_widget_hide(basic.localmbox_label);
gtk_widget_hide(basic.localmbox_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 3, 0);
gtk_widget_hide(basic.mailcmd_label);
gtk_widget_hide(basic.mailcmd_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 6, 0);
gtk_widget_hide(basic.mailcmd_chkbtn);
-/* gtk_table_set_row_spacing */
-/* (GTK_TABLE (basic.serv_table), 3, VSPACING_NARROW); */
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 5, 0);
+ gtk_widget_show(basic.uid_label);
+ gtk_widget_show(basic.pass_label);
+ gtk_widget_show(basic.uid_entry);
+ gtk_widget_show(basic.pass_entry);
+ gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+ 7, VSPACING_NARROW);
+
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_set_sensitive(receive.pop3_frame, TRUE);
+ gtk_widget_set_sensitive(receive.imap_frame, FALSE);
gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
gtk_widget_set_sensitive(basic.smtpserv_label, TRUE);
+
+#if USE_SSL
+ gtk_widget_set_sensitive(ssl.receive_frame, TRUE);
+ gtk_widget_set_sensitive(ssl.pop_chkbtn, TRUE);
+ gtk_widget_set_sensitive(ssl.imap_chkbtn, FALSE);
+ gtk_widget_set_sensitive(ssl.send_frame, TRUE);
+#endif
+ gtk_widget_show(advanced.popport_hbox);
+ gtk_widget_hide(advanced.imapport_hbox);
+ gtk_widget_hide(advanced.nntpport_hbox);
break;
}
gtk_widget_set_sensitive(basic.mailcmd_label, use_mailcmd);
gtk_widget_set_sensitive(basic.smtpserv_entry, !use_mailcmd);
gtk_widget_set_sensitive(basic.smtpserv_label, !use_mailcmd);
+ gtk_widget_set_sensitive(basic.uid_entry, !use_mailcmd);
+ gtk_widget_set_sensitive(basic.pass_entry, !use_mailcmd);
}
projects / claws.git / blobdiff