From fdabb69f4f25596df972caa76c85c2aeba26226e Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Fri, 27 Jul 2007 01:37:28 -0400 Subject: update openbox to use the current parser interface in libobt there is also some random bug fixes for other libobt stuff in here. --- openbox/actions/focus.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) (limited to 'openbox/actions/focus.c') diff --git a/openbox/actions/focus.c b/openbox/actions/focus.c index 67c1479f..67640a4d 100644 --- a/openbox/actions/focus.c +++ b/openbox/actions/focus.c @@ -7,38 +7,26 @@ typedef struct { gboolean here; } Options; -static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node); -static void free_func(gpointer options); +static gpointer setup_func(xmlNodePtr node); static gboolean run_func(ObActionsData *data, gpointer options); void action_focus_startup(void) { - actions_register("Focus", - setup_func, - free_func, - run_func, - NULL, NULL); + actions_register("Focus", setup_func, g_free, run_func, NULL, NULL); } -static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node) +static gpointer setup_func(xmlNodePtr node) { xmlNodePtr n; Options *o; o = g_new0(Options, 1); - if ((n = parse_find_node("here", node))) - o->here = parse_bool(doc, n); + if ((n = obt_parse_find_node(node, "here"))) + o->here = obt_parse_node_bool(n); return o; } -static void free_func(gpointer options) -{ - Options *o = options; - - g_free(o); -} - /* Always return FALSE because its not interactive */ static gboolean run_func(ObActionsData *data, gpointer options) { -- cgit v1.2.3