use the timer queue manager

[chaz/openbox] / src / client.cc

diff --git a/src/client.cc b/src/client.cc
index d6111ce2b40a7a9ba255c3b9785ecae1f8b30b04..57bf5161cf75614765292d8400f17e7d18ef5eae 100644 (file)
--- a/src/client.cc
+++ b/src/client.cc
@@ -5,7 +5,7 @@
 #endif
 
 #include "client.hh"
-#include "screen.hh"
+#include "bbscreen.hh"
 #include "openbox.hh"
 #include "otk/display.hh"
 #include "otk/property.hh"
@@ -27,6 +27,8 @@ OBClient::OBClient(int screen, Window window)
 {
   assert(window);
 
+  ignore_unmaps = 0;
+  
   // update EVERYTHING the first time!!
 
   // the state is kinda assumed to be normal. is this right? XXX
@@ -272,7 +274,10 @@ void OBClient::getMwmHints()
 void OBClient::getArea()
 {
   XWindowAttributes wattrib;
-  assert(XGetWindowAttributes(otk::OBDisplay::display, _window, &wattrib));
+  Status ret;
+  
+  ret = XGetWindowAttributes(otk::OBDisplay::display, _window, &wattrib);
+  assert(ret != BadWindow);
 
   _area.setRect(wattrib.x, wattrib.y, wattrib.width, wattrib.height);
   _border_width = wattrib.border_width;