[X2go-Commits] python-x2go.git - master (branch) updated: 0.1.1.1-8-g5b87155
X2go dev team
git-admin at x2go.org
Tue Jun 28 15:55:16 CEST 2011
The branch, master has been updated
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 -----------------------------------------------------------------
commit 5b871552813091544650f7333f40081fc5ee8560
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Jun 28 15:55:35 2011 +0200
Fix for MIME box action SAVEAS
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
x2go/mimebox.py | 8 ++++++--
x2go/x2go_exceptions.py | 2 ++
3 files changed, 9 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index a6a731a..cb2524e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ 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.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Fri, 24 Jun 2011 16:42:20 +0200
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/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