Midori Web Browser

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

  1. privcomplcrash
  2. Merge into trunk
Proposed by Cris Dywan
Status: Merged
Approved by: Paweł Forysiuk
Approved revision: 6262
Merged at revision: 6263
Proposed branch: lp:~kalikiana/midori/privcomplcrash
Merge into: lp:midori
Diff against target: 17 lines (+4/-2)
1 file modified
midori/midori-locationaction.c (+4/-2)
To merge this branch: bzr merge lp:~kalikiana/midori/privcomplcrash
Reviewer Review Type Date Requested Status
Paweł Forysiuk Approve
Review via email: mp+174568@code.launchpad.net

Commit message

Don't add HistoryCompletion if there's no history

To post a comment you must log in.
Revision history for this message
Paweł Forysiuk (tuxator) wrote :

Looks sensible

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'midori/midori-locationaction.c'
2--- midori/midori-locationaction.c 2013-06-21 20:49:53 +0000
3+++ midori/midori-locationaction.c 2013-07-13 17:27:24 +0000
4@@ -662,9 +662,11 @@
5 midori_autocompleter_add (action->autocompleter,
6 MIDORI_COMPLETION (midori_view_completion_new ()));
7 midori_autocompleter_add (action->autocompleter,
8- MIDORI_COMPLETION (midori_history_completion_new ()));
9- midori_autocompleter_add (action->autocompleter,
10 MIDORI_COMPLETION (midori_search_completion_new ()));
11+ /* FIXME: Currently HistoryCompletion doesn't work in memory */
12+ if (action->history != NULL)
13+ midori_autocompleter_add (action->autocompleter,
14+ MIDORI_COMPLETION (midori_history_completion_new ()));
15 }
16
17 if (!midori_autocompleter_can_complete (action->autocompleter, action->key))

Subscribers

People subscribed via source and target branches

to all changes: