diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2014-02-16 22:36:49 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2014-03-03 08:36:01 +0800 |
| commit | c53fbc0b8f3b98827d6816a627bdd4d467b84f74 (patch) | |
| tree | 10eb8683b6d413f9ae6946dcaf303c29027a84ef /em-format/e-mail-part-utils.c | |
| parent | 1e3d8b5c68754c377c54423f1fb9a322eb3ec9e8 (diff) | |
| download | gsoc2013-evolution-c53fbc0b8f3b98827d6816a627bdd4d467b84f74.tar gsoc2013-evolution-c53fbc0b8f3b98827d6816a627bdd4d467b84f74.tar.gz gsoc2013-evolution-c53fbc0b8f3b98827d6816a627bdd4d467b84f74.tar.bz2 gsoc2013-evolution-c53fbc0b8f3b98827d6816a627bdd4d467b84f74.tar.lz gsoc2013-evolution-c53fbc0b8f3b98827d6816a627bdd4d467b84f74.tar.xz gsoc2013-evolution-c53fbc0b8f3b98827d6816a627bdd4d467b84f74.tar.zst gsoc2013-evolution-c53fbc0b8f3b98827d6816a627bdd4d467b84f74.zip | |
Miscellaneous cleanups.
Diffstat (limited to 'em-format/e-mail-part-utils.c')
| -rw-r--r-- | em-format/e-mail-part-utils.c | 10 |
1 files changed, 7 insertions, 3 deletions
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; |