[gtk: 14/14] Merge branch 'wip/otte/for-master' into 'master'



commit 89e5b8cd3a7fa10bc7478cefaef3ee6066ee3834
Merge: b376d9617e e356d59a92
Author: Benjamin Otte <otte benjamin googlemail com>
Date:   Thu Mar 5 18:20:36 2020 +0000

    Merge branch 'wip/otte/for-master' into 'master'
    
    Wip/otte/for master
    
    See merge request GNOME/gtk!1502

 gdk/gdkdevice.c                  |   4 +
 gdk/gdkrgbaprivate.h             |   2 +-
 gdk/wayland/gdkdevice-wayland.c  |   1 +
 gdk/wayland/gdkdisplay-wayland.c |   4 +
 gdk/x11/gdkdisplay-x11.c         |   6 +-
 gdk/x11/gdksurface-x11.c         |   2 +-
 gsk/gl/gskgldriver.c             |   2 +-
 gtk/gtkaccelmap.c                |   1 +
 gtk/gtkbuilderparser.c           |   3 +-
 gtk/gtkicontheme.c               |  33 ++---
 gtk/gtkimcontextwayland.c        |   2 +-
 gtk/gtkmenutracker.c             |   2 +
 gtk/gtkmountoperation-x11.c      |   2 +-
 gtk/gtknotebook.c                |   2 +-
 gtk/gtkpathbar.c                 |   1 +
 gtk/gtkrbtree.c                  |  20 +--
 gtk/gtkshortcutssection.c        |   1 +
 gtk/gtktextbtree.c               |  16 ++-
 gtk/gtktextiter.c                |   6 +-
 gtk/gtktextview.c                |   4 +-
 gtk/gtktreemodelfilter.c         |   3 +
 gtk/gtktreemodelsort.c           |   2 +
 gtk/gtktreerbtree.c              |  25 ++--
 meson.build                      |   4 +
 tests/meson.build                |   1 +
 tests/testhover.c                | 291 +++++++++++++++++++++++++++++++++++++++
 26 files changed, 380 insertions(+), 60 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]