summaryrefslogtreecommitdiff
path: root/src/filterurljob.cpp
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-04-13 03:01:42 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-04-13 03:06:34 +0200
commiteb52521b43669aab1c38ab9872a53386b776662d (patch)
tree32530d744d6126c1d4d201326d28f9d474ffe2e4 /src/filterurljob.cpp
parentURLBAR ANIMATION: implementation fix (diff)
downloadrekonq-eb52521b43669aab1c38ab9872a53386b776662d.tar.xz
This commit is (quite) last in the urlbar encodings fix series. It fixes:
BUG: 233159 BUG: 234168 Moreover it "cleans" road to fix (not yet, but we are near..) another bug CCBUG: 230771 at least from the rekonq side. Changes in there - cleaning and fixing filterurljob class (responsible for the encodings) - using urls instead of strings in the resolver class (work with right data..) - letting first box appearance without item selection and adding one signal to use the filterurljob class directly.
Diffstat (limited to 'src/filterurljob.cpp')
-rw-r--r--src/filterurljob.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/filterurljob.cpp b/src/filterurljob.cpp
index e74f8ec8..f94b7810 100644
--- a/src/filterurljob.cpp
+++ b/src/filterurljob.cpp
@@ -58,7 +58,12 @@ void FilterUrlJob::run()
// the beautiful KDE web browsing shortcuts
KUriFilterData data(_urlString);
data.setCheckForExecutables(false); // if true, queries like "rekonq" or "dolphin" are considered as executables
- _url = KUriFilter::self()->filterUri(data)
- ? data.uri().pathOrUrl()
- : QUrl::fromUserInput( _urlString );
+
+ if(KUriFilter::self()->filterUri(data) && data.uriType() != KUriFilterData::Error)
+ {
+ QString tempUrlString = data.uri().url();
+ _url = KUrl(tempUrlString);
+ }
+ else
+ _url = QUrl::fromUserInput( _urlString );
}