talons

commit 9472dae1a6cd20379c71d26ddc180b1115c60123
parent a18648b8ad9973991e7efed1c32b730b38cf0ef9
Author: Colin Leroy <colin@colino.net>
Date:   Fri, 10 Oct 2008 06:52:20 +0000

2008-10-10 [colin]	3.6.0cvs25

	* src/common/ssl.c
		Tell libetpan it doesn't need to init
		GnuTLS

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

4 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-10 [colin]	3.6.0cvs25
+
+	* src/common/ssl.c
+		Tell libetpan it doesn't need to init
+		GnuTLS
+
 2008-10-10 [colin]	3.6.0cvs24
 
 	* claws-mail.pc.in
diff --git a/PATCHSETS b/PATCHSETS
@@ -3581,3 +3581,4 @@
 ( cvs diff -u -r 1.654.2.3641 -r 1.654.2.3642 configure.ac;  ) > 3.6.0cvs22.patchset
 ( cvs diff -u -r 1.654.2.3642 -r 1.654.2.3643 configure.ac;  ) > 3.6.0cvs23.patchset
 ( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 claws-mail.pc.in;  ) > 3.6.0cvs24.patchset
+( cvs diff -u -r 1.9.2.33 -r 1.9.2.34 src/common/ssl.c;  ) > 3.6.0cvs25.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=24
+EXTRA_VERSION=25
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/common/ssl.c b/src/common/ssl.c
@@ -237,6 +237,9 @@ void ssl_init(void)
 	SSL_CTX_set_verify_depth(ssl_ctx,1);
 #endif
 #else
+#ifdef HAVE_LIBETPAN
+	mailstream_gnutls_init_not_required();
+#endif	
 	gnutls_global_init();
 #endif
 }