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().

10 files changed, 0 insertions, 412 deletions

diff --git a/modules/audio-inline/e-mail-formatter-audio-inline.c b/modules/audio-inline/e-mail-formatter-audio-inline.c
index 4520e377b6..cf31f1596d 100644
--- a/modules/audio-inline/e-mail-formatter-audio-inline.c
+++ b/modules/audio-inline/e-mail-formatter-audio-inline.c
@@ -45,18 +45,12 @@ typedef EExtension EMailFormatterAudioInlineLoader;
 typedef EExtensionClass EMailFormatterAudioInlineLoaderClass;
 
 GType e_mail_formatter_audio_inline_get_type (void);
-GType e_mail_formatter_audio_inline_loader_get_type (void);
 
 G_DEFINE_DYNAMIC_TYPE (
 	EMailFormatterAudioInline,
 	e_mail_formatter_audio_inline,
 	E_TYPE_MAIL_FORMATTER_EXTENSION)
 
-G_DEFINE_DYNAMIC_TYPE (
-	EMailFormatterAudioInlineLoader,
-	e_mail_formatter_audio_inline_loader,
-	E_TYPE_EXTENSION)
-
 static const gchar *formatter_mime_types[] = {
 	"application/vnd.evolution.widget.audio-inline",
 	"audio/ac3",
@@ -331,44 +325,9 @@ e_mail_formatter_audio_inline_init (EMailFormatterExtension *extension)
 {
 }
 
-static void
-mail_formatter_audio_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_audio_inline_get_type ());
-}
-
-static void
-e_mail_formatter_audio_inline_loader_class_init (EExtensionClass *class)
-{
-	GObjectClass *object_class;
-
-	object_class = G_OBJECT_CLASS (class);
-	object_class->constructed = mail_formatter_audio_inline_loader_constructed;
-
-	class->extensible_type = E_TYPE_MAIL_FORMATTER_EXTENSION_REGISTRY;
-}
-
-static void
-e_mail_formatter_audio_inline_loader_class_finalize (EExtensionClass *class)
-{
-}
-
-static void
-e_mail_formatter_audio_inline_loader_init (EExtension *extension)
-{
-}
-
 void
 e_mail_formatter_audio_inline_type_register (GTypeModule *type_module)
 {
 	e_mail_formatter_audio_inline_register_type (type_module);
-	e_mail_formatter_audio_inline_loader_register_type (type_module);
 }
 
diff --git a/modules/audio-inline/e-mail-parser-audio-inline.c b/modules/audio-inline/e-mail-parser-audio-inline.c
index a4ef834e1e..1ebbf905ba 100644
--- a/modules/audio-inline/e-mail-parser-audio-inline.c
+++ b/modules/audio-inline/e-mail-parser-audio-inline.c
@@ -45,18 +45,12 @@ typedef EExtension EMailParserAudioInlineLoader;
 typedef EExtensionClass EMailParserAudioInlineLoaderClass;
 
 GType e_mail_parser_audio_inline_get_type (void);
-GType e_mail_parser_audio_inline_loader_get_type (void);
 
 G_DEFINE_DYNAMIC_TYPE (
 	EMailParserAudioInline,
 	e_mail_parser_audio_inline,
 	E_TYPE_MAIL_PARSER_EXTENSION)
 
-G_DEFINE_DYNAMIC_TYPE (
-	EMailParserAudioInlineLoader,
-	e_mail_parser_audio_inline_loader,
-	E_TYPE_EXTENSION)
-
 static const gchar *parser_mime_types[] = {
 	"audio/ac3",
 	"audio/x-ac3",
@@ -164,44 +158,9 @@ e_mail_parser_audio_inline_init (EMailParserExtension *extension)
 {
 }
 
-static void
-mail_parser_audio_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_audio_inline_get_type ());
-}
-
-static void
-e_mail_parser_audio_inline_loader_class_init (EExtensionClass *class)
-{
-	GObjectClass *object_class;
-
-	object_class = G_OBJECT_CLASS (class);
-	object_class->constructed = mail_parser_audio_inline_loader_constructed;
-
-	class->extensible_type = E_TYPE_MAIL_PARSER_EXTENSION_REGISTRY;
-}
-
-static void
-e_mail_parser_audio_inline_loader_class_finalize (EExtensionClass *class)
-{
-}
-
-static void
-e_mail_parser_audio_inline_loader_init (EExtension *extension)
-{
-}
-
 void
 e_mail_parser_audio_inline_type_register (GTypeModule *type_module)
 {
 	e_mail_parser_audio_inline_register_type (type_module);
-	e_mail_parser_audio_inline_loader_register_type (type_module);
 }
 
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);
 }
 
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);
 }
 
