From c53fbc0b8f3b98827d6816a627bdd4d467b84f74 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sun, 16 Feb 2014 09:36:49 -0500
Subject: Miscellaneous cleanups.
---
em-format/e-mail-part-utils.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
(limited to 'em-format/e-mail-part-utils.c')
diff --git a/em-format/e-mail-part-utils.c b/em-format/e-mail-part-utils.c
index f3b853d77d..7fb38ac199 100644
--- a/em-format/e-mail-part-utils.c
+++ b/em-format/e-mail-part-utils.c
@@ -538,14 +538,18 @@ gboolean
e_mail_part_is_inline (CamelMimePart *mime_part,
GQueue *extensions)
{
- const gchar *disposition;
EMailParserExtension *extension;
EMailParserExtensionClass *class;
+ const gchar *disposition;
+ gboolean is_inline = FALSE;
disposition = camel_mime_part_get_disposition (mime_part);
+ if (disposition != NULL)
+ is_inline = (g_ascii_strcasecmp (disposition, "inline") == 0);
+
if ((extensions == NULL) || g_queue_is_empty (extensions))
- return disposition && g_ascii_strcasecmp (disposition, "inline") == 0;
+ return is_inline;
extension = g_queue_peek_head (extensions);
class = E_MAIL_PARSER_EXTENSION_GET_CLASS (extension);
@@ -556,7 +560,7 @@ e_mail_part_is_inline (CamelMimePart *mime_part,
return TRUE;
if (disposition != NULL)
- return g_ascii_strcasecmp (disposition, "inline") == 0;
+ return is_inline;
/* Otherwise, use the default for this handler type. */
return (class->flags & E_MAIL_PARSER_EXTENSION_INLINE) != 0;
--
cgit v1.2.3