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

diff --git a/ChangeLog b/ChangeLog
index 4107c621c662705daf307f606eabddfea486b609..15fd9d91183ba9db7194a6a1b3612d7526cca50e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/PATCHSETS b/PATCHSETS
index b336cf0603c3ff33cd41833f84e413897dc88e8d..5f1842afa8cc6f0bb1292dc22267cb69536915e0 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -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

diff --git a/configure.ac b/configure.ac
index 709721b22f122e9edb0d81cd929b8361f03826d0..dbd9dbd5e82661df3179def84a00fb255c4e72e9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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=
 

diff --git a/src/prefs_account.c b/src/prefs_account.c
index ac46fe3079d37239af5f583c6f19d3821e65c0ed..de966f85e111ed4397c6d3efbc7bc4f292b768f5 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -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"));