[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.1.0.2-6-gc1dfbd5

[X2Go dev team]

The branch, build-baikal has been updated
       via  c1dfbd5f915820e4fc062fe5711d3a93b8237ef6 (commit)
      from  0a3dd9e121e701ff33f0574e5736d2af9ae539bf (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:
 x2go/backends/terminal/_stdout.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py
index b2bf621..91a8059 100644
--- a/x2go/backends/terminal/_stdout.py
+++ b/x2go/backends/terminal/_stdout.py
@@ -177,7 +177,8 @@ class X2goTerminalSessionSTDOUT(object):
     """
     def __init__(self, control_session, session_info=None,
                  geometry="800x600", depth=24, link="adsl", pack="16m-jpeg-9", 
-                 cache_type="unix-kde", kblayout='defkeymap', kbtype='pc105/defkeymap',
+                 cache_type="unix-kde", 
+                 keyboard='', kblayout='null', kbtype='null/null',
                  session_type="application", snd_system='pulse', snd_port=4713, cmd=None,
                  rdp_server=None, rdp_options=None,
                  xdmcp_server=None,
@@ -277,6 +278,7 @@ class X2goTerminalSessionSTDOUT(object):
         self.params.pack = str(pack)
         self.params.cache_type = str(cache_type)
         self.params.session_type = str(session_type)
+        self.params.keyboard = str(keyboard)
         self.params.kblayout = str(kblayout)
         self.params.kbtype = str(kbtype)
         self.params.snd_system = str(snd_system)
@@ -834,7 +836,7 @@ class X2goTerminalSessionSTDOUT(object):
                                                                )
 
         # let the proxy backend know that we want to define a very special keymap
-        if (self.params.kbtype.endswith('defkeymap') and self.params.kblayout.endswith('defkeymap')) or (self.params.kbtype == '' and self.params.kblayout == ''):
+        if (self.params.kbtype.endswith('defkeymap') and self.params.kblayout == 'defkeymap'):
             self.proxy_options.update({'defkeymap': True, })
 
         # set up SSH tunnel for X11 graphical elements


hooks/post-receive
-- 
python-x2go.git (Python X2Go Client API)

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 "python-x2go.git" (Python X2Go Client API).