The branch, twofactorauth has been updated via 41869db5d84ee8dfc5c46fb6d60789a2235f52e4 (commit) from 4590e1de20bab53d815f04aa7c7e03eb69443df0 (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 | 33 +++++++++++++++++---------------- x2go/inifiles.py | 2 +- 2 files changed, 18 insertions(+), 17 deletions(-) The diff of changes is: diff --git a/x2go/defaults.py b/x2go/defaults.py index e35887d..fefd815 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -160,23 +160,24 @@ X2GO_CLIENTPRINTING_DEFAULTS = { 'defaultprinter': 'PDF', }, } -X2GO_CLIENTXCONFIG_DEFAULTS = { - 'XServers': { - 'known_xservers': ['XMing', 'Cygwin-X', ], - }, - 'Cygwin-X': { - 'process_name': 'XWin.exe', - 'test_available': '%s\cygwin\bin\startxwin.exe' % os.environ['SystemDrive'], - 'run_command':'%s\cygwin\bin\run.exe /usr/bin/bash.exe -l -c /usr/bin/startxwin.exe' % os.environ['SystemDrive'], - 'parameters':[], - } - 'XMing': { - 'process_name': 'XMing.exe', - 'test_available':'%s\Xming\Xming.exe' % os.environ['ProgramFiles'], - 'run_command':'%s\Xming\Xming.exe' % os.environ['ProgramFiles'], - 'parameters': [':0', '-clibboard', '-multiwindow',] +if X2GOCLIENT_OS == 'Windows': + X2GO_CLIENTXCONFIG_DEFAULTS = { + 'XServers': { + 'known_xservers': ['XMing', 'Cygwin-X', ], + }, + 'Cygwin-X': { + 'process_name': 'XWin.exe', + 'test_available': '%s\cygwin\bin\startxwin.exe' % os.environ['SystemDrive'], + 'run_command':'%s\cygwin\bin\run.exe /usr/bin/bash.exe -l -c /usr/bin/startxwin.exe' % os.environ['SystemDrive'], + 'parameters':[], + }, + 'XMing': { + 'process_name': 'XMing.exe', + 'test_available':'%s\Xming\Xming.exe' % os.environ['ProgramFiles'], + 'run_command':'%s\Xming\Xming.exe' % os.environ['ProgramFiles'], + 'parameters': [':0', '-clibboard', '-multiwindow',], + }, } - } X2GO_SESSIONPROFILE_DEFAULTS = { 'speed': 2, 'pack': '16m-jpeg', 'quality': 9, 'link':'ADSL', diff --git a/x2go/inifiles.py b/x2go/inifiles.py index 0d6c8c1..3b19532 100644 --- a/x2go/inifiles.py +++ b/x2go/inifiles.py @@ -239,7 +239,7 @@ class X2goIniFile(object): return "<%s instance: %s>" % (self.__class__, self.name) def __init__(self, name): self.name = name - def set_option(self, option_name.lower(), value): + def set_option(self, option_name, value): setattr(self, option_name.lower(), value) for section_name in self.iniConfig.sections(): 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).