diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2012-07-10 09:10:22 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-07-10 23:12:39 -0700 |
| commit | 59c2c4f645b4d782599c274f4bc752de9623d308 (patch) | |
| tree | 9b4fe2f480bcd1bcf0b058f1ba5918bdc1bc0727 | |
| parent | f937c3d50157a9a42d2f2f10590b6b139ce18a29 (diff) | |
AllocDevicePair: Ensure XKB privates are initialised
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>
| -rw-r--r-- | dix/devices.c | 2 | ||||
| -rw-r--r-- | test/xtest.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/dix/devices.c b/dix/devices.c index 207b78b87..9cf04ed3f 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -2674,6 +2674,8 @@ AllocDevicePair(ClientPtr client, const char *name, *ptr = *keybd = NULL; + XkbInitPrivates(); + pointer = AddInputDevice(client, ptr_proc, TRUE); if (!pointer) diff --git a/test/xtest.c b/test/xtest.c index 99e218541..402d9ceba 100644 --- a/test/xtest.c +++ b/test/xtest.c @@ -76,8 +76,6 @@ xtest_init_devices(void) InitAtoms(); SyncExtensionInit(); - XkbInitPrivates(); - /* this also inits the xtest devices */ InitCoreDevices(); |