move the shit from OBRootWindow into OBScreen

[chaz/openbox] / src / client.cc

diff --git a/src/client.cc b/src/client.cc
index 23de426a3bf13f39f12440ba8b5dc8d1e94b120c..c0e63f2cb9c0ecd1c45d2c7c2e3741dd02303af9 100644 (file)
--- a/src/client.cc
+++ b/src/client.cc
@@ -93,7 +93,7 @@ void OBClient::getDesktop()
 
   property->get(_window, otk::OBProperty::net_wm_desktop,
                 otk::OBProperty::Atom_Cardinal,
-                &_desktop);
+                (long unsigned*)&_desktop);
 }
 
 
@@ -1236,10 +1236,7 @@ void OBClient::destroyHandler(const XDestroyWindowEvent &e)
 void OBClient::reparentHandler(const XReparentEvent &e)
 {
   // this is when the client is first taken captive in the frame
-  if (e.parent == frame->plate()) {
-    printf("Ignored ReparentNotify for 0x%lx\n", e.window);
-    return;
-  }
+  if (e.parent == frame->plate()) return;
 
 #ifdef    DEBUG
   printf("ReparentNotify for 0x%lx\n", e.window);