diff options
| author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2006-10-31 04:12:03 +0000 |
|---|---|---|
| committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2006-10-31 04:12:03 +0000 |
| commit | 1ca8df113fdf103c457f5b31cce5909e6bc85d00 (patch) | |
| tree | 402f6713c7b7b49c3d3320728714103e67b50cc7 | |
| parent | 2d71ecb8be94e10a880b6aa57711cffd8e52f9ce (diff) | |
disable POP before SMTP option with non-POP3 account.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1258 ee746299-78ed-0310-b773-934348b2243d
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.ja | 6 | ||||
| -rw-r--r-- | src/prefs_account_dialog.c | 12 |
3 files changed, 23 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2006-10-31 + + * src/prefs_account_dialog.c: prefs_account_protocol_activated(): + disable POP before SMTP option with non-POP3 account. + 2006-10-30 * version 2.3.0beta4 diff --git a/ChangeLog.ja b/ChangeLog.ja index ffaa8c00..d2902b22 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,3 +1,9 @@ +2006-10-31 + + * src/prefs_account_dialog.c: prefs_account_protocol_activated(): + POP3 以外のアカウントでは POP before SMTP オプションを無効にする + ようにした。 + 2006-10-30 * version 2.3.0beta4 diff --git a/src/prefs_account_dialog.c b/src/prefs_account_dialog.c index 4e7d9b48..83c3a9db 100644 --- a/src/prefs_account_dialog.c +++ b/src/prefs_account_dialog.c @@ -1168,6 +1168,8 @@ static void prefs_account_send_create(void) SET_TOGGLE_SENSITIVITY (smtp_auth_chkbtn, vbox4); + PACK_VSPACER(vbox3, vbox_spc, VSPACING_NARROW_2); + PACK_CHECK_BUTTON (vbox3, pop_bfr_smtp_chkbtn, _("Authenticate with POP3 before sending")); @@ -2115,12 +2117,16 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem) gtk_widget_show(receive.nntp_frame); gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE); + gtk_widget_set_sensitive(p_send.pop_bfr_smtp_chkbtn, FALSE); + if (!tmp_ac_prefs->account_name) { gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn), FALSE); } + gtk_widget_set_sensitive(p_send.pop_bfr_smtp_chkbtn, FALSE); + #if USE_SSL gtk_widget_hide(ssl.pop_frame); gtk_widget_hide(ssl.imap_frame); @@ -2157,6 +2163,8 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem) TRUE); } + gtk_widget_set_sensitive(p_send.pop_bfr_smtp_chkbtn, FALSE); + #if USE_SSL gtk_widget_hide(ssl.pop_frame); gtk_widget_hide(ssl.imap_frame); @@ -2193,6 +2201,8 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem) FALSE); } + gtk_widget_set_sensitive(p_send.pop_bfr_smtp_chkbtn, FALSE); + #if USE_SSL gtk_widget_hide(ssl.pop_frame); gtk_widget_show(ssl.imap_frame); @@ -2230,6 +2240,8 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem) TRUE); } + gtk_widget_set_sensitive(p_send.pop_bfr_smtp_chkbtn, TRUE); + #if USE_SSL gtk_widget_show(ssl.pop_frame); gtk_widget_hide(ssl.imap_frame); |