[gtk/matthiasc/for-master: 12/14] window: Propagate accel changes

[Matthias Clasen <matthiasc src gnome org>]

commit 64af90111e21364b54f7f430a557a912fa887270
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Jun 17 08:32:11 2021 -0400

    window: Propagate accel changes
    
    When the global accels change, tell the
    shortcut controller to re-inject them into
    the action muxer hierarchy.

 gtk/gtkwindow.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index a79e160582..df3d3d7e87 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -54,7 +54,7 @@
 #include "gtknativeprivate.h"
 #include "gtksettings.h"
 #include "gtkshortcut.h"
-#include "gtkshortcutcontroller.h"
+#include "gtkshortcutcontrollerprivate.h"
 #include "gtkshortcutmanager.h"
 #include "gtkshortcuttrigger.h"
 #include "gtksnapshot.h"
@@ -2376,6 +2376,8 @@ handle_keys_changed (gpointer data)
       priv->keys_changed_handler = 0;
     }
 
+  if (priv->application_shortcut_controller)
+    gtk_shortcut_controller_update_accels (GTK_SHORTCUT_CONTROLLER (priv->application_shortcut_controller));
   g_signal_emit (window, window_signals[KEYS_CHANGED], 0);
   
   return FALSE;