From 58dac2dedc606c97abd37688bdba92b0243eb494 Mon Sep 17 00:00:00 2001
From: Johann Latocha
Date: Wed, 2 Mar 2011 17:27:07 +0100
Subject: window manager intergration removed

---
 src/dialog.cpp | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

(limited to 'src/dialog.cpp')

diff --git a/src/dialog.cpp b/src/dialog.cpp
index f2765ac..6100d8c 100644
--- a/src/dialog.cpp
+++ b/src/dialog.cpp
@@ -6,21 +6,11 @@
 #include "save_restore_session.h"
 #include "sessiontreeitem.h"
 
-Dialog::Dialog(QString windowmgr, QWidget *parent)
+Dialog::Dialog(QWidget *parent)
     : QDialog(parent), ui(new Ui::Dialog) {
     model_ = new SessionTreeModel(parent);
     ui->setupUi(this);
 
-    windowmgr_ = new QProcess(this);
-    // start window manager
-    if (windowmgr != "") {
-        windowmgr_->start(windowmgr);
-        windowmgr_->waitForStarted(3000);
-        if (windowmgr_->error() == QProcess::FailedToStart)
-            QMessageBox::warning(this, tr("Warning"),
-                    tr("Window manager '") + windowmgr + tr("' couldn't be started!"));
-    }
-
     QDBusConnection dbus = QDBusConnection::sessionBus();
     ifaceDBus_ = new OrgOpenslxPvsInterface("org.openslx.pvs", "/", dbus, this);
 
@@ -43,8 +33,6 @@ Dialog::~Dialog() {
     delete ui;
     delete model_;
     delete ifaceDBus_;
-    windowmgr_->terminate();
-    windowmgr_->waitForFinished(3000);
 }
 
 void Dialog::changeEvent(QEvent *e) {
@@ -70,18 +58,12 @@ void Dialog::on_treeView_activated(QModelIndex index) {
         return;
     }
 
-    setVisible(false);
-    if (s->type() == Session::XSESSION) {
-        windowmgr_->terminate();
-        windowmgr_->waitForFinished(3000);
-        windowmgr_->kill();
-    }
-
     if (s->run()) {
         if (ifaceDBus_->isValid()) {
             writePVSSettings();
         }
         writeSessionName(s->shortDescription());
+        setVisible(false);
 
     } else {
         QMessageBox::warning(
-- 
cgit v1.2.3-55-g7522