Implement bypassing cache when reloading with Shift

diff --git a/midori/compat.h b/midori/compat.h
index 74dd0beed6360630c180b1ec1693890c6d92893a..261a2a7ae3d709be4733a604421c4634368835b5 100644 (file)
--- a/midori/compat.h
+++ b/midori/compat.h
@@ -73,6 +73,10 @@ webkit_web_view_zoom_out               (WebKitWebView*     web_view);
 
 #endif
 
+#if !WEBKIT_CHECK_VERSION (1, 1, 1)
+    #define webkit_web_view_reload_bypass_cache webkit_web_view_reload
+#endif
+
 G_END_DECLS
 
 #endif /* __COMPAT_H__ */

diff --git a/midori/midori-view.c b/midori/midori-view.c
index ee05743c35262842072302265d045415f7f67648..a610d5992df5cf7293b6614d3f809b567bc27db7 100644 (file)
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -2347,7 +2347,10 @@ midori_view_reload (MidoriView* view,
 {
     g_return_if_fail (MIDORI_IS_VIEW (view));
 
-    webkit_web_view_reload (WEBKIT_WEB_VIEW (view->web_view));
+    if (from_cache)
+        webkit_web_view_reload (WEBKIT_WEB_VIEW (view->web_view));
+    else
+        webkit_web_view_reload_bypass_cache (WEBKIT_WEB_VIEW (view->web_view));
 }
 
 /**