Handle redirections (e.g. from fish://localhost) without breaking the column view -- thanks Peter for the advice on how to separate the two cleanly.

svn path=/trunk/KDE/kdebase/apps/; revision=813954

1 files changed, 8 insertions, 0 deletions

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 296e101d6..46867dbad 100644
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -100,6 +100,8 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL
             this, SLOT(slotRequestItemInfo(KFileItem)));
     connect(m_view, SIGNAL(urlChanged(KUrl)),
             this, SLOT(slotUrlChanged(KUrl)));
+    connect(m_view, SIGNAL(requestUrlChange(KUrl)),
+            this, SLOT(slotRequestUrlChange(KUrl)));
     connect(m_view, SIGNAL(modeChanged()),
             this, SIGNAL(viewModeChanged())); // relay signal
 
@@ -357,6 +359,12 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&)
 
 void DolphinPart::slotUrlChanged(const KUrl& url)
 {
+    QString prettyUrl = url.pathOrUrl();
+    emit m_extension->setLocationBarUrl(prettyUrl);
+}
+
+void DolphinPart::slotRequestUrlChange(const KUrl& url)
+{
     if (m_view->url() != url) {
         // If the view URL is not equal to 'url', then an inner URL change has
         // been done (e. g. by activating an existing column in the column view).