X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=0143a3eb4e6365378a9f3f72211bfd8596e18a8a;hb=e2069b5792a80ba8ccfd03c9d1bdd5e364dbee10;hp=bd72ea9f0d58c765e4d8828de8ee7b62d8dfbe2b;hpb=3a8af58b19891cc8d12642229a690b3b4e5bc58b;p=chaz%2Fopenbox diff --git a/src/openbox.cc b/src/openbox.cc index bd72ea9f..0143a3eb 100644 --- a/src/openbox.cc +++ b/src/openbox.cc @@ -35,15 +35,6 @@ extern "C" { # include #endif // HAVE_FCNTL_H -#ifdef HAVE_UNISTD_H -# include -# include -#endif // HAVE_UNISTD_H - -#ifdef HAVE_SYS_SELECT_H -# include -#endif // HAVE_SYS_SELECT_H - #ifdef HAVE_SYS_WAIT_H # include #endif // HAVE_SYS_WAIT_H @@ -197,8 +188,6 @@ Openbox::~Openbox() { _state = State_Exiting; // time to kill everything - int first_screen = _screens.front()->number(); - std::for_each(_screens.begin(), _screens.end(), otk::PointerAssassin()); delete _bindings; @@ -217,18 +206,6 @@ Openbox::~Openbox() otk::Timer::destroy(); otk::RenderColor::destroy(); - - if (_restart) { - if (!_restart_prog.empty()) { - otk::putenv(otk::display->screenInfo(first_screen)->displayString()); - execl("/bin/sh", "/bin/sh", "-c", _restart_prog.c_str(), NULL); - perror(_restart_prog.c_str()); - } - - // fall back in case the above execlp doesn't work - execvp(_argv[0], _argv); - execvp(otk::basename(_argv[0]).c_str(), _argv); - } }