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

Normally reload error pages with WebKitGTK+ 1.1.14

Browse source 
For older versions we used a workaround for reloading
special pages like error pages. This is not needed
with recent versions of WebKitGTK+.
This commit is contained in:
Christian Dywan 2010-03-13 15:07:02 +01:00
parent 597dde083b
commit c7ee74610e
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
midori/midori-view.c
View file

@ -4398,7 +4398,9 @@ 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) #if WEBKIT_CHECK_VERSION (1, 1, 14)
title = NULL;
#elif WEBKIT_CHECK_VERSION (1, 1, 6)
/* WebKit 1.1.6 doesn't handle "alternate content" flawlessly, /* WebKit 1.1.6 doesn't handle "alternate content" flawlessly,
so reloading via Javascript works but not via API calls. */ so reloading via Javascript works but not via API calls. */
title = g_strdup_printf (_("Error - %s"), view->uri); title = g_strdup_printf (_("Error - %s"), view->uri);
@ -4407,7 +4409,7 @@ midori_view_reload (MidoriView* view,
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 (_("Error - %s"), view->uri); title = g_strdup_printf (_("Error - %s"), view->uri);
#endif #endif
if (view->title && strstr (title, view->title)) if (view->title && 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 (!(view->uri && *view->uri && strncmp (view->uri, "about:", 6))) else if (!(view->uri && *view->uri && strncmp (view->uri, "about:", 6)))
{ {