Commit 56ec2281 authored by Michael Gratton's avatar Michael Gratton 🤞

Merge branch 'wip/260-s390x-test-failure' into 'master'

Re-apply previous fix for s390x/pcc62

Closes #260

See merge request !135

(cherry picked from commit 254b0111)

719b3a19 Re-apply previous fix for s390x/pcc62
parent 8a80283e
Pipeline #62142 failed with stages
in 8 minutes and 35 seconds
......@@ -87,7 +87,8 @@ public class GearyWebExtension : Object {
bool should_load = false;
WebKit.Frame frame = page.get_main_frame();
// Explicit cast fixes build on s390x/ppc64. Bug 783882
unowned JS.GlobalContext context = frame.get_javascript_global_context();
unowned JS.GlobalContext context = (JS.GlobalContext)
frame.get_javascript_global_context();
try {
unowned JS.Value ret = execute_script(
context, "geary.allowRemoteImages", int.parse("__LINE__")
......@@ -105,7 +106,8 @@ public class GearyWebExtension : Object {
private void remote_image_load_blocked(WebKit.WebPage page) {
WebKit.Frame frame = page.get_main_frame();
// Explicit cast fixes build on s390x/ppc64. Bug 783882
unowned JS.GlobalContext context = frame.get_javascript_global_context();
unowned JS.GlobalContext context = (JS.GlobalContext)
frame.get_javascript_global_context();
try {
execute_script(
context, "geary.remoteImageLoadBlocked();", int.parse("__LINE__")
......@@ -121,7 +123,8 @@ public class GearyWebExtension : Object {
private void selection_changed(WebKit.WebPage page) {
WebKit.Frame frame = page.get_main_frame();
// Explicit cast fixes build on s390x/ppc64. Bug 783882
unowned JS.GlobalContext context = frame.get_javascript_global_context();
unowned JS.GlobalContext context = (JS.GlobalContext)
frame.get_javascript_global_context();
try {
execute_script(
context, "geary.selectionChanged();", int.parse("__LINE__")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment