nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

if the menu path starts with a /, then just load it, don't try the prefixes

Browse source
This commit is contained in:
Dana Jansens 2003-09-08 08:43:49 +00:00
parent c73bd381fe
commit aafa246e2f
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
openbox/menu.c
View file

@ -39,20 +39,27 @@ static gboolean menu_open(gchar *file, xmlDocPtr *doc, xmlNodePtr *node)
gboolean loaded = TRUE; gboolean loaded = TRUE;
gchar *p; gchar *p;
p = g_build_filename(g_get_home_dir(), ".openbox", file, NULL); if (file[0] == '/') {
if (!parse_load(p, "openbox_menu", doc, node)) { if (!parse_load(file, "openbox_menu", doc, node)) {
g_free(p); g_warning("Failed to load menu from '%s'", file);
p = g_build_filename(RCDIR, file, NULL); loaded = FALSE;
}
} else {
p = g_build_filename(g_get_home_dir(), ".openbox", file, NULL);
if (!parse_load(p, "openbox_menu", doc, node)) { if (!parse_load(p, "openbox_menu", doc, node)) {
g_free(p); g_free(p);
p = g_strdup(file); p = g_build_filename(RCDIR, file, NULL);
if (!parse_load(p, "openbox_menu", doc, node)) { if (!parse_load(p, "openbox_menu", doc, node)) {
g_warning("Failed to load menu from '%s'", file); g_free(p);
loaded = FALSE; p = g_strdup(file);
if (!parse_load(p, "openbox_menu", doc, node)) {
g_warning("Failed to load menu from '%s'", file);
loaded = FALSE;
}
} }
} }
g_free(p);
} }
g_free(p);
return loaded; return loaded;
} }