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, 82 insertions, 0 deletions

diff --git a/modules/vcard-inline/e-mail-formatter-vcard-inline.c b/modules/vcard-inline/e-mail-formatter-vcard-inline.c
index bcced23351..3032f23560 100644
--- a/modules/vcard-inline/e-mail-formatter-vcard-inline.c
+++ b/modules/vcard-inline/e-mail-formatter-vcard-inline.c
@@ -43,12 +43,18 @@ typedef EExtension EMailFormatterVCardInlineLoader;
 typedef EExtensionClass EMailFormatterVCardInlineLoaderClass;
 
 GType e_mail_formatter_vcard_inline_get_type (void);
+GType e_mail_formatter_vcard_inline_loader_get_type (void);
 
 G_DEFINE_DYNAMIC_TYPE (
 	EMailFormatterVCardInline,
 	e_mail_formatter_vcard_inline,
 	E_TYPE_MAIL_FORMATTER_EXTENSION)
 
+G_DEFINE_DYNAMIC_TYPE (
+	EMailFormatterVCardInlineLoader,
+	e_mail_formatter_vcard_inline_loader,
+	E_TYPE_EXTENSION)
+
 static const gchar *formatter_mime_types[] = {
 	"text/vcard",
 	"text/x-vcard",
@@ -217,9 +223,44 @@ e_mail_formatter_vcard_inline_init (EMailFormatterExtension *extension)
 {
 }
 
+static void
+mail_formatter_vcard_inline_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_vcard_inline_get_type ());
+}
+
+static void
+e_mail_formatter_vcard_inline_loader_class_init (EExtensionClass *class)
+{
+	GObjectClass *object_class;
+
+	object_class = G_OBJECT_CLASS (class);
+	object_class->constructed = mail_formatter_vcard_inline_loader_constructed;
+
+	class->extensible_type = E_TYPE_MAIL_FORMATTER_EXTENSION_REGISTRY;
+}
+
+static void
+e_mail_formatter_vcard_inline_loader_class_finalize (EExtensionClass *class)
+{
+}
+
+static void
+e_mail_formatter_vcard_inline_loader_init (EExtension *extension)
+{
+}
+
 void
 e_mail_formatter_vcard_inline_type_register (GTypeModule *type_module)
 {
 	e_mail_formatter_vcard_inline_register_type (type_module);
+	e_mail_formatter_vcard_inline_loader_register_type (type_module);
 }
 
diff --git a/modules/vcard-inline/e-mail-parser-vcard-inline.c b/modules/vcard-inline/e-mail-parser-vcard-inline.c
index b871351d0a..c1064dd28f 100644
--- a/modules/vcard-inline/e-mail-parser-vcard-inline.c
+++ b/modules/vcard-inline/e-mail-parser-vcard-inline.c
@@ -54,12 +54,18 @@ typedef EExtension EMailParserVCardInlineLoader;
 typedef EExtensionClass EMailParserVCardInlineLoaderClass;
 
 GType e_mail_parser_vcard_inline_get_type (void);
+GType e_mail_parser_vcard_inline_loader_get_type (void);
 
 G_DEFINE_DYNAMIC_TYPE (
 	EMailParserVCardInline,
 	e_mail_parser_vcard_inline,
 	E_TYPE_MAIL_PARSER_EXTENSION)
 
+G_DEFINE_DYNAMIC_TYPE (
+	EMailParserVCardInlineLoader,
+	e_mail_parser_vcard_inline_loader,
+	E_TYPE_EXTENSION)
+
 static const gchar *parser_mime_types[] = {
 	"text/vcard",
 	"text/x-vcard",
@@ -382,9 +388,44 @@ e_mail_parser_vcard_inline_init (EMailParserExtension *extension)
 {
 }
 
+static void
+mail_parser_vcard_inline_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_vcard_inline_get_type ());
+}
+
+static void
+e_mail_parser_vcard_inline_loader_class_init (EExtensionClass *class)
+{
+	GObjectClass *object_class;
+
+	object_class = G_OBJECT_CLASS (class);
+	object_class->constructed = mail_parser_vcard_inline_loader_constructed;
+
+	class->extensible_type = E_TYPE_MAIL_PARSER_EXTENSION_REGISTRY;
+}
+
+static void
+e_mail_parser_vcard_inline_loader_class_finalize (EExtensionClass *class)
+{
+}
+
+static void
+e_mail_parser_vcard_inline_loader_init (EExtension *extension)
+{
+}
+
 void
 e_mail_parser_vcard_inline_type_register (GTypeModule *type_module)
 {
 	e_mail_parser_vcard_inline_register_type (type_module);
+	e_mail_parser_vcard_inline_loader_register_type (type_module);
 }