mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-12-22 09:24:54 +01:00
Filter out carriage-returns in show and reply output.
Thanks, windows mail clients. Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
1a75f88d8b
commit
469d786c25
2 changed files with 19 additions and 9 deletions
|
@ -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;
|
||||
|
|
|
@ -99,14 +99,23 @@ show_part (GMimeObject *part, int *part_count)
|
|||
if (g_mime_content_type_is_type (content_type, "text", "*") &&
|
||||
!g_mime_content_type_is_type (content_type, "text", "html"))
|
||||
{
|
||||
GMimeStream *stream = g_mime_stream_file_new (stdout);
|
||||
g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream), FALSE);
|
||||
GMimeStream *stream_stdout = g_mime_stream_file_new (stdout);
|
||||
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));
|
||||
if (wrapper && stream)
|
||||
g_mime_data_wrapper_write_to_stream (wrapper, stream);
|
||||
if (stream)
|
||||
g_object_unref(stream);
|
||||
if (wrapper && stream_filter)
|
||||
g_mime_data_wrapper_write_to_stream (wrapper, stream_filter);
|
||||
if (stream_filter)
|
||||
g_object_unref(stream_filter);
|
||||
if (stream_stdout)
|
||||
g_object_unref(stream_stdout);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue