Merge branch 'master' into chaz

[chaz/openbox] / openbox / actions / debug.c

diff --git a/openbox/actions/debug.c b/openbox/actions/debug.c
index 3ae0901607fc698f3587d18438b43b6166858ac4..99446bc471a9e74fdb35ad95e294a9cc43f69102 100644 (file)
--- a/openbox/actions/debug.c
+++ b/openbox/actions/debug.c
@@ -19,10 +19,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, "string")))
-        o->str = obt_parse_node_string(n);
+    if ((n = obt_xml_find_node(node, "string")))
+        o->str = obt_xml_node_string(n);
     return o;
 }
 
@@ -30,7 +30,7 @@ static void free_func(gpointer options)
 {
     Options *o = options;
     g_free(o->str);
-    g_free(o);
+    g_slice_free(Options, o);
 }
 
 /* Always return FALSE because its not interactive */