diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2012-12-07 01:57:33 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2012-12-08 03:01:04 +0800 |
| commit | 9d34f72ec1b99d58ee1c3a6d1a964a6dde166f79 (patch) | |
| tree | 8849353e617afe5207095fb6100a33e79989c9bc /modules/audio-inline/e-mail-formatter-audio-inline.c | |
| parent | 3924dc759dbf38df0f9ff6941990dcf242478617 (diff) | |
| download | gsoc2013-evolution-9d34f72ec1b99d58ee1c3a6d1a964a6dde166f79.tar.gz gsoc2013-evolution-9d34f72ec1b99d58ee1c3a6d1a964a6dde166f79.tar.zst gsoc2013-evolution-9d34f72ec1b99d58ee1c3a6d1a964a6dde166f79.zip | |
EMailExtension: Replace mime_types() method with a string array.
In all implementations for EMailExtension, the MIME type list is a
static string array -- with the single exception of the text-highlight
module, where the MIME type list is dynamically assembled once.
Replace the mime_types() method with a "mime_types" string array in the
EMailExtensionInterface struct. Then the list of MIME types supported
by the class implementing the EMailExtensionInterface can be obtained
without requiring an instance of the class.
Diffstat (limited to 'modules/audio-inline/e-mail-formatter-audio-inline.c')
| -rw-r--r-- | modules/audio-inline/e-mail-formatter-audio-inline.c | 44 |
1 files changed, 25 insertions, 19 deletions
diff --git a/modules/audio-inline/e-mail-formatter-audio-inline.c b/modules/audio-inline/e-mail-formatter-audio-inline.c index 76c70eb5cc..51d250067f 100644 --- a/modules/audio-inline/e-mail-formatter-audio-inline.c +++ b/modules/audio-inline/e-mail-formatter-audio-inline.c @@ -62,18 +62,30 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED ( E_TYPE_MAIL_FORMATTER_EXTENSION, e_mail_formatter_formatter_extension_interface_init)); -static const gchar * formatter_mime_types[] = { "application/vnd.evolution.widget.audio-inline", - "audio/ac3", "audio/x-ac3", - "audio/basic", "audio/mpeg", - "audio/x-mpeg", "audio/mpeg3", - "audio/x-mpeg3", "audio/mp3", - "audio/x-mp3", "audio/mp4", - "audio/flac", "audio/x-flac", - "audio/mod", "audio/x-mod", - "audio/x-wav", "audio/microsoft-wav", - "audio/x-wma", "audio/x-ms-wma", - "application/ogg", "application/x-ogg", - NULL }; +static const gchar *formatter_mime_types[] = { + "application/vnd.evolution.widget.audio-inline", + "audio/ac3", + "audio/x-ac3", + "audio/basic", + "audio/mpeg", + "audio/x-mpeg", + "audio/mpeg3", + "audio/x-mpeg3", + "audio/mp3", + "audio/x-mp3", + "audio/mp4", + "audio/flac", + "audio/x-flac", + "audio/mod", + "audio/x-mod", + "audio/x-wav", + "audio/microsoft-wav", + "audio/x-wma", + "audio/x-ms-wma", + "application/ogg", + "application/x-ogg", + NULL +}; static void pause_clicked (GtkWidget *button, @@ -316,12 +328,6 @@ emfe_audio_inline_get_description (EMailFormatterExtension *extension) return _("Play the attachment in embedded audio player"); } -static const gchar ** -emfe_audio_inline_mime_types (EMailExtension *extension) -{ - return formatter_mime_types; -} - static void e_mail_formatter_audio_inline_constructed (GObject *object) { @@ -359,7 +365,7 @@ e_mail_formatter_formatter_extension_interface_init (EMailFormatterExtensionInte static void e_mail_formatter_mail_extension_interface_init (EMailExtensionInterface *iface) { - iface->mime_types = emfe_audio_inline_mime_types; + iface->mime_types = formatter_mime_types; } static void |