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. --- em-format/e-mail-formatter-message-rfc822.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'em-format/e-mail-formatter-message-rfc822.c') diff --git a/em-format/e-mail-formatter-message-rfc822.c b/em-format/e-mail-formatter-message-rfc822.c index 06f7e49603..f2d7d1cc66 100644 --- a/em-format/e-mail-formatter-message-rfc822.c +++ b/em-format/e-mail-formatter-message-rfc822.c @@ -35,9 +35,11 @@ #include -static const gchar * formatter_mime_types[] = { "message/rfc822", - "application/vnd.evolution.rfc822.end", - NULL }; +static const gchar *formatter_mime_types[] = { + "message/rfc822", + "application/vnd.evolution.rfc822.end", + NULL +}; typedef struct _EMailFormatterMessageRFC822 { GObject parent; @@ -255,12 +257,6 @@ emfe_message_rfc822_get_description (EMailFormatterExtension *extension) return _("Format part as an RFC822 message"); } -static const gchar ** -emfe_message_rfc822_mime_types (EMailExtension *extension) -{ - return formatter_mime_types; -} - static void e_mail_formatter_message_rfc822_class_init (EMailFormatterMessageRFC822Class *class) { @@ -277,7 +273,7 @@ e_mail_formatter_formatter_extension_interface_init (EMailFormatterExtensionInte static void e_mail_formatter_mail_extension_interface_init (EMailExtensionInterface *iface) { - iface->mime_types = emfe_message_rfc822_mime_types; + iface->mime_types = formatter_mime_types; } static void -- cgit