all repos — openbox @ aafa246e2f70dac1d42eb60d25777c58b6ebe896

openbox fork - make it a bit more like ryudo

if the menu path starts with a /, then just load it, don't try the prefixes
Dana Jansens danakj@orodu.net
commit

aafa246e2f70dac1d42eb60d25777c58b6ebe896

parent

c73bd381fe7d4bc601ca1f8ecdb1b8bbf074aa18

1 files changed, 15 insertions(+), 8 deletions(-)

jump to
M openbox/menu.copenbox/menu.c

@@ -39,20 +39,27 @@ {

gboolean loaded = TRUE; gchar *p; - p = g_build_filename(g_get_home_dir(), ".openbox", file, NULL); - if (!parse_load(p, "openbox_menu", doc, node)) { - g_free(p); - p = g_build_filename(RCDIR, file, NULL); + if (file[0] == '/') { + if (!parse_load(file, "openbox_menu", doc, node)) { + g_warning("Failed to load menu from '%s'", file); + loaded = FALSE; + } + } else { + p = g_build_filename(g_get_home_dir(), ".openbox", file, NULL); if (!parse_load(p, "openbox_menu", doc, node)) { g_free(p); - p = g_strdup(file); + p = g_build_filename(RCDIR, file, NULL); if (!parse_load(p, "openbox_menu", doc, node)) { - g_warning("Failed to load menu from '%s'", file); - loaded = FALSE; + g_free(p); + 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; }