[X2Go-Commits] python-x2go.git - release/0.4.0.x (branch) updated: 0.1.1.4-218-gf232adf
X2Go dev team
git-admin at x2go.org
Tue Jan 7 16:17:54 CET 2014
The branch, release/0.4.0.x has been updated
via f232adfff9b9c87dfdd85692e6b3dbdf337e9192 (commit)
from f1f0a7cf3889a23ecf0bc05f68800b302ca0be90 (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 | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 8bdba1c..bcb30b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -112,6 +112,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
- Handle detection of free TCP/IP X display port far more intelligently.
- On unused port detection bind to 127.0.0.1 by default.
- Provide X2goSession.get_session_type() method.
+ - Do not call HOOK method if self.allow_share_local_folders is False.
* Depend on python-xlib.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100
diff --git a/x2go/session.py b/x2go/session.py
index 3e134d8..06a41a9 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -1908,7 +1908,7 @@ class X2goSession(object):
"""
_retval = False
- if self.has_terminal_session() and self.share_local_folders and not self.faulty and self.is_running():
+ if self.has_terminal_session() and self.share_local_folders and not self.faulty and self.is_running() and self.allow_share_local_folders:
if self._SUPPORTED_FOLDERSHARING and self.is_folder_sharing_available():
if self.control_session.get_transport().reverse_tunnels[self.terminal_session.get_session_name()]['sshfs'][1] is not None:
_retval = True
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