[gtk/gtk-4-4: 20/20] Merge branch 'backports-for-4-4' into 'gtk-4-4'




commit 817cfcacced04a21249243a3631580f86d34dae0
Merge: 33a4ae12ef 5053e9917e
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Sep 3 00:55:54 2021 +0000

    Merge branch 'backports-for-4-4' into 'gtk-4-4'
    
    windowhandle: Quiet a compiler warning
    
    See merge request GNOME/gtk!3915

 demos/gtk-demo/fontify.c                           |   6 +
 docs/reference/meson.build                         |   4 +
 gdk/gdk.c                                          |   2 +-
 gdk/gdkpaintable.h                                 |  10 +-
 gdk/wayland/gdkdisplay-wayland.c                   |   2 +-
 gdk/x11/gdkdisplay-x11.c                           |   4 +-
 gdk/x11/gdkxftdefaults.c                           |   6 +-
 gsk/ngl/gsknglrenderjob.c                          |   5 +-
 gtk/compose/compose-parse.c                        |  31 +++++-
 gtk/compose/gtkcomposedata.h                       |   2 +-
 gtk/compose/sequences-big-endian                   | Bin 0 -> 32954 bytes
 gtk/compose/{sequences => sequences-little-endian} | Bin 32894 -> 32954 bytes
 gtk/gen-gtk-gresources-xml.py                      |   9 +-
 gtk/gtkcssstyle.c                                  | 121 +++++++++++----------
 gtk/gtkcssstyleprivate.h                           |   6 +-
 gtk/gtkeditable.c                                  |   6 +-
 gtk/gtkfontbutton.c                                |  15 ++-
 gtk/gtkpango.c                                     |   6 +
 gtk/gtkstylecontext.c                              |  17 +--
 gtk/gtktextbuffer.c                                |   6 +
 gtk/gtktextview.c                                  |  91 ++++++++++++++++
 gtk/gtkwindow.c                                    |  14 +--
 gtk/gtkwindowhandle.c                              |   2 +-
 gtk/meson.build                                    |   1 +
 modules/media/meson.build                          |  14 +--
 testsuite/gtk/compose/system.expected              |  14 ++-
 testsuite/gtk/label.c                              |   4 +
 27 files changed, 275 insertions(+), 123 deletions(-)
---


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