From 5916815daf238e1aa7539c8e9f878089296b5544 Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Sat, 9 May 2009 22:45:21 +0200 Subject: [PATCH] Work around broken reloading of "alternate content" --- midori/midori-view.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/midori/midori-view.c b/midori/midori-view.c index 5d52cfff..8a67ee9c 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -2753,9 +2753,15 @@ midori_view_reload (MidoriView* view, g_return_if_fail (MIDORI_IS_VIEW (view)); +#if WEBKIT_CHECK_VERSION (1, 1, 6) + /* WebKit 1.1.6 doesn't handle "alternate content" flawlessly, + so reloading via Javascript works but not via API calls. */ + title = g_strdup (_("Error")); +#else /* Error pages are special, we want to try loading the destination again, not the error page which isn't even a proper page */ title = g_strdup_printf (_("Not found - %s"), view->uri); +#endif if (view->title && strstr (title, view->title)) webkit_web_view_open (WEBKIT_WEB_VIEW (view->web_view), view->uri); else if (from_cache)