Merge lp://qastaging/~bilalakhtar/unity/5.0series-sru-software-center-integration-fixes into lp://qastaging/unity/5.0
Status: | Merged |
---|---|
Approved by: | Marco Trevisan (Treviño) |
Approved revision: | no longer in the source branch. |
Merged at revision: | 2389 |
Proposed branch: | lp://qastaging/~bilalakhtar/unity/5.0series-sru-software-center-integration-fixes |
Merge into: | lp://qastaging/unity/5.0 |
Diff against target: |
120 lines (+44/-2) 5 files modified
plugins/unityshell/src/Launcher.cpp (+2/-0) plugins/unityshell/src/LauncherController.cpp (+5/-0) plugins/unityshell/src/SoftwareCenterLauncherIcon.cpp (+7/-1) plugins/unityshell/src/SoftwareCenterLauncherIcon.h (+3/-0) tests/autopilot/autopilot/tests/test_launcher.py (+27/-1) |
To merge this branch: | bzr merge lp://qastaging/~bilalakhtar/unity/5.0series-sru-software-center-integration-fixes |
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marco Trevisan (Treviño) | Approve | ||
Brandon Schaefer (community) | Approve | ||
Thomi Richards (community) | quality | Approve | |
Tim Penhey (community) | Needs Fixing | ||
Review via email:
|
Commit message
SoftwareCenterL
Be consistent with auto-hiding launcher.
Description of the change
This branch fixes three bugs (linked to the branch), all regarding Software Center integration with the Unity launcher. These are bound for the next SRU, since all three of them are needed to fix bugs targeted at SRUs. One of the fixes, the one for bug #1012896, is the fix for an SRU regression.
The fix for bug #1012896 is needed only in the Precise branch. Here are the Unity quantal branch merge requests for the other two bug fixes:
https:/
https:/
> if (path.empty() || !path.compare( "software- center- agent") )
This needs to be changed, as in the other review.