This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit e58cebfaf0b5e8ff02eab120d9065c4fe58a453c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Apr 15 08:23:38 2014 +0200 Rename hook method HOOK_no_known_xserver_found to HOOK_no_installed_xservers_found. Call this new hook if no installed X-Servers could be found on the system. --- debian/changelog | 3 +++ x2go/client.py | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index fc101a9..95841e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,9 @@ python-x2go (0.5.0.0-0x2go1) UNRELEASED; urgency=low - Fix detection of matching path names in X2GoIniFiles. - Make sure X2GoClientXConfig config file really gets written to disk (after we changed the internas of X2GoIniFile for this new major release). + - Rename hook method HOOK_no_known_xserver_found to + HOOK_no_installed_xservers_found. Call this new hook if no installed + X-Servers could be found on the system. * debian/control: + Add dependencies: python-requests, python-simplejson. * python-x2go.spec: diff --git a/x2go/client.py b/x2go/client.py index 7397148..b7fbb8a 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -317,8 +317,8 @@ class X2GoClient(object): else: self.client_xconfig = X2GoClientXConfig(logger=self.logger) - if not self.client_xconfig.known_xservers: - self.HOOK_no_known_xserver_found() + if not self.client_xconfig.installed_xservers: + self.HOOK_no_installed_xservers_found() else: _last_display = None @@ -457,6 +457,10 @@ class X2GoClient(object): self.logger('HOOK_no_such_desktop: the desktop %s (via session profile %s) is not available for sharing (anymore).' % (desktop, profile_name), loglevel=log.loglevel_WARN) def HOOK_no_known_xserver_found(self): + self.logger('DEPRECATION WARNING: The hook method HOOK_no_known_xserver_found is obsolete. Use HOOK_no_installed_xservers_found instead', loglevel=log.loglevel_WARN) + self.HOOk_no_installed_xservers_found() + + def HOOK_no_installed_xservers_found(self): """\ HOOK method: called if the Python X2Go module could not find any usable XServer application to start. You will not be able to start X2Go sessions without an XServer. -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git