2007-07-26 [colin] 2.10.0cvs67

	* src/mimeview.c
	* src/matcher.c
	* src/common/ssl.c
		Fix threads use on BSDs

diff --git a/ChangeLog b/ChangeLog
index 95087db0fe29ecda733f0f6fb70a006261a8ece3..c526e1e3aab719b496565be7354d293fec16197f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-26 [colin]     2.10.0cvs67
+
+       * src/mimeview.c
+       * src/matcher.c
+       * src/common/ssl.c
+               Fix threads use on BSDs
+
 2007-07-26 [paul]      2.10.0cvs66
 
        * src/gtk/prefswindow.c

diff --git a/PATCHSETS b/PATCHSETS
index 92788ebd12de9b43859a565232406b8ffbfcdc38..4981a30c419ddd92642f59a9c71beba9bc397ca6 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2720,3 +2720,4 @@
 ( cvs diff -u -r 1.60.2.92 -r 1.60.2.93 src/addressbook.c;  cvs diff -u -r 1.14.2.28 -r 1.14.2.29 src/editaddress.c;  ) > 2.10.0cvs64.patchset
 ( cvs diff -u -r 1.654.2.2774 -r 1.654.2.2775 configure.ac;  ) > 2.10.0cvs65.patchset
 ( cvs diff -u -r 1.12.2.38 -r 1.12.2.39 src/gtk/prefswindow.c;  ) > 2.10.0cvs66.patchset
+( cvs diff -u -r 1.83.2.113 -r 1.83.2.114 src/mimeview.c;  cvs diff -u -r 1.75.2.43 -r 1.75.2.44 src/matcher.c;  cvs diff -u -r 1.9.2.20 -r 1.9.2.21 src/common/ssl.c;  ) > 2.10.0cvs67.patchset

diff --git a/configure.ac b/configure.ac
index 30d45ac421df61f5528d32a32b07a20dc4a48ab6..1e42f32900882e52989b9f7bb5c0e6f75baf60a5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=66
+EXTRA_VERSION=67
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/ssl.c b/src/common/ssl.c
index f905a6a9425e1cb3395f4ff1d2dd0029d13be793..0055117d410c0ddb5558ca8eac677d16b25bcd99 100644 (file)
--- a/src/common/ssl.c
+++ b/src/common/ssl.c
@@ -100,7 +100,7 @@ static void *SSL_connect_thread(void *data)
 
 static gint SSL_connect_nb(SSL *ssl)
 {
-#if (defined USE_PTHREAD && defined __GLIBC__ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)))
+#if (defined USE_PTHREAD && ((defined __GLIBC__ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3))) || !defined __GLIBC__))
        thread_data *td = g_new0(thread_data, 1);
        pthread_t pt;
        void *res = NULL;

diff --git a/src/matcher.c b/src/matcher.c
index 9ce382857b8d94e53092834416c41295f4649c86..8c8aef958196c0dd8060342ee97577fec43b100c 100644 (file)
--- a/src/matcher.c
+++ b/src/matcher.c
@@ -657,7 +657,7 @@ static gboolean matcherprop_match_test(const MatcherProp *prop,
        if (cmd == NULL)
                return FALSE;
 
-#if (defined USE_PTHREAD && defined __GLIBC__ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)))
+#if (defined USE_PTHREAD && ((defined __GLIBC__ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3))) || !defined __GLIBC__))
        /* debug output */
        if (debug_filtering_session
                        && prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {

diff --git a/src/mimeview.c b/src/mimeview.c
index 4f8c3476b0cbb99185eb2e061bfb378d5a077680..7e00d71345ea7264f67297c208691fa079762562 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -1059,7 +1059,7 @@ static void check_signature_cb(GtkWidget *widget, gpointer user_data)
 #endif
        noticeview_set_text(mimeview->siginfoview, _("Checking signature..."));
        GTK_EVENTS_FLUSH();
-#if (defined USE_PTHREAD && defined __GLIBC__ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)))
+#if (defined USE_PTHREAD && ((defined __GLIBC__ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3))) || !defined __GLIBC__))
        /* let's do it non-blocking */
        mimeview_check_sig_in_thread(mimeview);
        if (!mimeview->check_data) /* let's check syncronously */