debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Work around broken reloading of "alternate content"

Browse source
This commit is contained in:
Alexander Butenko 2009-05-09 22:45:21 +02:00 committed by Christian Dywan
parent 79e278bea8
commit 5916815daf
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
midori/midori-view.c
View file

@ -2753,9 +2753,15 @@ midori_view_reload (MidoriView* view,
g_return_if_fail (MIDORI_IS_VIEW (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 /* Error pages are special, we want to try loading the destination
again, not the error page which isn't even a proper page */ again, not the error page which isn't even a proper page */
title = g_strdup_printf (_("Not found - %s"), view->uri); title = g_strdup_printf (_("Not found - %s"), view->uri);
#endif
if (view->title && strstr (title, view->title)) if (view->title && strstr (title, view->title))
webkit_web_view_open (WEBKIT_WEB_VIEW (view->web_view), view->uri); webkit_web_view_open (WEBKIT_WEB_VIEW (view->web_view), view->uri);
else if (from_cache) else if (from_cache)