diff options
| author | Alexandr Shadchin <shadchin@cvs.openbsd.org> | 2012-06-12 17:11:24 +0000 |
|---|---|---|
| committer | Alexandr Shadchin <shadchin@cvs.openbsd.org> | 2012-06-12 17:11:24 +0000 |
| commit | 94ca25456fd27942a546d75551d9a0ef553ed9ba (patch) | |
| tree | 011b549c68b1b6539c50dd3223b17191eb6a8c7d /driver | |
| parent | 4f7ccf2ca0cb137cdb792b7dd4dbd1537b0b423f (diff) | |
Small cleanup
ok matthieu@
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/xf86-input-ws/src/emumb.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/driver/xf86-input-ws/src/emumb.c b/driver/xf86-input-ws/src/emumb.c index d77af59a6..b07f70e2b 100644 --- a/driver/xf86-input-ws/src/emumb.c +++ b/driver/xf86-input-ws/src/emumb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: emumb.c,v 1.10 2012/06/12 17:06:43 shadchin Exp $ */ +/* $OpenBSD: emumb.c,v 1.11 2012/06/12 17:11:23 shadchin Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. * Copyright 1993 by David Dawes <dawes@xfree86.org> @@ -395,9 +395,6 @@ wsmbEmuInitProperty(DeviceIntPtr dev) DBG(1, ErrorF("wsmbEmuInitProperty\n")); - if (!dev->button) /* don't init prop for keyboards */ - return; - prop_mbemu = MakeAtom(WS_PROP_MIDBUTTON, strlen(WS_PROP_MIDBUTTON), TRUE); rc = XIChangeDeviceProperty(dev, prop_mbemu, XA_INTEGER, 8, @@ -411,12 +408,9 @@ wsmbEmuInitProperty(DeviceIntPtr dev) XISetDevicePropertyDeletable(dev, prop_mbemu, FALSE); prop_mbtimeout = MakeAtom(WS_PROP_MIDBUTTON_TIMEOUT, - strlen(WS_PROP_MIDBUTTON_TIMEOUT), - TRUE); - rc = XIChangeDeviceProperty(dev, prop_mbtimeout, - XA_INTEGER, 32, PropModeReplace, 1, - &priv->emulateMB.timeout, FALSE); - + strlen(WS_PROP_MIDBUTTON_TIMEOUT), TRUE); + rc = XIChangeDeviceProperty(dev, prop_mbtimeout, XA_INTEGER, 32, + PropModeReplace, 1, &priv->emulateMB.timeout, FALSE); if (rc != Success) { xf86IDrvMsg(pInfo, X_ERROR, "cannot create device property %s: %d\n", |