GtkWidget *pop3_frame;
GtkWidget *rmmail_chkbtn;
GtkWidget *getall_chkbtn;
- GtkWidget *recvatgetall_chkbtn;
+ GtkWidget *size_limit_chkbtn;
+ GtkWidget *size_limit_entry;
GtkWidget *filter_on_recv_chkbtn;
GtkWidget *inbox_label;
GtkWidget *inbox_entry;
GtkWidget *imap_frame;
GtkWidget *imapdir_entry;
+
+ GtkWidget *recvatgetall_chkbtn;
} receive;
static struct Send {
GtkWidget *customhdr_chkbtn;
GtkWidget *smtp_auth_chkbtn;
- GtkWidget *smtp_userid_entry;
- GtkWidget *smtp_passwd_entry;
+ GtkWidget *smtp_uid_entry;
+ GtkWidget *smtp_pass_entry;
GtkWidget *pop_bfr_smtp_chkbtn;
} send;
static struct Compose {
GtkWidget *sigpath_entry;
-
+
GtkWidget *autocc_chkbtn;
GtkWidget *autocc_entry;
GtkWidget *autobcc_chkbtn;
{"use_mail_command", "FALSE", &tmp_ac_prefs.use_mail_command, P_BOOL,
&basic.mailcmd_chkbtn, prefs_set_data_from_toggle, prefs_set_toggle},
- {"mail_command", "/usr/sbin/sendmail", &tmp_ac_prefs.mail_command, P_STRING,
+ {"mail_command", "/usr/sbin/sendmail -t", &tmp_ac_prefs.mail_command, P_STRING,
&basic.mailcmd_entry, prefs_set_data_from_entry, prefs_set_entry},
{"use_nntp_auth", "FALSE", &tmp_ac_prefs.use_nntp_auth, P_BOOL,
&receive.getall_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
- {"receive_at_get_all", "TRUE", &tmp_ac_prefs.recv_at_getall, P_BOOL,
- &receive.recvatgetall_chkbtn,
+ {"enable_size_limit", "FALSE", &tmp_ac_prefs.enable_size_limit, P_BOOL,
+ &receive.size_limit_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
+ {"size_limit", "1024", &tmp_ac_prefs.size_limit, P_INT,
+ &receive.size_limit_entry,
+ prefs_set_data_from_entry, prefs_set_entry},
{"filter_on_receive", "TRUE", &tmp_ac_prefs.filter_on_recv, P_BOOL,
&receive.filter_on_recv_chkbtn,
{"imap_directory", NULL, &tmp_ac_prefs.imap_dir, P_STRING,
&receive.imapdir_entry, prefs_set_data_from_entry, prefs_set_entry},
+ {"receive_at_get_all", "TRUE", &tmp_ac_prefs.recv_at_getall, P_BOOL,
+ &receive.recvatgetall_chkbtn,
+ prefs_set_data_from_toggle, prefs_set_toggle},
+
/* Send */
{"add_date", "TRUE", &tmp_ac_prefs.add_date, P_BOOL,
&send.date_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
{"smtp_user_id", NULL, &tmp_ac_prefs.smtp_userid, P_STRING,
- &send.smtp_userid_entry, prefs_set_data_from_entry, prefs_set_entry},
-
+ &send.smtp_uid_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},
+ &send.smtp_pass_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,
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);
GTK_SIGNAL_FUNC(prefs_account_deleted), NULL);
gtk_signal_connect(GTK_OBJECT(dialog.window), "key_press_event",
GTK_SIGNAL_FUNC(prefs_account_key_pressed), NULL);
- gtk_signal_connect(GTK_OBJECT(dialog.window), "focus_in_event",
- GTK_SIGNAL_FUNC(manage_window_focus_in), NULL);
- gtk_signal_connect(GTK_OBJECT(dialog.window), "focus_out_event",
- GTK_SIGNAL_FUNC(manage_window_focus_out), NULL);
+ MANAGE_WINDOW_SIGNALS_CONNECT(dialog.window);
+
gtk_signal_connect(GTK_OBJECT(dialog.ok_btn), "clicked",
GTK_SIGNAL_FUNC(prefs_account_ok), NULL);
gtk_signal_connect(GTK_OBJECT(dialog.apply_btn), "clicked",
GtkWidget *vbox2;
GtkWidget *rmmail_chkbtn;
GtkWidget *getall_chkbtn;
- GtkWidget *recvatgetall_chkbtn;
+ GtkWidget *hbox1;
+ GtkWidget *size_limit_chkbtn;
+ GtkWidget *size_limit_entry;
+ GtkWidget *label;
GtkWidget *filter_on_recv_chkbtn;
GtkWidget *vbox3;
- GtkWidget *hbox1;
GtkWidget *inbox_label;
GtkWidget *inbox_entry;
GtkWidget *inbox_btn;
- GtkWidget *label;
GtkWidget *frame2;
GtkWidget *imapdir_label;
GtkWidget *imapdir_entry;
+ GtkWidget *recvatgetall_chkbtn;
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
_("Remove messages on server when received"));
PACK_CHECK_BUTTON (vbox2, getall_chkbtn,
_("Download all messages on server"));
- PACK_CHECK_BUTTON
- (vbox2, recvatgetall_chkbtn,
- _("`Get all' checks for new mail on this account"));
+
+ 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_usize (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"));
gtk_widget_show (imapdir_entry);
gtk_box_pack_start (GTK_BOX (hbox1), imapdir_entry, TRUE, TRUE, 0);
+ PACK_CHECK_BUTTON
+ (vbox1, recvatgetall_chkbtn,
+ _("`Get all' checks for new messages on this account"));
+
receive.pop3_frame = frame1;
receive.rmmail_chkbtn = rmmail_chkbtn;
receive.getall_chkbtn = getall_chkbtn;
- receive.recvatgetall_chkbtn = recvatgetall_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.imap_frame = frame2;
receive.imapdir_entry = imapdir_entry;
+
+ receive.recvatgetall_chkbtn = recvatgetall_chkbtn;
}
static void prefs_account_send_create(void)
GtkWidget *frame3;
GtkWidget *vbox3;
GtkWidget *smtp_auth_chkbtn;
- GtkWidget *hbox2;
- GtkWidget *smtp_auth_hbox;
+ GtkWidget *vbox4;
+ GtkWidget *hbox_spc;
GtkWidget *label;
- GtkWidget *uid_label;
- GtkWidget *smtp_userid_entry;
- GtkWidget *pass_label;
- GtkWidget *smtp_passwd_entry;
+ GtkWidget *smtp_uid_entry;
+ GtkWidget *smtp_pass_entry;
+ GtkWidget *vbox_spc;
GtkWidget *pop_bfr_smtp_chkbtn;
vbox1 = gtk_vbox_new (FALSE, VSPACING);
PACK_CHECK_BUTTON (vbox3, smtp_auth_chkbtn,
_("SMTP Authentication (SMTP AUTH)"));
- hbox2 = gtk_hbox_new (FALSE, 8);
- gtk_widget_show (hbox2);
- gtk_box_pack_start (GTK_BOX (vbox3), hbox2, FALSE, FALSE, 0);
+ vbox4 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox4);
+ gtk_box_pack_start (GTK_BOX (vbox3), vbox4, FALSE, FALSE, 0);
- label = gtk_label_new ("");
- gtk_widget_show (label);
- gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, FALSE, 0);
- gtk_widget_set_usize (label, 16, -1);
+ 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_usize (hbox_spc, 16, -1);
- label = gtk_label_new (_("(Leave User ID empty to use receive server's account information)"));
+ label = gtk_label_new (_("User ID"));
gtk_widget_show (label);
- gtk_box_pack_start (GTK_BOX (hbox2), label,
- FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
- 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);
+ smtp_uid_entry = gtk_entry_new ();
+ gtk_widget_show (smtp_uid_entry);
+ gtk_widget_set_usize (smtp_uid_entry, DEFAULT_ENTRY_WIDTH, -1);
+ gtk_box_pack_start (GTK_BOX (hbox), smtp_uid_entry, TRUE, TRUE, 0);
- label = gtk_label_new ("");
+ label = gtk_label_new (_("Password"));
gtk_widget_show (label);
- gtk_box_pack_start (GTK_BOX (smtp_auth_hbox), label, FALSE, FALSE, 0);
- gtk_widget_set_usize (label, 16, -1);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
- 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);
+ smtp_pass_entry = gtk_entry_new ();
+ gtk_widget_show (smtp_pass_entry);
+ gtk_widget_set_usize (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);
- 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);
+ PACK_VSPACER(vbox4, vbox_spc, VSPACING_NARROW_2);
- 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);
+ hbox = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox);
+ gtk_box_pack_start (GTK_BOX (vbox4), hbox, FALSE, FALSE, 0);
- 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);
+ 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_usize (hbox_spc, 16, -1);
+
+ label = gtk_label_new
+ (_("If you leave these entries empty, the same\n"
+ "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);
- SET_TOGGLE_SENSITIVITY (smtp_auth_chkbtn, smtp_auth_hbox);
- gtk_signal_connect(GTK_OBJECT(smtp_userid_entry), "changed",
- GTK_SIGNAL_FUNC(prefs_account_smtp_userid_cb), smtp_passwd_entry);
- prefs_account_smtp_userid_cb(GTK_EDITABLE(smtp_userid_entry), smtp_passwd_entry);
+ SET_TOGGLE_SENSITIVITY (smtp_auth_chkbtn, vbox4);
PACK_CHECK_BUTTON (vbox3, pop_bfr_smtp_chkbtn,
_("Authenticate with POP3 before sending"));
send.customhdr_chkbtn = customhdr_chkbtn;
send.smtp_auth_chkbtn = smtp_auth_chkbtn;
- send.smtp_userid_entry = smtp_userid_entry;
- send.smtp_passwd_entry = smtp_passwd_entry;
+ send.smtp_uid_entry = smtp_uid_entry;
+ send.smtp_pass_entry = smtp_pass_entry;
send.pop_bfr_smtp_chkbtn = pop_bfr_smtp_chkbtn;
}
GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
GtkWidget *menu;
GtkWidget *menuitem;
+ GList *children;
+ gint list_order[] = {
+ 0, /* A_POP3 */
+ 1, /* A_APOP */
+ -1, /* A_RPOP */
+ 2, /* A_IMAP4 */
+ 3, /* A_NNTP */
+ 4 /* A_LOCAL */
+ };
protocol = *((RecvProtocol *)pparam->data);
+ if (protocol < 0 || protocol > A_LOCAL) return;
+ if (list_order[protocol] < 0) return;
+ gtk_option_menu_set_history(optmenu, list_order[protocol]);
- switch (protocol) {
- case A_POP3:
- gtk_option_menu_set_history(optmenu, 0);
- break;
- case A_APOP:
- gtk_option_menu_set_history(optmenu, 1);
- break;
- case A_IMAP4:
- gtk_option_menu_set_history(optmenu, 2);
- break;
- case A_NNTP:
- gtk_option_menu_set_history(optmenu, 3);
- break;
- case A_LOCAL:
- gtk_option_menu_set_history(optmenu, 4);
- break;
- /*
- case A_LOCAL_CMD:
- gtk_option_menu_set_history(optmenu, 5);
- break;
- */
- default:
- break;
+ menu = gtk_option_menu_get_menu(optmenu);
+ menu_set_insensitive_all(GTK_MENU_SHELL(menu));
+
+#define SET_NTH_SENSITIVE(proto) \
+{ \
+ menuitem = g_list_nth_data(children, list_order[proto]); \
+ if (menuitem) \
+ gtk_widget_set_sensitive(menuitem, TRUE); \
+}
+
+ children = GTK_MENU_SHELL(menu)->children;
+ SET_NTH_SENSITIVE(protocol);
+ if (protocol == A_POP3) {
+ SET_NTH_SENSITIVE(A_APOP);
+ } else if (protocol == A_APOP) {
+ SET_NTH_SENSITIVE(A_POP3);
}
- menu = gtk_option_menu_get_menu(optmenu);
+#undef SET_NTH_SENSITIVE
+
menuitem = gtk_menu_get_active(GTK_MENU(menu));
gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
}
(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_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
#if USE_SSL
gtk_widget_set_sensitive(ssl.receive_frame, FALSE);
gtk_widget_set_sensitive(ssl.pop_chkbtn, FALSE);
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_set_sensitive(receive.recvatgetall_chkbtn, FALSE);
prefs_account_mailcmd_toggled
(GTK_TOGGLE_BUTTON(basic.mailcmd_chkbtn), NULL);
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(receive.recvatgetall_chkbtn, TRUE);
gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
gtk_widget_set_sensitive(basic.smtpserv_label, 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(receive.recvatgetall_chkbtn, TRUE);
gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
gtk_widget_set_sensitive(basic.smtpserv_label, TRUE);