This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit c3e7cc500b0a6ba2424a3360a7f287f948fc172f Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Apr 19 20:33:18 2021 +0200 x2gostartsession: revert previous commit, this was not supposed to enter the master branch yet. Revert "x2gostartsession: let x2godialog handle events via NX_CLIENT." This reverts commit 51e1da1312245accbfcb6f2fa360c5bef3d99588. --- debian/changelog | 2 ++ x2goserver/bin/x2gostartagent | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bdeb3800..dbec9f45 100644 --- a/debian/changelog +++ b/debian/changelog @@ -463,6 +463,8 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium Previously, any action that should have displayed a dialog did instead suspend x2goagent, since NX_CLIENT was set to x2gosuspend-session. Fixes: #1228. Fixes: #1540. + - x2gostartsession: revert previous commit, this was not supposed to enter + the master branch yet. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 19 Jul 2019 20:55:11 +0200 diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 0d6ddaac..ee63ac18 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -20,7 +20,6 @@ # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. X2GO_LIB_PATH="$(x2gopath 'libexec')" -X2GO_BASE_PATH="$(x2gopath 'base')" "${X2GO_LIB_PATH}/x2gosyslog" "${0}" 'info' "$(basename "${0}") called with options: ${*}" @@ -205,7 +204,7 @@ if [[ "${LWORD}" = 'LIMIT' ]]; then exit '9' fi -export NX_CLIENT="${X2GO_BASE_PATH}/bin/x2godialog" +export NX_CLIENT="${X2GO_LIB_PATH}/x2gosuspend-agent" COLORDEPTH="$(awk '{split($0,a,"-depth_"); print a[2]}' <<< "${X2GO_TYPE}")" -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git