aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-08-12 01:04:16 (GMT)
committerfluxgen <fluxgen>2003-08-12 01:04:16 (GMT)
commit7be86791e445a6d586528212d905cb02cd96abc3 (patch)
treef884b76380fb6944810f54eff8cd52476c7ee5ea
parent905538affe88881b693424c8be205b3686255f25 (diff)
downloadfluxbox-7be86791e445a6d586528212d905cb02cd96abc3.zip
fluxbox-7be86791e445a6d586528212d905cb02cd96abc3.tar.bz2
reverted back to no updateNetizenWindowDel in removeClient
-rw-r--r--src/Screen.cc12
-rw-r--r--src/fluxbox.cc4
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 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.cc,v 1.216 2003/08/12 00:27:57 fluxgen Exp $ 25// $Id: Screen.cc,v 1.217 2003/08/12 01:03:25 fluxgen Exp $
26 26
27 27
28#include "Screen.hh" 28#include "Screen.hh"
@@ -773,11 +773,8 @@ void BScreen::removeClient(WinClient &client) {
773 Fluxbox::instance()->revertFocus(focused->screen()); 773 Fluxbox::instance()->revertFocus(focused->screen());
774 } 774 }
775 775
776 Workspaces::iterator workspace_it = getWorkspacesList().begin(); 776 for_each(getWorkspacesList().begin(), getWorkspacesList().end(),
777 Workspaces::iterator workspace_it_end = getWorkspacesList().end(); 777 mem_fun(&Workspace::updateClientmenu));
778 for (; workspace_it != workspace_it_end; ++workspace_it) {
779 (*workspace_it)->removeWindow(client);
780 }
781 778
782 // remove any grouping this is expecting 779 // remove any grouping this is expecting
783 Groupables::iterator it = m_expecting_groups.begin(); 780 Groupables::iterator it = m_expecting_groups.begin();
@@ -791,8 +788,7 @@ void BScreen::removeClient(WinClient &client) {
791 } 788 }
792 // the client could be on icon menu so we update it 789 // the client could be on icon menu so we update it
793 updateIconMenu(); 790 updateIconMenu();
794 // finaly send notify signal 791
795 updateNetizenWindowDel(client.window());
796} 792}
797 793
798FluxboxWindow *BScreen::getIcon(unsigned int index) { 794FluxboxWindow *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 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.cc,v 1.182 2003/08/12 00:26:42 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.183 2003/08/12 01:04:16 fluxgen Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -1345,6 +1345,8 @@ void Fluxbox::update(FbTk::Subject *changedsub) {
1345 BScreen &screen = client.screen(); 1345 BScreen &screen = client.screen();
1346 1346
1347 screen.removeClient(client); 1347 screen.removeClient(client);
1348 // finaly send notify signal
1349 screen.updateNetizenWindowDel(client.window());
1348 1350
1349 if (m_focused_window == &client) 1351 if (m_focused_window == &client)
1350 revertFocus(screen); 1352 revertFocus(screen);