[geary/cherry-pick-84c54960] Merge branch 'wip/disable-js' into 'mainline'

[Michael Gratton <mjog src gnome org>]

commit 0cb33c7d91cdaf6a74cb8b15c1f3e8fe952966bb
Author: Michael Gratton <mike vee net>
Date:   Wed Sep 25 11:57:59 2019 +0000

    Merge branch 'wip/disable-js' into 'mainline'
    
    Explicitly disable parsing JavaScript markup in email bodies
    
    Closes #78
    
    See merge request GNOME/geary!303
    
    (cherry picked from commit 84c549606035d9eaae352c1b05b264510c22ff72)
    
    597e6d7d Explicitly disable parsing JavaScript markup in email bodies

 meson.build                                | 2 +-
 src/client/components/client-web-view.vala | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/meson.build b/meson.build
index 6ecfbfe0..00013e84 100644
--- a/meson.build
+++ b/meson.build
@@ -61,7 +61,7 @@ add_project_arguments([
 
 target_glib = '2.54' # Also passed to valac, so don't include a point rev
 target_gtk = '3.24.7'
-target_webkit = '2.20'
+target_webkit = '2.24'
 
 # Primary deps
 glib = dependency('glib-2.0', version: '>=' + target_glib)
diff --git a/src/client/components/client-web-view.vala b/src/client/components/client-web-view.vala
index 98d7bff7..950c8f2b 100644
--- a/src/client/components/client-web-view.vala
+++ b/src/client/components/client-web-view.vala
@@ -307,6 +307,7 @@ public abstract class ClientWebView : WebKit.WebView, Geary.BaseInterface {
         setts.enable_html5_local_storage = false;
         setts.enable_java = false;
         setts.enable_javascript = true;
+        setts.enable_javascript_markup = false;
         setts.enable_media_stream = false;
         setts.enable_offline_web_application_cache = false;
         setts.enable_page_cache = false;