[X2Go-Commits] python-x2go.git - twofactorauth (branch) updated: 0.1.1.1-3-g5d875b7
X2Go dev team
git-admin at x2go.org
Sat Sep 14 15:56:56 CEST 2013
The branch, twofactorauth has been updated
via 5d875b72fa48d6390993a5b445ae6687ac78341e (commit)
from dafc0ae55b24ce750d2e5edea6db79d394e61185 (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:
debian/changelog | 1 +
x2go/client.py | 2 +-
x2go/session.py | 1 -
3 files changed, 2 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 81061c2..0805825 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ python-x2go (0.1.1.2-0~x2go1) UNRELEASED; urgency=low
- bugfix version
- Use X2goRegistryException for session query for non-existing sessions.
- Catch this exception in X2goClient.
+ - Fix desktop sharing.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Fri, 24 Jun 2011 16:42:20 +0200
diff --git a/x2go/client.py b/x2go/client.py
index 1d71657..c4073ca 100644
--- a/x2go/client.py
+++ b/x2go/client.py
@@ -1185,7 +1185,7 @@ class X2goClient(object):
_desktop = desktop or "%s@%s" % (user, display)
# X2goClient.list_desktops() uses caching (if enabled, so we prefer lookups here...
- if _desktop not in self.list_desktops(session_uuid):
+ if not _desktop in self._X2goClient__list_desktops(session_uuid):
raise x2go_exceptions.X2goDesktopSharingException('No such desktop ID: %s' % _desktop)
return self.session_registry(session_uuid).share_desktop(desktop=desktop, user=user, display=display, share_mode=share_mode, check_desktop_list=False)
diff --git a/x2go/session.py b/x2go/session.py
index cfc8770..9439477 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -1066,7 +1066,6 @@ class X2goSession(object):
logger=self.logger, **self.terminal_params)
if self.has_terminal_session():
- self.terminal_session = _terminal
self.session_name = self.terminal_session.session_info.name
# shared desktop sessions get their startup command set by the control
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).
More information about the x2go-commits
mailing list