From cd5a55f9812643109be6c2b0ed5d8f8ce655a4a9 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Thu, 16 May 2013 13:06:56 -0400
Subject: em-format cleanups.

---
 em-format/e-mail-formatter-image.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'em-format/e-mail-formatter-image.c')

diff --git a/em-format/e-mail-formatter-image.c b/em-format/e-mail-formatter-image.c
index 82c635827a..f69a59cdba 100644
--- a/em-format/e-mail-formatter-image.c
+++ b/em-format/e-mail-formatter-image.c
@@ -104,8 +104,8 @@ emfe_image_format (EMailFormatterExtension *extension,
 		}
 
 	} else {
-
 		gchar *buffer;
+		const gchar *mime_type;
 
 		if (!e_mail_formatter_get_animate_images (formatter)) {
 
@@ -121,11 +121,16 @@ emfe_image_format (EMailFormatterExtension *extension,
 			content = g_base64_encode ((guchar *) ba->data, ba->len);
 		}
 
+		mime_type = part->mime_type;
+		if (mime_type == NULL)
+			mime_type = "image/*";
+
 		/* The image is already base64-encrypted so we can directly
 		 * paste it to the output */
 		buffer = g_strdup_printf (
-			"<img src=\"data:%s;base64,%s\" style=\"max-width: 100%%;\" />",
-			part->mime_type ? part->mime_type : "image/*", content);
+			"<img src=\"data:%s;base64,%s\" "
+			"     style=\"max-width: 100%%;\" />",
+			mime_type, content);
 
 		camel_stream_write_string (stream, buffer, cancellable, NULL);
 		g_free (buffer);
-- 
cgit v1.2.3