From 298364faef2187a7bbaeb73ed0603ebd4a2efdde Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Fri, 12 Jan 2007 12:17:18 +0000 Subject: [PATCH] 2007-01-12 [paul] 2.7.0cvs3-stable * src/procmime.c From 2.7.0cvs13: fix Forwarding msgs with attachments that have dos line endings --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- src/procmime.c | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 22b426550..cc1c2db0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-01-12 [paul] 2.7.0cvs3-stable + + * src/procmime.c + From 2.7.0cvs13: + fix Forwarding msgs with attachments + that have dos line endings + 2007-01-11 [colin] 2.7.0cvs2-stable * src/imap.c diff --git a/PATCHSETS b/PATCHSETS index 6bcb34316..8f341fab3 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2229,3 +2229,4 @@ ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 doc/man/claws-mail.1; ) > 2.6.1cvs119.patchset ( cvs diff -u -r 1.179.2.146 -r 1.179.2.147 src/imap.c; cvs diff -u -r 1.274.2.161 -r 1.274.2.162 src/mainwindow.c; cvs diff -u -r 1.83.2.96 -r 1.83.2.97 src/mimeview.c; cvs diff -u -r 1.2.2.29 -r 1.2.2.30 src/gtk/filesel.c; cvs diff -u -r 1.5.2.40 -r 1.5.2.41 src/gtk/pluginwindow.c; cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/plugins/pgpcore/select-keys.c; ) > 2.7.0cvs1-stable.patchset ( cvs diff -u -r 1.179.2.146.2.1 -r 1.179.2.146.2.2 src/imap.c; ) > 2.7.0cvs2-stable.patchset +( cvs diff -u -r 1.49.2.85 -r 1.49.2.86 src/procmime.c; ) > 2.7.0cvs3.patchset diff --git a/configure.ac b/configure.ac index 695c9bcd6..556947c92 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=7 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=2 +EXTRA_VERSION=3 EXTRA_RELEASE= EXTRA_GTK2_VERSION=-stable diff --git a/src/procmime.c b/src/procmime.c index 6d3939d95..2197972cb 100644 --- a/src/procmime.c +++ b/src/procmime.c @@ -2114,6 +2114,7 @@ gint procmime_write_message_rfc822(MimeInfo *mimeinfo, FILE *fp) } fseek(infp, mimeinfo->offset, SEEK_SET); while (fgets(buf, sizeof(buf), infp) == buf) { + strcrchomp(buf); if (buf[0] == '\n' && buf[1] == '\0') break; if (skip && (buf[0] == ' ' || buf[0] == '\t')) -- 2.11.4.GIT