M Makefile.am → Makefile.am

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

M data/menu → data/menu.xml

M data/rc.xml → data/rc.xml

@@ -324,10 +324,10 @@ <!-- You can specify more than one menu file in here and they are all loaded,
        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>

M openbox/menu.c → openbox/menu.c

@@ -92,7 +92,7 @@ xmlFreeDoc(doc);
         }
     }
     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);
         }