From 2209fd6d98f7ecd40c093030c40c22491f2a9383 Mon Sep 17 00:00:00 2001
From: Peter Penz <peter.penz19@gmail.com>
Date: Fri, 25 Jan 2008 18:28:50 +0000
Subject: Backport for #156586: don't try changing the directory within the
 terminal on non-local URLs

svn path=/branches/KDE/4.0/kdebase/apps/; revision=766395
---
 src/terminalsidebarpage.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/terminalsidebarpage.cpp')

diff --git a/src/terminalsidebarpage.cpp b/src/terminalsidebarpage.cpp
index 4a82599f0..4749e7714 100644
--- a/src/terminalsidebarpage.cpp
+++ b/src/terminalsidebarpage.cpp
@@ -50,11 +50,13 @@ QSize TerminalSidebarPage::sizeHint() const
 
 void TerminalSidebarPage::setUrl(const KUrl& url)
 {
-    if (!SidebarPage::url().equals(url, KUrl::CompareWithoutTrailingSlash)) {
-        SidebarPage::setUrl(url);
-        if ((m_terminal != 0) && isVisible()) {
-            m_terminal->sendInput("cd " + KShell::quoteArg(url.path()) + '\n');
-        }
+    if (!url.isValid() || (url == SidebarPage::url())) {
+        return;
+    }
+
+    SidebarPage::setUrl(url);
+    if ((m_terminal != 0) && isVisible() && url.isLocalFile()) {
+        m_terminal->sendInput("cd " + KShell::quoteArg(url.path()) + '\n');
     }
 }
 
-- 
cgit v1.3