void action_addremovedesktop_startup(void)
{
- actions_register("AddDesktop", setup_add_func, g_free, run_func,
- NULL, NULL);
- actions_register("RemoveDesktop", setup_remove_func, g_free, run_func,
- NULL, NULL);
+ actions_register("AddDesktop", setup_add_func, g_free, run_func);
+ actions_register("RemoveDesktop", setup_remove_func, g_free, run_func);
/* 3.4-compatibility */
- actions_register("AddDesktopLast", setup_addlast_func, g_free, run_func,
- NULL, NULL);
- actions_register("RemoveDesktopLast", setup_removelast_func, g_free, run_func,
- NULL, NULL);
- actions_register("AddDesktopCurrent", setup_addcurrent_func, g_free, run_func,
- NULL, NULL);
- actions_register("RemoveDesktopCurrent", setup_removecurrent_func, g_free, run_func,
- NULL, NULL);
+ actions_register("AddDesktopLast", setup_addlast_func, g_free, run_func);
+ actions_register("RemoveDesktopLast", setup_removelast_func,
+ g_free, run_func);
+ actions_register("AddDesktopCurrent", setup_addcurrent_func,
+ g_free, run_func);
+ actions_register("RemoveDesktopCurrent", setup_removecurrent_func,
+ g_free, run_func);
}
static gpointer setup_func(xmlNodePtr node)
o = g_new0(Options, 1);
- if ((n = obt_parse_find_node(node, "where"))) {
- gchar *s = obt_parse_node_string(n);
+ if ((n = obt_xml_find_node(node, "where"))) {
+ gchar *s = obt_xml_node_string(n);
if (!g_ascii_strcasecmp(s, "last"))
o->current = FALSE;
else if (!g_ascii_strcasecmp(s, "current"))