diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-05-12 11:06:57 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-05-12 11:06:57 +0200 |
| commit | cae8d69aedf1648f396de66bdee2590383a8b480 (patch) | |
| tree | 327c4ee9244e9ef35cf8f35cbae734acc240845a | |
| parent | Merge branch 'master' of gitorious.org:rekonq/mainline (diff) | |
| download | rekonq-cae8d69aedf1648f396de66bdee2590383a8b480.tar.xz | |
Fix UrlFilter Hangs
Cedric's patch
| -rw-r--r-- | src/filterurljob.cpp | 5 | ||||
| -rw-r--r-- | src/filterurljob.h | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/filterurljob.cpp b/src/filterurljob.cpp index bc6118d7..c887ac62 100644 --- a/src/filterurljob.cpp +++ b/src/filterurljob.cpp @@ -28,15 +28,14 @@ #include "filterurljob.h" // KDE Includes -#include <KUriFilter> #include <KUriFilterData> - FilterUrlJob::FilterUrlJob(WebView *view, const QString &urlString, QObject *parent) : Job(parent) , _view(view) , _urlString(urlString) { + uriFilter = KUriFilter::self(); } @@ -59,7 +58,7 @@ void FilterUrlJob::run() KUriFilterData data(_urlString); data.setCheckForExecutables(false); // if true, queries like "rekonq" or "dolphin" are considered as executables - if (KUriFilter::self()->filterUri(data) && data.uriType() != KUriFilterData::Error) + if (uriFilter->filterUri(data) && data.uriType() != KUriFilterData::Error) { QString tempUrlString = data.uri().url(); _url = KUrl(tempUrlString); diff --git a/src/filterurljob.h b/src/filterurljob.h index 6ab10695..c10c5e35 100644 --- a/src/filterurljob.h +++ b/src/filterurljob.h @@ -35,6 +35,7 @@ // KDE Includes #include <KUrl> +#include <KUriFilter> #include <ThreadWeaver/Job> // Qt Includes @@ -59,6 +60,8 @@ private: WebView *_view; QString _urlString; KUrl _url; + KUriFilter *uriFilter; + }; #endif // FILTER_URL_JOB_H |