fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-05-03 07:48:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

AllocDevicePair: Ensure XKB privates are initialised

Browse source 
Since we call directly into XKB and may be doing so before the extension
has been initialised, make sure its privates are set up first.  XTest
had a hack to do this itself, but seems cleaner to just make sure we do
it in AllocDevicePair.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 59c2c4f645)
This commit is contained in:
Daniel Stone 2012-07-10 09:10:22 +01:00 • committed by Jeremy Huddleston Sequoia
parent fc13888f19
commit 1b2ae1fd7a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dix/devices.c
View file

@ -2630,6 +2630,8 @@ AllocDevicePair(ClientPtr client, const char *name,
*ptr = *keybd = NULL;
XkbInitPrivates();
pointer = AddInputDevice(client, ptr_proc, TRUE);
if (!pointer)

2
test/xtest.c
View file

@ -63,8 +63,6 @@ xtest_init_devices(void)
dixResetPrivates();
InitAtoms();
XkbInitPrivates();
/* this also inits the xtest devices */
InitCoreDevices();