Merge lp:~khadgaray/compiz/lp1213809 into lp:compiz/0.9.11

[Ritesh Khadgaray]

OpenGL contexts are reference counted and only destroyed
once they are no longer current to any thread. To ensure
the context really is destroyed, lose current from it
before destroying it.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3783
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~khadgaray/compiz/lp1213809/+merge/180787/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/compiz-ci/287/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/100
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/100
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/100

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-ci/287/rebuild

review: Needs Fixing (continuous-integration)

[MC Return (mc-return)]

LGTM and seems to work perfectly. Thanks !

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-autolanding/152/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-autolanding/64/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-autolanding/64/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-autolanding/64/console

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

Found jenkins issue, re-approving.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'plugins/opengl/src/screen.cpp'
--- plugins/opengl/src/screen.cpp	2013-05-15 10:47:42 +0000
+++ plugins/opengl/src/screen.cpp	2013-08-19 06:47:31 +0000
@@ -1238,6 +1238,7 @@
     eglReleaseThread ();
     #else
 
+    glXMakeCurrent (screen->dpy (), None, NULL);
     if (priv->ctx)
 	glXDestroyContext (screen->dpy (), priv->ctx);
     #endif