Midori Web Browser

Merge lp:~gue5t/midori/dial-focus into lp:midori

  1. dial-focus
  2. Merge into trunk
Proposed by gue5t gue5t
Status: Merged
Approved by: Paweł Forysiuk
Approved revision: 6676
Merged at revision: 6680
Proposed branch: lp:~gue5t/midori/dial-focus
Merge into: lp:midori
Diff against target: 22 lines (+4/-4)
1 file modified
midori/midori-browser.c (+4/-4)
To merge this branch: bzr merge lp:~gue5t/midori/dial-focus
Reviewer Review Type Date Requested Status
Paweł Forysiuk Approve
Review via email: mp+216893@code.launchpad.net

Commit message

Don't focus the locationaction when leaving blank pages

Description of the change

We focus the locationbar upon navigation status changes without checking whether we're PROVISIONAL or COMMITTED, so we end up focusing it both when reaching and leaving blank pages like about:dial. Move the focus inside the COMMITTED conditional so we only focus when reaching such pages.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'midori/midori-browser.c'
2--- midori/midori-browser.c 2014-04-16 21:00:49 +0000
3+++ midori/midori-browser.c 2014-04-23 14:17:39 +0000
4@@ -671,14 +671,14 @@
5 GtkAction* action = _action_by_name (browser, "Location");
6 midori_location_action_set_text (
7 MIDORI_LOCATION_ACTION (action), uri);
8+
9+ /* Focus the urlbar on blank pages */
10+ if (midori_view_is_blank (view))
11+ midori_browser_activate_action (browser, "Location");
12 }
13
14 _midori_browser_update_interface (browser, view);
15 _midori_browser_set_statusbar_text (browser, view, NULL);
16-
17- /* Focus the urlbar on blank pages */
18- if (midori_view_is_blank (view))
19- midori_browser_activate_action (browser, "Location");
20 }
21
22 if (load_status == MIDORI_LOAD_FINISHED)

Subscribers

People subscribed via source and target branches

to all changes: