Merge branch 'backport' into work

[chaz/openbox] / openbox / actions / focus.c

diff --git a/openbox/actions/focus.c b/openbox/actions/focus.c
index 67640a4d8fb2767cfcfe4ec3ca8b6de11e0494b8..e25a79eac09b6b653d7ec21e4b3986339202603e 100644 (file)
--- 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;
@@ -43,7 +44,9 @@ static gboolean run_func(ObActionsData *data, gpointer options)
             (data->context != OB_FRAME_CONTEXT_CLIENT &&
              data->context != OB_FRAME_CONTEXT_FRAME))
         {
-            client_activate(data->client, o->here, FALSE, FALSE, TRUE);
+            actions_client_move(data, TRUE);
+            client_activate(data->client, TRUE, o->here, FALSE, FALSE, TRUE);
+            actions_client_move(data, FALSE);
         }
     } else if (data->context == OB_FRAME_CONTEXT_DESKTOP) {
         /* focus action on the root window. make keybindings work for this