summaryrefslogtreecommitdiff
path: root/xserver/Xi/extinit.c
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2010-12-21 20:10:50 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2010-12-21 20:10:50 +0000
commit239364510e41b034ad6ecb6cb51120232e7166cc (patch)
tree37c3c57c97d3fda8179a0204d94318a738309cc0 /xserver/Xi/extinit.c
parent9c0c4e62648084518b26f71ef3e5664454486b42 (diff)
Update to xorg-server 1.9.3. Tested by japser@, landry@ and ajacoutot@
in various configurations.
Diffstat (limited to 'xserver/Xi/extinit.c')
-rw-r--r--xserver/Xi/extinit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xserver/Xi/extinit.c b/xserver/Xi/extinit.c
index eda4efb50..fb8ad19ba 100644
--- a/xserver/Xi/extinit.c
+++ b/xserver/Xi/extinit.c
@@ -1120,8 +1120,6 @@ RestoreExtensionEvents(void)
static void
IResetProc(ExtensionEntry * unused)
{
- XIResetProperties();
-
ReplySwapVector[IReqCode] = ReplyNotSwappd;
EventSwapVector[DeviceValuator] = NotImplemented;
EventSwapVector[DeviceKeyPress] = NotImplemented;
@@ -1302,6 +1300,8 @@ XInputExtensionInit(void)
inputInfo.all_devices = &xi_all_devices;
inputInfo.all_master_devices = &xi_all_master_devices;
+
+ XIResetProperties();
} else {
FatalError("IExtensionInit: AddExtensions failed\n");
}