GtkWidget *autoreplyto_entry;
GtkWidget *smtp_auth_chkbtn;
+ GtkWidget *smtp_userid_entry;
+ GtkWidget *smtp_passwd_entry;
GtkWidget *pop_bfr_smtp_chkbtn;
} send;
#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;
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_enum_set_data_from_radiobtn (PrefParam *pparam);
-static void prefs_account_enum_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);
&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},
#endif /* USE_GPGME */
#if USE_SSL
- /* SSL Config */
- {"ssl_smtp", "FALSE", &tmp_ac_prefs.ssl_smtp, P_ENUM,
+ /* 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.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},
+ &ssl.imap_chkbtn, prefs_set_data_from_toggle, prefs_set_toggle},
#endif /* USE_SSL */
/* Advanced */
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;
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);
#if USE_SSL
prefs_account_ssl_create();
SET_NOTEBOOK_LABEL(dialog.notebook, _("SSL"), page++);
-#endif /* USE_GPGME */
+#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);
gtk_widget_set_usize (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 (_("Usually used"));
+ 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);
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);
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"));
GtkWidget *smtp_ssltunnel_radiobtn;
GtkWidget *smtp_sslstarttls_radiobtn;
- /* Vertial Box */
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);
- /* Receive Options */
PACK_FRAME (vbox1, receive_frame, _("Receive"));
- vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ 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 tunnel to connect to POP server"));
- PACK_CHECK_BUTTON (vbox2, imap_chkbtn, _("Use SSL tunnel to connect to IMAP server"));
+ PACK_CHECK_BUTTON (vbox2, pop_chkbtn,
+ _("Use SSL for POP3 connection"));
+ PACK_CHECK_BUTTON (vbox2, imap_chkbtn,
+ _("Use SSL for IMAP4 connection"));
- /* Send Options */
- PACK_FRAME (vbox1, send_frame, _("Send"));
+ PACK_FRAME (vbox1, send_frame, _("Send (SMTP)"));
- vbox3 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ 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, _("No SSL for SMTP"));
+ 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);
smtp_ssltunnel_radiobtn = gtk_radio_button_new_with_label_from_widget
(GTK_RADIO_BUTTON (smtp_nossl_radiobtn),
- _("Use SSL tunnel to connect to SMTP server"));
+ _("Use SSL for SMTP connection"));
gtk_widget_show (smtp_ssltunnel_radiobtn);
gtk_box_pack_start (GTK_BOX (vbox3), smtp_ssltunnel_radiobtn,
FALSE, FALSE, 0);
smtp_sslstarttls_radiobtn = gtk_radio_button_new_with_label_from_widget
(GTK_RADIO_BUTTON (smtp_nossl_radiobtn),
- _("Use STARTTLS command to start SMTP SSL session"));
+ _("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.pop_chkbtn = pop_chkbtn;
- ssl.imap_chkbtn = imap_chkbtn;
- ssl.smtp_nossl_radiobtn = smtp_nossl_radiobtn;
- ssl.smtp_ssltunnel_radiobtn = smtp_ssltunnel_radiobtn;
+ 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 */
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);
prefs_custom_header_open(&tmp_ac_prefs);
}
-#if USE_GPGME
+#if USE_GPGME || USE_SSL
static void prefs_account_enum_set_data_from_radiobtn(PrefParam *pparam)
{
GtkRadioButton *radiobtn;
(GTK_TOGGLE_BUTTON(basic.nntpauth_chkbtn), NULL);
gtk_widget_set_sensitive(receive.pop3_frame, FALSE);
gtk_widget_set_sensitive(receive.imap_frame, FALSE);
- gtk_widget_hide(advanced.popport_hbox);
- gtk_widget_hide(advanced.imapport_hbox);
- gtk_widget_show(advanced.nntpport_hbox);
-
#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.pass_entry, TRUE);
gtk_widget_set_sensitive(receive.pop3_frame, FALSE);
gtk_widget_set_sensitive(receive.imap_frame, FALSE);
- gtk_widget_hide(advanced.popport_hbox);
- gtk_widget_hide(advanced.imapport_hbox);
- gtk_widget_hide(advanced.nntpport_hbox);
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_IMAP4:
gtk_widget_set_sensitive(basic.inbox_label, 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);
- gtk_widget_hide(advanced.popport_hbox);
- gtk_widget_show(advanced.imapport_hbox);
- gtk_widget_hide(advanced.nntpport_hbox);
#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(receive.imap_frame, FALSE);
gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
gtk_widget_set_sensitive(basic.smtpserv_label, TRUE);
- gtk_widget_show(advanced.popport_hbox);
- gtk_widget_hide(advanced.imapport_hbox);
- gtk_widget_hide(advanced.nntpport_hbox);
#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;
}