new method for loading menu files etc

[chaz/openbox] / plugins / menu / include_menu.c

diff --git a/plugins/menu/include_menu.c b/plugins/menu/include_menu.c
index b4f383224d08639820651ae92d62c5c7722a0894..2133e9d24071110522e882e348f418e06f85a9e7 100644 (file)
--- a/plugins/menu/include_menu.c
+++ b/plugins/menu/include_menu.c
@@ -29,7 +29,8 @@ void *plugin_create(PluginMenuCreateData *data)
     char *label;
     char *filename;
     ObMenu *m;
-    
+    xmlDocPtr doc;
+
     parse_attr_string("id", data->node, &id);
     parse_attr_string("label", data->node, &label);
     
@@ -41,11 +42,11 @@ void *plugin_create(PluginMenuCreateData *data)
 
     parse_attr_string("filename", data->node, &filename);
 
-    xmlDocPtr doc = xmlParseFile(filename);
+    doc = xmlParseFile(filename);
     if (doc) {
         xmlNodePtr node = xmlDocGetRootElement(doc);
         if (node) {
-            parse_menu_full(doc, node, m, FALSE);
+            parse_menu_full(data->parse_inst, doc, node, m, FALSE);
         }
         xmlFreeDoc(doc);
     }