[gtk/matthiasc/for-master: 8/14] action muxer: Propagate accel changes




commit 15c65595b8e190f06518a3de385f7130273a58c5
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Jun 17 08:35:59 2021 -0400

    action muxer: Propagate accel changes
    
    When we set a new parent on an action muxer,
    accels may change, so call primary_accel_changed
    for involved actions.

 gtk/gtkactionmuxer.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkactionmuxer.c b/gtk/gtkactionmuxer.c
index d57e315daf..9eac44b72e 100644
--- a/gtk/gtkactionmuxer.c
+++ b/gtk/gtkactionmuxer.c
@@ -443,10 +443,9 @@ notify_observers_added (GtkActionMuxer *muxer,
       if (!action->watchers)
         continue;
 
-      if (action_muxer_query_action (muxer, action_name,
-                                     NULL, NULL, NULL, NULL, NULL,
-                                     FALSE))
-        continue;
+      for (node = action ? action->watchers : NULL; node; node = node->next)
+        gtk_action_observer_primary_accel_changed (node->data, GTK_ACTION_OBSERVABLE (muxer),
+                                                   action_name, NULL);
 
       gtk_action_observable_register_observer (GTK_ACTION_OBSERVABLE (parent), action_name, 
GTK_ACTION_OBSERVER (muxer));
 


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