talons

commit bef3502153147e4471b8dd68ded2c891921f90ca
parent 8338a74ceb2417a295c42f77c4b2cbe933376c79
Author: Colin Leroy <colin@colino.net>
Date:   Fri, 25 Apr 2008 22:37:01 +0000

2008-04-25 [colin]	3.4.0cvs15

	* src/common/ssl.c
		Fix/simplify previous commit

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/common/ssl.c
 | 
6
+-----

4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-25 [colin]	3.4.0cvs15
+
+	* src/common/ssl.c
+		Fix/simplify previous commit
+
 2008-04-25 [colin]	3.4.0cvs14
 
 	* src/addrindex.h
diff --git a/PATCHSETS b/PATCHSETS
@@ -3310,3 +3310,4 @@
 ( cvs diff -u -r 1.155.2.84 -r 1.155.2.85 src/Makefile.am;  diff -u /dev/null src/w32-logo.ico;  diff -u /dev/null src/w32-resource.rc;  ) > 3.4.0cvs12.patchset
 ( cvs diff -u -r 1.395.2.365 -r 1.395.2.366 src/summaryview.c;  ) > 3.4.0cvs13.patchset
 ( cvs diff -u -r 1.9.2.14 -r 1.9.2.15 src/addrindex.h;  cvs diff -u -r 1.9.2.26 -r 1.9.2.27 src/common/ssl.c;  cvs diff -u -r 1.4.2.26 -r 1.4.2.27 src/common/ssl_certificate.c;  ) > 3.4.0cvs14.patchset
+( cvs diff -u -r 1.9.2.27 -r 1.9.2.28 src/common/ssl.c;  ) > 3.4.0cvs15.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=14
+EXTRA_VERSION=15
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/common/ssl.c b/src/common/ssl.c
@@ -174,16 +174,12 @@ static gint SSL_connect_nb(gnutls_session ssl)
 			GPOINTER_TO_INT(res));
 	
 	return GPOINTER_TO_INT(res);
-#else
+#else /* USE_PTHREAD */
 #ifdef USE_OPENSSL
 	return SSL_connect(ssl);
 #else
 	do {
-#ifdef USE_PTHRED
-		result = gnutls_handshake(td->ssl);
-#else
 		result = gnutls_handshake(ssl);
-#endif
 	} while (result == GNUTLS_E_AGAIN || result == GNUTLS_E_INTERRUPTED);
 #endif
 #endif