gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

2010-04-15 [pawel] 3.7.5cvs48

Browse source 
* src/prefs_account.c
		Fix Bug 2144 'When creating an account with IMAP4+SSL,
				the port isn't configured properly'
		When using SSL/TLS tunneling automatically use default
		ports for encrypted connections: smtps, pop3s, imaps, nntps
This commit is contained in:
Paweł Pękala 2010-04-15 21:13:50 +00:00
parent e029ca4654
commit 1beb7d3d40
4 changed files with 66 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2010-04-15 [pawel] 3.7.5cvs48
* src/prefs_account.c
Fix Bug 2144 'When creating an account with IMAP4+SSL,
the port isn't configured properly'
When using SSL/TLS tunneling automatically use default
ports for encrypted connections: smtps, pop3s, imaps, nntps
2010-04-15 [pawel] 3.7.5cvs47
* src/action.c

1
PATCHSETS
View file

@ -3988,3 +3988,4 @@
( cvs diff -u -r 1.654.2.4057 -r 1.654.2.4058 configure.ac; ) > 3.7.5cvs45.patchset
( cvs diff -u -r 1.274.2.309 -r 1.274.2.310 src/mainwindow.c; ) > 3.7.5cvs46.patchset
( cvs diff -u -r 1.12.2.58 -r 1.12.2.59 src/action.c; ) > 3.7.5cvs47.patchset
( cvs diff -u -r 1.105.2.159 -r 1.105.2.160 src/prefs_account.c; ) > 3.7.5cvs48.patchset

2
configure.ac
View file

@ -12,7 +12,7 @@ MINOR_VERSION=7
MICRO_VERSION=5
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=47
EXTRA_VERSION=48
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

56
src/prefs_account.c
View file

@ -2293,6 +2293,54 @@ static void privacy_create_widget_func(PrefsPage * _page,
CREATE_RADIO_BUTTON(box, btn3, btn1, btn3_label, btn3_data); \
}
static void pop_ssltunnel_toggled(GtkToggleButton *button,
gpointer data)
{
gboolean active = gtk_toggle_button_get_active(button);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
advanced_page.popport_checkbtn)) == TRUE)
return;
gtk_spin_button_set_value(GTK_SPIN_BUTTON(advanced_page.popport_spinbtn),
active ? 995 : 110);
}
static void imap_ssltunnel_toggled(GtkToggleButton *button,
gpointer data)
{
gboolean active = gtk_toggle_button_get_active(button);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
advanced_page.imapport_checkbtn)) == TRUE)
return;
gtk_spin_button_set_value(GTK_SPIN_BUTTON(advanced_page.imapport_spinbtn),
active ? 993 : 143);
}
static void nntp_ssltunnel_toggled(GtkToggleButton *button,
gpointer data)
{
gboolean active = gtk_toggle_button_get_active(button);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
advanced_page.nntpport_checkbtn)) == TRUE)
return;
gtk_spin_button_set_value(GTK_SPIN_BUTTON(advanced_page.nntpport_spinbtn),
active ? 563 : 119);
}
static void smtp_ssltunnel_toggled(GtkToggleButton *button,
gpointer data)
{
gboolean active = gtk_toggle_button_get_active(button);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
advanced_page.smtpport_checkbtn)) == TRUE)
return;
gtk_spin_button_set_value(GTK_SPIN_BUTTON(advanced_page.smtpport_spinbtn),
active ? 465 : 25);
}
static void ssl_create_widget_func(PrefsPage * _page,
GtkWindow * window,
gpointer data)
@ -2353,6 +2401,8 @@ static void ssl_create_widget_func(PrefsPage * _page,
pop_starttls_radiobtn,
_("Use STARTTLS command to start SSL session"),
SSL_STARTTLS);
g_signal_connect(G_OBJECT(pop_ssltunnel_radiobtn), "toggled",
G_CALLBACK(pop_ssltunnel_toggled), NULL);
vbox3 = gtkut_get_options_frame(vbox1, &imap_frame, _("IMAP4"));
@ -2366,6 +2416,8 @@ static void ssl_create_widget_func(PrefsPage * _page,
imap_starttls_radiobtn,
_("Use STARTTLS command to start SSL session"),
SSL_STARTTLS);
g_signal_connect(G_OBJECT(imap_ssltunnel_radiobtn), "toggled",
G_CALLBACK(imap_ssltunnel_toggled), NULL);
vbox4 = gtkut_get_options_frame(vbox1, &nntp_frame, _("NNTP"));
@ -2380,6 +2432,8 @@ static void ssl_create_widget_func(PrefsPage * _page,
CREATE_RADIO_BUTTON(vbox4, nntp_ssltunnel_radiobtn, nntp_nossl_radiobtn,
_("Use SSL for NNTP connection"), SSL_TUNNEL);
g_signal_connect(G_OBJECT(nntp_ssltunnel_radiobtn), "toggled",
G_CALLBACK(nntp_ssltunnel_toggled), NULL);
vbox5 = gtkut_get_options_frame(vbox1, &send_frame, _("Send (SMTP)"));
@ -2393,6 +2447,8 @@ static void ssl_create_widget_func(PrefsPage * _page,
smtp_starttls_radiobtn,
_("Use STARTTLS command to start SSL session"),
SSL_STARTTLS);
g_signal_connect(G_OBJECT(smtp_ssltunnel_radiobtn), "toggled",
G_CALLBACK(smtp_ssltunnel_toggled), NULL);
PACK_FRAME(vbox1, cert_frame, _("Client certificates"));