aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2007-12-25 06:36:22 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2007-12-25 06:36:22 (GMT)
commit1bcc966153a557b6ab3ba236c9e468dbf0a2620e (patch)
tree15bb21d9c689e0d318d681f063873ba3de62644f /src/Screen.cc
parent9daf464b2812027c4a5a074f23896457471109f1 (diff)
downloadfluxbox-1bcc966153a557b6ab3ba236c9e468dbf0a2620e.zip
fluxbox-1bcc966153a557b6ab3ba236c9e468dbf0a2620e.tar.bz2
added resource session.screen<N>.slit.acceptKdeDockapps
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 4f42539..afbd90f 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1278,7 +1278,7 @@ bool BScreen::addKdeDockapp(Window client) {
1278 FbTk::EventManager *evm = FbTk::EventManager::instance(); 1278 FbTk::EventManager *evm = FbTk::EventManager::instance();
1279 if (handler == 0) { 1279 if (handler == 0) {
1280#ifdef SLIT 1280#ifdef SLIT
1281 if (slit() != 0) 1281 if (slit() != 0 && slit()->acceptKdeDockapp())
1282 slit()->addClient(client); 1282 slit()->addClient(client);
1283 else 1283 else
1284#endif // SLIT 1284#endif // SLIT
@@ -1311,7 +1311,7 @@ FluxboxWindow *BScreen::createWindow(Window client) {
1311 if (winclient->initial_state == WithdrawnState) { 1311 if (winclient->initial_state == WithdrawnState) {
1312 delete winclient; 1312 delete winclient;
1313#ifdef SLIT 1313#ifdef SLIT
1314 if (slit()) 1314 if (slit() && !isKdeDockapp(client))
1315 slit()->addClient(client); 1315 slit()->addClient(client);
1316#endif // SLIT 1316#endif // SLIT
1317 return 0; 1317 return 0;