[evolution/gnome-3-24] Bug 781404 - Disable inline audio play in message preview

[Milan Crha <mcrha src gnome org>]

commit 0de6eff07a5c27615aa7c26ea5b1fd21454f37e4
Author: Milan Crha <mcrha redhat com>
Date:   Wed Apr 19 19:04:52 2017 +0200

    Bug 781404 - Disable inline audio play in message preview

 src/em-format/e-mail-formatter-audio.c |    3 ++-
 src/em-format/e-mail-formatter.c       |    4 +++-
 src/em-format/e-mail-parser-audio.c    |    3 +++
 src/em-format/e-mail-parser.c          |    4 +++-
 4 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/src/em-format/e-mail-formatter-audio.c b/src/em-format/e-mail-formatter-audio.c
index eaaf382..0f8d20c 100644
--- a/src/em-format/e-mail-formatter-audio.c
+++ b/src/em-format/e-mail-formatter-audio.c
@@ -25,7 +25,8 @@
 #include "e-mail-formatter.h"
 #include "e-mail-part-audio.h"
 
-#define d(x)
+/* This is currently disabled, because the WebKit player requires javascript,
+   which is disabled in Evolution. */
 
 typedef EMailFormatterExtension EMailFormatterAudio;
 typedef EMailFormatterExtensionClass EMailFormatterAudioClass;
diff --git a/src/em-format/e-mail-formatter.c b/src/em-format/e-mail-formatter.c
index fc48971..f0ea97e 100644
--- a/src/em-format/e-mail-formatter.c
+++ b/src/em-format/e-mail-formatter.c
@@ -545,7 +545,9 @@ e_mail_formatter_base_init (EMailFormatterClass *class)
 
        /* Register internal extensions. */
        g_type_ensure (e_mail_formatter_attachment_get_type ());
-       g_type_ensure (e_mail_formatter_audio_get_type ());
+       /* This is currently disabled, because the WebKit player requires javascript,
+          which is disabled in Evolution. */
+       /* g_type_ensure (e_mail_formatter_audio_get_type ()); */
        g_type_ensure (e_mail_formatter_error_get_type ());
        g_type_ensure (e_mail_formatter_headers_get_type ());
        g_type_ensure (e_mail_formatter_image_get_type ());
diff --git a/src/em-format/e-mail-parser-audio.c b/src/em-format/e-mail-parser-audio.c
index a29434a..afea7ca 100644
--- a/src/em-format/e-mail-parser-audio.c
+++ b/src/em-format/e-mail-parser-audio.c
@@ -26,6 +26,9 @@
 #include "e-mail-part-audio.h"
 #include "e-mail-part.h"
 
+/* This is currently disabled, because the WebKit player requires javascript,
+   which is disabled in Evolution. */
+
 typedef EMailParserExtension EMailParserAudio;
 typedef EMailParserExtensionClass EMailParserAudioClass;
 
diff --git a/src/em-format/e-mail-parser.c b/src/em-format/e-mail-parser.c
index 2ad5892..1cbbe32 100644
--- a/src/em-format/e-mail-parser.c
+++ b/src/em-format/e-mail-parser.c
@@ -218,7 +218,9 @@ e_mail_parser_base_init (EMailParserClass *class)
 
        /* Register internal extensions. */
        g_type_ensure (e_mail_parser_application_mbox_get_type ());
-       g_type_ensure (e_mail_parser_audio_get_type ());
+       /* This is currently disabled, because the WebKit player requires javascript,
+          which is disabled in Evolution. */
+       /* g_type_ensure (e_mail_parser_audio_get_type ()); */
        g_type_ensure (e_mail_parser_headers_get_type ());
        g_type_ensure (e_mail_parser_message_get_type ());
        g_type_ensure (e_mail_parser_secure_button_get_type ());