]> git.notmuchmail.org Git - notmuch/commitdiff
notmuch show: Fix misplaced g_object_unref leading to error message.
authorCarl Worth <cworth@cworth.org>
Wed, 4 Nov 2009 23:01:11 +0000 (15:01 -0800)
committerCarl Worth <cworth@cworth.org>
Wed, 4 Nov 2009 23:01:37 +0000 (15:01 -0800)
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.

notmuch.c

index 3b4cd6f13a40f5c586cd1f2e85e16e5ab833e29d..d8c2ccd1905ab29dfcd4d0f3b78e80936abc13c5 100644 (file)
--- 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