Merge lp:~midori/midori/adblock_openwith into lp:midori

[Paweł Forysiuk]

Skip open-with codepath with abp links, they are internal

[lp:~midori/midori/adblock_openwith]

6998. By Paweł Forysiuk <email address hidden> on 2015-07-15

Fix typo and styling issue

6999. By Paweł Forysiuk <email address hidden> on 2015-07-18

Reword a comment a bit, re-adjust code style once more

[Cris Dywan (kalikiana)]

Makes sense, if a little bit awkward. I don't think we can do much better without investigating a new API.

review: Approve

=== modified file 'extensions/open-with.vala'
--- extensions/open-with.vala	2015-06-12 21:03:40 +0000
+++ extensions/open-with.vala	2015-07-18 05:56:22 +0000
@@ -627,9 +627,14 @@
         }
 
         bool navigation_requested (Midori.Tab tab, string uri) {
+	    /* FIXME: Make this a list of known/internal uris to pass-thru */
             if (uri.has_prefix ("file://") || Midori.URI.is_http (uri) || Midori.URI.is_blank (uri))
                 return false;
 
+            /* Don't find app for abp links, we should handle them internally */
+            if (uri.has_prefix("abp:"))
+                return true;
+
             string content_type = get_content_type (uri, null);
             open_with_type (uri, content_type, tab, NextStep.TRY_OPEN);
             return true;