From a81d635ea8ef62932b9a8c79620091b182be23eb Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Tue, 26 Jan 2016 15:54:20 +0100 Subject: reintroduce SESSION_NAME and return an empty String for vsession's exec string --- src/dialog.cpp | 3 ++- src/vsession.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/dialog.cpp b/src/dialog.cpp index 9cb5aeb..023e6ef 100644 --- a/src/dialog.cpp +++ b/src/dialog.cpp @@ -112,12 +112,13 @@ void Dialog::on_treeView_doubleClicked(const QModelIndex& index) else setenv("PVS_AUTO_CONNECT", "FALSE", 1); // export session information to the environment of the process to be exec'ed + setenv("SESSION_NAME", s->shortDescription().toUtf8(), 1); if (s->type() == Session::VSESSION) { setenv("SESSION_TYPE", "VSESSION", 1); setenv("SESSION_CMD", "", 1); } else if (s->type() == Session::XSESSION) { setenv("SESSION_TYPE", "XSESSION", 1); - setenv("SESSION_CMD", s->execCommand() != NULL ? s->execCommand().toUtf8() : "", 1); + setenv("SESSION_CMD", s->execCommand().toUtf8(), 1); } // Fork this process twice to detach pid_t pid = fork(); diff --git a/src/vsession.h b/src/vsession.h index dab0fd8..5c84d3b 100644 --- a/src/vsession.h +++ b/src/vsession.h @@ -41,7 +41,7 @@ class VSession : public Session { return getAttribute("long_description"); } QString execCommand() const { - return NULL; + return QString(""); } QIcon icon() const; -- cgit v1.2.3-55-g7522