projects
/
mikachu
/
openbox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'backport' into work
[mikachu/openbox.git]
/
openbox
/
actions
/
exit.c
diff --git
a/openbox/actions/exit.c
b/openbox/actions/exit.c
index
747514f
..
25fc08b
100644
(file)
--- a/
openbox/actions/exit.c
+++ b/
openbox/actions/exit.c
@@
-7,7
+7,7
@@
typedef struct {
gboolean prompt;
} Options;
gboolean prompt;
} Options;
-static gpointer setup_func(
ObParseInst *i, xmlDocPtr doc,
xmlNodePtr node);
+static gpointer setup_func(xmlNodePtr node);
static gboolean run_func(ObActionsData *data, gpointer options);
void action_exit_startup(void)
static gboolean run_func(ObActionsData *data, gpointer options);
void action_exit_startup(void)
@@
-15,7
+15,7
@@
void action_exit_startup(void)
actions_register("Exit", setup_func, NULL, run_func, NULL, NULL);
}
actions_register("Exit", setup_func, NULL, run_func, NULL, NULL);
}
-static gpointer setup_func(
ObParseInst *i, xmlDocPtr doc,
xmlNodePtr node)
+static gpointer setup_func(xmlNodePtr node)
{
xmlNodePtr n;
Options *o;
{
xmlNodePtr n;
Options *o;
@@
-23,8
+23,8
@@
static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
o = g_new0(Options, 1);
o->prompt = TRUE;
o = g_new0(Options, 1);
o->prompt = TRUE;
- if ((n =
parse_find_node("prompt", node
)))
- o->prompt =
parse_bool(doc,
n);
+ if ((n =
obt_parse_find_node(node, "prompt"
)))
+ o->prompt =
obt_parse_node_bool(
n);
return o;
}
return o;
}