From 9d34f72ec1b99d58ee1c3a6d1a964a6dde166f79 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
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-parser-source.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'em-format/e-mail-parser-source.c')

diff --git a/em-format/e-mail-parser-source.c b/em-format/e-mail-parser-source.c
index ee563acf9f..ce22b0805b 100644
--- a/em-format/e-mail-parser-source.c
+++ b/em-format/e-mail-parser-source.c
@@ -52,7 +52,10 @@ G_DEFINE_TYPE_EXTENDED (
 		E_TYPE_MAIL_PARSER_EXTENSION,
 		e_mail_parser_parser_extension_interface_init));
 
-static const gchar *parser_mime_types[] = { "application/vnd.evolution.source", NULL };
+static const gchar *parser_mime_types[] = {
+	"application/vnd.evolution.source",
+	NULL
+};
 
 static gboolean
 empe_source_parse (EMailParserExtension *extension,
@@ -77,12 +80,6 @@ empe_source_parse (EMailParserExtension *extension,
 	return TRUE;
 }
 
-static const gchar **
-empe_source_mime_types (EMailExtension *extension)
-{
-	return parser_mime_types;
-}
-
 static void
 e_mail_parser_source_class_init (EMailParserSourceClass *class)
 {
@@ -97,7 +94,7 @@ e_mail_parser_parser_extension_interface_init (EMailParserExtensionInterface *if
 static void
 e_mail_parser_mail_extension_interface_init (EMailExtensionInterface *iface)
 {
-	iface->mime_types = empe_source_mime_types;
+	iface->mime_types = parser_mime_types;
 }
 
 static void
-- 
cgit