From 7be86791e445a6d586528212d905cb02cd96abc3 Mon Sep 17 00:00:00 2001 From: fluxgen Date: Tue, 12 Aug 2003 01:04:16 +0000 Subject: reverted back to no updateNetizenWindowDel in removeClient --- src/Screen.cc | 12 ++++-------- src/fluxbox.cc | 4 +++- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/Screen.cc b/src/Screen.cc index 6d45427..e39dc1c 100644 --- a/src/Screen.cc +++ b/src/Screen.cc @@ -22,7 +22,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Screen.cc,v 1.216 2003/08/12 00:27:57 fluxgen Exp $ +// $Id: Screen.cc,v 1.217 2003/08/12 01:03:25 fluxgen Exp $ #include "Screen.hh" @@ -773,11 +773,8 @@ void BScreen::removeClient(WinClient &client) { Fluxbox::instance()->revertFocus(focused->screen()); } - Workspaces::iterator workspace_it = getWorkspacesList().begin(); - Workspaces::iterator workspace_it_end = getWorkspacesList().end(); - for (; workspace_it != workspace_it_end; ++workspace_it) { - (*workspace_it)->removeWindow(client); - } + for_each(getWorkspacesList().begin(), getWorkspacesList().end(), + mem_fun(&Workspace::updateClientmenu)); // remove any grouping this is expecting Groupables::iterator it = m_expecting_groups.begin(); @@ -791,8 +788,7 @@ void BScreen::removeClient(WinClient &client) { } // the client could be on icon menu so we update it updateIconMenu(); - // finaly send notify signal - updateNetizenWindowDel(client.window()); + } FluxboxWindow *BScreen::getIcon(unsigned int index) { diff --git a/src/fluxbox.cc b/src/fluxbox.cc index e12ba73..b6a0019 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc @@ -22,7 +22,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: fluxbox.cc,v 1.182 2003/08/12 00:26:42 fluxgen Exp $ +// $Id: fluxbox.cc,v 1.183 2003/08/12 01:04:16 fluxgen Exp $ #include "fluxbox.hh" @@ -1345,6 +1345,8 @@ void Fluxbox::update(FbTk::Subject *changedsub) { BScreen &screen = client.screen(); screen.removeClient(client); + // finaly send notify signal + screen.updateNetizenWindowDel(client.window()); if (m_focused_window == &client) revertFocus(screen); -- cgit v0.11.2