The branch, master has been updated via 6192724a528b0d585823170f54c2eced49098169 (commit) from 07f7380d8c343c7f583aa1faf45ad42d056c19c5 (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 ----------------------------------------------------------------- commit 6192724a528b0d585823170f54c2eced49098169 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jul 6 14:26:02 2011 +0200 Desktop sharing: try ''<user>@<display>.0'' additionally to ''<user>@<display>'' when trying to find a desktop for sharing. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/client.py | 7 +++++-- x2go/session.py | 8 ++++++-- 3 files changed, 13 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index bafb5d1..ce5e92e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ python-x2go (0.1.1.3-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.1.1.3): - README/TODO update. + - Desktop sharing: try ''<user>@<display>.0'' additionally to ''<user>@<display>'' when + trying to find a desktop for sharing. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 01 Jul 2011 14:53:48 +0200 diff --git a/x2go/client.py b/x2go/client.py index 1327d33..eba5515 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -1198,11 +1198,14 @@ class X2goClient(object): @rtype: C{bool} """ - _desktop = desktop or "%s@%s" % (user, display) # X2goClient.list_desktops() uses caching (if enabled, so we prefer lookups here... + _desktop = desktop or "%s@%s" % (user, display) if not _desktop in self._X2goClient__list_desktops(session_uuid): - raise x2go_exceptions.X2goDesktopSharingException('No such desktop ID: %s' % _desktop) + _orig_desktop = _desktop + _desktop = desktop or '%s.0' % _desktop + if not _desktop in self._X2goClient__list_desktops(session_uuid): + raise x2go_exceptions.X2goDesktopSharingException('No such desktop ID: %s' % _orig_desktop) return self.session_registry(session_uuid).share_desktop(desktop=desktop, user=user, display=display, share_mode=share_mode, check_desktop_list=False) __share_desktop_session = share_desktop_session diff --git a/x2go/session.py b/x2go/session.py index e69f960..9b9704e 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1092,8 +1092,12 @@ class X2goSession(object): self.terminal_session = 'PENDING' _desktop = desktop or '%s@%s' % (user, display) - if check_desktop_list and _desktop in self.list_desktops(): - raise X2goDesktopSharingException('No such desktop ID: %s' % _desktop) + if check_desktop_list: + if not _desktop in self._X2goSession__list_desktops(): + _orig_desktop = _desktop + _desktop = '%s.0' % _desktop + if not _desktop in self._X2GoSession__list_desktops(): + raise X2goDesktopSharingException('No such desktop ID: %s' % _orig_desktop) if self.is_alive(): _control = self.control_session 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).