[gtk: 3/3] Merge branch 'matthiasc/for-main' into 'main'

[Matthias Clasen <matthiasc src gnome org>]

commit 2dc33a9de1870a2ca5ede1303ce866356d0287e6
Merge: abac891bd2 7c5e1c6195
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Oct 6 03:48:36 2022 +0000

    Merge branch 'matthiasc/for-main' into 'main'
    
    gdk: Cosmetics
    
    See merge request GNOME/gtk!5087

 gdk/gdkconfig.h.meson                                   | 2 ++
 gdk/meson.build                                         | 2 ++
 gtk/a11y/gtkatspipango.c                                | 2 +-
 gtk/a11y/gtkatspitext.c                                 | 2 +-
 gtk/a11y/gtkatspitextbuffer.c                           | 2 +-
 gtk/gskpango.c                                          | 2 +-
 gtk/{gskpango.h => gskpangoprivate.h}                   | 6 +++---
 gtk/gtkcssshadowvalue.c                                 | 2 +-
 gtk/gtkdragicon.c                                       | 2 +-
 gtk/gtkentry.c                                          | 4 ++--
 gtk/gtkfilechooserwidget.c                              | 2 +-
 gtk/gtkfilesystemmodel.c                                | 2 +-
 gtk/gtkinscription.c                                    | 2 +-
 gtk/gtklabel.c                                          | 4 ++--
 gtk/gtkliststore.c                                      | 2 +-
 gtk/gtkpango.c                                          | 2 +-
 gtk/{gtkpango.h => gtkpangoprivate.h}                   | 6 +++---
 gtk/gtkpathbar.c                                        | 2 +-
 gtk/{gtkpathbar.h => gtkpathbarprivate.h}               | 8 ++++----
 gtk/gtkplacessidebar.c                                  | 2 +-
 gtk/gtksnapshot.c                                       | 2 +-
 gtk/gtktext.c                                           | 4 ++--
 gtk/gtktextattributes.c                                 | 2 +-
 gtk/{gtktextattributes.h => gtktextattributesprivate.h} | 4 ++--
 gtk/gtktextbtree.c                                      | 6 +++---
 gtk/{gtktextbtree.h => gtktextbtreeprivate.h}           | 6 +++---
 gtk/gtktextbuffer.c                                     | 4 ++--
 gtk/gtktextbufferprivate.h                              | 2 +-
 gtk/gtktextchild.c                                      | 2 +-
 gtk/gtktextchildprivate.h                               | 2 +-
 gtk/gtktextiter.c                                       | 2 +-
 gtk/gtktextiterprivate.h                                | 4 ++--
 gtk/gtktextlayout.c                                     | 6 +++---
 gtk/gtktextlayoutprivate.h                              | 2 +-
 gtk/gtktextlinedisplaycache.c                           | 2 +-
 gtk/gtktextmark.c                                       | 2 +-
 gtk/gtktextmarkprivate.h                                | 2 +-
 gtk/gtktextsegment.c                                    | 2 +-
 gtk/{gtktextsegment.h => gtktextsegmentprivate.h}       | 4 ++--
 gtk/gtktexttag.c                                        | 2 +-
 gtk/gtktexttagprivate.h                                 | 2 +-
 gtk/gtktexttypes.c                                      | 2 +-
 gtk/{gtktexttypes.h => gtktexttypesprivate.h}           | 4 ++--
 gtk/gtktextutil.c                                       | 2 +-
 gtk/{gtktextutil.h => gtktextutilprivate.h}             | 6 +++---
 gtk/gtktextview.c                                       | 4 ++--
 gtk/gtktextviewprivate.h                                | 2 +-
 gtk/gtktrashmonitor.c                                   | 2 +-
 gtk/{gtktrashmonitor.h => gtktrashmonitorprivate.h}     | 6 +++---
 gtk/gtktreedatalist.c                                   | 2 +-
 gtk/{gtktreedatalist.h => gtktreedatalistprivate.h}     | 6 +++---
 gtk/gtktreemodelsort.c                                  | 2 +-
 gtk/gtktreestore.c                                      | 2 +-
 testsuite/gtk/textbuffer.c                              | 2 +-
 54 files changed, 84 insertions(+), 80 deletions(-)
---