From bf30024dd7973006bf99d0ae509a7f0022368a41 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Fri, 7 Dec 2012 16:30:18 -0500
Subject: 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().
---
 modules/itip-formatter/e-mail-formatter-itip.c | 43 --------------------------
 modules/itip-formatter/e-mail-parser-itip.c    | 41 ------------------------
 2 files changed, 84 deletions(-)

(limited to 'modules/itip-formatter')

diff --git a/modules/itip-formatter/e-mail-formatter-itip.c b/modules/itip-formatter/e-mail-formatter-itip.c
index 86132f4f7b..ca2a0c6f24 100644
--- a/modules/itip-formatter/e-mail-formatter-itip.c
+++ b/modules/itip-formatter/e-mail-formatter-itip.c
@@ -37,9 +37,6 @@
 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);
 
@@ -48,11 +45,6 @@ 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",
@@ -155,43 +147,8 @@ 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 554d863957..d0ab563dcc 100644
--- a/modules/itip-formatter/e-mail-parser-itip.c
+++ b/modules/itip-formatter/e-mail-parser-itip.c
@@ -51,18 +51,12 @@ 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",
@@ -266,44 +260,9 @@ 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);
 }
 
-- 
cgit v1.2.3