From 42ba5dfd4b88bf2574d9edde60c7b57d87881ea5 Mon Sep 17 00:00:00 2001
From: Peter Penz <peter.penz19@gmail.com>
Date: Thu, 8 Jul 2010 19:46:56 +0000
Subject: Forward port of SVN commit 1147596: Skip redirection URLs when going
 back or forward in history (otherwise going back won't be possible for the
 user, as a redirection will occur again).

CCBUG: 212293

svn path=/trunk/KDE/kdebase/apps/; revision=1147597
---
 src/dolphinmainwindow.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/dolphinmainwindow.cpp')

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 4eef2fad5..f6f4e5eee 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -830,7 +830,15 @@ void DolphinMainWindow::replaceLocation()
 void DolphinMainWindow::goBack()
 {
     clearStatusBar();
-    m_activeViewContainer->urlNavigator()->goBack();
+    
+    KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
+    urlNavigator->goBack();
+    
+    if (urlNavigator->locationState().isEmpty()) {
+        // An empty location state indicates a redirection URL,
+        // which must be skipped too
+        urlNavigator->goBack();       
+    }
 }
 
 void DolphinMainWindow::goForward()
-- 
cgit v1.3