[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.0-21-gc27e353

[X2Go dev team]

The branch, master has been updated
       via  c27e35304f21a73a85d7bc1c4191fed696d4c0a0 (commit)
      from  b022803cb5b4dc10c740c52bd5845f9a52b7d9b9 (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 c27e35304f21a73a85d7bc1c4191fed696d4c0a0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun May 27 15:42:45 2012 +0200

    relocate x2gosetkeyboard call in x2goresume-session

-----------------------------------------------------------------------

Summary of changes:
 x2goserver/bin/x2goresume-session |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

The diff of changes is:
diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session
index cdb5af2..78f96a6 100755
--- a/x2goserver/bin/x2goresume-session
+++ b/x2goserver/bin/x2goresume-session
@@ -174,6 +174,13 @@ kill -HUP $X2GO_AGENT_PID &>/dev/null && {
 	#done
 	(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
+		X2GO_DISPLAY=$(echo $SESSION_NAME | cut -d"-" -f2)
+		export DISPLAY=:$X2GO_DISPLAY.0
+		x2gosetkeyboard "$SESSION_NAME" >/dev/null 2>/dev/null &
+	fi
+
 	# resume x2godesktopsharing, if it has been in use before the session got suspended
 	x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2goresume-desktopsharing "$SESSION_NAME" || true
 
@@ -198,9 +205,3 @@ echo "gr_port=$GR_PORT"
 echo "sound_port=$SOUND_PORT"
 echo "fs_port=$FS_PORT"
 
-# set client-side keyboard model, type, variant, etc.
-if [ "$X2GO_SET_KBD" == "0" ]; then
-	X2GO_DISPLAY=$(echo $SESSION_NAME | cut -d"-" -f2)
-	export DISPLAY=:$X2GO_DISPLAY.0
-	x2gosetkeyboard "$SESSION_NAME" >/dev/null 2>/dev/null &
-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).