aboutsummaryrefslogtreecommitdiffstats
path: root/em-format/e-mail-formatter-quote-message-rfc822.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2012-12-07 01:57:33 +0800
committerMatthew Barnes <mbarnes@redhat.com>2012-12-08 03:01:04 +0800
commit9d34f72ec1b99d58ee1c3a6d1a964a6dde166f79 (patch)
tree8849353e617afe5207095fb6100a33e79989c9bc /em-format/e-mail-formatter-quote-message-rfc822.c
parent3924dc759dbf38df0f9ff6941990dcf242478617 (diff)
downloadgsoc2013-evolution-9d34f72ec1b99d58ee1c3a6d1a964a6dde166f79.tar.gz
gsoc2013-evolution-9d34f72ec1b99d58ee1c3a6d1a964a6dde166f79.tar.zst
gsoc2013-evolution-9d34f72ec1b99d58ee1c3a6d1a964a6dde166f79.zip
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.
Diffstat (limited to 'em-format/e-mail-formatter-quote-message-rfc822.c')
-rw-r--r--em-format/e-mail-formatter-quote-message-rfc822.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/em-format/e-mail-formatter-quote-message-rfc822.c b/em-format/e-mail-formatter-quote-message-rfc822.c
index 2bb8de9eb2..d1b5ae5b68 100644
--- a/em-format/e-mail-formatter-quote-message-rfc822.c
+++ b/em-format/e-mail-formatter-quote-message-rfc822.c
@@ -35,10 +35,6 @@
#include <string.h>
-static const gchar * formatter_mime_types[] = { "message/rfc822",
- "application/vnd.evolution.rfc822.end",
- NULL };
-
typedef struct _EMailFormatterQuoteMessageRFC822 {
GObject parent;
} EMailFormatterQuoteMessageRFC822;
@@ -62,6 +58,12 @@ G_DEFINE_TYPE_EXTENDED (
E_TYPE_MAIL_FORMATTER_EXTENSION,
e_mail_formatter_quote_formatter_extension_interface_init));
+static const gchar *formatter_mime_types[] = {
+ "message/rfc822",
+ "application/vnd.evolution.rfc822.end",
+ NULL
+};
+
static gboolean
emfqe_message_rfc822_format (EMailFormatterExtension *extension,
EMailFormatter *formatter,
@@ -161,12 +163,6 @@ emfqe_message_rfc822_get_description (EMailFormatterExtension *extension)
return NULL;
}
-static const gchar **
-emfqe_message_rfc822_mime_types (EMailExtension *extension)
-{
- return formatter_mime_types;
-}
-
static void
e_mail_formatter_quote_message_rfc822_class_init (EMailFormatterQuoteMessageRFC822Class *class)
{
@@ -183,7 +179,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 = emfqe_message_rfc822_mime_types;
+ iface->mime_types = formatter_mime_types;
}
static void