diff options
| author | Dana Jansens <danakj@orodu.net> | 2003-01-13 08:13:58 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2003-01-13 08:13:58 +0000 |
| commit | 9e77a88d269bfafb78e56a646bfacebdd6ff4c5a (patch) | |
| tree | ee8dba749b3a6f1eaa21cf47b01ac4be11931455 /src/openbox.cc | |
| parent | 4dba699857918d0feda52c71c58eccd08839ec8b (diff) | |
move the Openbox::instance pointer to simply "openbox".
Diffstat (limited to 'src/openbox.cc')
| -rw-r--r-- | src/openbox.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/openbox.cc b/src/openbox.cc index 2be91335..0b3148e8 100644 --- a/src/openbox.cc +++ b/src/openbox.cc @@ -51,7 +51,7 @@ extern "C" { namespace ob { -Openbox *Openbox::instance = (Openbox *) 0; +Openbox *openbox = (Openbox *) 0; void Openbox::signalHandler(int signal) @@ -59,7 +59,7 @@ void Openbox::signalHandler(int signal) switch (signal) { case SIGUSR1: printf("Caught SIGUSR1 signal. Restarting.\n"); - instance->restart(); + openbox->restart(); break; case SIGHUP: @@ -67,7 +67,7 @@ void Openbox::signalHandler(int signal) case SIGTERM: case SIGPIPE: printf("Caught signal %d. Exiting.\n", signal); - instance->shutdown(); + openbox->shutdown(); break; case SIGFPE: @@ -86,7 +86,7 @@ Openbox::Openbox(int argc, char **argv) _state = State_Starting; // initializing everything - Openbox::instance = this; + openbox = this; _displayreq = (char*) 0; _argv = argv; @@ -378,7 +378,7 @@ void Openbox::setFocusedClient(Client *c) // call the python Focus callbacks EventData data(_focused_screen->number(), c, EventFocus, 0); - Openbox::instance->bindings()->fireEvent(&data); + _bindings->fireEvent(&data); } void Openbox::execute(int screen, const std::string &bin) |