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

[Paweł Forysiuk]

Don't bother adblocking internal pages and favicons

[lp:~midori/midori/adblock-skips]

6562. By Paweł Forysiuk on 2014-02-22

Use Midori.URI.is_blank when checking for internal pages

[Cris Dywan (kalikiana)]

Nice. Thanks!

review: Approve

=== modified file 'extensions/adblock/extension.vala'
--- extensions/adblock/extension.vala	2014-02-21 17:22:45 +0000
+++ extensions/adblock/extension.vala	2014-02-22 14:36:17 +0000
@@ -334,6 +334,14 @@
             if (request_uri == page_uri)
                 return false;
 
+            /* Skip adblock on internal pages */
+            if (Midori.URI.is_blank (page_uri))
+                return false;
+
+            /* Skip adblock on favicons and non http schemes */
+            if (!Midori.URI.is_http (request_uri) || request_uri.has_suffix ("favicon.ico"))
+                return false;
+
             Directive? directive = cache.lookup (request_uri);
             if (directive == null) {
                 foreach (Subscription sub in config) {