summaryrefslogtreecommitdiff
path: root/dix/grabs.c
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2013-04-24 14:40:31 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2013-05-10 14:32:38 +1000
commit5b00fc52270e9cfdfe7ac1838a21defe50fc3d31 (patch)
treec7e7d0deb2b6dea4856df4519d920c4629d0197c /dix/grabs.c
parent34c9b39d9937c2e19c2dffc9748605f90d40f965 (diff)
Move TouchListenerGone call to CloseDownClient
TouchListenerGone cleans up if a client disappears. Having this in FreeGrab() triggers cyclic removal of grabs, emitting wrong events. In particular, it would clean up a passive grab record while that grab is active. Move it to CloseDownClient() instead, cleaning up before we go. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'dix/grabs.c')
-rw-r--r--dix/grabs.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/dix/grabs.c b/dix/grabs.c
index f46a6b23a..b254ddcf1 100644
--- a/dix/grabs.c
+++ b/dix/grabs.c
@@ -257,9 +257,6 @@ FreeGrab(GrabPtr pGrab)
{
BUG_RETURN(!pGrab);
- if (pGrab->grabtype == XI2 && pGrab->type == XI_TouchBegin)
- TouchListenerGone(pGrab->resource);
-
free(pGrab->modifiersDetail.pMask);
free(pGrab->detail.pMask);