2006-10-10 [colin] 2.5.3cvs28
authorColin Leroy <colin@colino.net>
Tue, 10 Oct 2006 06:29:47 +0000 (06:29 +0000)
committerColin Leroy <colin@colino.net>
Tue, 10 Oct 2006 06:29:47 +0000 (06:29 +0000)
* src/procheader.c
Fix this \t problem in subject

ChangeLog
PATCHSETS
configure.ac
src/procheader.c

index 46996fe..491ecf0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-10 [colin]     2.5.3cvs28
+
+       * src/procheader.c
+               Fix this \t problem in subject
+
 2006-10-09 [colin]     2.5.3cvs27
 
        * src/main.c
index 38a152e..7bd3831 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/prefs_summaries.c;  ) > 2.5.3cvs25.patchset
 ( cvs diff -u -r 1.654.2.2031 -r 1.654.2.2032 configure.ac;  cvs diff -u -r 1.16.2.45 -r 1.16.2.46 src/msgcache.c;  cvs diff -u -r 1.10.2.23 -r 1.10.2.24 src/prefs_gtk.c;  ) > 2.5.3cvs26.patchset
 ( cvs diff -u -r 1.115.2.109 -r 1.115.2.110 src/main.c;  cvs diff -u -r 1.10.2.24 -r 1.10.2.25 src/prefs_gtk.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpcore/pgp_viewer.c;  cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/plugins/pgpcore/sgpgme.c;  ) > 2.5.3cvs27.patchset
+( cvs diff -u -r 1.47.2.34 -r 1.47.2.35 src/procheader.c;  ) > 2.5.3cvs28.patchset
index 936cb06..21c21fa 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=27
+EXTRA_VERSION=28
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index e5ffff3..2c1d4bf 100644 (file)
@@ -134,6 +134,7 @@ static gint generic_get_one_field(gchar *buf, size_t len, void *data,
                /* ([*WSP CRLF] 1*WSP) */
                if (nexthead == ' ' || nexthead == '\t') {
                        size_t buflen;
+                       gboolean skiptab = (nexthead == '\t');
                        /* trim previous trailing \n if requesting one header or
                         * unfolding was requested */
                        if ((!hentry && unfold) || (hp && hp->unfold))
@@ -145,6 +146,9 @@ static gint generic_get_one_field(gchar *buf, size_t len, void *data,
                        if ((len - buflen) > 2) {
                                if (getline(buf + buflen, len - buflen, data) == NULL)
                                        break;
+                               if (skiptab) { /* replace tab with space */
+                                       *(buf + buflen) = ' ';
+                               }
                        } else
                                break;
                } else {
@@ -541,7 +545,6 @@ static MsgInfo *parse_stream(void *data, gboolean isstring, MsgFlags flags,
                case H_SUBJECT:
                        if (msginfo->subject) break;
                         msginfo->subject = conv_unmime_header(hp, NULL);
-                       remove_return(msginfo->subject);
                        break;
                case H_MSG_ID:
                        if (msginfo->msgid) break;