The branch, master has been updated via 3335fca16afaa0792207228115e31630894dee71 (commit) from 5e5eb0cfffc514ee419a116a78f25ff98728c746 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3335fca16afaa0792207228115e31630894dee71 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jul 26 12:15:52 2012 +0200 X2Go resume session slot: double click on a selected session is supposed to resume that session. To make this feature functional for running sessions the session has to be suspended first. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ onmainwindow.cpp | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 42e7bb6..443d9d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,9 @@ x2goclient (3.99.2.2-0~x2go1) UNRELEASED; urgency=low - Allow x2goclient to connect to user accounts that have other shells than /bin/sh and alike configured as default shell. Also: removal bashisms in shell execution commands. + - X2Go resume session slot: double click on a selected session is supposed + to resume that session. To make this feature functional for running + sessions the session has to be suspended first. [ Oleksandr Shneyder ] * Fixing X2Go Plugin diff --git a/onmainwindow.cpp b/onmainwindow.cpp index b385360..965cbf8 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -3956,10 +3956,15 @@ void ONMainWindow::slotResumeSess() { x2goSession s=getSelectedSession(); QDesktopWidget wd; - if ( isColorDepthOk ( wd.depth(),s.colorDepth ) ) + if ( isColorDepthOk ( wd.depth(),s.colorDepth ) ) { + if ( s.status=="R" ) { + suspendSession ( s.sessionId ); + x2goDebug << "sleeping for two seconds between suspending and resuming"; + int sleeptime = 2; + while ((sleeptime = sleep (sleeptime))) {}; + } resumeSession ( s ); - else - { + } else { QString depth=QString::number ( s.colorDepth ); int res; if ( s.colorDepth==24 || s.colorDepth==32 ) hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).