From c8f7fb02e4d7b22c7b309097407342bd9a7be1cc Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 27 Dec 2006 06:36:06 +0000 Subject: [PATCH] If a required action is missing, don't recurse over the children. 2006-12-27 Matthias Clasen * gtk/gtkuimanager.c (update_node): If a required action is missing, don't recurse over the children. (#349119, Chris Moller) --- ChangeLog | 8 +++++++- gtk/gtkuimanager.c | 5 ++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ed0951a156..4a0eed1277 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,10 @@ -2006-12-17 Matthias Clasen +2006-12-27 Matthias Clasen + + * 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 Fix a few problems with nested menus in comboboxes (#386694, Yevgen Muntyan) diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index 8a3685f76e..724bdfcde2 100644 --- a/gtk/gtkuimanager.c +++ b/gtk/gtkuimanager.c @@ -2133,9 +2133,9 @@ update_node (GtkUIManager *self, info->type != NODE_TYPE_MENU_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) @@ -2560,7 +2560,6 @@ update_node (GtkUIManager *self, info->action = action; recurse_children: - /* process children */ child = node->children; while (child) {