aboutsummaryrefslogtreecommitdiffstats
path: root/em-format/e-mail-formatter-image.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2012-12-07 05:40:13 +0800
committerMatthew Barnes <mbarnes@redhat.com>2012-12-08 03:01:05 +0800
commit54455ca1ad6cae527544fed12d0de4ae95341082 (patch)
treeb223d428459e3be79d1162d8217be6c2856f643b /em-format/e-mail-formatter-image.c
parent9d34f72ec1b99d58ee1c3a6d1a964a6dde166f79 (diff)
downloadgsoc2013-evolution-54455ca1ad6cae527544fed12d0de4ae95341082.tar
gsoc2013-evolution-54455ca1ad6cae527544fed12d0de4ae95341082.tar.gz
gsoc2013-evolution-54455ca1ad6cae527544fed12d0de4ae95341082.tar.bz2
gsoc2013-evolution-54455ca1ad6cae527544fed12d0de4ae95341082.tar.lz
gsoc2013-evolution-54455ca1ad6cae527544fed12d0de4ae95341082.tar.xz
gsoc2013-evolution-54455ca1ad6cae527544fed12d0de4ae95341082.tar.zst
gsoc2013-evolution-54455ca1ad6cae527544fed12d0de4ae95341082.zip
Remove EMailExtension.
EMailExtension is now too trivial to keep as a standalone interface. Add a 'mime_types' string array to the EMailFormatterExtension and EMailFormatterParser interface structs. Alter e_mail_extension_registry_add_extension() to take a 'mime_types' string array and the GType of an extension to instantiate, rather than the extension instance directly. e_mail_extension_registry_remove_extension() is no longer needed.
Diffstat (limited to 'em-format/e-mail-formatter-image.c')
-rw-r--r--em-format/e-mail-formatter-image.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/em-format/e-mail-formatter-image.c b/em-format/e-mail-formatter-image.c
index 24ee2ef217..cd4d2e1e93 100644
--- a/em-format/e-mail-formatter-image.c
+++ b/em-format/e-mail-formatter-image.c
@@ -63,7 +63,6 @@ typedef struct _EMailFormatterImageClass {
} EMailFormatterImageClass;
static void e_mail_formatter_formatter_extension_interface_init (EMailFormatterExtensionInterface *iface);
-static void e_mail_formatter_mail_extension_interface_init (EMailExtensionInterface *iface);
G_DEFINE_TYPE_EXTENDED (
EMailFormatterImage,
@@ -71,9 +70,6 @@ G_DEFINE_TYPE_EXTENDED (
G_TYPE_OBJECT,
0,
G_IMPLEMENT_INTERFACE (
- E_TYPE_MAIL_EXTENSION,
- e_mail_formatter_mail_extension_interface_init)
- G_IMPLEMENT_INTERFACE (
E_TYPE_MAIL_FORMATTER_EXTENSION,
e_mail_formatter_formatter_extension_interface_init));
@@ -174,18 +170,13 @@ e_mail_formatter_image_class_init (EMailFormatterImageClass *class)
static void
e_mail_formatter_formatter_extension_interface_init (EMailFormatterExtensionInterface *iface)
{
+ iface->mime_types = formatter_mime_types;
iface->format = emfe_image_format;
iface->get_display_name = emfe_image_get_display_name;
iface->get_description = emfe_image_get_description;
}
static void
-e_mail_formatter_mail_extension_interface_init (EMailExtensionInterface *iface)
-{
- iface->mime_types = formatter_mime_types;
-}
-
-static void
e_mail_formatter_image_init (EMailFormatterImage *formatter)
{