[gtk: 8/8] Merge branch 'matthiasc/for-master' into 'master'




commit f5379d204702123afc742d873e1f5fc5726f6f52
Merge: 2cd0e5f60b 98c247ec29
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Jan 28 19:12:18 2021 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    Matthiasc/for master
    
    See merge request GNOME/gtk!3127

 gtk/{tools => }/gdkpixbufutils.c                   |   0
 gtk/gen-gtk-gresources-xml.py                      |   8 +--
 gtk/glade/README.glade                             |  17 -------
 gtk/glade/gtk-private-widgets.xml                  |  33 ------------
 gtk/gtkbox.c                                       |   1 -
 gtk/gtkboxlayout.c                                 |   2 +-
 gtk/gtkbuiltinicon.c                               |   9 ++--
 gtk/gtkcalendar.c                                  |   1 -
 gtk/gtkcenterlayout.c                              |  11 ++--
 gtk/gtkcheckbutton.c                               |   2 +-
 gtk/gtkcolorswatch.c                               |   1 -
 gtk/gtkcssinheritvalue.c                           |   2 +-
 gtk/gtkcssprovider.c                               |   1 -
 gtk/gtkcssshadowvalue.c                            |   1 -
 gtk/gtkentry.c                                     |   1 -
 gtk/gtkexpander.c                                  |   1 -
 gtk/gtkfilechooserwidget.c                         |   1 -
 gtk/gtkfontchooserwidget.c                         |   1 -
 gtk/gtkframe.c                                     |   2 -
 gtk/gtkgladecatalog.c                              |  56 ---------------------
 gtk/gtkgrid.c                                      |   2 +-
 gtk/gtkgridlayout.c                                |   2 +-
 gtk/{tools => }/gtkiconcachevalidator.c            |   0
 gtk/gtkiconhelper.c                                |   1 -
 gtk/gtkimage.c                                     |   1 -
 gtk/gtklabel.c                                     |   5 --
 gtk/gtklevelbar.c                                  |   3 +-
 gtk/gtklistbase.c                                  |   1 -
 gtk/gtkmountoperation.c                            |   1 -
 gtk/gtknotebook.c                                  |   1 -
 gtk/gtkpaned.c                                     |   3 +-
 gtk/gtkpasswordentry.c                             |   2 +-
 gtk/gtkprogressbar.c                               |   3 --
 gtk/gtkroundedbox.c                                |   1 -
 gtk/gtkscale.c                                     |   2 -
 gtk/gtkspinbutton.c                                |   2 -
 gtk/gtkspinner.c                                   |   2 +-
 gtk/gtkswitch.c                                    |   1 -
 gtk/gtktexthandle.c                                |  17 +++----
 gtk/gtktextutil.c                                  |   5 +-
 gtk/gtktextview.c                                  |  12 ++---
 gtk/gtktreeview.c                                  |   1 -
 gtk/gtkwidget.c                                    |   1 -
 gtk/gtkwindow.c                                    |   1 -
 .../actions}/gesture-pinch-symbolic.symbolic.png   | Bin
 ...ture-rotate-anticlockwise-symbolic.symbolic.png | Bin
 .../gesture-rotate-clockwise-symbolic.symbolic.png | Bin
 .../actions}/gesture-stretch-symbolic.symbolic.png | Bin
 .../gesture-swipe-left-symbolic.symbolic.png       | Bin
 .../gesture-swipe-right-symbolic.symbolic.png      | Bin
 ...ure-two-finger-swipe-left-symbolic.symbolic.png | Bin
 ...re-two-finger-swipe-right-symbolic.symbolic.png | Bin
 .../scalable/actions}/gesture-pinch-symbolic.svg   |   0
 .../gesture-rotate-anticlockwise-symbolic.svg      |   0
 .../actions}/gesture-rotate-clockwise-symbolic.svg |   0
 .../scalable/actions}/gesture-stretch-symbolic.svg |   0
 .../actions}/gesture-swipe-left-symbolic.svg       |   0
 .../actions}/gesture-swipe-right-symbolic.svg      |   0
 .../gesture-two-finger-swipe-left-symbolic.svg     |   0
 .../gesture-two-finger-swipe-right-symbolic.svg    |   0
 gtk/inspector/logo.png                             | Bin 2640 -> 0 bytes
 gtk/meson.build                                    |   7 +--
 meson.build                                        |   1 +
 tests/testentryicons.c                             |   2 +-
 {gtk/tools => tools}/encodesymbolic.c              |   0
 {gtk/tools => tools}/gtk-builder-tool-enumerate.c  |   0
 {gtk/tools => tools}/gtk-builder-tool-preview.c    |   0
 {gtk/tools => tools}/gtk-builder-tool-simplify.c   |   0
 {gtk/tools => tools}/gtk-builder-tool-validate.c   |   0
 {gtk/tools => tools}/gtk-builder-tool.c            |   0
 {gtk/tools => tools}/gtk-builder-tool.h            |   0
 {gtk/tools => tools}/gtk-launch.c                  |   0
 {gtk/tools => tools}/gtk-query-settings.c          |   0
 {gtk/tools => tools}/gtk4builder.its               |   0
 {gtk/tools => tools}/gtk4builder.loc               |   0
 {gtk/tools => tools}/gtk4builder.rng               |   0
 {gtk/tools => tools}/meson.build                   |  12 +++--
 {gtk/tools => tools}/updateiconcache.c             |   0
 78 files changed, 46 insertions(+), 197 deletions(-)
---


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