Normally reload error pages with WebKitGTK+ 1.1.14

For older versions we used a workaround for reloading
special pages like error pages. This is not needed
with recent versions of WebKitGTK+.

diff --git a/midori/midori-view.c b/midori/midori-view.c
index b6883bcb47fbcf035fe4ef6f4009a4f7baa0bc25..28f770f73a8df0bd9ea8293a70d6d6dff14e6afe 100644 (file)
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -4398,7 +4398,9 @@ midori_view_reload (MidoriView* 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,
        so reloading via Javascript works but not via API calls. */
     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 */
     title = g_strdup_printf (_("Error - %s"), view->uri);
 #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);
     else if (!(view->uri && *view->uri && strncmp (view->uri, "about:", 6)))
     {