2008-01-24 [colin] 3.2.0cvs67
authorColin Leroy <colin@colino.net>
Thu, 24 Jan 2008 16:40:22 +0000 (16:40 +0000)
committerColin Leroy <colin@colino.net>
Thu, 24 Jan 2008 16:40:22 +0000 (16:40 +0000)
* 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'

ChangeLog
PATCHSETS
configure.ac
src/etpan/imap-thread.c
src/etpan/nntp-thread.c

index 9656e76e7491b9433bd5f67e6f6f0a407a20ec22..0a62799cf46b2ab983650ef18fbdd385241b25cf 100644 (file)
--- 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
index 2a553a3de0fbfd75bf14108ba6a9e60d4def266c..fc23989c5d2c1ddff1b0a9c8581336f0601027ae 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index 1f6d0b54a022769d6e18cfaa95e84e307faf4ea9..6903dc252df9df1e9d32bf7cb0f4111949345465 100644 (file)
@@ -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=
 
index 566dcc1da972f468d84afd4888aa5130eaa66fc2..5c74747419d663ab4f53a425b273751d35f84ae6 100644 (file)
@@ -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);
index 57cafe9aef39f953d8fe6e8452914a5946290ca2..4945ba06977a5e566c1ba3379c6055202cc5564a 100644 (file)
@@ -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);