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.

1 files changed, 1 insertions, 11 deletions

diff --git a/em-format/e-mail-formatter-text-enriched.c b/em-format/e-mail-formatter-text-enriched.c
index ca24c354dd..7a358bdfad 100644
--- a/em-format/e-mail-formatter-text-enriched.c
+++ b/em-format/e-mail-formatter-text-enriched.c
@@ -45,7 +45,6 @@ typedef struct _EMailFormatterTextEnrichedClass {
 } EMailFormatterTextEnrichedClass;
 
 static void e_mail_formatter_formatter_extension_interace_init (EMailFormatterExtensionInterface *iface);
-static void e_mail_formatter_mail_extension_interface_init (EMailExtensionInterface *iface);
 
 G_DEFINE_TYPE_EXTENDED (
 	EMailFormatterTextEnriched,
@@ -53,9 +52,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_interace_init));
 
@@ -132,19 +128,13 @@ e_mail_formatter_text_enriched_class_init (EMailFormatterTextEnrichedClass *clas
 static void
 e_mail_formatter_formatter_extension_interace_init (EMailFormatterExtensionInterface *iface)
 {
+	iface->mime_types = formatter_mime_types;
 	iface->format = emfe_text_enriched_format;
 	iface->get_display_name = emfe_text_enriched_get_display_name;
 	iface->get_description = emfe_text_enriched_get_description;
 }
 
 static void
-e_mail_formatter_mail_extension_interface_init (EMailExtensionInterface *iface)
-{
-	iface->mime_types = formatter_mime_types;
-}
-
-static void
 e_mail_formatter_text_enriched_init (EMailFormatterTextEnriched *formatter)
 {
-
 }