2005-07-14 [hoa] 1.9.12cvs50

	* src/etpan/imap-thread.c
		enable debug log of libetpan when running with --debug

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index f1dc062..329a4cc 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-07-14 [hoa]       1.9.12cvs50
+
+       * src/etpan/imap-thread.c
+               enable debug log of libetpan when running with --debug
+
 2005-07-14 [colin]     1.9.12cvs49
 
        * configure.ac

diff --git a/PATCHSETS b/PATCHSETS
index 61b1816..66927d7 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -644,3 +644,4 @@
 ( cvs diff -u -r 1.61.2.29 -r 1.61.2.30 src/account.c;  cvs diff -u -r 1.60.2.17 -r 1.60.2.18 src/addressbook.c;  cvs diff -u -r 1.382.2.141 -r 1.382.2.142 src/compose.c;  cvs diff -u -r 1.50.2.9 -r 1.50.2.10 src/compose.h;  cvs diff -u -r 1.26.2.16 -r 1.26.2.17 src/foldersel.c;  cvs diff -u -r 1.115.2.41 -r 1.115.2.42 src/main.c;  cvs diff -u -r 1.204.2.46 -r 1.204.2.47 src/prefs_common.c;  cvs diff -u -r 1.395.2.92 -r 1.395.2.93 src/summaryview.c;  cvs diff -u -r 1.96.2.62 -r 1.96.2.63 src/textview.c;  cvs diff -u -r 1.5.2.15 -r 1.5.2.16 src/gtk/menu.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/sylpheed_icon.xpm;  ) > 1.9.12cvs47.patchset
 ( cvs diff -u -r 1.25.2.14 -r 1.25.2.15 src/stock_pixmap.c;  ) > 1.9.12cvs48.patchset
 ( cvs diff -u -r 1.654.2.683 -r 1.654.2.684 configure.ac;  cvs diff -u -r 1.24.2.7 -r 1.24.2.8 src/common/Makefile.am;  cvs diff -u -r 1.13.2.4 -r 1.13.2.5 src/common/plugin.c;  cvs diff -u -r 1.5 -r 1.6 src/common/plugin.h;  cvs diff -u -r 1.8.2.2 -r 1.8.2.3 src/plugins/Makefile.am;  diff -u /dev/null src/plugins/pgpcore/Makefile.am;  diff -u /dev/null src/plugins/pgpcore/passphrase.c;  diff -u /dev/null src/plugins/pgpcore/passphrase.h;  diff -u /dev/null src/plugins/pgpcore/plugin.c;  diff -u /dev/null src/plugins/pgpcore/prefs_gpg.c;  diff -u /dev/null src/plugins/pgpcore/prefs_gpg.h;  diff -u /dev/null src/plugins/pgpcore/select-keys.c;  diff -u /dev/null src/plugins/pgpcore/select-keys.h;  diff -u /dev/null src/plugins/pgpcore/sgpgme.c;  diff -u /dev/null src/plugins/pgpcore/sgpgme.h;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpmime/Makefile.am;  cvs diff -u -r -1.1.2.9 -r -1.1.2.10 src/plugins/pgpmime/passphrase.c;  cvs diff -u -r -1.1.2.2 -r -1.1.2.3 src/plugins/pgpmime/passphrase.h;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/plugins/pgpmime/pgpmime.c;  diff -u /dev/null src/plugins/pgpmime/pgpmime.deps;  cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/plugins/pgpmime/plugin.c;  cvs diff -u -r -1.1.2.10 -r -1.1.2.11 src/plugins/pgpmime/prefs_gpg.c;  cvs diff -u -r -1.1.2.3 -r -1.1.2.4 src/plugins/pgpmime/prefs_gpg.h;  cvs diff -u -r -1.1.2.7 -r -1.1.2.8 src/plugins/pgpmime/select-keys.c;  cvs diff -u -r -1.1.2.2 -r -1.1.2.3 src/plugins/pgpmime/select-keys.h;  cvs diff -u -r -1.1.2.12 -r -1.1.2.13 src/plugins/pgpmime/sgpgme.c;  cvs diff -u -r -1.1.2.5 -r -1.1.2.6 src/plugins/pgpmime/sgpgme.h;  ) > 1.9.12cvs49.patchset
+( cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/etpan/imap-thread.c;  ) > 1.9.12cvs50.patchset

diff --git a/configure.ac b/configure.ac
index b889287..14c1589 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=49
+EXTRA_VERSION=50
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
index 28d9aed..45f9b46 100644 (file)
--- a/src/etpan/imap-thread.c
+++ b/src/etpan/imap-thread.c
@@ -14,6 +14,7 @@
 
 #include <gtk/gtk.h>
 #include "etpan-thread-manager.h"
+#include "utils.h"
 
 static struct etpan_thread_manager * thread_manager = NULL;
 static chash * courier_workaround_hash = NULL;
@@ -41,10 +42,10 @@ void imap_main_init(void)
        
        mailstream_network_delay.tv_sec = ETPAN_DEFAULT_NETWORK_TIMEOUT;
        mailstream_network_delay.tv_usec = 0;
-
-#if 0
-       mailstream_debug = 1;
-#endif
+       
+       if (debug_get_mode())
+               mailstream_debug = 1;
+       
        imap_hash = chash_new(CHASH_COPYKEY, CHASH_DEFAULTSIZE);
        session_hash = chash_new(CHASH_COPYKEY, CHASH_DEFAULTSIZE);
        courier_workaround_hash = chash_new(CHASH_COPYKEY, CHASH_DEFAULTSIZE);