Merge lp://qastaging/~townsend/unity/fix_1070715-6.0 into lp://qastaging/unity/6.0

Proposed by Christopher Townsend
Status: Merged
Approved by: Ɓukasz Zemczak
Approved revision: no longer in the source branch.
Merged at revision: 2804
Proposed branch: lp://qastaging/~townsend/unity/fix_1070715-6.0
Merge into: lp://qastaging/unity/6.0
Diff against target: 63 lines (+39/-1)
2 files modified
launcher/SwitcherModel.cpp (+8/-1)
tests/test_switcher_model.cpp (+31/-0)
To merge this branch: bzr merge lp://qastaging/~townsend/unity/fix_1070715-6.0
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) Approve
Review via email: mp+155479@code.qastaging.launchpad.net

Commit message

Webapps cause two active applications in some cases, so added a check to only pick up the first active app which is the web browser. This is backport of Unity trunk revno. 3158.

Description of the change

When using Webapps, two icons are considered Active. The logic to find the last active application did not take this into account. Since a Webapp is always the last icon, this change picks up the first active app in the SwitcherModel constructor.

This is a backport from Unity trunk revno. 3158 and no regressions have been reported.

To post a comment you must log in.
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

LGTM

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1562/console reported an error when processing this lp:~townsend/unity/fix_1070715-6.0 branch.
Not merging it.

Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1564/console reported an error when processing this lp:~townsend/unity/fix_1070715-6.0 branch.
Not merging it.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches