From e62549b8d61cd739adbbd04487d96fe706da1370 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 9 Sep 2009 16:03:38 +1000 Subject: [PATCH] Xext: don't try to initialize XTEST device properties if they failed. Signed-off-by: Peter Hutterer --- Xext/xtest.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Xext/xtest.c b/Xext/xtest.c index 0400062d8..6b0e9fd14 100644 --- a/Xext/xtest.c +++ b/Xext/xtest.c @@ -642,21 +642,21 @@ int AllocXTestDevice (ClientPtr client, char* name, if ( retval == Success ){ dixSetPrivate(&((*ptr)->devPrivates), XTestDevicePrivateKey, (void *)master_ptr->id); dixSetPrivate(&((*keybd)->devPrivates), XTestDevicePrivateKey, (void *)master_keybd->id); + + XIChangeDeviceProperty(*ptr, XIGetKnownProperty(XI_PROP_XTEST_DEVICE), + XA_INTEGER, 8, PropModeReplace, 1, &dummy, + FALSE); + XISetDevicePropertyDeletable(*ptr, XIGetKnownProperty(XI_PROP_XTEST_DEVICE), FALSE); + XIRegisterPropertyHandler(*ptr, DeviceSetXTestProperty, NULL, NULL); + XIChangeDeviceProperty(*keybd, XIGetKnownProperty(XI_PROP_XTEST_DEVICE), + XA_INTEGER, 8, PropModeReplace, 1, &dummy, + FALSE); + XISetDevicePropertyDeletable(*keybd, XIGetKnownProperty(XI_PROP_XTEST_DEVICE), FALSE); + XIRegisterPropertyHandler(*keybd, DeviceSetXTestProperty, NULL, NULL); } xfree( xtestname ); - XIChangeDeviceProperty(*ptr, XIGetKnownProperty(XI_PROP_XTEST_DEVICE), - XA_INTEGER, 8, PropModeReplace, 1, &dummy, - FALSE); - XISetDevicePropertyDeletable(*ptr, XIGetKnownProperty(XI_PROP_XTEST_DEVICE), FALSE); - XIRegisterPropertyHandler(*ptr, DeviceSetXTestProperty, NULL, NULL); - XIChangeDeviceProperty(*keybd, XIGetKnownProperty(XI_PROP_XTEST_DEVICE), - XA_INTEGER, 8, PropModeReplace, 1, &dummy, - FALSE); - XISetDevicePropertyDeletable(*keybd, XIGetKnownProperty(XI_PROP_XTEST_DEVICE), FALSE); - XIRegisterPropertyHandler(*keybd, DeviceSetXTestProperty, NULL, NULL); - return retval; }