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 /em-format/e-mail-format-extensions.c | |
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 'em-format/e-mail-format-extensions.c')
-rw-r--r-- | em-format/e-mail-format-extensions.c | 144 |
1 files changed, 144 insertions, 0 deletions
diff --git a/em-format/e-mail-format-extensions.c b/em-format/e-mail-format-extensions.c new file mode 100644 index 0000000000..8ba36702a8 --- /dev/null +++ b/em-format/e-mail-format-extensions.c @@ -0,0 +1,144 @@ +/* + * e-mail-format-extensions.c + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> + * + */ + +#include "e-mail-format-extensions.h" + +#include "em-format/e-mail-parser-extension.h" +#include "em-format/e-mail-formatter-extension.h" + +typedef GType (*TypeFunc) (void); + +TypeFunc parser_funcs[] = { + e_mail_parser_application_mbox_get_type, + e_mail_parser_attachment_bar_get_type, + e_mail_parser_headers_get_type, + e_mail_parser_message_get_type, + e_mail_parser_secure_button_get_type, + e_mail_parser_source_get_type, + e_mail_parser_image_get_type, + e_mail_parser_inline_pgp_encrypted_get_type, + e_mail_parser_inline_pgp_signed_get_type, + e_mail_parser_message_delivery_status_get_type, + e_mail_parser_message_external_get_type, + e_mail_parser_message_rfc822_get_type, + e_mail_parser_multipart_alternative_get_type, + e_mail_parser_multipart_apple_double_get_type, + e_mail_parser_multipart_digest_get_type, + e_mail_parser_multipart_encrypted_get_type, + e_mail_parser_multipart_mixed_get_type, + e_mail_parser_multipart_related_get_type, + e_mail_parser_multipart_signed_get_type, + e_mail_parser_text_enriched_get_type, + e_mail_parser_text_html_get_type, + e_mail_parser_text_plain_get_type, +#ifdef ENABLE_SMIME + e_mail_parser_application_smime_get_type, +#endif + NULL +}; + +TypeFunc formatter_funcs[] = { + e_mail_formatter_attachment_get_type, + e_mail_formatter_attachment_bar_get_type, + e_mail_formatter_error_get_type, + e_mail_formatter_headers_get_type, + e_mail_formatter_secure_button_get_type, + e_mail_formatter_source_get_type, + e_mail_formatter_image_get_type, + e_mail_formatter_message_rfc822_get_type, + e_mail_formatter_text_enriched_get_type, + e_mail_formatter_text_html_get_type, + e_mail_formatter_text_plain_get_type, + NULL +}; + +TypeFunc quote_formatter_funcs[] = { + e_mail_formatter_quote_attachment_get_type, + e_mail_formatter_quote_headers_get_type, + e_mail_formatter_quote_message_rfc822_get_type, + e_mail_formatter_quote_text_enriched_get_type, + e_mail_formatter_quote_text_html_get_type, + e_mail_formatter_quote_text_plain_get_type, + NULL +}; + +TypeFunc print_formatter_funcs[] = { + e_mail_formatter_print_headers_get_type, + NULL +}; + +static void +load (EMailExtensionRegistry *ereg, + TypeFunc *func_array) +{ + gint ii; + + for (ii = 0; func_array[ii] != NULL; ii++) { + GType extension_type; + GType interface_type; + gpointer extension_class; + const gchar **mime_types = NULL; + + extension_type = func_array[ii](); + extension_class = g_type_class_ref (extension_type); + + interface_type = E_TYPE_MAIL_FORMATTER_EXTENSION; + if (g_type_is_a (extension_type, interface_type)) + mime_types = ((EMailFormatterExtensionClass *) + extension_class)->mime_types; + + interface_type = E_TYPE_MAIL_PARSER_EXTENSION; + if (g_type_is_a (extension_type, interface_type)) + mime_types = ((EMailParserExtensionClass *) + extension_class)->mime_types; + + if (mime_types != NULL) + e_mail_extension_registry_add_extension ( + ereg, mime_types, extension_type); + else + g_critical ( + "%s does not define any MIME types", + g_type_name (extension_type)); + + g_type_class_unref (extension_class); + } +} + +void +e_mail_parser_internal_extensions_load (EMailExtensionRegistry *ereg) +{ + load (ereg, parser_funcs); +} + +void +e_mail_formatter_internal_extensions_load (EMailExtensionRegistry *ereg) +{ + load (ereg, formatter_funcs); +} + +void +e_mail_formatter_quote_internal_extensions_load (EMailExtensionRegistry *ereg) +{ + load (ereg, quote_formatter_funcs); +} + +void +e_mail_formatter_print_internal_extensions_load (EMailExtensionRegistry *ereg) +{ + load (ereg, print_formatter_funcs); +} |