2007-08-19 [colin] 2.10.0cvs133

	* src/etpan/imap-thread.c
		Make all fetch logs less verbose

diff --git a/ChangeLog b/ChangeLog
index 67cbfa759c533fd9c5154b8dd5ebc536f749e0dd..a70e932659b232141591808fa980a21c33602806 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-19 [colin]     2.10.0cvs133
+
+       * src/etpan/imap-thread.c
+               Make all fetch logs less verbose
+
 2007-08-19 [paul]      2.10.0cvs132
 
        * src/foldersel.c

diff --git a/PATCHSETS b/PATCHSETS
index 651b8862add34ca6afe5dcc8a8533a2d796f9cb1..a22021a2e50ee79484c497a80bfc16a8b02d32f4 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2787,3 +2787,4 @@
 ( cvs diff -u -r 1.382.2.402 -r 1.382.2.403 src/compose.c;  cvs diff -u -r 1.204.2.146 -r 1.204.2.147 src/prefs_common.c;  cvs diff -u -r 1.103.2.92 -r 1.103.2.93 src/prefs_common.h;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/prefs_send.c;  cvs diff -u -r 1.17.2.40 -r 1.17.2.41 src/send_message.c;  ) > 2.10.0cvs130.patchset
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/editaddress_other_attributes_ldap.c;  ) > 2.10.0cvs131.patchset
 ( cvs diff -u -r 1.26.2.33 -r 1.26.2.34 src/foldersel.c;  cvs diff -u -r 1.207.2.174 -r 1.207.2.175 src/folderview.c;  cvs diff -u -r 1.395.2.320 -r 1.395.2.321 src/summaryview.c;  ) > 2.10.0cvs132.patchset
+( cvs diff -u -r 1.1.4.82 -r 1.1.4.83 src/etpan/imap-thread.c;  ) > 2.10.0cvs133.patchset

diff --git a/configure.ac b/configure.ac
index faa877f7997457fdd9c89662b6a6cebe10b49ab1..1813e55647e694b6383537d8b8a94a9aba6bd7f7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=132
+EXTRA_VERSION=133
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
index a3c0e96640669d76b04e3c7f2961a58df69f9278..c65eaf21fc0462fbe7e55e6d994b13f6dd2902b5 100644 (file)
--- a/src/etpan/imap-thread.c
+++ b/src/etpan/imap-thread.c
@@ -125,7 +125,7 @@ static void imap_logger_fetch(int direction, const char * str, size_t size)
        gchar **lines;
        int i = 0;
 
-       if (size > 8192) {
+       if (size > 128 && !direction) {
                log_print(LOG_PROTOCOL, "IMAP4%c [FETCH data - %zd bytes]\n", direction?'>':'<', size);
                return;
        }
@@ -1672,9 +1672,12 @@ static int imap_get_messages_list(mailimap * imap,
                goto free_fetch_type;
        }
 
+       mailstream_logger = imap_logger_fetch;
+       
        r = mailimap_uid_fetch(imap, set,
                               fetch_type, &fetch_result);
 
+       mailstream_logger = imap_logger_cmd;
        mailimap_fetch_type_free(fetch_type);
        mailimap_set_free(set);
 
@@ -1904,9 +1907,12 @@ static int imap_get_messages_flags_list(mailimap * imap,
                goto free_fetch_type;
        }
 
+       mailstream_logger = imap_logger_fetch;
+       
        r = mailimap_uid_fetch(imap, set,
                               fetch_type, &fetch_result);
 
+       mailstream_logger = imap_logger_cmd;
        mailimap_fetch_type_free(fetch_type);
        mailimap_set_free(set);
 
@@ -2148,8 +2154,11 @@ static int imap_fetch_header(mailimap * imap,
     goto free_fetch_att;
   }
 
+  mailstream_logger = imap_logger_fetch;
+  
   r = mailimap_uid_fetch(imap, set, fetch_type, &fetch_result);
   
+  mailstream_logger = imap_logger_cmd;
   mailimap_fetch_type_free(fetch_type);
   mailimap_set_free(set);
 
@@ -2549,8 +2558,11 @@ imap_get_envelopes_list(mailimap * imap, struct mailimap_set * set,
        else
                r = imap_add_header_fetch_att(fetch_type);
        
+       mailstream_logger = imap_logger_fetch;
+       
        r = mailimap_uid_fetch(imap, set, fetch_type, &fetch_result);
        
+       mailstream_logger = imap_logger_cmd;
        switch (r) {
        case MAILIMAP_NO_ERROR:
                break;