From c10235e6dd09d93fc6bbdeb8ef4d800be7c6f6d5 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 7 Dec 2012 12:44:32 -0500 Subject: EMailParserExtension: Convert get_flags() to an enum field. Of the parser extensions that override get_flags(), they all return a fixed set of flags. So we don't need an instance of the extension to obtain its flags. Just make it an EMailParserExtensionFlags field in the class structure. --- em-format/e-mail-part-utils.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 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 6f8013d7a8..665a7b5996 100644 --- a/em-format/e-mail-part-utils.c +++ b/em-format/e-mail-part-utils.c @@ -533,15 +533,17 @@ e_mail_part_is_inline (CamelMimePart *mime_part, { const gchar *disposition; EMailParserExtension *extension; + EMailParserExtensionClass *class; if ((extensions == NULL) || g_queue_is_empty (extensions)) return FALSE; extension = g_queue_peek_head (extensions); + class = E_MAIL_PARSER_EXTENSION_GET_CLASS (extension); + /* Some types need to override the disposition. * e.g. application/x-pkcs7-mime */ - if (e_mail_parser_extension_get_flags (extension) & - E_MAIL_PARSER_EXTENSION_INLINE_DISPOSITION) + if (class->flags & E_MAIL_PARSER_EXTENSION_INLINE_DISPOSITION) return TRUE; disposition = camel_mime_part_get_disposition (mime_part); @@ -549,6 +551,5 @@ e_mail_part_is_inline (CamelMimePart *mime_part, return g_ascii_strcasecmp (disposition, "inline") == 0; /* Otherwise, use the default for this handler type. */ - return (e_mail_parser_extension_get_flags (extension) & - E_MAIL_PARSER_EXTENSION_INLINE) != 0; + return (class->flags & E_MAIL_PARSER_EXTENSION_INLINE) != 0; } -- cgit v1.2.3