summaryrefslogtreecommitdiff
path: root/openbox/action.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-05-08 22:03:56 +0000
committerDana Jansens <danakj@orodu.net>2007-05-08 22:03:56 +0000
commit97821223393cdebd3eb3fdfcc6d0dcf7502a62d7 (patch)
treef1e03f0b64681b78b3adba5e653bac6bf52ff82c /openbox/action.c
parent1e4215c5c63c53c199a3a5a177607de308c8a3f1 (diff)
try again. merge r6177-6182 from 3.4-working
Diffstat (limited to 'openbox/action.c')
-rw-r--r--openbox/action.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/openbox/action.c b/openbox/action.c
index f8e66439..f8b2b7b3 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -1351,7 +1351,7 @@ void action_toggle_omnipresent(union ActionData *data)
{
client_set_desktop(data->client.any.c,
data->client.any.c->desktop == DESKTOP_ALL ?
- screen_desktop : DESKTOP_ALL, FALSE, FALSE);
+ screen_desktop : DESKTOP_ALL, FALSE);
}
void action_move_relative_horz(union ActionData *data)
@@ -1515,7 +1515,7 @@ void action_send_to_desktop(union ActionData *data)
if (data->sendto.desk < screen_num_desktops ||
data->sendto.desk == DESKTOP_ALL) {
- client_set_desktop(c, data->sendto.desk, data->sendto.follow, FALSE);
+ client_set_desktop(c, data->sendto.desk, data->sendto.follow);
if (data->sendto.follow)
screen_set_desktop(data->sendto.desk, TRUE);
}
@@ -1582,7 +1582,7 @@ void action_send_to_desktop_dir(union ActionData *data)
!data->sendtodir.inter.final ||
data->sendtodir.inter.cancel)
{
- client_set_desktop(c, d, data->sendtodir.follow, FALSE);
+ client_set_desktop(c, d, data->sendtodir.follow);
if (data->sendtodir.follow)
screen_set_desktop(d, TRUE);
}