Midori Web Browser

Merge lp:~kalikiana/midori/complurls into lp:midori

  1. complurls
  2. Merge into trunk
Proposed by Cris Dywan
Status: Merged
Approved by: André Stösel
Approved revision: 6327
Merged at revision: 6350
Proposed branch: lp:~kalikiana/midori/complurls
Merge into: lp:midori
Diff against target: 43 lines (+4/-4)
2 files modified
midori/midori-searchcompletion.vala (+2/-2)
midori/midori-viewcompletion.vala (+2/-2)
To merge this branch: bzr merge lp:~kalikiana/midori/complurls
Reviewer Review Type Date Requested Status
André Stösel Approve
Review via email: mp+179305@code.launchpad.net

Commit message

Rename internal completion URLs to avoid confusion

To post a comment you must log in.
Revision history for this message
André Stösel (ivaldi) wrote :

Finally about:search isn't so confusing anymore :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'midori/midori-searchcompletion.vala'
2--- midori/midori-searchcompletion.vala 2013-06-25 17:13:34 +0000
3+++ midori/midori-searchcompletion.vala 2013-08-08 23:32:51 +0000
4@@ -29,7 +29,7 @@
5 }
6
7 public override bool can_action (string action) {
8- return action == "about:search";
9+ return action == "complete:more/search";
10 }
11
12 public override async List<Suggestion>? complete (string text, string? action, Cancellable cancellable) {
13@@ -54,7 +54,7 @@
14
15 n++;
16 if (n == 3 && action == null) {
17- suggestion = new Suggestion ("about:search", _("Search with…"), false, background);
18+ suggestion = new Suggestion ("complete:more/search", _("Search with…"), false, background);
19 suggestion.action = true;
20 suggestions.append (suggestion);
21 break;
22
23=== modified file 'midori/midori-viewcompletion.vala'
24--- midori/midori-viewcompletion.vala 2013-06-25 18:09:24 +0000
25+++ midori/midori-viewcompletion.vala 2013-08-08 23:32:51 +0000
26@@ -28,7 +28,7 @@
27 }
28
29 public override bool can_action (string action) {
30- return action == "about:views";
31+ return action == "complete:more/views";
32 }
33
34 public override async List<Suggestion>? complete (string text, string? action, Cancellable cancellable) {
35@@ -77,7 +77,7 @@
36
37 n++;
38 if (n == 3 && action == null) {
39- suggestion = new Suggestion ("about:views", _("More open tabs…"), false, background);
40+ suggestion = new Suggestion ("complete:more/views", _("More open tabs…"), false, background);
41 suggestion.action = true;
42 suggestions.append (suggestion);
43 break;

Subscribers

People subscribed via source and target branches

to all changes: