From: Colin Leroy <colin@colino.net>
Date: Thu, 24 Jan 2008 16:40:22 +0000 (+0000)
Subject: 2008-01-24 [colin]	3.2.0cvs67
X-Git-Tag: rel_3_3_0~12
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=b7bf9f52b11c2cb9f36f85ee7d511b32a39ccbed;ds=sidebyside

2008-01-24 [colin]	3.2.0cvs67

	* src/etpan/imap-thread.c
	* src/etpan/nntp-thread.c
		Fix bug 1348, 'Hang ups at exit time with
		pgp plugin since 3.0.2'
---

diff --git a/ChangeLog b/ChangeLog
index 9656e76e7..0a62799cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-24 [colin]	3.2.0cvs67
+
+	* src/etpan/imap-thread.c
+	* src/etpan/nntp-thread.c
+		Fix bug 1348, 'Hang ups at exit time with 
+		pgp plugin since 3.0.2'
+
 2008-01-23 [colin]	3.2.0cvs66
 
 	* src/toolbar.c
diff --git a/PATCHSETS b/PATCHSETS
index 2a553a3de..fc23989c5 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3203,3 +3203,4 @@
 ( cvs diff -u -r 1.52.2.55 -r 1.52.2.56 src/prefs_folder_item.c;  ) > 3.2.0cvs64.patchset
 ( cvs diff -u -r 1.49.2.106 -r 1.49.2.107 src/procmime.c;  ) > 3.2.0cvs65.patchset
 ( cvs diff -u -r 1.43.2.94 -r 1.43.2.95 src/toolbar.c;  ) > 3.2.0cvs66.patchset
+( cvs diff -u -r 1.1.4.95 -r 1.1.4.96 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/etpan/nntp-thread.c;  ) > 3.2.0cvs67.patchset
diff --git a/configure.ac b/configure.ac
index 1f6d0b54a..6903dc252 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=66
+EXTRA_VERSION=67
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
index 566dcc1da..5c7474741 100644
--- a/src/etpan/imap-thread.c
+++ b/src/etpan/imap-thread.c
@@ -288,6 +288,9 @@ void imap_main_set_timeout(int sec)
 void imap_main_done(void)
 {
 	etpan_thread_manager_stop(thread_manager);
+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
+	return;
+#endif
 	etpan_thread_manager_join(thread_manager);
 	
 	g_source_remove(thread_manager_signal);
diff --git a/src/etpan/nntp-thread.c b/src/etpan/nntp-thread.c
index 57cafe9ae..4945ba069 100644
--- a/src/etpan/nntp-thread.c
+++ b/src/etpan/nntp-thread.c
@@ -150,6 +150,9 @@ void nntp_main_init(gboolean skip_ssl_cert_check)
 void nntp_main_done(void)
 {
 	etpan_thread_manager_stop(thread_manager);
+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
+	return;
+#endif
 	etpan_thread_manager_join(thread_manager);
 	
 	g_source_remove(thread_manager_signal);