nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make putting plugin menus in a menu closer to working..

Browse source
This commit is contained in:
Dana Jansens 2003-08-14 06:39:56 +00:00
parent a276868265
commit 12af0aedf2
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
openbox/menu.c
View file

@ -35,7 +35,7 @@ void parse_menu_full(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
xmlNodePtr nact; xmlNodePtr nact;
gchar *id = NULL, *title = NULL, *label = NULL, *plugin; gchar *id = NULL, *title = NULL, *label = NULL, *plugin;
ObMenu *menu = NULL, *parent; ObMenu *menu = NULL, *parent = NULL;
if (newmenu == TRUE) { if (newmenu == TRUE) {
if (!parse_attr_string("id", node, &id)) if (!parse_attr_string("id", node, &id))
@ -52,12 +52,12 @@ void parse_menu_full(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
data.parent = menu; data.parent = menu;
if (plugin_open_reopen(plugin, i)) if (plugin_open_reopen(plugin, i))
parent = plugin_create(plugin, &data); menu = plugin_create(plugin, &data);
g_free(plugin); g_free(plugin);
} else } else
menu = menu_new(title, id, data ? *((ObMenu**)data) : NULL); menu = menu_new(title, id, data ? *((ObMenu**)data) : NULL);
if (data) if (data && menu)
*((ObMenu**)data) = menu; *((ObMenu**)data) = menu;
} else { } else {
menu = (ObMenu *)data; menu = (ObMenu *)data;
@ -78,9 +78,11 @@ void parse_menu_full(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
} else { } else {
parent = menu; parent = menu;
parse_menu(i, doc, node, &parent); parse_menu(i, doc, node, &parent);
}
if (parent)
menu_add_entry(menu, menu_entry_new_submenu(parent->label, menu_add_entry(menu, menu_entry_new_submenu(parent->label,
parent)); parent));
}
} }
else if (!xmlStrcasecmp(node->name, (const xmlChar*) "item")) { else if (!xmlStrcasecmp(node->name, (const xmlChar*) "item")) {