callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

If a required action is missing, don't recurse over the children.

Browse Source 
2006-12-27  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkuimanager.c (update_node): If a required action
        is missing, don't recurse over the children.  (#349119,
        Chris Moller)
This commit is contained in:
Matthias Clasen
2006-12-27 06:37:18 +00:00
committed by Matthias Clasen
parent 264e9c0ce1
commit 1bb873464c
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,4 +1,10 @@
2006-12-17 Matthias Clasen <mclasen@redhat.com> 2006-12-27 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkuimanager.c (update_node): If a required action
is missing, don't recurse over the children. (#349119,
Chris Moller)
2006-12-27 Matthias Clasen <mclasen@redhat.com>
Fix a few problems with nested menus in comboboxes Fix a few problems with nested menus in comboboxes
(#386694, Yevgen Muntyan) (#386694, Yevgen Muntyan)

4
gtk/gtkuimanager.c
View File

@ -2133,9 +2133,9 @@ update_node (GtkUIManager *self,
info->type != NODE_TYPE_MENU_PLACEHOLDER && info->type != NODE_TYPE_MENU_PLACEHOLDER &&
info->type != NODE_TYPE_TOOLBAR_PLACEHOLDER) info->type != NODE_TYPE_TOOLBAR_PLACEHOLDER)
{ {
g_warning ("%s: missing action", info->name); g_warning ("%s: missing action %s", info->name, action_name);
goto recurse_children; return;
} }
if (action) if (action)