From 54455ca1ad6cae527544fed12d0de4ae95341082 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 6 Dec 2012 16:40:13 -0500 Subject: Remove EMailExtension. EMailExtension is now too trivial to keep as a standalone interface. Add a 'mime_types' string array to the EMailFormatterExtension and EMailFormatterParser interface structs. Alter e_mail_extension_registry_add_extension() to take a 'mime_types' string array and the GType of an extension to instantiate, rather than the extension instance directly. e_mail_extension_registry_remove_extension() is no longer needed. --- em-format/e-mail-parser-secure-button.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'em-format/e-mail-parser-secure-button.c') diff --git a/em-format/e-mail-parser-secure-button.c b/em-format/e-mail-parser-secure-button.c index 4f49dd99a0..ca38021388 100644 --- a/em-format/e-mail-parser-secure-button.c +++ b/em-format/e-mail-parser-secure-button.c @@ -38,16 +38,12 @@ typedef struct _EMailParserSecureButtonClass { } EMailParserSecureButtonClass; static void e_mail_parser_parser_extension_interface_init (EMailParserExtensionInterface *iface); -static void e_mail_parser_mail_extension_interface_init (EMailExtensionInterface *iface); G_DEFINE_TYPE_EXTENDED ( EMailParserSecureButton, e_mail_parser_secure_button, G_TYPE_OBJECT, 0, - G_IMPLEMENT_INTERFACE ( - E_TYPE_MAIL_EXTENSION, - e_mail_parser_mail_extension_interface_init) G_IMPLEMENT_INTERFACE ( E_TYPE_MAIL_PARSER_EXTENSION, e_mail_parser_parser_extension_interface_init)) @@ -86,14 +82,9 @@ e_mail_parser_secure_button_class_init (EMailParserSecureButtonClass *class) static void e_mail_parser_parser_extension_interface_init (EMailParserExtensionInterface *iface) -{ - iface->parse = empe_secure_button_parse; -} - -static void -e_mail_parser_mail_extension_interface_init (EMailExtensionInterface *iface) { iface->mime_types = parser_mime_types; + iface->parse = empe_secure_button_parse; } static void -- cgit v1.2.3