Filter out carriage-returns in show and reply output.

[notmuch] / notmuch-show.c

diff --git a/notmuch-show.c b/notmuch-show.c
index 7749dbc4b68ffde96b39fe81c95a993a8e708955..30b7df596854763f236a2c6fa9aeda7891bb9d7a 100644 (file)
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -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
     {
@@ -211,6 +220,10 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
 
        messages = notmuch_thread_get_toplevel_messages (thread);
 
+       if (messages == NULL)
+           INTERNAL_ERROR ("Thread %s has no toplevel messages.\n",
+                           notmuch_thread_get_thread_id (thread));
+
        show_messages (ctx, messages, 0);
 
        notmuch_thread_destroy (thread);