[notmuch] [PATCH] Setup the GMimeStream only when needed
nstraz at redhat.com
nstraz at redhat.com
Thu Apr 1 06:47:21 PDT 2010
I ran into this while looking at the vim plugin. Vim's system() call
redirects output to a file and it was missing many of the part{ lines.
If stream_stdout is setup too early, it will overwrite the part start
when notmuch is redirected to a file.
---
notmuch-show.c | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/notmuch-show.c b/notmuch-show.c
index ff1fecb..96647c1 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -236,9 +236,6 @@ format_part_text (GMimeObject *part, int *part_count)
{
GMimeContentDisposition *disposition;
GMimeContentType *content_type;
- GMimeStream *stream_stdout = g_mime_stream_file_new (stdout);
-
- g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);
disposition = g_mime_object_get_content_disposition (part);
if (disposition &&
@@ -256,14 +253,14 @@ format_part_text (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_stdout = g_mime_stream_file_new (stdout);
+ g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);
show_part_content (part, stream_stdout);
+ g_object_unref(stream_stdout);
}
printf ("\fattachment}\n");
- if (stream_stdout)
- g_object_unref(stream_stdout);
-
return;
}
@@ -276,7 +273,10 @@ format_part_text (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_stdout = g_mime_stream_file_new (stdout);
+ g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);
show_part_content (part, stream_stdout);
+ g_object_unref(stream_stdout);
}
else
{
@@ -285,9 +285,6 @@ format_part_text (GMimeObject *part, int *part_count)
}
printf ("\fpart}\n");
-
- if (stream_stdout)
- g_object_unref(stream_stdout);
}
static void
--
1.6.6.1
More information about the notmuch
mailing list