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-quote-text-html.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'em-format/e-mail-formatter-quote-text-html.c') diff --git a/em-format/e-mail-formatter-quote-text-html.c b/em-format/e-mail-formatter-quote-text-html.c index 21cb444818..d592150c28 100644 --- a/em-format/e-mail-formatter-quote-text-html.c +++ b/em-format/e-mail-formatter-quote-text-html.c @@ -33,8 +33,6 @@ #include -static const gchar *formatter_mime_types[] = { "text/html", NULL }; - typedef struct _EMailFormatterQuoteTextHTML { GObject parent; } EMailFormatterQuoteTextHTML; @@ -60,6 +58,11 @@ G_DEFINE_TYPE_EXTENDED ( E_TYPE_MAIL_FORMATTER_EXTENSION, e_mail_formatter_quote_formatter_extension_interface_init)); +static const gchar *formatter_mime_types[] = { + "text/html", + NULL +}; + static gboolean emqfe_text_html_format (EMailFormatterExtension *extension, EMailFormatter *formatter, @@ -110,12 +113,6 @@ emqfe_text_html_get_description (EMailFormatterExtension *extension) return _("Format part as HTML"); } -static const gchar ** -emqfe_text_html_mime_types (EMailExtension *extension) -{ - return formatter_mime_types; -} - static void e_mail_formatter_quote_text_html_class_init (EMailFormatterQuoteTextHTMLClass *class) { @@ -132,7 +129,7 @@ e_mail_formatter_quote_formatter_extension_interface_init (EMailFormatterExtensi static void e_mail_formatter_quote_mail_extension_interface_init (EMailExtensionInterface *iface) { - iface->mime_types = emqfe_text_html_mime_types; + iface->mime_types = formatter_mime_types; } static void -- cgit v1.2.3