summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-01-16 01:42:08 +0100
committerAndrea Diamantini <adjam7@gmail.com>2010-01-16 01:42:08 +0100
commitdd73e53d49e2ac064de7dcb2d14f0435f2ff6b68 (patch)
treef6078135e6d221079a6f6df0edf10ffe086085b4 /src
parentMerge branch 'AdFixes' (diff)
downloadrekonq-dd73e53d49e2ac064de7dcb2d14f0435f2ff6b68.tar.xz
upgrading RULES files and applying loadUrl fix: "double quotes
replaced with encoded chars" Courtesy patch of Andrea Scarpino. Thanks and Welcome! CCMAIL:andrea@archlinux.org
Diffstat (limited to 'src')
-rw-r--r--src/adblock/tests/RULES4
-rw-r--r--src/application.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/adblock/tests/RULES b/src/adblock/tests/RULES
index ee8485a6..8dfdf8fa 100644
--- a/src/adblock/tests/RULES
+++ b/src/adblock/tests/RULES
@@ -10,10 +10,10 @@ adv
@@advice
!
! Block every google site :)
-|http://google*
+||http://google*
!
! Block every pdf file!
-*pdf|
+*pdf||
!
! Block every div of the class "advise"
##div.advise \ No newline at end of file
diff --git a/src/application.cpp b/src/application.cpp
index e83a59bb..e06f6f15 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -309,7 +309,7 @@ void Application::loadUrl(const KUrl& url, const Rekonq::OpenType& type)
// the beautiful KDE web browsing shortcuts
KUriFilterData data(loadingUrl.pathOrUrl());
data.setCheckForExecutables(false); // if true, queries like "rekonq" or "dolphin" are considered as executables
- loadingUrl = KUriFilter::self()->filterUri(data) ? data.uri().url() : QUrl::fromUserInput(loadingUrl.pathOrUrl());
+ loadingUrl = KUriFilter::self()->filterUri(data) ? data.uri().pathOrUrl() : QUrl::fromUserInput(loadingUrl.pathOrUrl());
// we are sure of the url now, let's add it to history
// anyway we store here just http sites because local and ftp ones are
@@ -370,4 +370,4 @@ AdBlockManager *Application::adblockManager()
}
return s_adblockManager;
}
- \ No newline at end of file
+