From 24df4baa6ba7bb61e4b954c22cbed73b99143cea Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Wed, 30 May 2007 20:30:24 +0000 Subject: [PATCH] dont need to recurse --- openbox/menu.c | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/openbox/menu.c b/openbox/menu.c index 71eb0591..3fcf3e87 100644 --- a/openbox/menu.c +++ b/openbox/menu.c @@ -547,50 +547,38 @@ ObMenuEntry* menu_add_separator(ObMenu *self, gint id, const gchar *label) void menu_set_show_func(ObMenu *self, ObMenuShowFunc func) { - do { - self->show_func = func; - self = self->more_menu; - } while (self); + self->show_func = func; + self->more_menu->show_func = func; /* keep it in sync */ } void menu_set_hide_func(ObMenu *self, ObMenuHideFunc func) { - do { - self->hide_func = func; - self = self->more_menu; - } while (self); + self->hide_func = func; + self->more_menu->hide_func = func; /* keep it in sync */ } void menu_set_update_func(ObMenu *self, ObMenuUpdateFunc func) { - do { - self->update_func = func; - self = self->more_menu; - } while (self); + self->update_func = func; + self->more_menu->update_func = func; /* keep it in sync */ } void menu_set_execute_func(ObMenu *self, ObMenuExecuteFunc func) { - do { - self->execute_func = func; - self = self->more_menu; - } while (self); + self->execute_func = func; + self->more_menu->execute_func = func; /* keep it in sync */ } void menu_set_destroy_func(ObMenu *self, ObMenuDestroyFunc func) { - do { - self->destroy_func = func; - self = self->more_menu; - } while (self); + self->destroy_func = func; + self->more_menu->destroy_func = func; /* keep it in sync */ } void menu_set_place_func(ObMenu *self, ObMenuPlaceFunc func) { - do { - self->place_func = func; - self = self->more_menu; - } while (self); + self->place_func = func; + self->more_menu->place_func = func; /* keep it in sync */ } ObMenuEntry* menu_find_entry_id(ObMenu *self, gint id) -- 2.44.0