From 8ab3094b501b0044a44fad34bbdb0b50dc67976e Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Tue, 17 Aug 2004 06:40:55 +0000 Subject: [PATCH] 2004-08-17 [colin] 0.9.12cvs65.1 * src/common/ssl.c * src/plugins/pgpmime/plugin.c Sync with HEAD --- ChangeLog-gtk2.claws | 6 ++++++ PATCHSETS | 1 + configure.ac | 4 ++-- src/common/ssl.c | 2 +- src/plugins/pgpmime/plugin.c | 5 ++++- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 562b5d006..b7f7ddcc9 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,9 @@ +2004-08-17 [colin] 0.9.12cvs65.1 + + * src/common/ssl.c + * src/plugins/pgpmime/plugin.c + Sync with HEAD + 2004-08-14 [colin] 0.9.12cvs60.3 * src/plugins/trayicon/trayicon.c diff --git a/PATCHSETS b/PATCHSETS index 277b8f5a1..a55445313 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -120,3 +120,4 @@ ( cvs diff -u -r 1.3.2.3 -r 1.3.2.4 src/folderutils.c; ) > 0.9.12cvs60.1.patchset ( cvs diff -u -r 1.9.2.6 -r 1.9.2.7 src/common/defs.h; ) > 0.9.12cvs60.2.patchset ( cvs diff -u -r 1.14.2.9 -r 1.14.2.10 src/plugins/trayicon/trayicon.c; ) > 0.9.12cvs60.3.patchset +( cvs diff -u -r 1.9.2.5 -r 1.9.2.6 src/common/ssl.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpmime/plugin.c; ) > 0.9.12cvs65.1.patchset diff --git a/configure.ac b/configure.ac index 126d86675..cdcc892c4 100644 --- a/configure.ac +++ b/configure.ac @@ -11,9 +11,9 @@ MINOR_VERSION=9 MICRO_VERSION=12 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=60 +EXTRA_VERSION=65 EXTRA_RELEASE= -EXTRA_GTK2_VERSION=.3 +EXTRA_GTK2_VERSION=.1 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION} diff --git a/src/common/ssl.c b/src/common/ssl.c index 3594e2094..3e8577fc3 100644 --- a/src/common/ssl.c +++ b/src/common/ssl.c @@ -87,7 +87,7 @@ void *SSL_connect_thread(void *data) gint SSL_connect_nb(SSL *ssl) { -#ifdef USE_PTHREAD +#if (defined USE_PTHREAD && defined __GLIBC__ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3))) thread_data *td = g_new0(thread_data, 1); pthread_t pt; void *res = NULL; diff --git a/src/plugins/pgpmime/plugin.c b/src/plugins/pgpmime/plugin.c index 29f548175..c35025795 100644 --- a/src/plugins/pgpmime/plugin.c +++ b/src/plugins/pgpmime/plugin.c @@ -60,7 +60,10 @@ const gchar *plugin_name(void) const gchar *plugin_desc(void) { - return _(""); + return _("This plugin allows to check digitally signed messages' " + "signatures, and to decrypt encrypted messages. \n" + "\n" + "You don't need it to send signed or encrypted emails."); } const gchar *plugin_type(void) -- 2.25.1