Teach EMailExtensionRegistry to find extensions.

Now we have the following extension points in the GType hierarchy:

   E_TYPE_MAIL_FORMATTER_EXTENSION
   E_TYPE_MAIL_FORMATTER_PRINT_EXTENSION
   E_TYPE_MAIL_FORMATTER_QUOTE_EXTENSION
   E_TYPE_MAIL_PARSER_EXTENSION

A registry just needs to be given one of these extension points, and it
can use g_type_children() to find and load all registered extensions.

This eliminates e-mail-format-extensions.[ch] as well as the dynamic
loaders I added a few commits back.  Dynamically loaded extensions are
now easier to register, at the cost of internal extensions being a tad
more cumbersome to register.  Fair tradeoff, imo.

This also makes e_mail_extension_registry_add_extension() a private
function used only by e_mail_formatter_extension_registry_load() and
e_mail_parser_extension_registry_load().

1 files changed, 0 insertions, 41 deletions

diff --git a/modules/prefer-plain/e-mail-parser-prefer-plain.c b/modules/prefer-plain/e-mail-parser-prefer-plain.c
index d434c20bc8..1351b33c6c 100644
--- a/modules/prefer-plain/e-mail-parser-prefer-plain.c
+++ b/modules/prefer-plain/e-mail-parser-prefer-plain.c
@@ -51,7 +51,6 @@ struct _EMailParserPreferPlainClass {
 };
 
 GType e_mail_parser_prefer_plain_get_type (void);
-GType e_mail_parser_prefer_plain_loader_get_type (void);
 
 enum {
 	PREFER_HTML,
@@ -64,11 +63,6 @@ G_DEFINE_DYNAMIC_TYPE (
 	e_mail_parser_prefer_plain,
 	E_TYPE_MAIL_PARSER_EXTENSION)
 
-G_DEFINE_DYNAMIC_TYPE (
-	EMailParserPreferPlainLoader,
-	e_mail_parser_prefer_plain_loader,
-	E_TYPE_EXTENSION)
-
 static const gchar *parser_mime_types[] = {
 	"multipart/alternative",
 	"text/html",
@@ -491,44 +485,9 @@ e_mail_parser_prefer_plain_init (EMailParserPreferPlain *parser)
 	parser->show_suppressed = g_settings_get_boolean (parser->settings, "show-suppressed");
 }
 
-static void
-mail_parser_prefer_plain_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_prefer_plain_get_type ());
-}
-
-static void
-e_mail_parser_prefer_plain_loader_class_init (EExtensionClass *class)
-{
-	GObjectClass *object_class;
-
-	object_class = G_OBJECT_CLASS (class);
-	object_class->constructed = mail_parser_prefer_plain_loader_constructed;
-
-	class->extensible_type = E_TYPE_MAIL_PARSER_EXTENSION_REGISTRY;
-}
-
-static void
-e_mail_parser_prefer_plain_loader_class_finalize (EExtensionClass *class)
-{
-}
-
-static void
-e_mail_parser_prefer_plain_loader_init (EExtension *extension)
-{
-}
-
 void
 e_mail_parser_prefer_plain_type_register (GTypeModule *type_module)
 {
 	e_mail_parser_prefer_plain_register_type (type_module);
-	e_mail_parser_prefer_plain_loader_register_type (type_module);
 }