revert 7246 and simplify action_raiselower a bit, turns out 7246 wasn't needed for...

[chaz/openbox] / openbox / stacking.c

diff --git a/openbox/stacking.c b/openbox/stacking.c
index 481c14bdb3731b9bf910afe67cd785ba510802ee..e323b569fd670e0d0098b0fe6813e59426847abe 100644 (file)
--- a/openbox/stacking.c
+++ b/openbox/stacking.c
@@ -545,8 +545,8 @@ static gboolean stacking_occludes(ObClient *client, ObClient *sibling)
     return occludes;
 }
 
-gboolean stacking_restack_request(ObClient *client, ObClient *sibling,
-                                  gint detail, gboolean activate)
+void stacking_restack_request(ObClient *client, ObClient *sibling,
+                              gint detail, gboolean activate)
 {
     switch (detail) {
     case Below:
@@ -563,8 +563,6 @@ gboolean stacking_restack_request(ObClient *client, ObClient *sibling,
            lower it to the bottom */
         if (stacking_occludes(client, sibling))
             stacking_lower(CLIENT_AS_WINDOW(client));
-        else
-            return FALSE;
         break;
     case Above:
         ob_debug("Restack request Above for client %s sibling %s\n",
@@ -586,8 +584,7 @@ gboolean stacking_restack_request(ObClient *client, ObClient *sibling,
                 client_activate(client, FALSE, TRUE);
             else
                 stacking_raise(CLIENT_AS_WINDOW(client));
-        } else
-            return FALSE;
+        }
         break;
     case Opposite:
         ob_debug("Restack request Opposite for client %s sibling "
@@ -605,5 +602,4 @@ gboolean stacking_restack_request(ObClient *client, ObClient *sibling,
             stacking_lower(CLIENT_AS_WINDOW(client));
         break;
     }
-    return TRUE;
 }