From: Dana Jansens Date: Tue, 2 Sep 2003 17:46:37 +0000 (+0000) Subject: move the default menu to menu.xml X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=67f9061a7a8d28b1859bc19baad5811d5310ae47;p=chaz%2Fopenbox move the default menu to 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.xml similarity index 100% rename from data/menu rename to data/menu.xml 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 --> - /etc/X11/openbox/openbox-menu + /etc/X11/openbox/openbox-menu.xml - menu + menu.xml 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); }