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-secure-button.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'em-format/e-mail-formatter-secure-button.c') diff --git a/em-format/e-mail-formatter-secure-button.c b/em-format/e-mail-formatter-secure-button.c index 8d6df161fd..6c41467c7c 100644 --- a/em-format/e-mail-formatter-secure-button.c +++ b/em-format/e-mail-formatter-secure-button.c @@ -57,7 +57,10 @@ G_DEFINE_TYPE_EXTENDED ( E_TYPE_MAIL_FORMATTER_EXTENSION, e_mail_formatter_formatter_extension_interface_init)); -static const gchar *formatter_mime_types[] = { "application/vnd.evolution.widget.secure-button", NULL }; +static const gchar *formatter_mime_types[] = { + "application/vnd.evolution.widget.secure-button", + NULL +}; static const struct { const gchar *icon, *shortdesc, *description; @@ -483,12 +486,6 @@ emfe_secure_button_get_description (EMailFormatterExtension *extension) return NULL; } -static const gchar ** -emfe_secure_button_mime_types (EMailExtension *extension) -{ - return formatter_mime_types; -} - static void e_mail_formatter_secure_button_class_init (EMailFormatterSecureButtonClass *class) { @@ -506,7 +503,7 @@ e_mail_formatter_formatter_extension_interface_init (EMailFormatterExtensionInte static void e_mail_formatter_mail_extension_interface_init (EMailExtensionInterface *iface) { - iface->mime_types = emfe_secure_button_mime_types; + iface->mime_types = formatter_mime_types; } static void -- cgit