[gtk: 2/2] Merge branch 'detect-synaptics-touchpads-v2' into 'master'

[Carlos Garnacho <carlosg src gnome org>]

commit 28c27f37ee5fe3a1a9d6a4c35bd9b979f228cf9e
Merge: dcc6124209 0ad27cc598
Author: Carlos Garnacho <mrgarnacho gmail com>
Date:   Tue Mar 20 17:03:15 2018 +0000

    Merge branch 'detect-synaptics-touchpads-v2' into 'master'
    
    x11/xi2: Report touchpads as TOUCHPAD, not MOUSE
    
    See merge request GNOME/gtk!65

 gdk/x11/gdkdevicemanager-xi2.c | 23 ++++++++++++++++---
 tests/testinput.c              | 52 +++++++++++++++++++++++++++++++++---------
 2 files changed, 61 insertions(+), 14 deletions(-)
---