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.

1 files changed, 50 insertions, 102 deletions

diff --git a/em-format/e-mail-extension-registry.c b/em-format/e-mail-extension-registry.c
index 7e5f3a9b0b..158951f813 100644
--- a/em-format/e-mail-extension-registry.c
+++ b/em-format/e-mail-extension-registry.c
@@ -22,6 +22,7 @@
 
 #include <libebackend/libebackend.h>
 
+#include "e-mail-format-extensions.h"
 #include "e-mail-formatter-extension.h"
 #include "e-mail-parser-extension.h"
 
@@ -57,49 +58,6 @@ destroy_queue (GQueue *queue)
 }
 
 static void
-mail_extension_registry_add_extension (EMailExtensionRegistry *registry,
-                                       const gchar **mime_types,
-                                       GType extension_type)
-{
-	GObject *extension;
-	gint ii;
-
-	if (mime_types == NULL) {
-		g_critical (
-			"%s does not define any MIME types",
-			g_type_name (extension_type));
-		return;
-	}
-
-	extension = g_object_new (extension_type, NULL);
-
-	for (ii = 0; mime_types[ii] != NULL; ii++) {
-		GQueue *queue;
-
-		queue = g_hash_table_lookup (
-			registry->priv->table, mime_types[ii]);
-		if (queue == NULL) {
-			queue = g_queue_new ();
-			g_hash_table_insert (
-				registry->priv->table,
-				(gpointer) mime_types[ii],
-				queue);
-		}
-
-		g_queue_push_head (queue, g_object_ref (extension));
-
-		if (camel_debug ("emformat:registry")) {
-			printf (
-				"Added extension '%s' for type '%s'\n",
-				g_type_name (extension_type),
-				mime_types[ii]);
-		}
-	}
-
-	g_object_unref (extension);
-}
-
-static void
 mail_extension_registry_finalize (GObject *object)
 {
 	EMailExtensionRegistryPrivate *priv;
@@ -138,6 +96,55 @@ e_mail_extension_registry_init (EMailExtensionRegistry *registry)
 }
 
 /**
+ * e_mail_extension_registry_add_extension:
+ * @registry: an #EMailExtensionRegistry
+ * @mime_types: a %NULL-terminated array of MIME types
+ * @extension_type: the #GType of the extension being added
+ *
+ * Creates an instance of @extension_type and registers the instance for
+ * all provided MIME types.
+ */
+void
+e_mail_extension_registry_add_extension (EMailExtensionRegistry *registry,
+                                         const gchar **mime_types,
+                                         GType extension_type)
+{
+	GObject *extension;
+	gint ii;
+
+	g_return_if_fail (E_IS_MAIL_EXTENSION_REGISTRY (registry));
+	g_return_if_fail (mime_types != NULL);
+	g_return_if_fail (extension_type != G_TYPE_INVALID);
+
+	extension = g_object_new (extension_type, NULL);
+
+	for (ii = 0; mime_types[ii] != NULL; ii++) {
+		GQueue *queue;
+
+		queue = g_hash_table_lookup (
+			registry->priv->table, mime_types[ii]);
+		if (queue == NULL) {
+			queue = g_queue_new ();
+			g_hash_table_insert (
+				registry->priv->table,
+				(gpointer) mime_types[ii],
+				queue);
+		}
+
+		g_queue_push_head (queue, g_object_ref (extension));
+
+		if (camel_debug ("emformat:registry")) {
+			printf (
+				"Added extension '%s' for type '%s'\n",
+				g_type_name (extension_type),
+				mime_types[ii]);
+		}
+	}
+
+	g_object_unref (extension);
+}
+
+/**
  * e_mail_extension_registry_get_for_mime_type:
  * @regstry: An #EMailExtensionRegistry
  * @mime_type: A string with mime-type to look up
@@ -217,36 +224,6 @@ e_mail_parser_extension_registry_init (EMailParserExtensionRegistry *registry)
 {
 }
 
-void
-e_mail_parser_extension_registry_load (EMailParserExtensionRegistry *registry)
-{
-	GType *children;
-	GType base_extension_type;
-	guint ii, n_children;
-
-	g_return_if_fail (E_IS_MAIL_PARSER_EXTENSION_REGISTRY (registry));
-
-	base_extension_type = E_TYPE_MAIL_PARSER_EXTENSION;
-	children = g_type_children (base_extension_type, &n_children);
-
-	for (ii = 0; ii < n_children; ii++) {
-		EMailParserExtensionClass *class;
-
-		if (G_TYPE_IS_ABSTRACT (children[ii]))
-			continue;
-
-		class = g_type_class_ref (children[ii]);
-
-		mail_extension_registry_add_extension (
-			E_MAIL_EXTENSION_REGISTRY (registry),
-			class->mime_types, children[ii]);
-
-		g_type_class_unref (class);
-	}
-
-	g_free (children);
-}
-
 /******************************************************************************/
 
 G_DEFINE_TYPE_WITH_CODE (
@@ -265,32 +242,3 @@ e_mail_formatter_extension_registry_init (EMailFormatterExtensionRegistry *regis
 {
 }
 
-void
-e_mail_formatter_extension_registry_load (EMailFormatterExtensionRegistry *registry,
-                                          GType base_extension_type)
-{
-	GType *children;
-	guint ii, n_children;
-
-	g_return_if_fail (E_IS_MAIL_FORMATTER_EXTENSION_REGISTRY (registry));
-
-	children = g_type_children (base_extension_type, &n_children);
-
-	for (ii = 0; ii < n_children; ii++) {
-		EMailFormatterExtensionClass *class;
-
-		if (G_TYPE_IS_ABSTRACT (children[ii]))
-			continue;
-
-		class = g_type_class_ref (children[ii]);
-
-		mail_extension_registry_add_extension (
-			E_MAIL_EXTENSION_REGISTRY (registry),
-			class->mime_types, children[ii]);
-
-		g_type_class_unref (class);
-	}
-
-	g_free (children);
-}
-