This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/x2godialog in repository x2goserver. commit 875dfa9487c6bd7445405dc99a71cc73fe46cc9c Author: Ulrich Sibiller <uli42@gmx.de> Date: Fri Mar 12 11:48:19 2021 +0100 x2goserver/bin/x2gostartagent: actually let x2godialog handle events via NX_CLIENT. For a proper description, refer to 51e1da1312245accbfcb6f2fa360c5bef3d99588. Fixes: #1228. Fixes: #1540. --- debian/changelog | 3 +++ x2goserver/bin/x2gostartagent | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e4b5ed4c..882e9b73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -518,6 +518,9 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium Fixes: #1228. Fixes: #1540. - x2gostartsession: revert previous commit, this was not supposed to enter the master branch yet. + - x2goserver/bin/x2gostartagent: actually let x2godialog handle events via + NX_CLIENT. For a proper description, refer to + 51e1da1312245accbfcb6f2fa360c5bef3d99588. Fixes: #1228. Fixes: #1540. [ Hanno Foest ] * New upstream version (4.1.0.4): diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index cd9fc97b..faef237f 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -20,6 +20,7 @@ # 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: ${*}" @@ -204,7 +205,7 @@ if [[ "${LWORD}" = 'LIMIT' ]]; then exit '9' fi -export NX_CLIENT="${X2GO_LIB_PATH}/x2gosuspend-agent" +export NX_CLIENT="${X2GO_BASE_PATH}/bin/x2godialog" 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