X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fscreen.c;h=d48d0dda2284fc6b1ec80cd1bfcf7a8de93ff3cb;hb=7869b81d4601b4ee04296d8139f2665c33b3a3d2;hp=ffbe7124ddaa3d6c1d45891291af6ffedd11dae4;hpb=ebabf3943c926547739254fb67f8024166ea000f;p=chaz%2Fopenbox

diff --git a/openbox/screen.c b/openbox/screen.c
index ffbe7124..d48d0dda 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -438,7 +438,7 @@ void screen_set_num_desktops(guint num)
     for (it = client_list; it; it = g_list_next(it)) {
         ObClient *c = it->data;
         if (c->desktop >= num && c->desktop != DESKTOP_ALL)
-            client_set_desktop(c, num - 1, FALSE, FALSE);
+            client_set_desktop(c, num - 1, FALSE);
     }
  
     /* change our struts/area to match (after moving windows) */
@@ -473,7 +473,7 @@ void screen_set_desktop(guint num, gboolean dofocus)
     ob_debug("Moving to desktop %d\n", num+1);
 
     if (moveresize_client)
-        client_set_desktop(moveresize_client, num, TRUE, FALSE);
+        client_set_desktop(moveresize_client, num, TRUE);
 
     /* show windows before hiding the rest to lessen the enter/leave events */
 
@@ -498,7 +498,7 @@ void screen_set_desktop(guint num, gboolean dofocus)
         if (c->can_focus) {
             /* do this here so that if you switch desktops to a window with
                helper windows then the helper windows won't flash */
-            client_bring_non_application_windows(c);
+            client_bring_helper_windows(c);
             /* reduce flicker by hiliting now rather than waiting for the
                server FocusIn event */
             frame_adjust_focus(c->frame, TRUE);