From 7708e9021437690edae888c34c5128ef2ce79e35 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 4 Mar 2009 23:23:23 +0100 Subject: [PATCH] Implement bypassing cache when reloading with Shift --- midori/compat.h | 4 ++++ midori/midori-view.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/midori/compat.h b/midori/compat.h index 74dd0bee..261a2a7a 100644 --- 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 ee05743c..a610d599 100644 --- 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)); } /**