X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=18c4a5ca6e45697e874176b06e2e705adadec955;hb=77a8e11660edd66279f2d3def6de3768874ba780;hp=d95de520ed3530e97a2c001e3d76c48de47f45dc;hpb=925262bee2d1edfbec1c3fb1725f09cc926b4c7d;p=chaz%2Fopenbox

diff --git a/src/openbox.cc b/src/openbox.cc
index d95de520..18c4a5ca 100644
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -51,7 +51,6 @@ extern "C" {
 namespace ob {
 
 Openbox *Openbox::instance  = (Openbox *) 0;
-OBActions *Openbox::actions = (OBActions *) 0;
 
 
 void Openbox::signalHandler(int signal)
@@ -124,7 +123,9 @@ Openbox::Openbox(int argc, char **argv)
 
   _property = new otk::OBProperty();
 
-  Openbox::actions = new OBActions();
+  _actions = new OBActions();
+
+  setMasterHandler(_actions); // set as the master event handler
 
   // create the mouse cursors we'll use
   _cursors.session = XCreateFontCursor(otk::OBDisplay::display, XC_left_ptr);