2005-07-15 [hoa] 1.9.12cvs59

	* src/etpan/imap-thread.c
	    disable login of IMAP password in libetpan log file.

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 11f6133..37f6bdb 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-07-15 [hoa]       1.9.12cvs59
+
+       * src/etpan/imap-thread.c
+           disable login of IMAP password in libetpan log file.
+
 2005-07-15 [paul]      1.9.12cvs58
 
        * src/account.c

diff --git a/PATCHSETS b/PATCHSETS
index cbe5868..f806f79 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -653,3 +653,4 @@
 ( cvs diff -u -r 1.5.2.17 -r 1.5.2.18 src/gtk/pluginwindow.c;  ) > 1.9.12cvs56.patchset
 ( cvs diff -u -r 1.61.2.30 -r 1.61.2.31 src/account.c;  cvs diff -u -r 1.3.2.11 -r 1.3.2.12 src/ssl_manager.c;  ) > 1.9.12cvs57.patchset
 ( cvs diff -u -r 1.61.2.31 -r 1.61.2.32 src/account.c;  ) > 1.9.12cvs58.patchset
+( cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/etpan/imap-thread.c;  ) > 1.9.12cvs59.patchset

diff --git a/configure.ac b/configure.ac
index 74af38b..3271a6b 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=58
+EXTRA_VERSION=59
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
index 45f9b46..7d0a3a7 100644 (file)
--- a/src/etpan/imap-thread.c
+++ b/src/etpan/imap-thread.c
@@ -16,6 +16,8 @@
 #include "etpan-thread-manager.h"
 #include "utils.h"
 
+#define DISABLE_LOG_DURING_LOGIN
+
 static struct etpan_thread_manager * thread_manager = NULL;
 static chash * courier_workaround_hash = NULL;
 static chash * imap_hash = NULL;
@@ -424,11 +426,23 @@ static void login_run(struct etpan_thread_op * op)
        struct login_param * param;
        struct login_result * result;
        int r;
+#ifdef DISABLE_LOG_DURING_LOGIN
+       int old_debug;
+#endif
        
        param = op->param;
+       
+#ifdef DISABLE_LOG_DURING_LOGIN
+       old_debug = mailstream_debug;
+#endif
+       
        r = mailimap_login(param->imap,
                           param->login, param->password);
        
+#ifdef DISABLE_LOG_DURING_LOGIN
+       mailstream_debug = old_debug;
+#endif
+       
        result = op->result;
        result->error = r;
        debug_print("imap login run - end %i\n", r);