[X2Go-Commits] [x2goserver] 01/03: x2gostartsession: let x2godialog handle events via NX_CLIENT.

git-admin at x2go.org git-admin at x2go.org
Mon Apr 19 20:28:46 CEST 2021


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit 51e1da1312245accbfcb6f2fa360c5bef3d99588
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Fri Mar 12 11:48:19 2021 +0100

    x2gostartsession: let x2godialog handle events via NX_CLIENT.
    
    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.
---
 debian/changelog              | 4 ++++
 x2goserver/bin/x2gostartagent | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5fde4817..102e58c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -458,6 +458,10 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium
       Previous version was incomplete. Note that this will only work correctly
       once we actually update to 3.5.99.26 within X2Go, but it doesn't hurt to
       have the new definitions until then. Fixes: #1538.
+    - x2gostartsession: let x2godialog handle events via NX_CLIENT.
+      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.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 19 Jul 2019 20:55:11 +0200
 
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index ee63ac18..0d6ddaac 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


More information about the x2go-commits mailing list