2008-10-10 [colin] 3.6.0cvs25

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

diff --git a/ChangeLog b/ChangeLog
index 022d4f143794458b4313dcad651d3a764af1dd4e..96d0f8a49cc385e49e04678e359e16b1a17f76d4 100644 (file)
--- 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
index 2068a1da374579fdd51609b2ec8759dbcc75f7df..32d790d06cc9c03027e1ee19a48fee162dc7fffd 100644 (file)
--- 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
index 5840b428f725171d9e92b60cb8939e2fdef28e21..3e38d40ced620bfeeadcc6e3528af322799dbe42 100644 (file)
--- 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
index 703d4b8def9bf19557ea5103ebf023212b73472e..4bce5808bd32065223cd49a253db5591ad518ca6 100644 (file)
--- 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
 }