[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.2.0.10-89-g384130b
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:31:24 CET 2014
The branch, build-baikal has been updated
via 384130ba3e22a2ea7c3c4d021f1e7e22a072727b (commit)
from 78a8ce92518502a16c909b84a7987e1a3f858523 (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 | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/x2go/session.py b/x2go/session.py
index a511ed9..c7bda03 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -1754,6 +1754,8 @@ class X2goSession(object):
@raise Exception: any exception that occurs during published application menu retrieval is passed through
"""
+ self.terminal_session = 'PENDING'
+
# initialize a dummy event to avoid many if clauses further down in the code
self.reset_progress_status()
_dummy_event = threading.Event()
@@ -1763,7 +1765,6 @@ class X2goSession(object):
self._progress_status = 1
progress_event.set()
- self.terminal_session = 'PENDING'
_new_session = False
if self.session_name is None:
self.session_name = session_name
@@ -2026,6 +2027,8 @@ class X2goSession(object):
@raise X2goSessionException: if the available desktop session appears to be dead, in fact
"""
+ self.terminal_session = 'PENDING'
+
# initialize a dummy event to avoid many if clauses further down in the code
self.reset_progress_status()
_dummy_event = threading.Event()
@@ -2035,8 +2038,6 @@ class X2goSession(object):
self._progress_status = 5
progress_event.set()
- self.terminal_session = 'PENDING'
-
_desktop = desktop or '%s@%s' % (user, display)
if check_desktop_list:
if not _desktop in self._X2goSession__list_desktops():
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