The branch, master has been updated via af80d226b539a8edefdc424edd1e51211ad575c3 (commit) from 736ec9e1531886250ab8b7986db9146dc73a7d2d (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 af80d226b539a8edefdc424edd1e51211ad575c3 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jun 12 16:22:20 2013 +0200 Revert "Enable full access desktop sharing across user accounts." This reverts commit 7b90207804eeba8b0f4674f46312fe44e40343cc. Conflicts (resolved by Mike Gabriel): debian/changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 - onmainwindow.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c2dcc38..c0f09a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,6 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low - If a priv SSH key has been specified, skip the autologin procedure. Let's consider a given SSH private key that fails to log the user in as an overall login failure. (Fixes: #141). - - Enable full access desktop sharing across user accounts. - Avoid multiple selectUserSession requests when in broker mode. - Properly set the remote server address received via selectUserSession diff --git a/onmainwindow.cpp b/onmainwindow.cpp index b707d84..dd7b6c1 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -4370,7 +4370,7 @@ void ONMainWindow::slotActivated ( const QModelIndex& index ) index.row(), D_USER ).data().toString(); bShadowView->setEnabled ( true ); - bShadow->setEnabled ( true ); + bShadow->setEnabled ( user==getCurrentUname() ); } } 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).