X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-show.c;h=0200b9c4a4cd28fe7126d83b5b0045c82037e9bb;hp=603992a612448c8892888580a4fae68f5aa123dc;hb=e32c8a5e6bcc7bdbf5e1a5800ac42e25dc8ca70e;hpb=61f0a5b8ee2adf540106a09c5f83fe634da6beb3

diff --git a/notmuch-show.c b/notmuch-show.c
index 603992a6..0200b9c4 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -255,7 +255,9 @@ _extract_email_address (const void *ctx, const char *from)
     email = talloc_strdup (ctx, email);
 
   DONE:
-    /* XXX: How to free addresses here? */
+    if (addresses)
+	g_object_unref (addresses);
+
     return email;
    }
 
@@ -469,9 +471,12 @@ show_text_part_content (GMimeObject *part, GMimeStream *stream_out)
 	/* This result can be NULL for things like "unknown-8bit".
 	 * Don't set a NULL filter as that makes GMime print
 	 * annoying assertion-failure messages on stderr. */
-	if (charset_filter)
+	if (charset_filter) {
 	    g_mime_stream_filter_add (GMIME_STREAM_FILTER (stream_filter),
 				      charset_filter);
+	    g_object_unref (charset_filter);
+	}
+
     }
 
     wrapper = g_mime_part_get_content_object (GMIME_PART (part));
@@ -753,8 +758,7 @@ show_message (void *ctx,
     }
 
     if (format->part_content)
-	show_message_body (notmuch_message_get_filename (message),
-			   format, params);
+	show_message_body (message, format, params);
 
     if (params->part <= 0) {
 	fputs (format->body_end, stdout);
@@ -861,7 +865,7 @@ do_show_single (void *ctx,
 
 	while (!feof (file)) {
 	    size = fread (buf, 1, sizeof (buf), file);
-	    fwrite (buf, size, 1, stdout);
+	    (void) fwrite (buf, size, 1, stdout);
 	}
 
 	fclose (file);