Revert "Teach EMailExtensionRegistry to find extensions."

This reverts commit bf30024dd7973006bf99d0ae509a7f0022368a41, because
it breaks EMailFormatter/Parser extensions, like the prefer-plain.
The thing is that the internal formatters/parsers (also extensions)
should be always added first, and only after then can be added extended
extensions, which are used before those internal. This constraint was not
satisfied with the reverted commit, the order of extension registration
was unpredictable, depended on GType.

2 files changed, 84 insertions, 0 deletions

diff --git a/modules/itip-formatter/e-mail-formatter-itip.c b/modules/itip-formatter/e-mail-formatter-itip.c
index 500810b639..6d5a3f1ac1 100644
--- a/modules/itip-formatter/e-mail-formatter-itip.c
+++ b/modules/itip-formatter/e-mail-formatter-itip.c
@@ -37,6 +37,9 @@
 typedef EMailFormatterExtension EMailFormatterItip;
 typedef EMailFormatterExtensionClass EMailFormatterItipClass;
 
+typedef EExtension EMailFormatterItipLoader;
+typedef EExtensionClass EMailFormatterItipLoaderClass;
+
 GType e_mail_formatter_itip_get_type (void);
 GType e_mail_formatter_itip_loader_get_type (void);
 
@@ -45,6 +48,11 @@ G_DEFINE_DYNAMIC_TYPE (
 	e_mail_formatter_itip,
 	E_TYPE_MAIL_FORMATTER_EXTENSION)
 
+G_DEFINE_DYNAMIC_TYPE (
+	EMailFormatterItipLoader,
+	e_mail_formatter_itip_loader,
+	E_TYPE_EXTENSION)
+
 static const gchar *formatter_mime_types[] = {
 	"text/calendar",
 	"application/ics",
@@ -158,8 +166,43 @@ e_mail_formatter_itip_init (EMailFormatterExtension *extension)
 {
 }
 
+static void
+mail_formatter_itip_loader_constructed (GObject *object)
+{
+	EExtensible *extensible;
+
+	extensible = e_extension_get_extensible (E_EXTENSION (object));
+
+	e_mail_extension_registry_add_extension (
+		E_MAIL_EXTENSION_REGISTRY (extensible),
+		formatter_mime_types,
+		e_mail_formatter_itip_get_type ());
+}
+
+static void
+e_mail_formatter_itip_loader_class_init (EExtensionClass *class)
+{
+	GObjectClass *object_class;
+
+	object_class = G_OBJECT_CLASS (class);
+	object_class->constructed = mail_formatter_itip_loader_constructed;
+
+	class->extensible_type = E_TYPE_MAIL_FORMATTER_EXTENSION_REGISTRY;
+}
+
+static void
+e_mail_formatter_itip_loader_class_finalize (EExtensionClass *class)
+{
+}
+
+static void
+e_mail_formatter_itip_loader_init (EExtension *extension)
+{
+}
+
 void
 e_mail_formatter_itip_type_register (GTypeModule *type_module)
 {
 	e_mail_formatter_itip_register_type (type_module);
+	e_mail_formatter_itip_loader_register_type (type_module);
 }
diff --git a/modules/itip-formatter/e-mail-parser-itip.c b/modules/itip-formatter/e-mail-parser-itip.c
index 9e5ff46e45..5d2cb458f1 100644
--- a/modules/itip-formatter/e-mail-parser-itip.c
+++ b/modules/itip-formatter/e-mail-parser-itip.c
@@ -50,12 +50,18 @@ typedef EExtension EMailParserItipLoader;
 typedef EExtensionClass EMailParserItipLoaderClass;
 
 GType e_mail_parser_itip_get_type (void);
+GType e_mail_parser_itip_loader_get_type (void);
 
 G_DEFINE_DYNAMIC_TYPE (
 	EMailParserItip,
 	e_mail_parser_itip,
 	E_TYPE_MAIL_PARSER_EXTENSION)
 
+G_DEFINE_DYNAMIC_TYPE (
+	EMailParserItipLoader,
+	e_mail_parser_itip_loader,
+	E_TYPE_EXTENSION)
+
 static const gchar *parser_mime_types[] = {
 	"text/calendar",
 	"application/ics",
@@ -259,9 +265,44 @@ e_mail_parser_itip_init (EMailParserExtension *class)
 {
 }
 
+static void
+mail_parser_itip_loader_constructed (GObject *object)
+{
+	EExtensible *extensible;
+
+	extensible = e_extension_get_extensible (E_EXTENSION (object));
+
+	e_mail_extension_registry_add_extension (
+		E_MAIL_EXTENSION_REGISTRY (extensible),
+		parser_mime_types,
+		e_mail_parser_itip_get_type ());
+}
+
+static void
+e_mail_parser_itip_loader_class_init (EExtensionClass *class)
+{
+	GObjectClass *object_class;
+
+	object_class = G_OBJECT_CLASS (class);
+	object_class->constructed = mail_parser_itip_loader_constructed;
+
+	class->extensible_type = E_TYPE_MAIL_PARSER_EXTENSION_REGISTRY;
+}
+
+static void
+e_mail_parser_itip_loader_class_finalize (EExtensionClass *class)
+{
+}
+
+static void
+e_mail_parser_itip_loader_init (EExtension *extension)
+{
+}
+
 void
 e_mail_parser_itip_type_register (GTypeModule *type_module)
 {
 	e_mail_parser_itip_register_type (type_module);
+	e_mail_parser_itip_loader_register_type (type_module);
 }