nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix 3.4 compatibility for SendToDesktop

Browse source
This commit is contained in:
Mikael Magnusson 2010-07-01 15:17:02 +02:00
parent eafcc06030
commit 179312f9ae
1 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
openbox/actions/desktop.c
View file

@ -54,7 +54,6 @@ static void i_post_func(gpointer options);
static gpointer setup_go_last_func(xmlNodePtr node); static gpointer setup_go_last_func(xmlNodePtr node);
static gpointer setup_send_last_func(xmlNodePtr node); static gpointer setup_send_last_func(xmlNodePtr node);
static gpointer setup_go_abs_func(xmlNodePtr node); static gpointer setup_go_abs_func(xmlNodePtr node);
static gpointer setup_send_abs_func(xmlNodePtr node);
static gpointer setup_go_next_func(xmlNodePtr node, static gpointer setup_go_next_func(xmlNodePtr node,
ObActionsIPreFunc *pre, ObActionsIPreFunc *pre,
ObActionsIInputFunc *input, ObActionsIInputFunc *input,
@ -125,8 +124,6 @@ void action_desktop_startup(void)
actions_register("SendToDesktopLast", setup_send_last_func, actions_register("SendToDesktopLast", setup_send_last_func,
free_func, run_func); free_func, run_func);
actions_register("Desktop", setup_go_abs_func, free_func, run_func); actions_register("Desktop", setup_go_abs_func, free_func, run_func);
actions_register("SendToDesktop", setup_send_abs_func,
free_func, run_func);
actions_register_i("DesktopNext", setup_go_next_func, free_func, run_func); actions_register_i("DesktopNext", setup_go_next_func, free_func, run_func);
actions_register_i("SendToDesktopNext", setup_send_next_func, actions_register_i("SendToDesktopNext", setup_send_next_func,
free_func, run_func); free_func, run_func);
@ -244,6 +241,11 @@ static gpointer setup_send_func(xmlNodePtr node,
Options *o; Options *o;
o = setup_func(node, pre, input, cancel, post); o = setup_func(node, pre, input, cancel, post);
if ((n = obt_xml_find_node(node, "desktop"))) {
/* 3.4 compatibility */
o->u.abs.desktop = obt_xml_node_int(n) - 1;
o->type = ABSOLUTE;
}
o->send = TRUE; o->send = TRUE;
o->follow = TRUE; o->follow = TRUE;
@ -265,7 +267,6 @@ static void free_func(gpointer o)
g_slice_free(Options, o); g_slice_free(Options, o);
} }
/* Always return FALSE because its not interactive */
static gboolean run_func(ObActionsData *data, gpointer options) static gboolean run_func(ObActionsData *data, gpointer options)
{ {
Options *o = options; Options *o = options;
@ -403,18 +404,6 @@ static gpointer setup_go_abs_func(xmlNodePtr node)
return o; return o;
} }
static gpointer setup_send_abs_func(xmlNodePtr node)
{
xmlNodePtr n;
Options *o = setup_follow(node);
o->type = ABSOLUTE;
if ((n = obt_xml_find_node(node, "desktop")))
o->u.abs.desktop = obt_xml_node_int(n) - 1;
else
o->u.abs.desktop = screen_desktop;
return o;
}
static void setup_rel(Options *o, xmlNodePtr node, gboolean lin, static void setup_rel(Options *o, xmlNodePtr node, gboolean lin,
ObDirection dir, ObDirection dir,
ObActionsIPreFunc *pre, ObActionsIPreFunc *pre,