X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.hh;h=2b8e8b07f5b1aab3ff0e120063baf19656409731;hb=3682df8ed27e96067a171b71cbf58d5a00ca813b;hp=d53bce0b43172f3853da424e04a5cbf5c08d40be;hpb=96a9196cbb71b7f8d5e3d98a92b2e59bb1b591a8;p=chaz%2Fopenbox

diff --git a/src/openbox.hh b/src/openbox.hh
index d53bce0b..2b8e8b07 100644
--- a/src/openbox.hh
+++ b/src/openbox.hh
@@ -16,7 +16,6 @@ extern "C" {
 
 #include "otk/display.hh"
 #include "otk/screeninfo.hh"
-#include "otk/property.hh"
 #include "otk/configuration.hh"
 #include "otk/eventdispatcher.hh"
 #include "otk/eventhandler.hh"
@@ -108,14 +107,6 @@ private:
   //! A list of all the managed screens
   ScreenList _screens;
   
-  //! Cached atoms on the display
-  /*!
-    This is a pointer because the Property class uses otk::Display::display
-    in its constructor, so, it needs to be initialized <b>after</b> the display
-    is initialized in this class' constructor.
-  */
-  otk::Property *_property;
-
   //! The action interface through which all user-available actions occur
   Actions *_actions;
 
@@ -177,9 +168,6 @@ public:
   //! Returns the state of the window manager (starting, exiting, etc)
   inline RunState state() const { return _state; }
 
-  //! Returns the otk::Property instance for the window manager
-  inline const otk::Property *property() const { return _property; }
-
   //! Returns the Actions instance for the window manager
   inline Actions *actions() const { return _actions; }
 
@@ -189,7 +177,7 @@ public:
   //! Returns a managed screen
   inline Screen *screen(int num) {
     assert(num >= 0); assert(num < (signed)_screens.size());
-    if (num >= screenCount())
+    if (num < 0 || num >= screenCount())
       return NULL;
     return _screens[num];
   }