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

move the default menu to menu.xml

Browse source
This commit is contained in:
Dana Jansens 2003-09-02 17:46:37 +00:00
parent 06fb4c7382
commit 67f9061a7a
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -259,7 +259,7 @@ dist_thebear_theme_DATA = \
dist_rc_DATA = \ dist_rc_DATA = \
data/rc.xml \ data/rc.xml \
data/menu data/menu.xml
dist_desktopfiles_DATA = \ dist_desktopfiles_DATA = \
data/openbox.desktop data/openbox.desktop

0
data/menu → data/menu.xml
View file

4
data/rc.xml
View file

@ -324,10 +324,10 @@
just don't make menu ids clash or, well, it'll be kind of pointless --> just don't make menu ids clash or, well, it'll be kind of pointless -->
<!-- debian menu file --> <!-- 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/) --> <!-- default menu file (or custom one in $HOME/.openbox/) -->
<file>menu</file> <file>menu.xml</file>
</menu> </menu>
</openbox_config> </openbox_config>

2
openbox/menu.c
View file

@ -92,7 +92,7 @@ void menu_startup()
} }
} }
if (!loaded) { if (!loaded) {
if (menu_open("menu", &doc, &node)) { if (menu_open("menu.xml", &doc, &node)) {
parse_tree(menu_parse_inst, doc, node->xmlChildrenNode); parse_tree(menu_parse_inst, doc, node->xmlChildrenNode);
xmlFreeDoc(doc); xmlFreeDoc(doc);
} }