[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.1.1.0-24-g256fe8a

[X2Go dev team]

The branch, build-baikal has been updated
       via  256fe8a5e2f9211367ecaf0e5a40cf7fee334d42 (commit)
      from  9a49f7672ec2bbde2b70c891fc5d005782efd7b6 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                  |    2 +-
 x2goserver/bin/x2goresume-session |    5 ++---
 x2goserver/bin/x2gostartagent     |    5 ++---
 3 files changed, 5 insertions(+), 7 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 1b8278b..0dea2cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,7 +21,7 @@ x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low
     - Add support for client-side keyboard detection. Moved script
       x2gosetkeyboard from x2goserver-pyhoca into x2goserver package.
     - Make x2gosetkeyboard set the client-side keyboard on sessino start and
-      resume.
+      resume if usekbd is set to True and the keyboard type is set ,,auto''.
     - Reset keyboard settings to pc104/us before setting client-side keyboard
       parameters.
   * Depend on x2goagent (>= 2:3.5.0.12), make sure that x2goagent has the patch
diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session
index 78f96a6..3a9772f 100755
--- a/x2goserver/bin/x2goresume-session
+++ b/x2goserver/bin/x2goresume-session
@@ -128,8 +128,7 @@ LISTSTR=`echo "$OPTIONS" | awk -F, {'print $17'}`
 KTSTR=`echo "$KTSTR" | sed "s/\//\\\\\\\\\//"`
 X2GO_KBD_TYPE=`echo "$X2GO_KBD_TYPE" | sed "s/\//\\\\\\\\\//"`
 
-if [ "$X2GO_SET_KBD" == "0" ]
-then
+if [ "$X2GO_SET_KBD" == "0" ] || [ "$X2GO_KBD_TYPE" == "auto" ]; then
 	X2GO_KBD_TYPE="null\/null"
 fi
 
@@ -175,7 +174,7 @@ kill -HUP $X2GO_AGENT_PID &>/dev/null && {
 	(sleep 1; $X2GO_LIB_PATH/x2goresume  "$X2GO_CLIENT" "$SESSION_NAME"  "$GR_PORT" "$SOUND_PORT" "$FS_PORT" > /dev/null;)
 
 	# set client-side keyboard model, type, variant, etc.
-	if [ "$X2GO_SET_KBD" == "0" ]; then
+	if [ "$X2GO_SET_KBD" != "0" ] && [ "$X2GO_KBD_TYPE" == "auto" ]; then
 		X2GO_DISPLAY=$(echo $SESSION_NAME | cut -d"-" -f2)
 		export DISPLAY=:$X2GO_DISPLAY.0
 		x2gosetkeyboard "$SESSION_NAME" >/dev/null 2>/dev/null &
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 90b82b1..e772bf4 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -214,8 +214,7 @@ xauth -f "$XAUTHORITY" add "${HOSTNAME}/unix:${X2GO_PORT}" MIT-MAGIC-COOKIE-1 "$
 xauth -f "$XAUTHORITY" add "${HOSTNAME}:${X2GO_PORT}" MIT-MAGIC-COOKIE-1 "${X2GO_COOKIE}"
 
 
-if [ "$X2GO_SET_KBD" == "0" ]
-then
+if [ "$X2GO_SET_KBD" == "0" ] || [ "$X2GO_KBD_TYPE" == "auto" ];then
     X2GO_HOST="nx/nx,link=${X2GO_LINK},pack=${X2GO_PACK},limit=0,root=${SESSION_DIR},cache=8M,images=32M,type=${X2GO_TYPE},id=${SESSION_NAME},cookie=$X2GO_COOKIE,errors=${SESSION_DIR}/session.log,kbtype=null/null,geometry=${X2GO_GEOMETRY},resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT},client=linux,menu=0"
 else
     X2GO_HOST="nx/nx,link=${X2GO_LINK},pack=${X2GO_PACK},limit=0,root=${SESSION_DIR},cache=8M,images=32M,type=${X2GO_TYPE},id=${SESSION_NAME},cookie=$X2GO_COOKIE,errors=${SESSION_DIR}/session.log,kbtype=${X2GO_KBD_TYPE},geometry=${X2GO_GEOMETRY},resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT},client=linux,menu=0"
@@ -273,7 +272,7 @@ X2GO_SND_PORT=1024
 
 $X2GO_LIB_PATH/x2gocreatesession "$X2GO_COOKIE" "$X2GO_AGENT_PID" "$X2GO_CLIENT" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" "$SESSION_NAME" > /dev/null
 
-if [ "$X2GO_SET_KBD" != "0" ]; then
+if [ "$X2GO_SET_KBD" == "0" ] || [ "$X2GO_KBD_TYPE" != "auto" ]; then
 	$X2GO_LIB_PATH/x2gosyslog "$0" "info" "blocking creation of agent's keyboard file ${SESSION_DIR}/keyboard as requested by session startup command"
 	mkdir -p ${SESSION_DIR}/keyboard
 fi


hooks/post-receive
-- 
x2goserver.git (X2Go Server)

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 "x2goserver.git" (X2Go Server).