X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Factions%2Fdebug.c;h=99446bc471a9e74fdb35ad95e294a9cc43f69102;hb=d179d6428ae585a3b8a13479bfe4586e41de2ff9;hp=99e838a64c7dbee4a88d365cef6b6384dfcee480;hpb=435df32acc55a3bc4cc8f9ba954ae21b65c7c69d;p=chaz%2Fopenbox diff --git a/openbox/actions/debug.c b/openbox/actions/debug.c index 99e838a6..99446bc4 100644 --- a/openbox/actions/debug.c +++ b/openbox/actions/debug.c @@ -11,7 +11,7 @@ static gboolean run_func(ObActionsData *data, gpointer options); void action_debug_startup(void) { - actions_register("Debug", setup_func, free_func, run_func, NULL, NULL); + actions_register("Debug", setup_func, free_func, run_func); } static gpointer setup_func(xmlNodePtr node) @@ -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 */