This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 433cbe570d883ea90040ed9c04598958c45a4af6 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Fri Aug 15 11:29:39 2014 +0200 Disable sessions explorer "back" button if user sessions disabled. --- debian/changelog | 1 + onmainwindow.cpp | 3 +++ sessionexplorer.cpp | 5 +++++ sessionexplorer.h | 2 ++ 4 files changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index cce31b5..efb54b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,7 @@ x2goclient (4.0.3.0-0x2go1) UNRELEASED; urgency=low - Session name autocomplition only for sessions in current folder. - Support for sessions folders and commandline options "--session" and "--sessionid". + - Disable sessions explorer "back" button if user sessions disabled. [ Mike DePaulo ] * New upstream release (4.0.3.0): diff --git a/onmainwindow.cpp b/onmainwindow.cpp index e544408..b792f06 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -8204,7 +8204,10 @@ void ONMainWindow::setUsersEnabled ( bool enable ) } } else + { users->setEnabled ( enable ); + sessionExplorer->setEnable(enable); + } } diff --git a/sessionexplorer.cpp b/sessionexplorer.cpp index cd16ed3..a6c5981 100644 --- a/sessionexplorer.cpp +++ b/sessionexplorer.cpp @@ -594,3 +594,8 @@ void SessionExplorer::deleteFolder(QString path) } placeButtons(); } + +void SessionExplorer::setEnable(bool enable) +{ + backButton->setEnabled(enable); +} diff --git a/sessionexplorer.h b/sessionexplorer.h index 67bd171..98b8742 100644 --- a/sessionexplorer.h +++ b/sessionexplorer.h @@ -74,6 +74,8 @@ public: currentPath=path; } + void setEnable(bool enable); + //vars private: -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git