diff options
author | Milan Crha <mcrha@redhat.com> | 2013-01-29 23:31:58 +0800 |
---|---|---|
committer | Milan Crha <mcrha@redhat.com> | 2013-01-29 23:31:58 +0800 |
commit | 57adde4be6ef1709008dc27af43ada147cf21588 (patch) | |
tree | a2befed2aa4a75d7e613560944c87c89eaad3557 /modules/tnef-attachment | |
parent | 6d7b644e8e890929d267fbfffcaed5e60d9dff2a (diff) | |
download | gsoc2013-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/tnef-attachment')
-rw-r--r-- | modules/tnef-attachment/e-mail-parser-tnef-attachment.c | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/modules/tnef-attachment/e-mail-parser-tnef-attachment.c b/modules/tnef-attachment/e-mail-parser-tnef-attachment.c index dc93b91955..cc9d024349 100644 --- a/modules/tnef-attachment/e-mail-parser-tnef-attachment.c +++ b/modules/tnef-attachment/e-mail-parser-tnef-attachment.c @@ -64,12 +64,18 @@ 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", @@ -274,10 +280,45 @@ 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 |