trim line feeds
authorPaul Mangan <paul@claws-mail.org>
Sat, 6 Dec 2003 11:57:22 +0000 (11:57 +0000)
committerPaul Mangan <paul@claws-mail.org>
Sat, 6 Dec 2003 11:57:22 +0000 (11:57 +0000)
ChangeLog.claws
configure.ac
src/procheader.c

index 4a6440a60579884aa8d7a5319ff9bde6647d7c5b..f0330130f05ffae6ce5e343399a466c78bece7c2 100644 (file)
@@ -1,3 +1,8 @@
+2003-12-06 [paul]      0.9.7claws28
+
+       * src/procheader.c
+               add Alfons' patch to trim line feeds
+
 2003-12-06 [paul]      0.9.7claws27
 
        * partial sync with 0.9.7cvs8
index 0e65137a04dd48099677929465bc6a1239a098b5..f7c79da009681ad6cb3bda39eb4ab9d862589ce2 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=7
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=27
+EXTRA_VERSION=28
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
index 4d543b60dd4437ddfc46dbfd51266c79cd369140..1adc3ef07d8f99dfc6641094f705a05bbbd70373 100644 (file)
@@ -134,8 +134,9 @@ static gint generic_get_one_field(gchar *buf, gint len, void *data,
                        if ((len - buflen) > 2) {
                                if (getline(buf + buflen, len - buflen, data) == NULL)
                                        break;
-
-                               if (hp && hp->unfold)
+                               /* trim trailing \n if requesting one header or
+                                * unfolding was requested */
+                               if (!hentry || (hp && hp->unfold))
                                    strretchomp(buf);
                        } else
                                break;