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

[Matthias Clasen <matthiasc src gnome org>]

commit 1bda665662b9db0baa16d86298f36927434ccc21
Merge: fad4c60499 47bb556327
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Jun 17 17:53:16 2021 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    action muxer fixes
    
    See merge request GNOME/gtk!3678

 demos/print-editor/print-editor.c                  |  17 +++--
 demos/widget-factory/widget-factory.c              |   1 +
 examples/bp/bloatpad.c                             |  69 ++++++++++++++++-----
 examples/bp/bloatpad.gresources.xml                |   5 ++
 .../format-justify-center-symbolic.symbolic.png    | Bin 0 -> 119 bytes
 .../format-justify-left-symbolic.symbolic.png      | Bin 0 -> 115 bytes
 .../format-justify-right-symbolic.symbolic.png     | Bin 0 -> 117 bytes
 .../actions/view-fullscreen-symbolic.symbolic.png  | Bin 0 -> 207 bytes
 .../actions/view-restore-symbolic.symbolic.png     | Bin 0 -> 204 bytes
 examples/drawing.c                                 |   6 +-
 examples/sunny.c                                   |   4 +-
 gtk/gtkactionmuxer.c                               |  36 ++++++-----
 gtk/gtkactionobserver.c                            |   8 ++-
 gtk/gtkmenutrackeritem.c                           |   6 +-
 gtk/gtkshortcutcontroller.c                        |  23 +++++--
 gtk/gtkshortcutcontrollerprivate.h                 |   2 +
 gtk/gtkwindow.c                                    |   4 +-
 testsuite/gdk/clipboard-client.c                   |   3 +-
 18 files changed, 133 insertions(+), 51 deletions(-)
---