move the default menu to menu.xml
This commit is contained in:
parent
06fb4c7382
commit
67f9061a7a
4 changed files with 4 additions and 4 deletions
|
@ -259,7 +259,7 @@ dist_thebear_theme_DATA = \
|
|||
|
||||
dist_rc_DATA = \
|
||||
data/rc.xml \
|
||||
data/menu
|
||||
data/menu.xml
|
||||
|
||||
dist_desktopfiles_DATA = \
|
||||
data/openbox.desktop
|
||||
|
|
|
@ -324,10 +324,10 @@
|
|||
just don't make menu ids clash or, well, it'll be kind of pointless -->
|
||||
|
||||
<!-- debian menu file -->
|
||||
<file>/etc/X11/openbox/openbox-menu</file>
|
||||
<file>/etc/X11/openbox/openbox-menu.xml</file>
|
||||
|
||||
<!-- default menu file (or custom one in $HOME/.openbox/) -->
|
||||
<file>menu</file>
|
||||
<file>menu.xml</file>
|
||||
</menu>
|
||||
|
||||
</openbox_config>
|
||||
|
|
|
@ -92,7 +92,7 @@ void menu_startup()
|
|||
}
|
||||
}
|
||||
if (!loaded) {
|
||||
if (menu_open("menu", &doc, &node)) {
|
||||
if (menu_open("menu.xml", &doc, &node)) {
|
||||
parse_tree(menu_parse_inst, doc, node->xmlChildrenNode);
|
||||
xmlFreeDoc(doc);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue