[X2Go-Commits] python-x2go.git - brokerclient (branch) updated: 9ce76c3bb9a3bfefbe5128aee2d3e3bd9aa1e8c5
X2Go dev team
git-admin at x2go.org
Tue Jan 7 16:19:29 CET 2014
The branch, brokerclient has been updated
via 9ce76c3bb9a3bfefbe5128aee2d3e3bd9aa1e8c5 (commit)
from ae691bede6465337b0b0c30ee05fdb462a52cc2d (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/session.py | 9 ++++++---
x2go/x2go_exceptions.py | 3 ++-
2 files changed, 8 insertions(+), 4 deletions(-)
The diff of changes is:
diff --git a/x2go/session.py b/x2go/session.py
index 11f35fd..1b614c3 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -261,7 +261,7 @@ class X2goSession(object):
STILL UNDOCUMENTED
"""
- self.terminal_session.disconnect()
+ self.control_session.disconnect()
self.connected = False
self.running = False
self.suspended = False
@@ -304,8 +304,11 @@ class X2goSession(object):
if self.printing or self.share_local_folders:
_terminal.start_sshfs()
- if self.printing:
- _terminal.start_printing()
+ try:
+ if self.printing:
+ _terminal.start_printing()
+ except X2goPrintException:
+ pass
if self.share_local_folders:
if _control.get_transport().reverse_tunnels[_terminal.get_session_name()]['sshfs'][1] is not None:
diff --git a/x2go/x2go_exceptions.py b/x2go/x2go_exceptions.py
index 142b2e1..0d8ec8e 100644
--- a/x2go/x2go_exceptions.py
+++ b/x2go/x2go_exceptions.py
@@ -47,4 +47,5 @@ class X2goSessionException(_X2goException): pass
class X2goProfileException(_X2goException): pass
class X2goSettingsException(_X2goException): pass
class X2goFwTunnelException(_X2goException): pass
-class X2goRevFwTunnelException(_X2goException): pass
\ No newline at end of file
+class X2goRevFwTunnelException(_X2goException): pass
+class X2goPrintException(_X2goException): pass
\ No newline at end of file
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