X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-show.c;h=fb7430081f2600cbf3747652b227c182866553e2;hp=1ed49d995efad1fac8dd1c5e9b37532f18734b32;hb=fe9c60dba7de212266dee3d731d867820966e054;hpb=f744b050b16d2a8c7223e06f7e071914ae05645e

diff --git a/notmuch-show.c b/notmuch-show.c
index 1ed49d99..fb743008 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -393,22 +393,23 @@ show_text_part_content (GMimeObject *part, GMimeStream *stream_out)
 	INTERNAL_ERROR ("Illegal request to format non-text part (%s) as text.",
 			g_mime_content_type_to_string (content_type));
 
-    charset = g_mime_object_get_content_type_parameter (part, "charset");
+    if (stream_out == NULL)
+	return;
 
-    if (stream_out) {
-	stream_filter = g_mime_stream_filter_new (stream_out);
-	g_mime_stream_filter_add(GMIME_STREAM_FILTER (stream_filter),
-				 g_mime_filter_crlf_new (FALSE, FALSE));
-        if (charset) {
-	    GMimeFilter *charset_filter;
-	    charset_filter = g_mime_filter_charset_new (charset, "UTF-8");
-	    /* 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)
-		g_mime_stream_filter_add (GMIME_STREAM_FILTER (stream_filter),
-					  charset_filter);
-	}
+    stream_filter = g_mime_stream_filter_new (stream_out);
+    g_mime_stream_filter_add(GMIME_STREAM_FILTER (stream_filter),
+			     g_mime_filter_crlf_new (FALSE, FALSE));
+
+    charset = g_mime_object_get_content_type_parameter (part, "charset");
+    if (charset) {
+	GMimeFilter *charset_filter;
+	charset_filter = g_mime_filter_charset_new (charset, "UTF-8");
+	/* 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)
+	    g_mime_stream_filter_add (GMIME_STREAM_FILTER (stream_filter),
+				      charset_filter);
     }
 
     wrapper = g_mime_part_get_content_object (GMIME_PART (part));
@@ -419,7 +420,7 @@ show_text_part_content (GMimeObject *part, GMimeStream *stream_out)
 }
 
 static const char*
-signerstatustostring (GMimeSignerStatus x)
+signer_status_to_string (GMimeSignerStatus x)
 {
     switch (x) {
     case GMIME_SIGNER_STATUS_NONE:
@@ -453,23 +454,25 @@ format_part_start_text (GMimeObject *part, int *part_count)
 static void
 format_part_content_text (GMimeObject *part)
 {
-    GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (part);
+    const char *cid = g_mime_object_get_content_id (part);
     GMimeContentType *content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
-    GMimeStream *stream_stdout = g_mime_stream_file_new (stdout);
 
-    printf (", Content-type: %s\n", g_mime_content_type_to_string (content_type));
-
-    if (disposition &&
-	strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0)
+    if (GMIME_IS_PART (part))
     {
 	const char *filename = g_mime_part_get_filename (GMIME_PART (part));
-	printf ("Attachment: %s (%s)\n", filename,
-		g_mime_content_type_to_string (content_type));
+	if (filename)
+	    printf (", Filename: %s", filename);
     }
 
+    if (cid)
+	printf (", Content-id: %s", cid);
+
+    printf (", Content-type: %s\n", g_mime_content_type_to_string (content_type));
+
     if (g_mime_content_type_is_type (content_type, "text", "*") &&
 	!g_mime_content_type_is_type (content_type, "text", "html"))
     {
+	GMimeStream *stream_stdout = g_mime_stream_file_new (stdout);
 	g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);
 	show_text_part_content (part, stream_stdout);
 	g_object_unref(stream_stdout);
@@ -545,7 +548,9 @@ format_part_sigstatus_json (const GMimeSignatureValidity* validity)
 	printf ("{");
 
 	/* status */
-	printf ("\"status\": %s", json_quote_str (ctx_quote, signerstatustostring(signer->status)));
+	printf ("\"status\": %s",
+		json_quote_str (ctx_quote,
+				signer_status_to_string (signer->status)));
 
 	if (signer->status == GMIME_SIGNER_STATUS_GOOD)
 	{
@@ -588,7 +593,6 @@ format_part_content_json (GMimeObject *part)
     GMimeStream *stream_memory = g_mime_stream_mem_new ();
     const char *cid = g_mime_object_get_content_id (part);
     void *ctx = talloc_new (NULL);
-    GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (part);
     GByteArray *part_content;
 
     printf (", \"content-type\": %s",
@@ -597,12 +601,11 @@ format_part_content_json (GMimeObject *part)
     if (cid != NULL)
 	    printf(", \"content-id\": %s", json_quote_str (ctx, cid));
 
-    if (disposition &&
-	strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0)
+    if (GMIME_IS_PART (part))
     {
 	const char *filename = g_mime_part_get_filename (GMIME_PART (part));
-
-	printf (", \"filename\": %s", json_quote_str (ctx, filename));
+	if (filename)
+	    printf (", \"filename\": %s", json_quote_str (ctx, filename));
     }
 
     if (g_mime_content_type_is_type (content_type, "text", "*") &&
@@ -896,7 +899,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
 	} else if ((STRNCMP_LITERAL (argv[i], "--verify") == 0) ||
 		   (STRNCMP_LITERAL (argv[i], "--decrypt") == 0)) {
 	    if (params.cryptoctx == NULL) {
-		GMimeSession* session = g_object_new(notmuch_gmime_session_get_type(), NULL);
+		GMimeSession* session = g_object_new(g_mime_session_get_type(), NULL);
 		if (NULL == (params.cryptoctx = g_mime_gpg_context_new(session, "gpg")))
 		    fprintf (stderr, "Failed to construct gpg context.\n");
 		else