The branch, release/0.4.0.x has been updated via 056f7f11a7cf6888fc659b0e169571ebcb97f8d9 (commit) from 67e7103edcf5cec2c0ebad49b648bbd365e2b9a9 (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/base.py | 5 +++-- x2go/backends/proxy/nx3.py | 13 +++++++++++-- x2go/client.py | 5 ++++- x2go/defaults.py | 12 +++++------- x2go/xserver.py | 1 + 5 files changed, 24 insertions(+), 12 deletions(-) The diff of changes is: diff --git a/x2go/backends/proxy/base.py b/x2go/backends/proxy/base.py index 76a66c5..5836a57 100644 --- a/x2go/backends/proxy/base.py +++ b/x2go/backends/proxy/base.py @@ -174,12 +174,13 @@ class X2goProxyBASE(threading.Thread): p = self.proxy = subprocess.Popen(cmd_line, env=self.PROXY_ENV, stdout=self.session_log_stdout, - stderr=self.session_log_stderr) + stderr=self.session_log_stderr, + shell=False) while self._keepalive: gevent.sleep(.5) - #p.terminate() + p.terminate() def _update_local_proxy_socket(self, port): pass diff --git a/x2go/backends/proxy/nx3.py b/x2go/backends/proxy/nx3.py index a6b73a3..274288d 100644 --- a/x2go/backends/proxy/nx3.py +++ b/x2go/backends/proxy/nx3.py @@ -55,10 +55,19 @@ class X2goProxyNX3(base.X2goProxyBASE): """ base.X2goProxyBASE.__init__(self, *args, **kwargs) - + # setting some default environment variables, nxproxy paths etc. if _X2GOCLIENT_OS == "Windows": - self.PROXY_CMD = os.path.join(os.environ["ProgramFiles"], os.path.normpath("x2goclient/nxproxy.exe")) + _nxproxy_paths = [ + os.path.join(os.environ["ProgramFiles"], os.path.normpath("x2goclient/nxproxy.exe")), + os.path.join(os.environ["ProgramFiles"], os.path.normpath("NX Client for Windows/bin/nxproxy.exe")), + ] + if os.environ.has_key('NXPROXY_BINARY'): + _nxproxy_paths.insert(0, os.environ['NXPROXY_BINARY']) + for _nxproxy_cmd in _nxproxy_paths: + if os.path.exists(_nxproxy_cmd): + break + self.PROXY_CMD = _nxproxy_cmd else: self.PROXY_CMD = "/usr/bin/nxproxy" self.PROXY_ENV.update({ diff --git a/x2go/client.py b/x2go/client.py index 723a28b..5480e30 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -183,7 +183,10 @@ class X2goClient(object): p_xs = (start_xserver, self.client_xconfig.get_xserver_config(start_xserver)) if p_xs is not None: self.xserver = X2goXServer(p_xs[0], p_xs[1], logger=self.logger) - + else: + # presume the running XServer listens on :0 + os.environ.update({'DISPLAY': 'localhost:0'}) + self.session_profiles = X2goSessionProfiles(logger=self.logger) self.session_registry = X2goSessionRegistry(logger=self.logger) self.session_guardian = X2goSessionGuardian(self, enable_cache=use_cache, logger=self.logger) diff --git a/x2go/defaults.py b/x2go/defaults.py index b4c3e54..6e475ff 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -46,9 +46,7 @@ if X2GOCLIENT_OS == "Windows": SUPPORTED_SOUND = False SUPPORTED_PRINTING = True SUPPORTED_FOLDERSHARING = True - DISPLAY='127.0.0.1:0.0' - os.environ['DISPLAY'] = DISPLAY - + elif X2GOCLIENT_OS == "Linux": import getpass CURRENT_LOCAL_USER = getpass.getuser() @@ -166,14 +164,14 @@ if X2GOCLIENT_OS == 'Windows': 'known_xservers': ['Xming', 'Cygwin-X', ], }, 'Cygwin-X': { - 'display': ':40', + 'display': 'localhost:40', 'process_name': 'XWin.exe', 'test_installed': os.path.join(os.environ['SystemDrive'], '\\', 'cygwin', 'bin', 'XWin.exe'), - 'run_command':os.path.join(os.environ['SystemDrive'], '\\', 'cygwin', 'bin', 'XWin.exe'), - 'parameters':[':40', '-clipboard', '-multiwindow', '-notrayicon', '-nowinkill', ], + 'run_command': os.path.join(os.environ['SystemDrive'], '\\', 'cygwin', 'bin', 'XWin.exe'), + 'parameters': [':40', '-clipboard', '-multiwindow', '-notrayicon', '-nowinkill', ], }, 'Xming': { - 'display': ':40', + 'display': 'localhost:40', 'process_name': 'Xming.exe', 'test_installed': os.path.join(os.environ['ProgramFiles'], 'Xming', 'Xming.exe'), 'run_command': os.path.join(os.environ['ProgramFiles'], 'Xming', 'Xming.exe'), diff --git a/x2go/xserver.py b/x2go/xserver.py index 5392b69..ed80e8b 100644 --- a/x2go/xserver.py +++ b/x2go/xserver.py @@ -173,6 +173,7 @@ class X2goXServer(threading.Thread): self.xserver_name = xserver_name self.xserver_config = xserver_config if self.xserver_config.has_key('display'): + self.logger('settings DISPLAY environment variable to %s' % self.xserver_config['display'], loglevel=log.loglevel_NOTICE) os.environ.update({'DISPLAY': self.xserver_config['display']}) threading.Thread.__init__(self) self.daemon = True 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).