From 9d34f72ec1b99d58ee1c3a6d1a964a6dde166f79 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 6 Dec 2012 12:57:33 -0500 Subject: EMailExtension: Replace mime_types() method with a string array. In all implementations for EMailExtension, the MIME type list is a static string array -- with the single exception of the text-highlight module, where the MIME type list is dynamically assembled once. Replace the mime_types() method with a "mime_types" string array in the EMailExtensionInterface struct. Then the list of MIME types supported by the class implementing the EMailExtensionInterface can be obtained without requiring an instance of the class. --- modules/itip-formatter/e-mail-formatter-itip.c | 16 ++++++---------- modules/itip-formatter/e-mail-parser-itip.c | 16 ++++++---------- 2 files changed, 12 insertions(+), 20 deletions(-) (limited to 'modules/itip-formatter') diff --git a/modules/itip-formatter/e-mail-formatter-itip.c b/modules/itip-formatter/e-mail-formatter-itip.c index 54cb096292..9e2afc4459 100644 --- a/modules/itip-formatter/e-mail-formatter-itip.c +++ b/modules/itip-formatter/e-mail-formatter-itip.c @@ -58,9 +58,11 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED ( E_TYPE_MAIL_FORMATTER_EXTENSION, e_mail_formatter_formatter_extension_interface_init)); -static const gchar * formatter_mime_types[] = { "text/calendar", - "application/ics", - NULL }; +static const gchar *formatter_mime_types[] = { + "text/calendar", + "application/ics", + NULL +}; static gboolean emfe_itip_format (EMailFormatterExtension *extension, @@ -151,12 +153,6 @@ emfe_itip_get_description (EMailFormatterExtension *extension) return _("Display part as an invitation"); } -static const gchar ** -emfe_itip_mime_types (EMailExtension *extension) -{ - return formatter_mime_types; -} - static void e_mail_formatter_itip_constructed (GObject *object) { @@ -206,7 +202,7 @@ e_mail_formatter_formatter_extension_interface_init (EMailFormatterExtensionInte static void e_mail_formatter_mail_extension_interface_init (EMailExtensionInterface *iface) { - iface->mime_types = emfe_itip_mime_types; + iface->mime_types = formatter_mime_types; } static void diff --git a/modules/itip-formatter/e-mail-parser-itip.c b/modules/itip-formatter/e-mail-parser-itip.c index 505842807a..f8fb4f68fb 100644 --- a/modules/itip-formatter/e-mail-parser-itip.c +++ b/modules/itip-formatter/e-mail-parser-itip.c @@ -68,9 +68,11 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED ( E_TYPE_MAIL_PARSER_EXTENSION, e_mail_parser_parser_extension_interface_init)); -static const gchar * parser_mime_types[] = { "text/calendar", - "application/ics", - NULL }; +static const gchar *parser_mime_types[] = { + "text/calendar", + "application/ics", + NULL +}; static void mail_part_itip_free (EMailPart *mail_part) @@ -257,12 +259,6 @@ empe_itip_get_flags (EMailParserExtension *extension) return E_MAIL_PARSER_EXTENSION_INLINE_DISPOSITION; } -static const gchar ** -empe_mime_types (EMailExtension *extension) -{ - return parser_mime_types; -} - void e_mail_parser_itip_type_register (GTypeModule *type_module) { @@ -272,7 +268,7 @@ e_mail_parser_itip_type_register (GTypeModule *type_module) static void e_mail_parser_mail_extension_interface_init (EMailExtensionInterface *iface) { - iface->mime_types = empe_mime_types; + iface->mime_types = parser_mime_types; } static void -- cgit v1.2.3