From: Jonas Ådahl <jadahl@gmail.com>
Date: Mon, 27 Jan 2014 22:27:16 +0000 (+0100)
Subject: evdev: Don't report touch devices with buttons as actual touch devices
X-Git-Tag: 0.1.0~45
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3290b78bd644c90ce04961080f78e65ca995c282;p=platform%2Fupstream%2Flibinput.git

evdev: Don't report touch devices with buttons as actual touch devices

This was a detail of the original version of the commit "evdev: Remove
EVDEV_TOUCH and with it evdev_device->caps" that got lost during porting.

Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
---

diff --git a/src/evdev.c b/src/evdev.c
index be0247b9..05144f1c 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -586,7 +586,7 @@ evdev_configure_device(struct evdev_device *device)
 		device->seat_caps |= EVDEV_DEVICE_POINTER;
 	if (has_keyboard)
 		device->seat_caps |= EVDEV_DEVICE_KEYBOARD;
-	if (has_touch)
+	if (has_touch && !has_button)
 		device->seat_caps |= EVDEV_DEVICE_TOUCH;
 
 	return 0;