2007-07-26 [colin] 2.10.0cvs67

* src/mimeview.c
	* src/matcher.c
	* src/common/ssl.c
		Fix threads use on BSDs
This commit is contained in:
Colin Leroy 2007-07-26 16:27:36 +00:00
parent da04bd8bdb
commit af3288a90e
6 changed files with 12 additions and 4 deletions

View file

@ -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

View file

@ -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

View file

@ -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=

View file

@ -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;

View file

@ -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) {

View file

@ -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 */