X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Factions%2Fshowmenu.c;h=485a31d5a7e06880eee48d0f1f6aef512db13911;hb=d179d6428ae585a3b8a13479bfe4586e41de2ff9;hp=9590bd1589561eaedd7616606f3d1f5c38c7e4ed;hpb=22a88cfe99d897dc7d3be7b53b954f6cdfa250c6;p=chaz%2Fopenbox

diff --git a/openbox/actions/showmenu.c b/openbox/actions/showmenu.c
index 9590bd15..485a31d5 100644
--- a/openbox/actions/showmenu.c
+++ b/openbox/actions/showmenu.c
@@ -12,8 +12,7 @@ static gboolean run_func(ObActionsData *data, gpointer options);
 
 void action_showmenu_startup(void)
 {
-    actions_register("ShowMenu", setup_func, free_func, run_func,
-                     NULL, NULL);
+    actions_register("ShowMenu", setup_func, free_func, run_func);
 }
 
 static gpointer setup_func(xmlNodePtr node)
@@ -21,10 +20,10 @@ static gpointer setup_func(xmlNodePtr node)
     xmlNodePtr n;
     Options *o;
 
-    o = g_new0(Options, 1);
+    o = g_slice_new0(Options);
 
-    if ((n = obt_parse_find_node(node, "menu")))
-        o->name = obt_parse_node_string(n);
+    if ((n = obt_xml_find_node(node, "menu")))
+        o->name = obt_xml_node_string(n);
     return o;
 }
 
@@ -32,7 +31,7 @@ static void free_func(gpointer options)
 {
     Options *o = options;
     g_free(o->name);
-    g_free(o);
+    g_slice_free(Options, o);
 }
 
 /* Always return FALSE because its not interactive */