[X2Go-Commits] x2goserver.git - build-main (branch) updated: 3.1.1.0-23-g9a49f76

[X2Go dev team]

The branch, build-main has been updated
       via  9a49f7672ec2bbde2b70c891fc5d005782efd7b6 (commit)
      from  5de98c2ed290873f044368348d310522ccda3004 (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               |    3 ++-
 x2goserver/bin/x2gosetkeyboard |    5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index bc71ddd..1b8278b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,10 +22,11 @@ x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low
       x2gosetkeyboard from x2goserver-pyhoca into x2goserver package.
     - Make x2gosetkeyboard set the client-side keyboard on sessino start and
       resume.
+    - 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
     105_nxagent_export-remote-keyboard-config.full.patch included.
 
-
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 04 Apr 2012 11:44:14 +0200
 
 x2goserver (3.1.1.0-0~x2go1) unstable; urgency=low
diff --git a/x2goserver/bin/x2gosetkeyboard b/x2goserver/bin/x2gosetkeyboard
index 710daa9..949af5e 100755
--- a/x2goserver/bin/x2gosetkeyboard
+++ b/x2goserver/bin/x2gosetkeyboard
@@ -64,6 +64,10 @@ read_keyboard_file() {
 
 }
 
+reset_keymap() {
+	setxkbmap -layout us -option "" -model pc104
+}
+
 update_keymap() {
 
 	if [ "$XKB_RULES" = "evdev" ]; then
@@ -83,5 +87,6 @@ update_keymap() {
 ### main ###
 $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "Setting X keyboard according to ${X2GO_CLIENT_KBD_FILE}"
 read_keyboard_file
+reset_keymap
 update_keymap
 


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