From 57adde4be6ef1709008dc27af43ada147cf21588 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Tue, 29 Jan 2013 16:31:58 +0100
Subject: 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.
---
 .../e-mail-formatter-text-highlight.c              | 41 ++++++++++++++++++++++
 .../text-highlight/e-mail-parser-text-highlight.c  | 41 ++++++++++++++++++++++
 2 files changed, 82 insertions(+)

(limited to 'modules/text-highlight')

diff --git a/modules/text-highlight/e-mail-formatter-text-highlight.c b/modules/text-highlight/e-mail-formatter-text-highlight.c
index 5e8c15c16c..ea4cb6c839 100644
--- a/modules/text-highlight/e-mail-formatter-text-highlight.c
+++ b/modules/text-highlight/e-mail-formatter-text-highlight.c
@@ -45,12 +45,18 @@ typedef EExtension EMailFormatterTextHighlightLoader;
 typedef EExtensionClass EMailFormatterTextHighlightLoaderClass;
 
 GType e_mail_formatter_text_highlight_get_type (void);
+GType e_mail_formatter_text_highlight_loader_get_type (void);
 
 G_DEFINE_DYNAMIC_TYPE (
 	EMailFormatterTextHighlight,
 	e_mail_formatter_text_highlight,
 	E_TYPE_MAIL_FORMATTER_EXTENSION)
 
+G_DEFINE_DYNAMIC_TYPE (
+	EMailFormatterTextHighlightLoader,
+	e_mail_formatter_text_highlight_loader,
+	E_TYPE_EXTENSION)
+
 static gchar *
 get_default_font (void)
 {
@@ -384,9 +390,44 @@ e_mail_formatter_text_highlight_init (EMailFormatterExtension *extension)
 {
 }
 
+static void
+mail_formatter_text_highlight_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),
+		get_mime_types (),
+		e_mail_formatter_text_highlight_get_type ());
+}
+
+static void
+e_mail_formatter_text_highlight_loader_class_init (EExtensionClass *class)
+{
+	GObjectClass *object_class;
+
+	object_class = G_OBJECT_CLASS (class);
+	object_class->constructed = mail_formatter_text_highlight_loader_constructed;
+
+	class->extensible_type = E_TYPE_MAIL_FORMATTER_EXTENSION_REGISTRY;
+}
+
+static void
+e_mail_formatter_text_highlight_loader_class_finalize (EExtensionClass *class)
+{
+}
+
+static void
+e_mail_formatter_text_highlight_loader_init (EExtension *extension)
+{
+}
+
 void
 e_mail_formatter_text_highlight_type_register (GTypeModule *type_module)
 {
 	e_mail_formatter_text_highlight_register_type (type_module);
+	e_mail_formatter_text_highlight_loader_register_type (type_module);
 }
 
diff --git a/modules/text-highlight/e-mail-parser-text-highlight.c b/modules/text-highlight/e-mail-parser-text-highlight.c
index 28d10409b1..99d920fe0b 100644
--- a/modules/text-highlight/e-mail-parser-text-highlight.c
+++ b/modules/text-highlight/e-mail-parser-text-highlight.c
@@ -41,12 +41,18 @@ typedef EExtension EMailParserTextHighlightLoader;
 typedef EExtensionClass EMailParserTextHighlightLoaderClass;
 
 GType e_mail_parser_text_highlight_get_type (void);
+GType e_mail_parser_text_highlight_loader_get_type (void);
 
 G_DEFINE_DYNAMIC_TYPE (
 	EMailParserTextHighlight,
 	e_mail_parser_text_highlight,
 	E_TYPE_MAIL_PARSER_EXTENSION)
 
+G_DEFINE_DYNAMIC_TYPE (
+	EMailParserTextHighlightLoader,
+	e_mail_parser_text_highlight_loader,
+	E_TYPE_EXTENSION)
+
 static gboolean
 empe_text_highlight_parse (EMailParserExtension *extension,
                            EMailParser *parser,
@@ -104,9 +110,44 @@ e_mail_parser_text_highlight_init (EMailParserExtension *extension)
 {
 }
 
+static void
+mail_parser_text_highlight_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),
+		get_mime_types (),
+		e_mail_parser_text_highlight_get_type ());
+}
+
+static void
+e_mail_parser_text_highlight_loader_class_init (EExtensionClass *class)
+{
+	GObjectClass *object_class;
+
+	object_class = G_OBJECT_CLASS (class);
+	object_class->constructed = mail_parser_text_highlight_loader_constructed;
+
+	class->extensible_type = E_TYPE_MAIL_PARSER_EXTENSION_REGISTRY;
+}
+
+static void
+e_mail_parser_text_highlight_loader_class_finalize (EExtensionClass *class)
+{
+}
+
+static void
+e_mail_parser_text_highlight_loader_init (EExtension *extension)
+{
+}
+
 void
 e_mail_parser_text_highlight_type_register (GTypeModule *type_module)
 {
 	e_mail_parser_text_highlight_register_type (type_module);
+	e_mail_parser_text_highlight_loader_register_type (type_module);
 }
 
-- 
cgit v1.2.3