Merge lp:~unity-team/compiz/trunk.fix_env into lp:~unity-team/compiz/trunk
Status: | Merged |
---|---|
Merge reported by: | David Barth |
Merged at revision: | not available |
Proposed branch: | lp:~unity-team/compiz/trunk.fix_env |
Merge into: | lp:~unity-team/compiz/trunk |
Diff against target: |
33 lines (+8/-5) 1 file modified
src/screen.cpp (+8/-5) |
To merge this branch: | bzr merge lp:~unity-team/compiz/trunk.fix_env |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Didier Roche-Tolomelli | Approve | ||
Review via email: mp+56566@code.launchpad.net |
This proposal supersedes a proposal from 2011-04-06.
Description of the change
This branch basically fixes the way we were botching the env for applications that we launch.
Because of the way compiz works, we need to ensure that the program is not just using the env as started by DISPLAY=:blah but actually the display and screen that compiz is running on (eg priv->displayString and priv->screenNum). However what we were doing in this case was replacing the display with 0.priv->screenNum every time which attempts to start any commands we wish to run on display :0. This is incorrect behaviour - it should reflect the display that compiz was actually started on.
code looks code! +1