From 67f9061a7a8d28b1859bc19baad5811d5310ae47 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Tue, 2 Sep 2003 17:46:37 +0000
Subject: move the default menu to menu.xml

---
 Makefile.am    |  2 +-
 data/menu      | 44 --------------------------------------------
 data/menu.xml  | 44 ++++++++++++++++++++++++++++++++++++++++++++
 data/rc.xml    |  4 ++--
 openbox/menu.c |  2 +-
 5 files changed, 48 insertions(+), 48 deletions(-)
 delete mode 100644 data/menu
 create mode 100644 data/menu.xml

diff --git a/Makefile.am b/Makefile.am
index 1465e50f..826b0550 100644
--- 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
deleted file mode 100644
index a3c973e8..00000000
--- a/data/menu
+++ /dev/null
@@ -1,44 +0,0 @@
-<openbox_menu>
-
-<menu id="games-menu" label="Games">
-  <item label="Crack-Attack">
-    <action name="execute"><execute>crack-attack</execute></action>
-  </item>
-  <item label="XFRisk">
-    <action name="execute"><execute>xfrisk</execute></action>
-  </item>
-  <item label="Quake III">
-    <action name="execute"><execute>quake3</execute></action>
-  </item>
-</menu>
-
-<menu id="apps-menu" label="Applications">
-  <item label="Xterm">
-    <action name="execute"><execute>xterm</execute></action>
-  </item>
-  <item label="Mozilla">
-    <action name="execute"><execute>mozilla</execute></action>
-  </item>
-  <item label="Gaim">
-    <action name="execute"><execute>gaim</execute></action>
-  </item>
-  <item label="Quark">
-    <action name="execute"><execute>strange-quark</execute></action>
-  </item>
-</menu>
-
-<menu id="root-menu" label="Openbox 3">
-  <menu id="apps-menu" />
-  <menu id="games-menu" />
-  <separator />
-  <menu id="client-list-menu" />
-  <separator />
-  <item label="Restart">
-    <action name="restart" />
-  </item>
-  <item label="Exit">
-    <action name="exit" />
-  </item>
-</menu>
-
-</openbox_menu>
diff --git a/data/menu.xml b/data/menu.xml
new file mode 100644
index 00000000..a3c973e8
--- /dev/null
+++ b/data/menu.xml
@@ -0,0 +1,44 @@
+<openbox_menu>
+
+<menu id="games-menu" label="Games">
+  <item label="Crack-Attack">
+    <action name="execute"><execute>crack-attack</execute></action>
+  </item>
+  <item label="XFRisk">
+    <action name="execute"><execute>xfrisk</execute></action>
+  </item>
+  <item label="Quake III">
+    <action name="execute"><execute>quake3</execute></action>
+  </item>
+</menu>
+
+<menu id="apps-menu" label="Applications">
+  <item label="Xterm">
+    <action name="execute"><execute>xterm</execute></action>
+  </item>
+  <item label="Mozilla">
+    <action name="execute"><execute>mozilla</execute></action>
+  </item>
+  <item label="Gaim">
+    <action name="execute"><execute>gaim</execute></action>
+  </item>
+  <item label="Quark">
+    <action name="execute"><execute>strange-quark</execute></action>
+  </item>
+</menu>
+
+<menu id="root-menu" label="Openbox 3">
+  <menu id="apps-menu" />
+  <menu id="games-menu" />
+  <separator />
+  <menu id="client-list-menu" />
+  <separator />
+  <item label="Restart">
+    <action name="restart" />
+  </item>
+  <item label="Exit">
+    <action name="exit" />
+  </item>
+</menu>
+
+</openbox_menu>
diff --git a/data/rc.xml b/data/rc.xml
index af348774..c3737d30 100644
--- 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 8cc1c872..d9541027 100644
--- 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);
         }
-- 
cgit v1.2.3