Midori Web Browser

Merge lp:~gue5t/midori/unbreak-local-pages into lp:midori

  1. unbreak-local-pages
  2. Merge into trunk
Proposed by gue5t gue5t
Status: Merged
Approved by: Cris Dywan
Approved revision: 6581
Merged at revision: 6581
Proposed branch: lp:~gue5t/midori/unbreak-local-pages
Merge into: lp:midori
Diff against target: 12 lines (+1/-1)
1 file modified
extensions/open-with.vala (+1/-1)
To merge this branch: bzr merge lp:~gue5t/midori/unbreak-local-pages
Reviewer Review Type Date Requested Status
Cris Dywan Approve
Review via email: mp+208989@code.launchpad.net

Commit message

Fix loading file:// pages

Description of the change

This treats file:// pages the same way as http:// and https:// pages in the open-with extension, so they can be accessed without specifying an application.

To post a comment you must log in.
Revision history for this message
Cris Dywan (kalikiana) wrote :

Makes sense, and seems to work right. Thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'extensions/open-with.vala'
2--- extensions/open-with.vala 2014-02-25 19:26:47 +0000
3+++ extensions/open-with.vala 2014-03-03 02:55:48 +0000
4@@ -601,7 +601,7 @@
5 WebKit.WebNavigationAction action, WebKit.WebPolicyDecision decision) {
6
7 string uri = request.uri;
8- if (Midori.URI.is_http (uri) || Midori.URI.is_blank (uri))
9+ if (uri.has_prefix ("file://") || Midori.URI.is_http (uri) || Midori.URI.is_blank (uri))
10 return false;
11
12 decision.ignore ();

Subscribers

People subscribed via source and target branches

to all changes: