Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

actionmuxer: Don't emit signals for irrelevant changes

Browse Source 
If the action muxer has an action, there is no need to
react to parent changes for that same action.

Fixes: https://gitlab.gnome.org/GNOME/gtk/issues/2398
This commit is contained in:
Matthias Clasen
2020-02-04 12:45:07 +01:00
parent b8ffe5b245
commit 8d8005d892
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gtk/gtkactionmuxer.c
View File

@@ -357,7 +357,8 @@ gtk_action_muxer_action_added_to_parent (GActionGroup *action_group,
{
GtkActionMuxer *muxer = user_data;
gtk_action_muxer_action_added (muxer, action_name, action_group, action_name);
if (!gtk_action_muxer_find_group (muxer, action_name, NULL))
gtk_action_muxer_action_added (muxer, action_name, action_group, action_name);
}
static void
@@ -394,7 +395,8 @@ gtk_action_muxer_action_removed_from_parent (GActionGroup *action_group,
{
GtkActionMuxer *muxer = user_data;
gtk_action_muxer_action_removed (muxer, action_name);
if (!gtk_action_muxer_find_group (muxer, action_name, NULL))
gtk_action_muxer_action_removed (muxer, action_name);
}
static void
@@ -1132,7 +1134,10 @@ gtk_action_muxer_set_parent (GtkActionMuxer *muxer,
actions = g_action_group_list_actions (G_ACTION_GROUP (muxer->parent));
for (it = actions; *it; it++)
gtk_action_muxer_action_removed (muxer, *it);
{
if (!gtk_action_muxer_find (muxer, *it, NULL))
gtk_action_muxer_action_removed (muxer, *it);
}
g_strfreev (actions);
emit_changed_accels (muxer, muxer->parent);
@@ -1157,7 +1162,10 @@ gtk_action_muxer_set_parent (GtkActionMuxer *muxer,
actions = g_action_group_list_actions (G_ACTION_GROUP (muxer->parent));
for (it = actions; *it; it++)
gtk_action_muxer_action_added (muxer, *it, G_ACTION_GROUP (muxer->parent), *it);
{
if (!gtk_action_muxer_find (muxer, *it, NULL))
gtk_action_muxer_action_added (muxer, *it, G_ACTION_GROUP (muxer->parent), *it);
}
g_strfreev (actions);
emit_changed_accels (muxer, muxer->parent);