nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'mjog/webkit_plugin_warning' into 'mainline'

Browse source 
Components.WebView: Fix CI failure building with WebKitGTK >= 2.31

See merge request GNOME/geary!624
This commit is contained in:
Michael Gratton 2021-01-14 11:28:00 +00:00
commit 17da8cea2d
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/client/components/components-web-view.vala
View file

@ -325,7 +325,9 @@ public abstract class Components.WebView : WebKit.WebView, Geary.BaseInterface {
setts.enable_media_stream = false;
setts.enable_offline_web_application_cache = false;
setts.enable_page_cache = false;
#if WEBKIT_PLUGINS_SUPPORTED
setts.enable_plugins = false;
#endif
setts.hardware_acceleration_policy =
WebKit.HardwareAccelerationPolicy.NEVER;
setts.javascript_can_access_clipboard = true;

4
src/client/meson.build
View file

@ -192,6 +192,10 @@ client_vala_args += [
)
]
if webkit2gtk.version().version_compare('<2.31')
client_vala_args += [ '--define=WEBKIT_PLUGINS_SUPPORTED' ]
endif
# Main client application library
client_lib = shared_library(
client_package,