1 files changed, 2 insertions, 24 deletions

diff --git a/src/Ewmh.cc b/src/Ewmh.cc
index ea73807..019751f 100644
--- a/src/Ewmh.cc
+++ b/src/Ewmh.cc
@@ -783,31 +783,9 @@ bool Ewmh::checkClientMessage(const XClientMessageEvent &ce,
         // ce.window = window to focus
 
         if (winclient->fbwindow()) {
-
-            FluxboxWindow* fbwin = winclient->fbwindow();
-
-            // if the raised window is on a different workspace
-            // we do what the user wish:
-            //   either ignore|go to that workspace|get the window
-            if (fbwin->screen().currentWorkspaceID() != fbwin->workspaceNumber()
-                && !fbwin->isStuck()) {
-                BScreen::FollowModel model = (ce.data.l[0] == 2) ?
-                    fbwin->screen().getUserFollowModel() :
-                    fbwin->screen().getFollowModel();
-                if (model == BScreen::FOLLOW_ACTIVE_WINDOW) {
-                    fbwin->screen().changeWorkspaceID(fbwin->workspaceNumber());
-                } else if (model == BScreen::FETCH_ACTIVE_WINDOW) {
-                    fbwin->screen().sendToWorkspace(fbwin->screen().currentWorkspaceID(), fbwin);
-                } else if (model == BScreen::SEMIFOLLOW_ACTIVE_WINDOW) {
-                    if (fbwin->isIconic())
-                        fbwin->screen().sendToWorkspace(fbwin->screen().currentWorkspaceID(), fbwin);
-                    else
-                        fbwin->screen().changeWorkspaceID(fbwin->workspaceNumber());
-                } // else we ignore it. my favourite mode :)
-            }
-            fbwin->raise();
+            winclient->focus();
+            winclient->fbwindow()->raise();
         }
-        winclient->focus();
         return true;
     } else if (ce.message_type == m_net_close_window) {
         if (winclient == 0)