diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-08-23 00:05:18 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-08-23 00:05:18 +0200 |
| commit | a0fe09d63b05d7198ebe013f1d6be9097a0acf65 (patch) | |
| tree | 2c7907ef79d4f07b0aa26b206ffd8d0bbf9e5eaa /src/adblock/adblockmanager.cpp | |
| parent | Merge commit 'refs/merge-requests/185' of git://gitorious.org/rekonq/mainline... (diff) | |
| parent | Add support for domain option in the ad block module (diff) | |
| download | rekonq-a0fe09d63b05d7198ebe013f1d6be9097a0acf65.tar.xz | |
Merge commit 'refs/merge-requests/186' of git://gitorious.org/rekonq/mainline into m186
Diffstat (limited to 'src/adblock/adblockmanager.cpp')
| -rw-r--r-- | src/adblock/adblockmanager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp index 8deb0bcd..f7c61cdb 100644 --- a/src/adblock/adblockmanager.cpp +++ b/src/adblock/adblockmanager.cpp @@ -187,7 +187,7 @@ QNetworkReply *AdBlockManager::block(const QNetworkRequest &request, WebPage *pa foreach(const AdBlockRule &filter, _whiteList) { - if (filter.match(urlString, urlStringLowerCase)) + if (filter.match(request, urlString, urlStringLowerCase)) { kDebug() << "****ADBLOCK: WHITE RULE (@@) Matched: ***********"; kDebug() << "UrlString: " << urlString; @@ -205,7 +205,7 @@ QNetworkReply *AdBlockManager::block(const QNetworkRequest &request, WebPage *pa foreach(const AdBlockRule &filter, _blackList) { - if (filter.match(urlString, urlStringLowerCase)) + if (filter.match(request, urlString, urlStringLowerCase)) { kDebug() << "****ADBLOCK: BLACK RULE Matched: ***********"; kDebug() << "UrlString: " << urlString; @@ -215,7 +215,7 @@ QNetworkReply *AdBlockManager::block(const QNetworkRequest &request, WebPage *pa foreach(QWebElement el, elements) { const QString srcAttribute = el.attribute("src"); - if (filter.match(srcAttribute, srcAttribute.toLower())) + if (filter.match(request, srcAttribute, srcAttribute.toLower())) { kDebug() << "MATCHES ATTRIBUTE!!!!!"; el.setStyleProperty(QL1S("visibility"), QL1S("hidden")); |