AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

action muxer: Don't activate disabled actions

Browse Source 
We really shouldn't.
This commit is contained in:
Matthias Clasen 2019-06-22 21:19:19 -04:00
parent 366e8da927
commit 8fd968e5bf
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/gtkactionmuxer.c
View File

@ -648,10 +648,13 @@ gtk_action_muxer_activate_action (GActionGroup *action_group,
GtkWidgetAction *action = g_ptr_array_index (muxer->widget_actions, i); GtkWidgetAction *action = g_ptr_array_index (muxer->widget_actions, i);
if (strcmp (action->name, action_name) == 0) if (strcmp (action->name, action_name) == 0)
{ {
if (action->activate) if (muxer->widget_actions_enabled[i])
action->activate (muxer->widget, action->name, parameter); {
else if (action->pspec) if (action->activate)
prop_action_activate (muxer->widget, action, parameter); action->activate (muxer->widget, action->name, parameter);
else if (action->pspec)
prop_action_activate (muxer->widget, action, parameter);
}
return; return;
} }