2008-11-26 [colin] 3.6.1cvs44
authorColin Leroy <colin@colino.net>
Wed, 26 Nov 2008 11:59:59 +0000 (11:59 +0000)
committerColin Leroy <colin@colino.net>
Wed, 26 Nov 2008 11:59:59 +0000 (11:59 +0000)
* src/main.c
* src/common/claws.c
* src/common/ssl.c
Make sure libgcrypt's threading is initialised
before gnutls. See also old bug 1539.

ChangeLog
PATCHSETS
configure.ac
src/common/claws.c
src/common/ssl.c
src/main.c

index bfb27a4aaff7e300a3209937ac9c0091795dbcc4..b66d750c0fccf6db84f6fb68c7d2a436cff64bf1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-26 [colin]     3.6.1cvs44
+
+       * src/main.c
+       * src/common/claws.c
+       * src/common/ssl.c
+               Make sure libgcrypt's threading is initialised
+               before gnutls. See also old bug 1539.
+
 2008-11-26 [colin]     3.6.1cvs43
 
        * src/imap.c
index 98402ccaddcc83fb24068afdeb7bf1a66dbe9e50..4e25735270a074fa345517139c6e51782ea6916b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.382.2.487 -r 1.382.2.488 src/compose.c;  ) > 3.6.1cvs41.patchset
 ( cvs diff -u -r 1.49.2.121 -r 1.49.2.122 src/procmime.c;  ) > 3.6.1cvs42.patchset
 ( cvs diff -u -r 1.179.2.236 -r 1.179.2.237 src/imap.c;  cvs diff -u -r 1.101.2.57 -r 1.101.2.58 src/news.c;  cvs diff -u -r 1.1.4.105 -r 1.1.4.106 src/etpan/imap-thread.c;  ) > 3.6.1cvs43.patchset
+( cvs diff -u -r 1.115.2.215 -r 1.115.2.216 src/main.c;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/common/claws.c;  cvs diff -u -r 1.9.2.35 -r 1.9.2.36 src/common/ssl.c;  ) > 3.6.1cvs44.patchset
index bfe57307f867d2599f504252847f84538cb6fe3c..7bbc7b5a6899b96aeb865fe84dc1dfe8c436fad2 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=43
+EXTRA_VERSION=44
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index cb0723cafd8f82a89f796d719d41062a2cdc1295..53037af0a213c798faf0eb932f400d9a80ddf3b9 100644 (file)
@@ -91,6 +91,9 @@ gboolean claws_init(int *argc, char ***argv)
        if (claws_initialized)
                return TRUE;
 
+#ifdef USE_GNUTLS
+       ssl_init();
+#endif
        startup_dir = g_get_current_dir();
 
        parse_parameter(argc, argv);
@@ -115,10 +118,6 @@ gboolean claws_init(int *argc, char ***argv)
 
        srand((gint) time(NULL));
 
-#ifdef USE_GNUTLS
-       ssl_init();
-#endif
-
        claws_initialized = TRUE;
 
        return TRUE;
index e87a532fbee3faf7e843d8de1119ef979cf5a86b..85600a55f6562e5f6ca63becd4e042aba7273c98 100644 (file)
 
 #include <glib.h>
 #include <glib/gi18n.h>
+#include <errno.h>
+#include <pthread.h>
+#include <gcrypt.h>
+GCRY_THREAD_OPTION_PTHREAD_IMPL;
 
 #include "claws.h"
 #include "utils.h"
@@ -148,6 +152,7 @@ const gchar *claws_ssl_get_cert_dir(void)
 
 void ssl_init(void)
 {
+       gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
 #ifdef HAVE_LIBETPAN
        mailstream_gnutls_init_not_required();
 #endif 
index 5e2480c1e57ca0d9518b3879d47bc610a9fef9a4..dd2092f8afd7d183250ab076fa1d50dcdf5f489a 100644 (file)
 #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
@@ -1053,7 +1048,6 @@ int main(int argc, char *argv[])
        GtkUIManager *gui_manager = NULL;
        GSList *plug_list = NULL;
        gboolean never_ran = FALSE;
-
        START_TIMING("startup");
 
        sc_starting = TRUE;
@@ -1444,10 +1438,6 @@ 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);