lp:~compiz-team/compiz/compiz.fix_1067964

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:compiz/0.9.9 at revision 3441

Daniel van Vugt: Approve on 2012-10-26

PS Jenkins bot (community): Approve (continuous-integration) on 2012-10-26

Diff: 109 lines (+39/-14)

4 files modified

compizconfig/gsettings/CMakeLists.txt (+0/-6)
compizconfig/gsettings/gsettings_backend_shared/CMakeLists.txt (+2/-8)
compizconfig/libcompizconfig/src/main.c (+7/-0)
compizconfig/libcompizconfig/tests/compizconfig_test_ccs_object.cpp (+30/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1067964: CCSGSettingsBackendConcept tests fail in continuous-integration due to incorrect linking

High

Fix Released

Link a bug report

Related blueprints

3444. By Sam Spilsbury on 2012-10-26

Memleak

3443. By Sam Spilsbury on 2012-10-26

Test the die behaviour and ensure no segfault

3442. By Sam Spilsbury on 2012-10-26

Added an error message about that

3441. By Sam Spilsbury on 2012-10-26

Don't link in static libraries that define their own objects twice, pull
them in through the shared library. Doing so will result in duplicate
static symbols for the type name and that always ends badly (LP: #1067964)

3440. By MC Return on 2012-10-22

Screenshot Plugin: Re-added GL_BLEND enabling and disabling calls to fix the selection rectangle not being transparent anymore.
Make sure to use GL_BLEND for the non-GLES codepath only.
Those calls got lost in r3320 (GLES merge).

(LP: #1047788). Fixes: https://bugs.launchpad.net/bugs/1047788. Approved by Timo Jyrinki.

3439. By Łukasz Zemczak on 2012-10-19

Only declare wasBlend if we're not using GLES (fixes ARM build failures). Approved by Didier Roche.

3438. By MC Return on 2012-10-19

Re-added missing glEnable (GL_BLEND); and glDisable (GL_BLEND); calls to the OpenGL codepath to fix the text plugin's missing transparency.
Those got lost during the big GLES merge.
(LP: #1042132). Fixes: https://bugs.launchpad.net/bugs/1042132. Approved by Daniel van Vugt.

3437. By Sami Jaktholm on 2012-10-19

Grid: Reset the currently handled window in the GridWindow destructor
only if the destroyed window was the handled one.

Currently completely unrelated GridWindow destruction will erase the
saved ID of the window Grid should be handling. This will break
the functionality if a GridWindow is destroyed while another window
is being dragged.

Fixes LP: #1067812 and LP: #1048855.. Fixes: https://bugs.launchpad.net/bugs/1048855, https://bugs.launchpad.net/bugs/1067812. Approved by Daniel van Vugt, MC Return.

3436. By Daniel van Vugt on 2012-10-18

Don't try to dereference NULL, which is returned by
ccsGConfIntegratedSettingReadValue when it gets unexpected data from gconf.
(LP: #1056615). Fixes: https://bugs.launchpad.net/bugs/1056615. Approved by Sam Spilsbury.

3435. By MC Return on 2012-10-18

Make sure showdesktop is loaded after unityshell.
(LP: #1067534)

fadedesktop conflicts with unityshell and showdesktop now.
showdesktop still conflicts with fadesktop, but not with unityshell anymore.

Together with the fix for Unity this allows the CCSM user to use the full functionality of the "Show Desktop" plug-in together with Unity-3d for the first time, namely sliding windows out of view to show the desktop and sliding them back in to restore the previous state.. Fixes: https://bugs.launchpad.net/bugs/1067534. Approved by Daniel van Vugt, Marco Trevisan (Treviño), Omer Akram.