diff options
| author | Dana Jansens <danakj@orodu.net> | 2009-12-11 19:02:11 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2009-12-11 19:02:11 -0500 |
| commit | acafa38c8ea210b12ed92fc16281b915ab61542c (patch) | |
| tree | ce4c7d2a4a9b3478a4d48af2c54ada06593ed022 /openbox/actions | |
| parent | 2f09e0ce388f63c341cb328d795766e2bd0dc24b (diff) | |
| parent | 9ba2b04e96449fea5b6bd212aa3d431638754bdd (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/config.c
openbox/event.c
openbox/prop.c
openbox/prop.h
openbox/screen.c
openbox/screen.h
Diffstat (limited to 'openbox/actions')
| -rw-r--r-- | openbox/actions/focus.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/openbox/actions/focus.c b/openbox/actions/focus.c index 4d0f220d..e25a79ea 100644 --- a/openbox/actions/focus.c +++ b/openbox/actions/focus.c @@ -2,6 +2,7 @@ #include "openbox/event.h" #include "openbox/client.h" #include "openbox/focus.h" +#include "openbox/screen.h" typedef struct { gboolean here; @@ -44,7 +45,7 @@ static gboolean run_func(ObActionsData *data, gpointer options) data->context != OB_FRAME_CONTEXT_FRAME)) { actions_client_move(data, TRUE); - client_activate(data->client, o->here, FALSE, FALSE, TRUE); + client_activate(data->client, TRUE, o->here, FALSE, FALSE, TRUE); actions_client_move(data, FALSE); } } else if (data->context == OB_FRAME_CONTEXT_DESKTOP) { |