From: David Bremner <bremner@debian.org>
Date: Sat, 10 Sep 2011 13:11:25 +0000 (-0300)
Subject: Merge branch 'release'
X-Git-Tag: 0.9_rc1~40
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=c35ac0bdbd51ddc606cbeb35e8b7b86e450b4b74;hp=b824877c4391b738205904f0bd3ec8ec3b87d136

Merge branch 'release'
---

diff --git a/notmuch-show.c b/notmuch-show.c
index dbb1efb9..912999e1 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -708,6 +708,9 @@ format_part_end_json (GMimeObject *part)
 static void
 format_part_content_raw (GMimeObject *part)
 {
+    if (! GMIME_IS_PART (part))
+	return;
+
     GMimeStream *stream_stdout;
     GMimeStream *stream_filter = NULL;
     GMimeDataWrapper *wrapper;