From: Carl Worth <cworth@cworth.org>
Date: Wed, 4 Nov 2009 23:01:11 +0000 (-0800)
Subject: notmuch show: Fix misplaced g_object_unref leading to error message.
X-Git-Tag: 0.1~580
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=2aa6c2d9a1bef0ce6f7fa3718bd1a2a3bc5f0d85

notmuch show: Fix misplaced g_object_unref leading to error message.

We were inadvertently calling g_object_unref on a wild pointer leading
to the following error message:

	GLib-GObject-CRITICAL **: g_object_unref: assertion
	`G_IS_OBJECT (object)' failed

Now, why glib doesn't abort on critical errors, I'll never understand.
---

diff --git a/notmuch.c b/notmuch.c
index 3b4cd6f1..d8c2ccd1 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -1006,6 +1006,8 @@ show_message_part (GMimeObject *part, int *part_count)
 	wrapper = g_mime_part_get_content_object (GMIME_PART (part));
 	if (wrapper)
 	    g_mime_data_wrapper_write_to_stream (wrapper, stream);
+
+	g_object_unref (stream);
     }
     else
     {
@@ -1014,8 +1016,6 @@ show_message_part (GMimeObject *part, int *part_count)
     }
 
     printf ("\fpart}\n");
-
-    g_object_unref (stream);
 }
 
 static notmuch_status_t