[PATCH xf86-input-synaptics v2 13/13] Filter touch events if two-finger scrolling is enabled

[Chase Douglas]

Signed-off-by: Chase Douglas <chase.douglas at canonical.com>
---
 src/synaptics.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/synaptics.c b/src/synaptics.c
index 4761eca..48e7e25 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -2598,9 +2598,10 @@ HandleTouches(InputInfoPtr pInfo, struct SynapticsHwState *hw)
     Bool restart_touches = FALSE;
     int i;
 
-    if (para->click_action[F3_CLICK1] || para.tap_action[F3_TAP])
+    if (para->click_action[F3_CLICK1] || para->tap_action[F3_TAP])
         min_touches = 4;
-    else if (para->click_action[F2_CLICK1] || para.tap_action[F2_TAP])
+    else if (para->click_action[F2_CLICK1] || para->tap_action[F2_TAP] ||
+             para->scroll_twofinger_vert || para->scroll_twofinger_horiz)
         min_touches = 3;
 
     /* Count new number of active touches */
-- 
1.7.8.3