talons

commit 974a0c5eef44954748e3347a671416d33e47f512
parent a374b0bd752b6e902b234e0d81e08f2de89a7871
Author: Colin Leroy <colin@colino.net>
Date:   Fri, 14 May 2010 09:15:34 +0000

2010-05-14 [colin]	3.7.6cvs4

	* src/gtk/sslcertwindow.c
		Fix bug 1993, 'Cannot send mail when SSL certificate is
		expired but certificate check is skipped' and maybe
		bug 2200, 'SSL is not working with POP3'

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/gtk/sslcertwindow.c
 | 
4
+++-

4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-14 [colin]	3.7.6cvs4
+
+	* src/gtk/sslcertwindow.c
+		Fix bug 1993, 'Cannot send mail when SSL certificate is 
+		expired but certificate check is skipped' and maybe
+		bug 2200, 'SSL is not working with POP3'
+
 2010-05-14 [colin]	3.7.6cvs3
 
 	* src/plugins/pgpinline/pgpinline.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3999,3 +3999,4 @@
 ( cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/prefs_message.c;  cvs diff -u -r 1.103.2.128 -r 1.103.2.129 src/prefs_common.h;  cvs diff -u -r 1.204.2.195 -r 1.204.2.196 src/prefs_common.c;  cvs diff -u -r 1.96.2.223 -r 1.96.2.224 src/textview.c;  ) > 3.7.6cvs1.patchset
 ( cvs diff -u -r 1.1.2.31 -r 1.1.2.32 src/prefs_message.c;  ) > 3.7.6cvs2.patchset
 ( cvs diff -u -r 1.1.2.44 -r 1.1.2.45 src/plugins/pgpinline/pgpinline.c;  ) > 3.7.6cvs3.patchset
+( cvs diff -u -r 1.9.2.29 -r 1.9.2.30 src/gtk/sslcertwindow.c;  ) > 3.7.6cvs4.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=3
+EXTRA_VERSION=4
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/gtk/sslcertwindow.c b/src/gtk/sslcertwindow.c
@@ -267,8 +267,10 @@ static gboolean sslcert_ask_hook(gpointer source, gpointer data)
 {
 	SSLCertHookData *hookdata = (SSLCertHookData *)source;
 
-	if (prefs_common.skip_ssl_cert_check)
+	if (prefs_common.skip_ssl_cert_check) {
+		hookdata->accept = TRUE;
 		return TRUE;
+	}
 
 	if (hookdata == NULL) {
 		return FALSE;