[X2Go-Commits] python-x2go.git - twofactorauth (branch) updated: 0.1.1.4-249-gb4a9e5f

X2Go dev team git-admin at x2go.org
Sat Sep 14 15:57:31 CEST 2013


The branch, twofactorauth has been updated
       via  b4a9e5f4921f5713fb71acf692f1ae73ec843666 (commit)
      from  86aa11e89f7d667813ddadd61209466c57b843d7 (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/proxy/_nx3.py |   40 ----------------------------------------
 1 file changed, 40 deletions(-)

The diff of changes is:
diff --git a/x2go/backends/proxy/_nx3.py b/x2go/backends/proxy/_nx3.py
index 7005178..271f318 100644
--- a/x2go/backends/proxy/_nx3.py
+++ b/x2go/backends/proxy/_nx3.py
@@ -116,46 +116,6 @@ class X2goProxyNX3(base.X2goProxyBASE):
 
     def process_proxy_options(self):
 
-        if self.proxy_options.has_key('defkeymap') and self.proxy_options['defkeymap']:
-
-            # first: draw in xkb_rules_names from xprop output
-            xkb_rules_names = utils.xkb_rules_names()
-            _proxy_options = {
-                'xkbrules': xkb_rules_names['rules'],
-                'xkbmodel': xkb_rules_names['model'],
-                'xkblayout': xkb_rules_names['layout'],
-                'xkbvariant': xkb_rules_names['variant'],
-                'xkboptions': xkb_rules_names['options'],
-            }
-
-            # merge self.proxy_options into the proxy_options we obtained from xprop
-            _proxy_options.update(self.proxy_options)
-            self.proxy_options = _proxy_options
-
-            del self.proxy_options['defkeymap']
-
-            # create keyboard file
-            _keyboard = """\
-rules=%s
-model=%s
-layout=%s
-variant=%s
-options=%s""" % ( self.proxy_options['xkbrules'],
-                  self.proxy_options['xkbmodel'],
-                  self.proxy_options['xkblayout'],
-                  self.proxy_options['xkbvariant'],
-                  self.proxy_options['xkboptions'], )
-
-            # remove processed options from self.process_options
-            del self.proxy_options['xkbrules']
-            del self.proxy_options['xkbmodel']
-            del self.proxy_options['xkblayout']
-            del self.proxy_options['xkbvariant']
-            del self.proxy_options['xkboptions']
-
-            # write the keyboard file into the remote session directory
-            self.session_instance.control_session._x2go_sftp_write('%s/keyboard' % self.session_info.remote_container, _keyboard)
-
         # run the base variant of this method (basically for logging of ignored process_options)
         base.X2goProxyBASE.process_proxy_options(self)
 


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




More information about the x2go-commits mailing list