aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index eab0f59..db302fe 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -54,6 +54,7 @@
54#include "AtomHandler.hh" 54#include "AtomHandler.hh"
55#include "HeadArea.hh" 55#include "HeadArea.hh"
56#include "FbCommands.hh" 56#include "FbCommands.hh"
57#include "SystemTray.hh"
57#include "Debug.hh" 58#include "Debug.hh"
58 59
59#include "FbTk/I18n.hh" 60#include "FbTk/I18n.hh"
@@ -1234,12 +1235,10 @@ bool BScreen::isKdeDockapp(Window client) const {
1234bool BScreen::addKdeDockapp(Window client) { 1235bool BScreen::addKdeDockapp(Window client) {
1235 1236
1236 XSelectInput(FbTk::App::instance()->display(), client, StructureNotifyMask); 1237 XSelectInput(FbTk::App::instance()->display(), client, StructureNotifyMask);
1237 string atom_name("_NET_SYSTEM_TRAY_S");
1238 atom_name += FbTk::StringUtil::number2String(screenNumber());
1239 // find the right atomhandler that has the name: _NET_SYSTEM_TRAY_S<num>
1240 AtomHandler *handler = Fluxbox::instance()->getAtomHandler(atom_name);
1241 FbTk::EventHandler *evh = 0; 1238 FbTk::EventHandler *evh = 0;
1242 FbTk::EventManager *evm = FbTk::EventManager::instance(); 1239 FbTk::EventManager *evm = FbTk::EventManager::instance();
1240
1241 AtomHandler *handler = Fluxbox::instance()->getAtomHandler(SystemTray::getNetSystemTrayAtom(screenNumber()));
1243 if (handler == 0) { 1242 if (handler == 0) {
1244#ifdef SLIT 1243#ifdef SLIT
1245 if (slit() != 0 && slit()->acceptKdeDockapp()) 1244 if (slit() != 0 && slit()->acceptKdeDockapp())