Merge branch 'backport' into work

[mikachu/openbox.git] / openbox / actions / desktop.c

diff --git a/openbox/actions/desktop.c b/openbox/actions/desktop.c
index 37268bb..e352aa2 100644 (file)
--- a/openbox/actions/desktop.c
+++ b/openbox/actions/desktop.c
@@ -86,7 +86,7 @@ static gpointer setup_go_func(xmlNodePtr node)
         }
         else {
             o->type = ABSOLUTE;
-            o->abs.desktop = obt_parse_node_int(n) - 1;
+            o->abs.desktop = atoi(s) - 1;
         }
         g_free(s);
     }
@@ -118,8 +118,6 @@ static gboolean run_func(ObActionsData *data, gpointer options)
     Options *o = options;
     guint d;
 
-
-
     switch (o->type) {
     case LAST:
         d = screen_last_desktop;
@@ -142,7 +140,12 @@ static gboolean run_func(ObActionsData *data, gpointer options)
             go = o->follow;
         }
 
-        if (go) screen_set_desktop(d, TRUE);
+        if (go) {
+            screen_set_desktop(d, TRUE);
+            if (data->client)
+                client_bring_helper_windows(data->client);
+        }
+
         actions_client_move(data, FALSE);
     }
     return FALSE;