[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-214-g6b7b203

[X2Go dev team]

The branch, master has been updated
       via  6b7b20325f154f16a9c22c22187690521f90b213 (commit)
      from  e6cdad130e1aebe7fa94022b3f7fe0d1cf6c4f8c (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 6b7b20325f154f16a9c22c22187690521f90b213
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Sep 25 12:23:37 2013 +0200

    Work around buggy X2Go Client on Mac OS. If the keyboard type is set to "query", we force X2GO_SET_KBD to 1. (Partly resolves: #112).
    
    Conflicts (when cherry-picked from release/4.0.1.x branch, resolved by Mike Gabriel):
    	debian/changelog

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

Summary of changes:
 debian/changelog              |   11 ++++++++++-
 x2goserver/bin/x2gostartagent |    5 +++++
 2 files changed, 15 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 6a70599..4af91da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -152,7 +152,16 @@ x2goserver (4.0.1.0-0~x2go1) unstable; urgency=low
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 07 Jun 2013 23:07:40 +0200
 
-x2goserver (4.0.0.5-0~x2go1) UNRELEASED; urgency=low
+x2goserver (4.0.0.6-0~x2go1) UNRELEASED; urgency=low
+
+  * New upstream version (4.0.0.6):
+    - Work around buggy X2Go Client on Mac OS. If the keyboard type
+      is set to "query", we force X2GO_SET_KBD to 1.
+      (Partly resolves: #112).
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 25 Sep 2013 12:19:16 +0200
+
+x2goserver (4.0.0.5-0~x2go1) unstable; urgency=low
 
   * New upstream version (4.0.0.5):
     - Make x2goumount-session tolerant towards usernames that contain spaces
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 607a35e..bc399c2 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -60,6 +60,11 @@ X2GO_CMD="$1"; shift
 X2GO_RESIZE=0
 X2GO_FULLSCREEN=0
 
+# Mac OS keyboard issue workaround: for old/broken clients that used to call type=query and usekbd=0...
+if [ "$X2GO_KBD_TYPE" = "query" ]; then
+	X2GO_SET_KBD=1
+fi
+
 XAUTHORITY=${XAUTHORITY:-"$HOME/.Xauthority"}
 
 if [ "$X2GO_STYPE" == "S" ]; then


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).