e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Allow omitting menus/ in menu path. May make migration from <16.8 less painful. 

SVN revision: 21605
This commit is contained in:
Kim Woelders 2006-03-30 21:07:10 +00:00
parent 016e84b20e
commit 203d91bd09
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/menus-misc.c
View File

@ -402,7 +402,7 @@ MenuCreateFromFlatFile(const char *name, Menu * parent, MenuStyle * ms,
const char *file)
{
Menu *m = NULL;
char *ff;
char *ff, buf[4096];
static int calls = 0;
if (calls > 32)
@ -411,7 +411,15 @@ MenuCreateFromFlatFile(const char *name, Menu * parent, MenuStyle * ms,
ff = FindFile(file, NULL, 0);
if (!ff)
goto done;
{
if (isabspath(file))
goto done;
/* Check also menus subdir */
Esnprintf(buf, sizeof(buf), "menus/%s", file);
ff = FindFile(buf, NULL, 0);
if (!ff)
goto done;
}
m = MenuCreate(name, NULL, parent, ms);
MenuSetData(m, ff);