Merge lp://staging/~seb128/unity-control-center/define-unity-env into lp://staging/unity-control-center
Proposed by
Sebastien Bacher
Status: | Merged |
---|---|
Approved by: | Iain Lane |
Approved revision: | 12775 |
Merged at revision: | 12775 |
Proposed branch: | lp://staging/~seb128/unity-control-center/define-unity-env |
Merge into: | lp://staging/unity-control-center |
Diff against target: |
10 lines (+1/-0) 1 file modified
shell/control-center.c (+1/-0) |
To merge this branch: | bzr merge lp://staging/~seb128/unity-control-center/define-unity-env |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Iain Lane (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Unity Control Center development team | Pending | ||
Review via email: mp+215153@code.staging.launchpad.net |
Commit message
shell: set XDG_CURRENT_DESKTOP to Unity so the correct list of panels is
included in the grid. The gnome-menus api respects OnlyShowIn, without that
we end up missing most of the panels in other environment (e.g ubiquity).
We can't change the .desktop keys since that would lead to wrong behaviour
in e.g the Unity dash
Description of the change
shell: set XDG_CURRENT_DESKTOP to Unity so the correct list of panels is
included in the grid. The gnome-menus api respects OnlyShowIn, without that
we end up missing most of the panels in other environment (e.g ubiquity).
We can't change the .desktop keys since that would lead to wrong behaviour
in e.g the Unity dash
To post a comment you must log in.
PASSED: Continuous integration, rev:12775 jenkins. qa.ubuntu. com/job/ unity-control- center- ci/97/ jenkins. qa.ubuntu. com/job/ unity-control- center- trusty- amd64-ci/ 97 jenkins. qa.ubuntu. com/job/ unity-control- center- trusty- armhf-ci/ 97 jenkins. qa.ubuntu. com/job/ unity-control- center- trusty- i386-ci/ 98
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- control- center- ci/97/rebuild
http://