From 469d786c2548b0bcd711e79726c488094ffde583 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 18 Nov 2009 11:55:18 -0800 Subject: Filter out carriage-returns in show and reply output. Thanks, windows mail clients. Signed-off-by: Keith Packard --- gmime-filter-reply.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gmime-filter-reply.c') diff --git a/gmime-filter-reply.c b/gmime-filter-reply.c index 3e298e1b..b269db4e 100644 --- a/gmime-filter-reply.c +++ b/gmime-filter-reply.c @@ -130,8 +130,9 @@ filter_filter (GMimeFilter *filter, char *inbuf, size_t inlen, size_t prespace, reply->saw_nl = TRUE; else reply->saw_nl = FALSE; - - *outptr++ = *inptr++; + if (*inptr != '\r') + *outptr++ = *inptr; + inptr++; } } else { g_mime_filter_set_size (filter, inlen + 1, FALSE); @@ -150,7 +151,7 @@ filter_filter (GMimeFilter *filter, char *inbuf, size_t inlen, size_t prespace, else *outptr++ = *inptr; reply->saw_angle = FALSE; - } else { + } else if (*inptr != '\r') { if (*inptr == '\n') reply->saw_nl = TRUE; *outptr++ = *inptr; -- cgit v1.2.3