[gtk: 2/2] Merge branch 'scroll-event-propagation' into 'master'

[Carlos Garnacho <carlosg src gnome org>]

commit d7c2e5844b21936666b7e9e5ffa6b685a9492463
Merge: c2c1acc73e edc4b2f7d0
Author: Carlos Garnacho <mrgarnacho gmail com>
Date:   Mon Nov 12 10:05:46 2018 +0000

    Merge branch 'scroll-event-propagation' into 'master'
    
    eventcontrollerscroll: Conditionally propagate ::scroll
    
    Closes #45
    
    See merge request GNOME/gtk!250

 gtk/gtkcalendar.c              | 12 +++++++-----
 gtk/gtkcombobox.c              |  8 +++++---
 gtk/gtkeventcontrollerscroll.c | 13 ++++++++-----
 gtk/gtkmarshalers.list         |  1 +
 gtk/gtkmenu.c                  |  6 ++++--
 gtk/gtkpathbar.c               | 12 +++++++-----
 gtk/gtkrange.c                 |  6 ++++--
 gtk/gtkscalebutton.c           |  6 ++++--
 gtk/gtkscrolledwindow.c        |  6 ++++--
 gtk/gtkspinbutton.c            |  4 +++-
 gtk/gtktreeview.c              |  6 ++++--
 11 files changed, 51 insertions(+), 29 deletions(-)
---