debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-21 18:38:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Filter out carriage-returns in show and reply output.

Browse source 
Thanks, windows mail clients.

Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Keith Packard 2009-11-18 11:55:18 -08:00 committed by Carl Worth
parent 1a75f88d8b
commit 469d786c25
2 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gmime-filter-reply.c
View file

@ -130,8 +130,9 @@ filter_filter (GMimeFilter *filter, char *inbuf, size_t inlen, size_t prespace,
reply->saw_nl = TRUE; reply->saw_nl = TRUE;
else else
reply->saw_nl = FALSE; reply->saw_nl = FALSE;
if (*inptr != '\r')
*outptr++ = *inptr++; *outptr++ = *inptr;
inptr++;
} }
} else { } else {
g_mime_filter_set_size (filter, inlen + 1, FALSE); 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 else
*outptr++ = *inptr; *outptr++ = *inptr;
reply->saw_angle = FALSE; reply->saw_angle = FALSE;
} else { } else if (*inptr != '\r') {
if (*inptr == '\n') if (*inptr == '\n')
reply->saw_nl = TRUE; reply->saw_nl = TRUE;
*outptr++ = *inptr; *outptr++ = *inptr;

21
notmuch-show.c
View file

@ -99,14 +99,23 @@ show_part (GMimeObject *part, int *part_count)
if (g_mime_content_type_is_type (content_type, "text", "*") && if (g_mime_content_type_is_type (content_type, "text", "*") &&
!g_mime_content_type_is_type (content_type, "text", "html")) !g_mime_content_type_is_type (content_type, "text", "html"))
{ {
GMimeStream *stream = g_mime_stream_file_new (stdout); GMimeStream *stream_stdout = g_mime_stream_file_new (stdout);
g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream), FALSE); GMimeStream *stream_filter = NULL;
if (stream_stdout) {
g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);
stream_filter = g_mime_stream_filter_new(stream_stdout);
g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter),
g_mime_filter_crlf_new(FALSE, FALSE));
}
wrapper = g_mime_part_get_content_object (GMIME_PART (part)); wrapper = g_mime_part_get_content_object (GMIME_PART (part));
if (wrapper && stream) if (wrapper && stream_filter)
g_mime_data_wrapper_write_to_stream (wrapper, stream); g_mime_data_wrapper_write_to_stream (wrapper, stream_filter);
if (stream) if (stream_filter)
g_object_unref(stream); g_object_unref(stream_filter);
if (stream_stdout)
g_object_unref(stream_stdout);
} }
else else
{ {