handle systray apps closing..

diff --git a/src/Screen.cc b/src/Screen.cc
index d92dec3502cb54a66c3e4050600fc6044ed124c8..5441d0bba0d7eb2231f1d2f8ca5d37babc122986 100644 (file)
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1342,7 +1342,7 @@ void BScreen::manageWindow(Window w) {
   // is the window a KDE systray window?
   Window systray;
   if (xatom->getValue(w, XAtom::kde_net_wm_system_tray_window_for,
-                      XAtom::window, systray) && systray) {
+                      XAtom::window, systray) && systray != None) {
     addSystrayWindow(w);
     return;
   }
@@ -1381,6 +1381,15 @@ void BScreen::manageWindow(Window w) {
 
 
 void BScreen::unmanageWindow(BlackboxWindow *w, bool remap) {
+  // is the window a KDE systray window?
+  Window systray;
+  if (xatom->getValue(w->getClientWindow(),
+                      XAtom::kde_net_wm_system_tray_window_for,
+                      XAtom::window, systray) && systray != None) {
+    removeSystrayWindow(w->getClientWindow());
+    return;
+  }
+
   w->restore(remap);
 
   // Remove the modality so that its parent won't try to re-focus the window