[gtk: 2/2] Merge branch 'window-activate-grab-4-2.4' into 'master'

[Benjamin Otte <otte src gnome org>]

commit bcb3a32686d69e542ad4a12f69e1e09cedecad4b
Merge: 3684b72121 01455399e8
Author: Benjamin Otte <otte benjamin googlemail com>
Date:   Mon Apr 30 09:48:25 2018 +0000

    Merge branch 'window-activate-grab-4-2.4' into 'master'
    
    gdk: do not deactivate surface on keyboard grab
    
    Closes #85
    
    See merge request GNOME/gtk!120

 gdk/x11/gdkdevicemanager-core-x11.c | 2 +-
 gdk/x11/gdkeventsource.c            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---