[geary/geary-0.13] Merge branch 'wip/260-s390x-test-failure' into 'master'

[Michael Gratton <mjog src gnome org>]

commit 56ec22818f662a031a8944c24ad53f1a73dba454
Author: Michael Gratton <mike vee net>
Date:   Sun Feb 24 04:48:47 2019 +0000

    Merge branch 'wip/260-s390x-test-failure' into 'master'
    
    Re-apply previous fix for s390x/pcc62
    
    Closes #260
    
    See merge request GNOME/geary!135
    
    (cherry picked from commit 254b01115e9cc135c1f4433630a3c2b27e40669f)
    
    719b3a19 Re-apply previous fix for s390x/pcc62

 src/client/web-process/web-process-extension.vala | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/src/client/web-process/web-process-extension.vala 
b/src/client/web-process/web-process-extension.vala
index 1f478a6c..ac7723d7 100644
--- a/src/client/web-process/web-process-extension.vala
+++ b/src/client/web-process/web-process-extension.vala
@@ -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__")