[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.2.0.10-46-g75cba9e
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:27:20 CET 2014
The branch, build-baikal has been updated
via 75cba9e266f86bb406c7b86aab45c71767ac90d8 (commit)
from f7b6768fd794368b50dd6405b0068b2e2b72d28c (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/session.py | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 966718a..765cb68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,7 @@ python-x2go (0.2.1.0-0~x2go1) UNRELEASED; urgency=low
- Rename session type XFCE4 to XFCE (using an unversioned name).
- Avoid false positive notifications about started-by-other sessions.
- Introduce locks for session registrations.
+ - Wait for mounting of print and mimebox spooling share.
* /debian/rules:
+ Allow package build on systems with missing dh_python2.
* /debian/control:
diff --git a/x2go/session.py b/x2go/session.py
index 26f1d41..c80ede5 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -1737,7 +1737,7 @@ class X2goSession(object):
if self._SUPPORTED_PRINTING and self.printing:
try:
- self.has_terminal_session() and not self.faulty and gevent.spawn(self.terminal_session.start_printing)
+ self.has_terminal_session() and not self.faulty and self.terminal_session.start_printing()
self.has_terminal_session() and not self.faulty and self.session_environment.update({'X2GO_SPOOLDIR': self.terminal_session.get_printing_spooldir(), })
except x2go_exceptions.X2goUserException, e:
self.logger('%s' % str(e), loglevel=log.loglevel_WARN)
@@ -1746,7 +1746,7 @@ class X2goSession(object):
if self._SUPPORTED_MIMEBOX and self.allow_mimebox:
try:
- self.has_terminal_session() and not self.faulty and gevent.spawn(self.terminal_session.start_mimebox, mimebox_extensions=self.mimebox_extensions, mimebox_action=self.mimebox_action)
+ self.has_terminal_session() and not self.faulty and self.terminal_session.start_mimebox(mimebox_extensions=self.mimebox_extensions, mimebox_action=self.mimebox_action)
self.has_terminal_session() and self.session_environment.update({'X2GO_MIMEBOX': self.terminal_session.get_mimebox_spooldir(), })
except x2go_exceptions.X2goUserException, e:
self.logger('%s' % str(e), loglevel=log.loglevel_WARN)
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