diff options
author | markt <markt> | 2007-10-13 21:51:37 (GMT) |
---|---|---|
committer | markt <markt> | 2007-10-13 21:51:37 (GMT) |
commit | a59428d67a95a9df16554962f0a6257d6378328a (patch) | |
tree | f856ed9300c34f7a17d499f22d895610cfbc08e5 /src/Slit.cc | |
parent | 41b5c6dadb1f474675660cef18b812d4c2338ed2 (diff) | |
download | fluxbox-a59428d67a95a9df16554962f0a6257d6378328a.zip fluxbox-a59428d67a95a9df16554962f0a6257d6378328a.tar.bz2 |
merged changes from pre-devel
Diffstat (limited to 'src/Slit.cc')
-rw-r--r-- | src/Slit.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/Slit.cc b/src/Slit.cc index a8e95a0..b18dddc 100644 --- a/src/Slit.cc +++ b/src/Slit.cc | |||
@@ -59,7 +59,6 @@ | |||
59 | #include "SlitTheme.hh" | 59 | #include "SlitTheme.hh" |
60 | #include "SlitClient.hh" | 60 | #include "SlitClient.hh" |
61 | #include "Xutil.hh" | 61 | #include "Xutil.hh" |
62 | #include "FbAtoms.hh" | ||
63 | #include "FbTk/App.hh" | 62 | #include "FbTk/App.hh" |
64 | #include "FbTk/MenuSeparator.hh" | 63 | #include "FbTk/MenuSeparator.hh" |
65 | #include "FbTk/StringUtil.hh" | 64 | #include "FbTk/StringUtil.hh" |
@@ -497,15 +496,9 @@ void Slit::addClient(Window w) { | |||
497 | 496 | ||
498 | Atom *proto = 0; | 497 | Atom *proto = 0; |
499 | int num_return = 0; | 498 | int num_return = 0; |
500 | FbAtoms *fbatoms = FbAtoms::instance(); | ||
501 | 499 | ||
502 | if (XGetWMProtocols(disp, w, &proto, &num_return)) { | 500 | if (XGetWMProtocols(disp, w, &proto, &num_return)) { |
503 | 501 | ||
504 | for (int i = 0; i < num_return; ++i) { | ||
505 | if (proto[i] == fbatoms->getFluxboxStructureMessagesAtom()) | ||
506 | screen().addNetizen(w); | ||
507 | } | ||
508 | |||
509 | XFree((void *) proto); | 502 | XFree((void *) proto); |
510 | #ifdef DEBUG | 503 | #ifdef DEBUG |
511 | } else { | 504 | } else { |
@@ -588,8 +581,6 @@ void Slit::removeClient(SlitClient *client, bool remap, bool destroy) { | |||
588 | else // Clear the window info, but keep around to help future sorting? | 581 | else // Clear the window info, but keep around to help future sorting? |
589 | client->initialize(); | 582 | client->initialize(); |
590 | 583 | ||
591 | screen().removeNetizen(client->window()); | ||
592 | |||
593 | if (remap && client->window() != 0) { | 584 | if (remap && client->window() != 0) { |
594 | Display *disp = FbTk::App::instance()->display(); | 585 | Display *disp = FbTk::App::instance()->display(); |
595 | 586 | ||