[gtk: 2/2] Merge branch 'wip/nacho/tool-api' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 1d5bc2838be2b913c98dfcca13533dc27c09a881
Merge: 0d99ef7cee 45ec3fc389
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Jan 7 13:25:11 2021 +0000

    Merge branch 'wip/nacho/tool-api' into 'master'
    
    seat: improve api to take into account the tool type
    
    See merge request GNOME/gtk!3047

 gdk/gdkseat.c                  |  9 +++++----
 gdk/gdkseatdefault.c           |  2 +-
 gdk/gdkseatprivate.h           |  7 ++++---
 gdk/x11/gdkdevicemanager-xi2.c | 11 ++++++-----
 4 files changed, 16 insertions(+), 13 deletions(-)
---