[X2Go-Commits] python-x2go.git - brokerclient (branch) updated: 0.1.1.4-139-g5c9619b

X2Go dev team git-admin at x2go.org
Tue Jan 7 16:21:02 CET 2014


The branch, brokerclient has been updated
       via  5c9619b3f1a8c241a5ede97b644c2794e512113c (commit)
      from  e6596c551489ab155e241299d30cc90a74fd25a1 (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 e92b8d4..9550438 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
     - Handle empty control session in the session list cache.
     - Render and cache dictionary based published applications menu tree in
       Python X2Go. Cache the tree once rendered.
+    - Fix availablity check of client-side folder sharing.
   * 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 1079a59..8a05bee 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -1737,8 +1737,8 @@ class X2goSession(object):
 
         """
         _retval = False
-        if self.has_terminal_session():
-            if self._SUPPORTED_FOLDERSHARING and self.share_local_folders and self.terminal_session and not self.faulty and self.is_folder_sharing_available():
+        if self.has_terminal_session() and self.share_local_folders and not self.faulty:
+            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
                     for _folder in self.share_local_folders:


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