X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.hh;h=abdcfef386968d922e4a301b285678a82f6a585a;hb=977ecf1f1e82f385a542648b545a0d0877febaf0;hp=8c2015f95870af95005b39bc65525f048762b1e4;hpb=74cb09bb2cc4832463a57743b1495eef24237d2a;p=chaz%2Fopenbox

diff --git a/src/openbox.hh b/src/openbox.hh
index 8c2015f9..abdcfef3 100644
--- a/src/openbox.hh
+++ b/src/openbox.hh
@@ -24,13 +24,14 @@ extern "C" {
 #include "otk/configuration.hh"
 #include "otk/eventdispatcher.hh"
 #include "otk/eventhandler.hh"
-#include "client.hh"
 
 namespace ob {
 
 class OBScreen;
+class OBClient;
+class OBActions;
 
-//! The main class for the Openbox window manager.
+//! The main class for the Openbox window manager
 /*!
   Only a single instance of the Openbox class may be used in the application. A
   pointer to this instance is held in the Openbox::instance static member
@@ -43,7 +44,7 @@ class OBScreen;
 class Openbox : public otk::OtkEventDispatcher, public otk::OtkEventHandler
 {
 public:
-  //! The single instance of the Openbox class for the application.
+  //! The single instance of the Openbox class for the application
   /*!
     Since this variable is globally available in the application, the Openbox
     class does not need to be passed around to any of the other classes.
@@ -111,6 +112,9 @@ private:
   */
   otk::OBProperty *_property;
 
+  //! The action interface through which all user-available actions occur
+  OBActions *_actions;
+
   //! The running state of the window manager
   RunState _state;
 
@@ -188,8 +192,6 @@ public:
     manager can be destroyed.
   */
   inline void shutdown() { _doshutdown = true; }
-
-  virtual void mapRequestHandler(const XMapRequestEvent &);
 };
 
 }