diff options
| author | Keith Packard <keithp@keithp.com> | 2010-06-06 20:45:53 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-06-06 21:24:04 -0700 |
| commit | bc26665661565918af484ccd17caad951010df60 (patch) | |
| tree | 1f922d9d23c3b43974714c0df0715a467a231a5d /xkb | |
| parent | f03be727d647183a2176355ad0ac9a6735067be9 (diff) | |
Initialize private keys in test suite
Make sure all of the private keys used by the test code are
initialized before being used.
Signed-off-by: Keith Packard <keithp@keithp.com>
Tested-by: Robert Hooker <sarvatt@ubuntu.com>
Diffstat (limited to 'xkb')
| -rw-r--r-- | xkb/xkb.c | 2 | ||||
| -rw-r--r-- | xkb/xkbActions.c | 5 |
2 files changed, 6 insertions, 1 deletions
@@ -6707,7 +6707,7 @@ XkbExtensionInit(void) if (!RT_XKBCLIENT) return; - if (!dixRegisterPrivateKey(&xkbDevicePrivateKeyRec, PRIVATE_DEVICE, 0)) + if (!XkbInitPrivates()) return; if ((extEntry = AddExtension(XkbName, XkbNumberEvents, XkbNumberErrors, diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c index afc44ac44..c5030d04d 100644 --- a/xkb/xkbActions.c +++ b/xkb/xkbActions.c @@ -63,6 +63,11 @@ xkbUnwrapProc(DeviceIntPtr device, DeviceHandleProc proc, backupproc,xkbUnwrapProc); } +Bool +XkbInitPrivates(void) +{ + return dixRegisterPrivateKey(&xkbDevicePrivateKeyRec, PRIVATE_DEVICE, 0); +} void XkbSetExtension(DeviceIntPtr device, ProcessInputProc proc) |