2004-08-17 [colin] 0.9.12cvs65.1

	* src/common/ssl.c
	* src/plugins/pgpmime/plugin.c
		Sync with HEAD

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 562b5d00638ff1ff4c786f471c0d3106a50c8884..b7f7ddcc97199bb7d043271481e55490ff52033d 100644 (file)
--- 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 277b8f5a14a311e5766b4c4fd93d90b936a474be..a5544531391d636fd2ce21b6cb2739cf8c0a6dc1 100644 (file)
--- 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 126d86675b539e62110e48fb5ff69d3774e4651f..cdcc892c40209922a61207a8207094c2fc31bcb3 100644 (file)
--- 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 3594e20944fe6137fd656d7cb05c948e28504936..3e8577fc3f7ed014c3651fd9a07d2be5ddc9bb7b 100644 (file)
--- 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 29f548175431e378591d6610e884418396fc24b4..c3502579540f4a63a657d6ff8c767bedb08a7911 100644 (file)
--- 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)