move the default menu to menu.xml

diff --git a/Makefile.am b/Makefile.am
index 1465e50f1122490778375eeeb436d1eb20abde10..826b0550c1c258adddc80319a53e823557994465 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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

diff --git a/data/menu b/data/menu.xml
similarity index 100%
rename from data/menu
rename to data/menu.xml

diff --git a/data/rc.xml b/data/rc.xml
index af3487740f4e178d276dd2000d60eada40103f8e..c3737d30b425fdaaa4d51609307ea892d6c36ca8 100644 (file)
--- a/data/rc.xml
+++ b/data/rc.xml
@@ -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>

diff --git a/openbox/menu.c b/openbox/menu.c
index 8cc1c872f2c642fb36704fceff3ccde993406922..d954102762dc1d1309d8749208ccb4e70c7d79db 100644 (file)
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -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);
         }