Compiz Core

Merge lp://qastaging/~vanvugt/compiz-core/fix-921406 into lp://qastaging/compiz-core/0.9.5

fix-921406
Merge into 0.9.5

Proposed by Daniel van Vugt on 2012-01-25

Status:

Merged

Approved by:

Sam Spilsbury on 2012-01-25

Approved revision:

2962

Merged at revision:

2963

Proposed branch:

lp://qastaging/~vanvugt/compiz-core/fix-921406

Merge into:

lp://qastaging/compiz-core/0.9.5

Diff against target:

133 lines (+51/-0)

2 files modified

plugins/composite/tests/paintscheduler/test-paintscheduler.cpp (+46/-0)
src/signalsource.cpp (+5/-0)

To merge this branch:

bzr merge lp://qastaging/~vanvugt/compiz-core/fix-921406

Critical

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Alan Griffiths		2012-01-25	Approve on 2012-01-25
Review via email: mp+90053@code.qastaging.launchpad.net

Description of the change

Fix build failures with glib 2.30 (oneiric) (LP: #921406)

Amazingly, there is no compatible GThread/GMutex/GCond API that is compatible with both glib 2.30 (oneiric) and 2.31 (precise). So we need to #if them :(

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2012-01-25:

Messy, but if it needs to be...

review: Approve

Revision history for this message

Sam Spilsbury (smspillaz) wrote on 2012-01-25:

Ack, we also hit similar problems in unity too

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2012-01-26:

Actually you could emulate the old 2.30 API using the new one (2.31) with a bunch of wrapper functions and/or macros. But since this is the only place in compiz affected, not worth doing (yet).