diff --git a/workspace.cpp b/workspace.cpp index 9245008521..5818d6b86f 100644 --- a/workspace.cpp +++ b/workspace.cpp @@ -873,7 +873,7 @@ void Workspace::slotCurrentDesktopChanged(uint oldDesktop, uint newDesktop) closeActivePopup(); ++block_focus; StackingUpdatesBlocker blocker(this); - updateClientVisibilityOnDesktopChange(oldDesktop, newDesktop); + updateClientVisibilityOnDesktopChange(newDesktop); // Restore the focus on this desktop --block_focus; @@ -881,7 +881,7 @@ void Workspace::slotCurrentDesktopChanged(uint oldDesktop, uint newDesktop) emit currentDesktopChanged(oldDesktop, movingClient); } -void Workspace::updateClientVisibilityOnDesktopChange(uint oldDesktop, uint newDesktop) +void Workspace::updateClientVisibilityOnDesktopChange(uint newDesktop) { for (ToplevelList::ConstIterator it = stacking_order.constBegin(); it != stacking_order.constEnd(); @@ -994,8 +994,6 @@ void Workspace::updateCurrentActivity(const QString &new_activity) // mapping done from front to back => less exposure events //Notify::raise((Notify::Event) (Notify::DesktopChange+new_desktop)); - const QString &old_activity = Activities::self()->previous(); - for (ToplevelList::ConstIterator it = stacking_order.constBegin(); it != stacking_order.constEnd(); ++it) { diff --git a/workspace.h b/workspace.h index 012210d958..7e23807fa8 100644 --- a/workspace.h +++ b/workspace.h @@ -527,7 +527,7 @@ private: void closeActivePopup(); void updateClientArea(bool force); void resetClientAreas(uint desktopCount); - void updateClientVisibilityOnDesktopChange(uint oldDesktop, uint newDesktop); + void updateClientVisibilityOnDesktopChange(uint newDesktop); void activateClientOnNewDesktop(uint desktop); AbstractClient *findClientToActivateOnDesktop(uint desktop);