aboutsummaryrefslogtreecommitdiffstats
path: root/modules/audio-inline
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2013-01-29 23:31:58 +0800
committerMilan Crha <mcrha@redhat.com>2013-01-29 23:31:58 +0800
commit57adde4be6ef1709008dc27af43ada147cf21588 (patch)
treea2befed2aa4a75d7e613560944c87c89eaad3557 /modules/audio-inline
parent6d7b644e8e890929d267fbfffcaed5e60d9dff2a (diff)
downloadgsoc2013-evolution-57adde4be6ef1709008dc27af43ada147cf21588.tar
gsoc2013-evolution-57adde4be6ef1709008dc27af43ada147cf21588.tar.gz
gsoc2013-evolution-57adde4be6ef1709008dc27af43ada147cf21588.tar.bz2
gsoc2013-evolution-57adde4be6ef1709008dc27af43ada147cf21588.tar.lz
gsoc2013-evolution-57adde4be6ef1709008dc27af43ada147cf21588.tar.xz
gsoc2013-evolution-57adde4be6ef1709008dc27af43ada147cf21588.tar.zst
gsoc2013-evolution-57adde4be6ef1709008dc27af43ada147cf21588.zip
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.
Diffstat (limited to 'modules/audio-inline')
-rw-r--r--modules/audio-inline/e-mail-formatter-audio-inline.c41
-rw-r--r--modules/audio-inline/e-mail-parser-audio-inline.c41
2 files changed, 82 insertions, 0 deletions
diff --git a/modules/audio-inline/e-mail-formatter-audio-inline.c b/modules/audio-inline/e-mail-formatter-audio-inline.c
index 7abcf934fa..235315a64d 100644
--- a/modules/audio-inline/e-mail-formatter-audio-inline.c
+++ b/modules/audio-inline/e-mail-formatter-audio-inline.c
@@ -43,12 +43,18 @@ 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",
@@ -323,9 +329,44 @@ 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 1ebbf905ba..a4ef834e1e 100644
--- a/modules/audio-inline/e-mail-parser-audio-inline.c
+++ b/modules/audio-inline/e-mail-parser-audio-inline.c
@@ -45,12 +45,18 @@ 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",
@@ -158,9 +164,44 @@ 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);
}