[X2go-Commits] python-x2go.git - build-main (branch) updated: 0.1.1.1-12-g3fb1a45
X2go dev team
git-admin at x2go.org
Tue Jun 28 21:08:15 CEST 2011
The branch, build-main has been updated
via 3fb1a45de69efba836f725c5e8ae5ca128959127 (commit)
via a7e043c046bd4088bc991a79708b8544123ff45b (commit)
via 9ab58903d0517d1633730fc2e1973eac8d7c2bea (commit)
via 56bb7e448827dc04c8f1e680b624a3d5c3720b21 (commit)
via 5b871552813091544650f7333f40081fc5ee8560 (commit)
from 15598f15f512d67222a5d2b4f1b4bb277b29f520 (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 | 2 ++
x2go/forward.py | 11 ++++++-----
x2go/mimebox.py | 8 ++++++--
x2go/mimeboxactions.py | 2 +-
x2go/printqueue.py | 2 +-
x2go/session.py | 2 +-
x2go/x2go_exceptions.py | 2 ++
7 files changed, 19 insertions(+), 10 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index a6a731a..67214b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ python-x2go (0.1.1.2-0~x2go1) UNRELEASED; urgency=low
- Improve error handling / logging in forward.py.
- Add X2goSession method that detects if auto-connecting a session profile
is probably possible.
+ - Fix MIME box action SAVEAS.
+ - Fix for session status notification for sessions with PENDING terminal session.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Fri, 24 Jun 2011 16:42:20 +0200
diff --git a/x2go/forward.py b/x2go/forward.py
index f12666b..f87e964 100644
--- a/x2go/forward.py
+++ b/x2go/forward.py
@@ -113,11 +113,12 @@ class X2goFwServer(StreamServer):
chan_peername = self.chan.getpeername()
_success = True
except Exception, e:
- self.logger('incoming request to %s:%d failed on attempt %d: %s' % (self.chain_host,
- self.chain_port,
- _count,
- repr(e)),
- loglevel=log.loglevel_WARN)
+ self.logger('incoming request to %s:%d failed on attempt %d of %d: %s' % (self.chain_host,
+ self.chain_port,
+ _count,
+ _maxwait,
+ repr(e)),
+ loglevel=log.loglevel_WARN)
gevent.sleep(.4)
diff --git a/x2go/mimebox.py b/x2go/mimebox.py
index ec2e974..be62404 100644
--- a/x2go/mimebox.py
+++ b/x2go/mimebox.py
@@ -93,10 +93,13 @@ class X2goMIMEboxQueue(threading.Thread):
self.client_instance = client_instance
self.client_rootdir = client_instance.get_client_rootdir()
+ # this has to be set before we set the MIME box action...
+ self._accept_jobs = False
+
if mimebox_action is None:
- mimebox_action = mimebox_actions.X2goMIMEboxActionOPEN(client_instance=self.client_instance, logger=self.logger, **mimebox_action_args)
+ mimebox_action = mimebox_actions.X2goMIMEboxActionOPEN(client_instance=self.client_instance, logger=self.logger)
elif type(mimebox_action) in (types.StringType, types.UnicodeType):
- mimebox_action = self.set_mimebox_action(mimebox_action)
+ mimebox_action = self.set_mimebox_action(mimebox_action, client_instance=self.client_instance, logger=self.logger)
else:
# hope it's already an instance...
self.mimebox_action = mimebox_action
@@ -105,6 +108,7 @@ class X2goMIMEboxQueue(threading.Thread):
self.daemon = True
self._accept_jobs = True
+
def __del__(self):
"""\
Class destructor.
diff --git a/x2go/mimeboxactions.py b/x2go/mimeboxactions.py
index 7987fb0..4fb21fb 100644
--- a/x2go/mimeboxactions.py
+++ b/x2go/mimeboxactions.py
@@ -260,7 +260,7 @@ class X2goMIMEboxActionSAVEAS(X2goMIMEboxAction):
@param mimebox_file: PDF file name as placed in to the X2go spool directory
"""
- self.logger('Session %s (%s) is calling X2goClient class hook method <client_instance>.HOOK_open_mimebox_saveas_dialog(%s)' % (self.session_name, self.profile_name, self.mimebox_file), loglevel=log.loglevel_NOTICE)
+ self.logger('Session %s (%s) is calling X2goClient class hook method <client_instance>.HOOK_open_mimebox_saveas_dialog(%s)' % (self.session_name, self.profile_name, mimebox_file), loglevel=log.loglevel_NOTICE)
self.client_instance.HOOK_open_mimebox_saveas_dialog(os.path.join(mimebox_dir, mimebox_file), profile_name=self.profile_name, session_name=self.session_name)
time.sleep(60)
diff --git a/x2go/printqueue.py b/x2go/printqueue.py
index 4529c9f..d064e41 100644
--- a/x2go/printqueue.py
+++ b/x2go/printqueue.py
@@ -105,7 +105,7 @@ class X2goPrintQueue(threading.Thread):
self.client_rootdir = client_instance.get_client_rootdir()
self.printing_backend = printing_backend
if print_action is not None:
- self.set_print_action(print_action, logger=logger, **print_action_args)
+ self.set_print_action(print_action, client_instance=self.client_instance, logger=logger, **print_action_args)
threading.Thread.__init__(self)
self.daemon = True
self._accept_jobs = True
diff --git a/x2go/session.py b/x2go/session.py
index ead7b93..e69f960 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -979,7 +979,7 @@ class X2goSession(object):
@rtype: C{bool}
"""
- self.terminal_session == 'PENDING'
+ self.terminal_session = 'PENDING'
_new_session = False
if self.session_name is None:
self.session_name = session_name
diff --git a/x2go/x2go_exceptions.py b/x2go/x2go_exceptions.py
index 9b7b3eb..c068b6c 100644
--- a/x2go/x2go_exceptions.py
+++ b/x2go/x2go_exceptions.py
@@ -57,6 +57,8 @@ class X2goRevFwTunnelException(_X2goException): pass
class X2goPrintException(_X2goException): pass
class X2goPrintQueueException(_X2goException): pass
class X2goPrintActionException(_X2goException): pass
+class X2goMIMEboxActionException(_X2goException): pass
+class X2goMIMEboxQueueException(_X2goException): pass
class X2goSSHProxyException(_X2goException): pass
class X2goSSHProxyAuthenticationException(_X2goException): pass
class X2goNotImplementedYetException(_X2goException): pass
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