M src/Screen.cc → src/Screen.cc

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // 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 @@ else
             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 @@ }
     }
     // 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) {

M src/fluxbox.cc → src/fluxbox.cc

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // 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 @@
         BScreen &screen = client.screen();
         
         screen.removeClient(client);
+        // finaly send notify signal
+        screen.updateNetizenWindowDel(client.window());
 
         if (m_focused_window == &client) 
             revertFocus(screen);