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

[Matthias Clasen <matthiasc src gnome org>]

commit 502b3ceaa29663f70801920077bceaf4138b56d3
Merge: da5efea663 01abd1565e
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Sep 29 15:37:29 2021 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    gtk-builder-tool: Simplify <style>
    
    See merge request GNOME/gtk!4009

 demos/widget-factory/widget-factory.ui             | 687 ++++++++++-----------
 gtk/a11y/gtkatspicontext.c                         |  83 +--
 gtk/ui/gtkaboutdialog.ui                           |  46 +-
 gtk/ui/gtkappchooserdialog.ui                      |  22 +-
 gtk/ui/gtkappchooserwidget.ui                      |  20 +-
 gtk/ui/gtkassistant.ui                             |  18 +-
 gtk/ui/gtkcolorchooserdialog.ui                    |   8 +-
 gtk/ui/gtkcoloreditor.ui                           |  24 +-
 gtk/ui/gtkcombobox.ui                              |  26 +-
 gtk/ui/gtkdialog.ui                                |   4 +-
 gtk/ui/gtkdropdown.ui                              |  73 ++-
 gtk/ui/gtkemojichooser.ui                          |  76 +--
 gtk/ui/gtkemojicompletion.ui                       |   2 +-
 gtk/ui/gtkfilechooserdialog.ui                     |   6 +-
 gtk/ui/gtkfilechooserwidget.ui                     |  66 +-
 gtk/ui/gtkfontchooserdialog.ui                     |   8 +-
 gtk/ui/gtkfontchooserwidget.ui                     |  65 +-
 gtk/ui/gtklockbutton.ui                            |   8 +-
 gtk/ui/gtkmediacontrols.ui                         |   9 +-
 gtk/ui/gtkmessagedialog.ui                         |  12 +-
 gtk/ui/gtkpagesetupunixdialog.ui                   |  34 +-
 gtk/ui/gtkplacesview.ui                            |  50 +-
 gtk/ui/gtkplacesviewrow.ui                         |  16 +-
 gtk/ui/gtkprintunixdialog.ui                       | 250 ++++----
 gtk/ui/gtkscalebutton.ui                           |  13 +-
 gtk/ui/gtksidebarrow.ui                            |  16 +-
 gtk/ui/gtkstatusbar.ui                             |   6 +-
 gtk/ui/gtkvideo.ui                                 |  10 +-
 gtk/ui/gtkvolumebutton.ui                          |   6 +-
 .../tools/simplify-data-3to4/assistant.expected    |   8 +-
 testsuite/tools/simplify-data-3to4/box.expected    | 280 ++++-----
 .../tools/simplify-data-3to4/checkbutton.expected  |   2 +-
 testsuite/tools/simplify-data-3to4/grid.expected   |  18 +-
 .../gtkfilechooserdialog.expected                  |   4 +-
 .../tools/simplify-data-3to4/notebook.expected     |   8 +-
 .../simplify-data-3to4/office-runner.expected      |  36 +-
 testsuite/tools/simplify-data-3to4/stack.expected  |   4 +-
 .../tools/simplify-data-3to4/toolbar.expected      |   6 +-
 testsuite/tools/simplify-data/test3.expected       |   2 +-
 tools/gtk-builder-tool-simplify.c                  |  81 ++-
 40 files changed, 1051 insertions(+), 1062 deletions(-)
---