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, 10 deletions

diff --git a/em-format/e-mail-parser-application-mbox.c b/em-format/e-mail-parser-application-mbox.c
index d7b41b0c86..2821e981de 100644
--- a/em-format/e-mail-parser-application-mbox.c
+++ b/em-format/e-mail-parser-application-mbox.c
@@ -43,7 +43,6 @@ typedef struct _EMailParserApplicationMBoxClass {
 } EMailParserApplicationMBoxClass;
 
 static void e_mail_parser_parser_extension_interface_init (EMailParserExtensionInterface *iface);
-static void e_mail_parser_mail_extension_interface_init (EMailExtensionInterface *iface);
 
 G_DEFINE_TYPE_EXTENDED (
 	EMailParserApplicationMBox,
@@ -51,9 +50,6 @@ G_DEFINE_TYPE_EXTENDED (
 	G_TYPE_OBJECT,
 	0,
 	G_IMPLEMENT_INTERFACE (
-		E_TYPE_MAIL_EXTENSION,
-		e_mail_parser_mail_extension_interface_init)
-	G_IMPLEMENT_INTERFACE (
 		E_TYPE_MAIL_PARSER_EXTENSION,
 		e_mail_parser_parser_extension_interface_init));
 
@@ -190,17 +186,12 @@ e_mail_parser_application_mbox_class_init (EMailParserApplicationMBoxClass *clas
 static void
 e_mail_parser_parser_extension_interface_init (EMailParserExtensionInterface *interface)
 {
+	interface->mime_types = parser_mime_types;
 	interface->parse = empe_app_mbox_parse;
 	interface->get_flags = empe_app_mbox_get_flags;
 }
 
 static void
-e_mail_parser_mail_extension_interface_init (EMailExtensionInterface *interface)
-{
-	interface->mime_types = parser_mime_types;
-}
-
-static void
 e_mail_parser_application_mbox_init (EMailParserApplicationMBox *self)
 {
 }