[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kfile
From:       Mark Gaiser <markg85 () gmail ! com>
Date:       2010-09-08 10:27:04
Message-ID: 20100908102704.AB27AAC857 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1172981 by markg:

Fix KUrlNavigator to send raw data (QString instead of KUrl) to KUriFilter.

BUG: 153347
FIXED-IN: 4.6


 M  +8 -9      kurlnavigator.cpp  


--- trunk/KDE/kdelibs/kfile/kurlnavigator.cpp #1172980:1172981
@@ -966,8 +966,15 @@
 
 KUrl KUrlNavigator::uncommittedUrl() const
 {
-    return KUrl(d->m_pathBox->currentText().trimmed());
+    KUriFilterData filteredData(d->m_pathBox->currentText().trimmed());
+    filteredData.setCheckForExecutables(false);
+    if (KUriFilter::self()->filterUri(filteredData, QStringList() << \
"kshorturifilter" << "kurisearchfilter")) { +        return filteredData.uri();
 }
+    else {
+        return KUrl(filteredData.typedString());
+    }
+}
 
 void KUrlNavigator::setLocationUrl(const KUrl& newUrl)
 {
@@ -978,14 +985,6 @@
     KUrl url = newUrl;
     url.cleanPath();
     
-    KUriFilterData urlData(url);
-    urlData.setCheckForExecutables(false);
-    if (KUriFilter::self()->filterUri(urlData, QStringList() << "kshorturifilter" << \
                "kurisearchfilter")) {
-        url = urlData.uri();
-    } else {
-        url = KUrlCompletion::replacedPath(url.url(), true, true);
-    }
-    
     if ((url.protocol() == QLatin1String("tar")) || (url.protocol() == \
QLatin1String("zip"))) {  // The URL represents a tar- or zip-file. Check whether
         // the URL is really part of the tar- or zip-file, otherwise


[prev in list] [next in list] [prev in thread] [next in thread]