X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=notmuch.c;h=06c5aa4666911f49e1688de9603d27ec61dba15c;hb=b1baaab2d53426b44adbbe93b067708a528edad0;hp=c607457c0040d61866be19d2e8f5a8407ab05b62;hpb=02aa1391beae37e1c4641a9543871d96afdae1bb;p=notmuch

diff --git a/notmuch.c b/notmuch.c
index c607457c..06c5aa46 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
@@ -1067,25 +1067,6 @@ show_message_body (const char *filename)
     return ret;
 }
 
-static int
-_message_is_unread (notmuch_message_t *message)
-{
-    notmuch_tags_t *tags;
-    const char *tag;
-
-    for (tags = notmuch_message_get_tags (message);
-	 notmuch_tags_has_more (tags);
-	 notmuch_tags_advance (tags))
-    {
-	tag = notmuch_tags_get (tags);
-
-	if (strcmp (tag, "unread") == 0)
-	    return 1;
-    }
-
-    return 0;
-}
-
 static int
 show_command (void *ctx, unused (int argc), unused (char *argv[]))
 {
@@ -1096,7 +1077,6 @@ show_command (void *ctx, unused (int argc), unused (char *argv[]))
     notmuch_messages_t *messages;
     notmuch_message_t *message;
     int ret = 0;
-    int unread;
 
     const char *headers[] = {
 	"Subject", "From", "To", "Cc", "Bcc", "Date"
@@ -1135,11 +1115,10 @@ show_command (void *ctx, unused (int argc), unused (char *argv[]))
 	 notmuch_messages_advance (messages))
     {
 	message = notmuch_messages_get (messages);
-	unread = _message_is_unread (message);
 
-	printf ("\fmessage{ ID: %s %s\n",
+	printf ("\fmessage{ ID: %s Filename: %s\n",
 		notmuch_message_get_message_id (message),
-		unread ? "unread" : "");
+		notmuch_message_get_filename (message));
 
 	printf ("\fheader{\n");