DATAACQTEAM-121 Correct previous fix
Avoid client crash when gtk>=2.24 and cairo<1.9.4
Merge remote-tracking branch 'origin/gda-8.40' into gda-8.42