[X2Go-Commits] x2goserver.git - build-main (branch) updated: 4.0.1.6-6-gafa555f

[X2Go dev team]

The branch, build-main has been updated
       via  afa555fcfdb84dcc005a38f7b0644813dde1e625 (commit)
      from  97f863c86780bd84dc487105f6645056010431e6 (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 |    6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index f0269f5..8493262 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ x2goserver (4.0.1.7-0~x2go1) UNRELEASED; urgency=low
       Xsession.options they get symlinked into /etc/x2go. Otherwise Xsession.d
       and Xsession.options are created under /etc/x2go as empty dir/file.
       (Fixes: #278).
+    - Fix automatic keyboard setup (via x2gosetkeyboard) while resuming a session.
+      (Fixes: #285).
   * /debian/control:
     - Update LONG_DESCRIPTIONS.
     - Move xfonts-base from Recommends: field to Depends: field (bin:package
diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session
index f492d62..9c8e2bc 100755
--- a/x2goserver/bin/x2goresume-session
+++ b/x2goserver/bin/x2goresume-session
@@ -133,12 +133,14 @@ KTSTR=`echo "$KTSTR" | sed "s/\//\\\\\\\\\//"`
 X2GO_KBD_TYPE=`echo "$X2GO_KBD_TYPE" | sed "s/\//\\\\\\\\\//"`
 
 if [ "$X2GO_SET_KBD" == "0" ] || [ "$X2GO_KBD_TYPE" == "auto" ]; then
-	X2GO_KBD_TYPE="null\/null"
+	keyboard_type="null\/null"
+else
+	keyboard_type="$X2GO_KBD_TYPE"
 fi
 
 NEWOPTIONS=`echo "$OPTIONS" | sed  -e  "s/$LSTR/link=$X2GO_LINK/"\
  -e "s/$PSTR/pack=$X2GO_PACK/"\
- -e "s/$KTSTR/kbtype=$X2GO_KBD_TYPE/"\
+ -e "s/$KTSTR/kbtype=$keyboard_type/"\
  -e "s/$GSTR/geometry=$X2GO_GEOMETRY/"\
  -e "s/$RSTR/resize=$X2GO_RESIZE/"\
  -e "s/$LISTSTR/listen=$GR_PORT/"\


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