diff --git a/modules/text-highlight/e-mail-formatter-text-highlight.c b/modules/text-highlight/e-mail-formatter-text-highlight.c
index fc5ca1d482..dd5ed1d4d5 100644
--- a/modules/text-highlight/e-mail-formatter-text-highlight.c
+++ b/modules/text-highlight/e-mail-formatter-text-highlight.c
@@ -45,18 +45,12 @@ 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)
 {
@@ -375,44 +369,9 @@ 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 99d920fe0b..28d10409b1 100644
--- a/modules/text-highlight/e-mail-parser-text-highlight.c
+++ b/modules/text-highlight/e-mail-parser-text-highlight.c
@@ -41,18 +41,12 @@ 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,
@@ -110,44 +104,9 @@ 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);
 }
 
diff --git a/modules/tnef-attachment/e-mail-parser-tnef-attachment.c b/modules/tnef-attachment/e-mail-parser-tnef-attachment.c
index f2619ae1cc..6ff54b062c 100644
--- a/modules/tnef-attachment/e-mail-parser-tnef-attachment.c
+++ b/modules/tnef-attachment/e-mail-parser-tnef-attachment.c
@@ -65,18 +65,12 @@ typedef EExtension EMailParserTnefAttachmentLoader;
 typedef EExtensionClass EMailParserTnefAttachmentLoaderClass;
 
 GType e_mail_parser_tnef_attachment_get_type (void);
-GType e_mail_parser_tnef_attachment_loader_get_type (void);
 
 G_DEFINE_DYNAMIC_TYPE (
 	EMailParserTnefAttachment,
 	e_mail_parser_tnef_attachment,
 	E_TYPE_MAIL_PARSER_EXTENSION)
 
-G_DEFINE_DYNAMIC_TYPE (
-	EMailParserTnefAttachmentLoader,
-	e_mail_parser_tnef_attachment_loader,
-	E_TYPE_EXTENSION)
-
 static const gchar *parser_mime_types[] = {
 	"application/vnd.ms-tnef",
 	"application/ms-tnefl",
@@ -281,45 +275,10 @@ e_mail_parser_tnef_attachment_init (EMailParserTnefAttachment *extension)
 {
 }
 
-static void
-mail_parser_tnef_attachment_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_tnef_attachment_get_type ());
-}
-
-static void
-e_mail_parser_tnef_attachment_loader_class_init (EExtensionClass *class)
-{
-	GObjectClass *object_class;
-
-	object_class = G_OBJECT_CLASS (class);
-	object_class->constructed = mail_parser_tnef_attachment_loader_constructed;
-
-	class->extensible_type = E_TYPE_MAIL_PARSER_EXTENSION_REGISTRY;
-}
-
-static void
-e_mail_parser_tnef_attachment_loader_class_finalize (EExtensionClass *class)
-{
-}
-
-static void
-e_mail_parser_tnef_attachment_loader_init (EExtension *extension)
-{
-}
-
 void
 e_mail_parser_tnef_attachment_type_register (GTypeModule *type_module)
 {
 	e_mail_parser_tnef_attachment_register_type (type_module);
-	e_mail_parser_tnef_attachment_loader_register_type (type_module);
 }
 
 void
diff --git a/modules/vcard-inline/e-mail-formatter-vcard-inline.c b/modules/vcard-inline/e-mail-formatter-vcard-inline.c
index 873d9c7343..f7dc88e5b0 100644
--- a/modules/vcard-inline/e-mail-formatter-vcard-inline.c
+++ b/modules/vcard-inline/e-mail-formatter-vcard-inline.c
@@ -43,18 +43,12 @@ 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",
@@ -213,44 +207,9 @@ 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 67f357440b..bd4050287a 100644
--- a/modules/vcard-inline/e-mail-parser-vcard-inline.c
+++ b/modules/vcard-inline/e-mail-parser-vcard-inline.c
@@ -55,18 +55,12 @@ 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",
@@ -387,44 +381,9 @@ 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);
 }