From e2069b5792a80ba8ccfd03c9d1bdd5e364dbee10 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Mon, 3 Feb 2003 00:06:46 +0000
Subject: move the restart into main.cc, so the openbox class can clean up
 properly before the restart

---
 src/openbox.cc | 23 -----------------------
 1 file changed, 23 deletions(-)

(limited to 'src/openbox.cc')

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 <fcntl.h>
 #endif // HAVE_FCNTL_H
 
-#ifdef    HAVE_UNISTD_H
-#  include <sys/types.h>
-#  include <unistd.h>
-#endif // HAVE_UNISTD_H
-
-#ifdef    HAVE_SYS_SELECT_H
-#  include <sys/select.h>
-#endif // HAVE_SYS_SELECT_H
-
 #ifdef    HAVE_SYS_WAIT_H
 #  include <sys/wait.h>
 #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);
-  }
 }
 
 
-- 
cgit v1.2.3