blob: 78845d34c2fb40b6a5649d77cf7c38f11faab101 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
commit e02e4ccafcaf3eb8993152dfcbfbee0240ea2db2
Author: Adam Jackson <ajax@redhat.com>
Date: Sun Feb 24 20:00:43 2008 -0500
Bug #14029: Don't LockDisplay() recursively.
See also Red Hat bugzilla #326461.
diff --git a/src/xkb/XKBBind.c b/src/xkb/XKBBind.c
index e190d00..4dc9265 100644
--- a/src/xkb/XKBBind.c
+++ b/src/xkb/XKBBind.c
@@ -368,7 +368,6 @@ XkbRefreshKeyboardMapping(register XkbMapNotifyEvent *event)
changes= xkbi->changes;
else bzero(&changes,sizeof(changes));
XkbNoteMapChanges(&changes,event,XKB_XLIB_MAP_MASK);
- LockDisplay(dpy);
if ((rtrn=XkbGetMapChanges(dpy,xkbi->desc,&changes))!=Success) {
#ifdef DEBUG
fprintf(stderr,"Internal Error! XkbGetMapChanges failed:\n");
@@ -379,7 +378,6 @@ XkbRefreshKeyboardMapping(register XkbMapNotifyEvent *event)
xkbi->flags&= ~XkbMapPending;
bzero(&xkbi->changes,sizeof(XkbMapChangesRec));
}
- UnlockDisplay(dpy);
return rtrn;
}
return BadMatch;
|
GitWeb
