Allow loading of menu files outside of your XDG_CONFIG_HOME (Fix bug 5711)

[chaz/openbox] / openbox / menu.c

diff --git a/openbox/menu.c b/openbox/menu.c
index eaf081d944a3c1e4e0e2c54f63038b1b8a33a010..7c49cedbe3d411b22b7fbb0647d7bb37aeeb332d 100644 (file)
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -90,7 +90,16 @@ void menu_startup(gboolean reconfig)
             loaded = TRUE;
             obt_xml_tree_from_root(menu_parse_inst);
             obt_xml_close(menu_parse_inst);
-        } else
+        }
+        else if (obt_xml_load_file(menu_parse_inst,
+                                   it->data,
+                                   "openbox_menu"))
+        {
+            loaded = TRUE;
+            obt_xml_tree_from_root(menu_parse_inst);
+            obt_xml_close(menu_parse_inst);
+        }
+        else
             g_message(_("Unable to find a valid menu file \"%s\""),
                       (const gchar*)it->data);
     }