talons

commit a0d8d01287ce90ca0652e8b321787389a57c240e
parent f5e742d3b324ff5304a585a2a604077cd8f51241
Author: Colin Leroy <colin@colino.net>
Date:   Sun,  2 Mar 2008 15:37:49 +0000

2008-03-02 [colin]	3.3.1cvs7

	* src/main.c
		Probably fix bug 1539, 'Program crashes':
		Setup Gcrypt's thread functions when built
		with GnuTLS

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/main.c
 | 
9
+++++++++

4 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-02 [colin]	3.3.1cvs7
+
+	* src/main.c
+		Probably fix bug 1539, 'Program crashes':
+		Setup Gcrypt's thread functions when built
+		with GnuTLS
+
 2008-03-01 [colin]	3.3.1cvs6
 
 	* src/folder.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3241,3 +3241,4 @@
 ( cvs diff -u -r 1.179.2.211 -r 1.179.2.212 src/imap.c;  ) > 3.3.1cvs4.patchset
 ( cvs diff -u -r 1.382.2.438 -r 1.382.2.439 src/compose.c;  cvs diff -u -r 1.179.2.212 -r 1.179.2.213 src/imap.c;  cvs diff -u -r 1.94.2.171 -r 1.94.2.172 src/messageview.c;  cvs diff -u -r 1.1.4.97 -r 1.1.4.98 src/etpan/imap-thread.c;  ) > 3.3.1cvs5.patchset
 ( cvs diff -u -r 1.213.2.177 -r 1.213.2.178 src/folder.c;  cvs diff -u -r 1.1.2.54 -r 1.1.2.55 src/imap_gtk.c;  ) > 3.3.1cvs6.patchset
+( cvs diff -u -r 1.115.2.190 -r 1.115.2.191 src/main.c;  ) > 3.3.1cvs7.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=6
+EXTRA_VERSION=7
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/main.c b/src/main.c
@@ -44,6 +44,11 @@
 #ifdef HAVE_LIBSM
 #include <X11/SM/SMlib.h>
 #endif
+#ifdef USE_GNUTLS
+#include <pthread.h>
+#include <gcrypt.h>
+GCRY_THREAD_OPTION_PTHREAD_IMPL;
+#endif
 
 #include "wizard.h"
 #ifdef HAVE_STARTUP_NOTIFICATION
@@ -1314,6 +1319,10 @@ int main(int argc, char *argv[])
 	if (claws_crashed())
 		main_window_popup(mainwin);
 
+#ifdef USE_GNUTLS
+	gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+#endif
+
 #ifdef HAVE_LIBETPAN
 	imap_main_init(prefs_common.skip_ssl_cert_check);
 	imap_main_set_timeout(prefs_common.io_timeout_secs);