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-image.c | 44 +++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 24 deletions(-)

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

diff --git a/em-format/e-mail-parser-image.c b/em-format/e-mail-parser-image.c
index 12242746f2..d2ca8d69d0 100644
--- a/em-format/e-mail-parser-image.c
+++ b/em-format/e-mail-parser-image.c
@@ -53,23 +53,25 @@ G_DEFINE_TYPE_EXTENDED (
 		E_TYPE_MAIL_PARSER_EXTENSION,
 		e_mail_parser_parser_extension_interface_init));
 
-static const gchar *parser_mime_types[] = { "image/gif",
-					    "image/jpeg",
-					    "image/png",
-					    "image/x-png",
-					    "image/x-bmp",
-					    "image/bmp",
-					    "image/svg",
-					    "image/x-cmu-raster",
-					    "image/x-ico",
-					    "image/x-portable-anymap",
-					    "image/x-portable-bitmap",
-					    "image/x-portable-graymap",
-					    "image/x-portable-pixmap",
-					    "image/x-xpixmap",
-					    "image/jpg",
-					    "image/pjpeg",
-					    NULL };
+static const gchar *parser_mime_types[] = {
+	"image/gif",
+	"image/jpeg",
+	"image/png",
+	"image/x-png",
+	"image/x-bmp",
+	"image/bmp",
+	"image/svg",
+	"image/x-cmu-raster",
+	"image/x-ico",
+	"image/x-portable-anymap",
+	"image/x-portable-bitmap",
+	"image/x-portable-graymap",
+	"image/x-portable-pixmap",
+	"image/x-xpixmap",
+	"image/jpg",
+	"image/pjpeg",
+	NULL
+};
 
 static gboolean
 empe_image_parse (EMailParserExtension *extension,
@@ -117,12 +119,6 @@ empe_image_parse (EMailParserExtension *extension,
 	return TRUE;
 }
 
-static const gchar **
-empe_image_mime_types (EMailExtension *extension)
-{
-	return parser_mime_types;
-}
-
 static void
 e_mail_parser_image_class_init (EMailParserImageClass *class)
 {
@@ -137,7 +133,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_image_mime_types;
+	iface->mime_types = parser_mime_types;
 }
 
 static void
-- 
cgit v1.2.3