Midori Web Browser

Merge lp:~midori/midori/adblock-skips into lp:midori

  1. adblock-skips
  2. Merge into trunk
Proposed by Paweł Forysiuk
Status: Merged
Approved by: Cris Dywan
Approved revision: 6562
Merged at revision: 6562
Proposed branch: lp:~midori/midori/adblock-skips
Merge into: lp:midori
Diff against target: 18 lines (+8/-0)
1 file modified
extensions/adblock/extension.vala (+8/-0)
To merge this branch: bzr merge lp:~midori/midori/adblock-skips
Reviewer Review Type Date Requested Status
Cris Dywan Approve
Review via email: mp+207739@code.launchpad.net

Commit message

Don't bother adblocking internal pages and favicons

To post a comment you must log in.
lp:~midori/midori/adblock-skips updated
6562. By Paweł Forysiuk

Use Midori.URI.is_blank when checking for internal pages

Revision history for this message
Cris Dywan (kalikiana) wrote :

Nice. Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'extensions/adblock/extension.vala'
2--- extensions/adblock/extension.vala 2014-02-21 17:22:45 +0000
3+++ extensions/adblock/extension.vala 2014-02-22 14:36:17 +0000
4@@ -334,6 +334,14 @@
5 if (request_uri == page_uri)
6 return false;
7
8+ /* Skip adblock on internal pages */
9+ if (Midori.URI.is_blank (page_uri))
10+ return false;
11+
12+ /* Skip adblock on favicons and non http schemes */
13+ if (!Midori.URI.is_http (request_uri) || request_uri.has_suffix ("favicon.ico"))
14+ return false;
15+
16 Directive? directive = cache.lookup (request_uri);
17 if (directive == null) {
18 foreach (Subscription sub in config) {

Subscribers

People subscribed via source and target branches

to all changes: