lp:~mc-return/compiz/compiz.merge-fix1067534

Branch merges

Merged into lp:compiz/0.9.9 at revision 3435

Daniel van Vugt: Approve on 2012-10-18

PS Jenkins bot: Needs Fixing (continuous-integration) on 2012-10-17

Marco Trevisan (Treviño): Approve on 2012-10-17

Omer Akram (community): Approve on 2012-10-17

Diff: 23 lines (+2/-0)

2 files modified

plugins/fadedesktop/fadedesktop.xml.in (+1/-0)
plugins/showdesktop/showdesktop.xml.in (+1/-0)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1067534: "Show desktop" plug-in actually works with Unity when ensured that it is loaded after unityshell

Low

Fix Released

Link a bug report

Related blueprints

3432. By MC Return on 2012-10-16

Make sure unityshell is loaded after showdesktop

3431. By MC Return on 2012-10-16

fadedesktop conflicts with unityshell and showdesktop now.

3430. By Daniel van Vugt on 2012-10-16

Restore cube transparency support for the top and bottom faces. It got
deleted as part of the GLES merge (r3320) in 0.9.8.0.
(LP: #1048272)
. Fixes: https://bugs.launchpad.net/bugs/1048272. Approved by Sam Spilsbury, PS Jenkins bot, MC Return.

3429. By Daniel van Vugt on 2012-10-16

Remove dead code (unused subtypes). Approved by Sam Spilsbury.

3428. By Daniel van Vugt on 2012-10-16

Ensure template instances relating to CompRect are only instantiated in core
and never in any plugin.
(LP: #1067219)
. Fixes: https://bugs.launchpad.net/bugs/1067219. Approved by Sam Spilsbury, PS Jenkins bot.

3427. By Daniel van Vugt on 2012-10-16

Templates relating to CompRegion should only be instantiated in core and
never in any plugins.
(LP: #1067218)

Note: This required removing -std=c++0x from the opengl plugin. That flag
was causing opengl to have slightly different symbol requirements to the
template instance in core. Not that it matters because -std=c++0x appears to
have been unused by opengl.
. Fixes: https://bugs.launchpad.net/bugs/1067218. Approved by Sam Spilsbury.

3426. By Daniel van Vugt on 2012-10-16

Remove duplicate point.h (LP: #1067234)

I had to keep the copy in include/ rather than the one in src/ because it's
used by include/core/{window,screen}.h. Doing it the other way around caused
pain and complication.. Fixes: https://bugs.launchpad.net/bugs/1067234. Approved by .

3425. By Sam Spilsbury on 2012-10-16

Don't write plugins-with-set-keys every single time we read a schema, if
the value is already in plugins-with-set-keys. Added tests to demonstrate
behaviour.
(LP: #1064791)

vanvugt says: This also seems to fix LP: #1044662, somehow.. Fixes: https://bugs.launchpad.net/bugs/1064791. Approved by Daniel van Vugt.

3424. By Sam Spilsbury on 2012-10-16

Remove redundant checks in Expo which could cause grid to be triggered in
expo. (LP: #1037142)

We'd be checking for a condition that could never be true, as we pass
noOptions () to expoTerm. Better just to not have that check at all, since
it's useless in a post 0.8 world.

.. Fixes: https://bugs.launchpad.net/bugs/1037142. Approved by Daniel van Vugt.

3423. By Daniel van Vugt on 2012-10-16

Templates related to the opengl plugin should only be instantiated in the
opengl plugin. Ensure users of opengl.h don't also get local copies
instantiated.
(LP: #1066795) (LP: #1066798). Fixes: https://bugs.launchpad.net/bugs/1066795, https://bugs.launchpad.net/bugs/1066798. Approved by Sam Spilsbury.