Merge lp:~3v1n0/unity/dual-icon-race-fix into lp:unity
Status: | Merged |
---|---|
Approved by: | Christopher Townsend |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3564 |
Proposed branch: | lp:~3v1n0/unity/dual-icon-race-fix |
Merge into: | lp:unity |
Prerequisite: | lp:~3v1n0/unity/source-manager-remove-all |
Diff against target: |
368 lines (+228/-27) 5 files modified
launcher/ApplicationLauncherIcon.cpp (+21/-24) launcher/ApplicationLauncherIcon.h (+1/-0) launcher/LauncherIcon.cpp (+12/-1) launcher/SoftwareCenterLauncherIcon.cpp (+0/-1) tests/test_application_launcher_icon.cpp (+194/-1) |
To merge this branch: | bzr merge lp:~3v1n0/unity/dual-icon-race-fix |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Christopher Townsend (community) | Approve | ||
Review via email: mp+190363@code.launchpad.net |
This proposal supersedes a proposal from 2013-10-10.
Commit message
ApplicationLaun
In this case the app is unset when removed, doing it twice causes the app->seen flag to
be reset and this breaks the assumtions of the LauncherController, making it to recreate
a new app for the same BamfApplication.
Description of the change
We had an issue caused by the fact that we were setting the app "seen" flag
as false, both when an icon was removed and afterwards (after some seconds
of delay) when destroyed.
Doing this was wrong especially in the case where we were destroying an icon
that was already removed and recently re-used, because we were messing with
the "seen" flag of an application that was now owned by another icon.
Some cleanup, moving stuff to LauncherIcon and a bunch of new unit tests.
LGTM. Nice tests:)