X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/47d31139224f9bfded4626803626a58afe3eb748..4ba9eb8ea34baee7e5e100a0d3c33f23f75cf708:/src/dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index b9134d91c..9d33329e5 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -21,7 +21,6 @@
 #include <kprotocolmanager.h>
 
 #include <QtGui/QApplication>
-#include <QtGui/QClipboard>
 #include <QtGui/QKeyEvent>
 #include <QtGui/QItemSelection>
 #include <QtGui/QBoxLayout>
@@ -280,7 +279,7 @@ void DolphinViewContainer::updateStatusBar()
 void DolphinViewContainer::initializeProgress()
 {
     if (url().protocol() == "nepomuksearch") {
-        // The Nepomuk IO-slave does not provide any progress information. Give
+        // The Nepomuk IO-slave does not provide progress information right away. Give
         // an immediate hint to the user that a searching is done:
         m_statusBar->setProgressText(i18nc("@info", "Searching..."));
         m_statusBar->setProgress(-1);
@@ -434,7 +433,13 @@ void DolphinViewContainer::redirect(const KUrl& oldUrl, const KUrl& newUrl)
     Q_UNUSED(oldUrl);
     const bool block = m_urlNavigator->signalsBlocked();
     m_urlNavigator->blockSignals(true);
+
+    // Assure that the location state is reset for redirection URLs. This
+    // allows to skip redirection URLs when going back or forward in the
+    // URL history.
+    m_urlNavigator->saveLocationState(QByteArray());
     m_urlNavigator->setLocationUrl(newUrl);
+
     m_urlNavigator->blockSignals(block);
 }