diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2012-12-07 05:40:13 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2012-12-08 03:01:05 +0800 |
| commit | 54455ca1ad6cae527544fed12d0de4ae95341082 (patch) | |
| tree | b223d428459e3be79d1162d8217be6c2856f643b /em-format/e-mail-formatter-secure-button.c | |
| parent | 9d34f72ec1b99d58ee1c3a6d1a964a6dde166f79 (diff) | |
| download | gsoc2013-evolution-54455ca1ad6cae527544fed12d0de4ae95341082.tar.gz gsoc2013-evolution-54455ca1ad6cae527544fed12d0de4ae95341082.tar.zst gsoc2013-evolution-54455ca1ad6cae527544fed12d0de4ae95341082.zip | |
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.
Diffstat (limited to 'em-format/e-mail-formatter-secure-button.c')
| -rw-r--r-- | em-format/e-mail-formatter-secure-button.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/em-format/e-mail-formatter-secure-button.c b/em-format/e-mail-formatter-secure-button.c index 6c41467c7c..b31c6fb819 100644 --- a/em-format/e-mail-formatter-secure-button.c +++ b/em-format/e-mail-formatter-secure-button.c @@ -43,7 +43,6 @@ typedef struct _EMailFormatterSecureButtonClass { } EMailFormatterSecureButtonClass; static void e_mail_formatter_formatter_extension_interface_init (EMailFormatterExtensionInterface *iface); -static void e_mail_formatter_mail_extension_interface_init (EMailExtensionInterface *iface); G_DEFINE_TYPE_EXTENDED ( EMailFormatterSecureButton, @@ -51,9 +50,6 @@ G_DEFINE_TYPE_EXTENDED ( G_TYPE_OBJECT, 0, G_IMPLEMENT_INTERFACE ( - E_TYPE_MAIL_EXTENSION, - e_mail_formatter_mail_extension_interface_init) - G_IMPLEMENT_INTERFACE ( E_TYPE_MAIL_FORMATTER_EXTENSION, e_mail_formatter_formatter_extension_interface_init)); @@ -494,6 +490,7 @@ e_mail_formatter_secure_button_class_init (EMailFormatterSecureButtonClass *clas static void e_mail_formatter_formatter_extension_interface_init (EMailFormatterExtensionInterface *iface) { + iface->mime_types = formatter_mime_types; iface->format = emfe_secure_button_format; iface->get_widget = emfe_secure_button_get_widget; iface->get_display_name = emfe_secure_button_get_display_name; @@ -501,12 +498,6 @@ e_mail_formatter_formatter_extension_interface_init (EMailFormatterExtensionInte } static void -e_mail_formatter_mail_extension_interface_init (EMailExtensionInterface *iface) -{ - iface->mime_types = formatter_mime_types; -} - -static void e_mail_formatter_secure_button_init (EMailFormatterSecureButton *extension) { |