Fix a pointer truncation bug on 64-bit where C compiler assumed int return type

2 files changed, 11 insertions, 3 deletions

diff --git a/midori/midori-view.h b/midori/midori-view.h
index c885100b..1cc5e8c3 100644
--- a/midori/midori-view.h
+++ b/midori/midori-view.h
@@ -259,6 +259,10 @@ midori_view_get_tls_info               (MidoriView*        view,
                                         GTlsCertificateFlags* tls_flags,
                                         gchar**               hostname);
 
+MidoriContextAction*
+midori_view_get_page_context_action (MidoriView*          view,
+                                     WebKitHitTestResult* hit_test_result);
+
 G_END_DECLS
 
 #endif /* __MIDORI_VIEW_H__ */
diff --git a/tests/actions.vala b/tests/actions.vala
index b44c891c..90ae8f62 100644
--- a/tests/actions.vala
+++ b/tests/actions.vala
@@ -20,13 +20,17 @@ void actions_view_page () {
 
     var hit_test_result = Object.new (typeof (WebKit.HitTestResult), "context", WebKit.HitTestResultContext.DOCUMENT) as WebKit.HitTestResult;
     var menu = view.get_page_context_action (hit_test_result);
+    assert (menu != null);
     assert (menu.name == "PageContextMenu");
     assert (menu.get_by_name ("Back") != null);
 
 #if !HAVE_WEBKIT2
-    hit_test_result = Object.new (typeof (WebKit.HitTestResult), "context", WebKit.HitTestResultContext.EDITABLE) as WebKit.HitTestResult;
-    menu = view.get_page_context_action (hit_test_result);
-    var copy = menu.get_by_name ("Copy");
+    var hit_test_result2 = Object.new (typeof (WebKit.HitTestResult), "context", WebKit.HitTestResultContext.EDITABLE) as WebKit.HitTestResult;
+    var menu2 = view.get_page_context_action (hit_test_result2);
+    assert (menu2 != null);
+    assert (menu2.name == "PageContextMenu");
+    var copy = menu2.get_by_name ("Copy");
+    assert (copy != null);
     assert (!copy.sensitive);
     assert (view.web_view.search_text ("flat", true, false, false));
     menu = view.get_page_context_action (hit_test_result);