X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Factions%2Fdesktop.c;h=d939ed511ad5dd938fe92bd9d7da645444173b7c;hb=b2e52c7b48ee64213b4d9e3fbab0d35f66410122;hp=75949be2e5fc2d1c40622f07e87a75b676a2a461;hpb=3b4b52921adba74472904b37ec13d9c8d8686a10;p=chaz%2Fopenbox

diff --git a/openbox/actions/desktop.c b/openbox/actions/desktop.c
index 75949be2..d939ed51 100644
--- a/openbox/actions/desktop.c
+++ b/openbox/actions/desktop.c
@@ -32,7 +32,7 @@ static gpointer setup_send_func(ObParseInst *i, xmlDocPtr doc,
                                 xmlNodePtr node);
 static gboolean run_func(ObActionsData *data, gpointer options);
 
-void action_desktop_startup()
+void action_desktop_startup(void)
 {
     actions_register("GoToDesktop", setup_go_func, g_free, run_func,
                      NULL, NULL);
@@ -140,12 +140,14 @@ static gboolean run_func(ObActionsData *data, gpointer options)
     if (d < screen_num_desktops && d != screen_desktop) {
         gboolean go = TRUE;
 
+        actions_client_move(data, TRUE);
         if (o->send && data->client && client_normal(data->client)) {
             client_set_desktop(data->client, d, o->follow, FALSE);
             go = o->follow;
         }
 
         if (go) screen_set_desktop(d, TRUE);
+        actions_client_move(data, FALSE);
     }
     return FALSE;
 }