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

Allow loading of menu files outside of your XDG_CONFIG_HOME (Fix bug 5711)

Browse source 
When the given file name can not be found in your XDG_CONFIG_HOME, ie in
 ~/.config/openbox, then try the file name directly.

This means if you specify a menu file such as "/home/dana/helloworld.xml",
openbox will try, in order:
1) ~/.config/openbox/home/dana/helloworld.xml
2) /home/dana/helloworld.xml

And it will load the file you meant when it tries the second one.
This commit is contained in:
Dana Jansens 2012-09-30 21:23:58 -04:00
parent dc4cfa94c9
commit 51d735672c
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
openbox/menu.c
View file

@ -90,7 +90,16 @@ void menu_startup(gboolean reconfig)
loaded = TRUE; loaded = TRUE;
obt_xml_tree_from_root(menu_parse_inst); obt_xml_tree_from_root(menu_parse_inst);
obt_xml_close(menu_parse_inst); obt_xml_close(menu_parse_inst);
} else }
else if (obt_xml_load_file(menu_parse_inst,
it->data,
"openbox_menu"))
{
loaded = TRUE;
obt_xml_tree_from_root(menu_parse_inst);
obt_xml_close(menu_parse_inst);
}
else
g_message(_("Unable to find a valid menu file \"%s\""), g_message(_("Unable to find a valid menu file \"%s\""),
(const gchar*)it->data); (const gchar*)it->data);
} }