[PATCH xf86-input-synaptics resend] Revert "Default to 2-finger emulation when HW supports it"

[Chase Douglas]

This changes the default behavior for trackpads that have only pressure
information to emulate two finger actions. It's been reported that the
default value is too low and/or that the pressure values may fluctuate
with environmental factors (temperature, humidity, etc.). When the
value is wrong, spurious right clicks and scroll events are triggered.

Fixes: http://bugs.launchpad.net/bugs/742213

This reverts commit ffa6dc2809734a6aaa690e9133d6761480603a68.

Signed-off-by: Chase Douglas <chase.douglas at canonical.com>
---
Forgot to Cc xorg-devel on the first patch sending.

 src/synaptics.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/src/synaptics.c b/src/synaptics.c
index 1233917..61bc0c5 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -450,18 +450,13 @@ static void set_default_parameters(InputInfoPtr pInfo)
     fingerLow = priv->minp + range * (25.0/256);
     fingerHigh = priv->minp + range * (30.0/256);
     fingerPress = priv->minp + range * 1.000;
+    emulateTwoFingerMinZ = priv->minp + range * (282.0/256);
     edgeMotionMinZ = priv->minp + range * (30.0/256);
     edgeMotionMaxZ = priv->minp + range * (160.0/256);
     pressureMotionMinZ = priv->minp + range * (30.0/256);
     pressureMotionMaxZ = priv->minp + range * (160.0/256);
     palmMinZ = priv->minp + range * (200.0/256);
 
-    /* Enable emulation when hw supports both pressure and width. */
-    if (!priv->has_double && priv->has_width)
-	emulateTwoFingerMinZ = fingerHigh;
-    else
-	emulateTwoFingerMinZ = priv->minp + range * (282.0/256);
-
     range = priv->maxw - priv->minw;
 
     /* scaling based on defaults below and a tool width of 16 */
-- 
1.7.4.1