X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-show.c;h=dda83a10d337fc8f64bbe5bd42a94da2f0891bc6;hp=df601fbb4af3fe61f69cb7d6364297bc188022e1;hb=5143e5e840b5e9d95611f57fdc9d4b27af6f0564;hpb=10a48e0566db1566e6c0221b9f9927ac123a0c1f

diff --git a/notmuch-show.c b/notmuch-show.c
index df601fbb..dda83a10 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -393,26 +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));
 
-    /* do nothing if this is a multipart */
-    if (GMIME_IS_MULTIPART (part) || GMIME_IS_MESSAGE_PART (part))
+    if (stream_out == NULL)
 	return;
 
-    charset = g_mime_object_get_content_type_parameter (part, "charset");
+    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 (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);
-	}
+    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));
@@ -423,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:
@@ -459,7 +456,6 @@ format_part_content_text (GMimeObject *part)
 {
     GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (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));
 
@@ -474,6 +470,7 @@ format_part_content_text (GMimeObject *part)
     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);
@@ -549,7 +546,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)
 	{
@@ -900,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