[X2Go-Commits] python-x2go.git - twofactorauth (branch) updated: fd693f04c4356a039705d13f8e01e53dfa1b5497

[X2Go dev team]

The branch, twofactorauth has been updated
       via  fd693f04c4356a039705d13f8e01e53dfa1b5497 (commit)
      from  c86fe24bf4a4dd7e5dae5720ec9bfbc0d10bfc10 (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/defaults.py |   30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

The diff of changes is:
diff --git a/x2go/defaults.py b/x2go/defaults.py
index 1b4ce5c..d285402 100644
--- a/x2go/defaults.py
+++ b/x2go/defaults.py
@@ -68,8 +68,10 @@ X2GO_CLIENTSETTINGS_DEFAULTS = {
         },
     'General': {
         # clientport is not needed for Python X2go
-        'clientport': 22, 
+        'clientport': 22,
         'autoresume': True,
+        'sharefolders': [],
+        'printing':False
         },
     'Authorization': {
         'newprofile': True,
@@ -96,15 +98,15 @@ X2GO_CLIENTPRINTING_DEFAULTS = {
         'ps': False,
         },
     'view': {
-        # If General->pdfview is true: 
+        # If General->pdfview is true:
         #   if open is true, the PDF viewer command is executed
-        #   if open is false, the incoming print job is saved in ~/PDF folder 
+        #   if open is false, the incoming print job is saved in ~/PDF folder
         'open': True,
         # command to execute as PDF viewer
         'command': 'xpdf',
         },
     'CUPS': {
-        # default print queue for CUPS, if print queue does not exist, the default 
+        # default print queue for CUPS, if print queue does not exist, the default
         # CUPS queue is detected
         'defaultprinter': 'PDF',
         },
@@ -117,17 +119,27 @@ X2GO_SESSIONPROFILE_DEFAULTS = {
     'fullscreen': False,
     'width': 800,'height': 600,'dpi': 96,'setdpi': False,
     'usekbd':True, 'layout': 'us', 'type': 'pc105/us',
-    'sound':False, 'soundsystem': 'pulse', 'startsoundsystem': True, 'soundtunnel':True, 'defsndport':True, 'sndport':4713, 
-    'printing':True, 
-    'name': None, 'icon': ':icons/128x128/x2gosession.png', 
+    'sound':False, 'soundsystem': 'pulse', 'startsoundsystem': True, 'soundtunnel':True, 'defsndport':True, 'sndport':4713,
+    'printing':True,
+    'name': None, 'icon': ':icons/128x128/x2gosession.png',
     'host': None, 'user': None, 'key': None, 'sshport': 22, 'add_to_known_hosts': True,
     'rootless': True, 'applications': 'WWWBROWSER, MAILCLIENT, OFFICE, TERMINAL', 'command':'TERMINAL', 'session_type': 'application',
-    'rdpoptions':None, 'rdpserver':None, 
+    'rdpoptions':None, 'rdpserver':None,
     'default':False,
     'print': True,
     'xdmcpserver': 'localhost',
     }
 
+
+##
+## Ini to session parameter name conversion
+##
+
+# Here the parameters from the sessionprofile are transformed to sessionparams. The first
+# gives the profile name, the second the session name
+X2GO_INIPARMS_TO_SESSION_PARMS = (('soundsystem','snd_system'), ('command','cmd'),('host','server'),('user', 'username'),
+                        ('layout','kblayout'),('type','kbtype'))
+
 ##
 ## X2go Proxy defaults
 ##
@@ -178,7 +190,7 @@ pack_methods_nx3_formatted="""
            '\', \''.join(pack_methods_nx3[57:62]), \
            '\', \''.join(pack_methods_nx3[62:]))
 
-# _pack_methods_nx3 is the complete list of NX3 pack methods that can be used to check options 
+# _pack_methods_nx3 is the complete list of NX3 pack methods that can be used to check options
 # against
 _pack_methods_nx3 = [ m for m in pack_methods_nx3 if "%" not in m ]
 for meth in [ m for m in pack_methods_nx3 if "%" in m ]:


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