Merge branch 'backport' into work

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

diff --git a/openbox/actions/omnipresent.c b/openbox/actions/omnipresent.c
index 4f60b540ff9cae47bc888935645f778bd46c68bc..030a01592b9857df888dd768440cc964024de8eb 100644 (file)
--- a/openbox/actions/omnipresent.c
+++ b/openbox/actions/omnipresent.c
@@ -4,7 +4,7 @@
 
 static gboolean run_func_toggle(ObActionsData *data, gpointer options);
 
-void action_omnipresent_startup()
+void action_omnipresent_startup(void)
 {
     actions_register("ToggleOmnipresent", NULL, NULL, run_func_toggle,
                      NULL, NULL);
@@ -13,9 +13,12 @@ void action_omnipresent_startup()
 /* Always return FALSE because its not interactive */
 static gboolean run_func_toggle(ObActionsData *data, gpointer options)
 {
-    if (data->client)
+    if (data->client) {
+        actions_client_move(data, TRUE);
         client_set_desktop(data->client,
                            data->client->desktop == DESKTOP_ALL ?
                            screen_desktop : DESKTOP_ALL, FALSE, TRUE);
+        actions_client_move(data, FALSE);
+    }
     return FALSE;
 }