[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 545184b7508a9d4c0c9c86e13e42f508601331ea

[X2Go dev team]

The branch, build-baikal has been updated
       via  545184b7508a9d4c0c9c86e13e42f508601331ea (commit)
      from  ba2a2f8390524d0b9bebf0ea36a8357a029df55e (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:
 x2go/defaults.py |   11 +++++++++++
 x2go/session.py  |   10 ++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/x2go/defaults.py b/x2go/defaults.py
index a75e059..f132c57 100644
--- a/x2go/defaults.py
+++ b/x2go/defaults.py
@@ -43,15 +43,26 @@ if X2GOCLIENT_OS == "Windows":
     import win32api
     CURRENT_LOCAL_USER = win32api.GetUserName()
     X2GO_SSH_ROOTDIR = os.path.join('.x2go','.ssh')
+    SUPPORTED_SOUND = False
+    SUPPORTED_PRINTING = True
+    SUPPORTED_FOLDERSHARING = True
 
 elif X2GOCLIENT_OS == "Linux":
     import getpass
     CURRENT_LOCAL_USER = getpass.getuser()
     X2GO_SSH_ROOTDIR = '.ssh'
+    SUPPORTED_SOUND = True
+    SUPPORTED_PRINTING = True
+    SUPPORTED_FOLDERSHARING = True
+
 elif X2GOCLIENT_OS == "Mac":
     import getpass
     CURRENT_LOCAL_USER = getpass.getuser()
     X2GO_SSH_ROOTDIR = '.ssh'
+    SUPPORTED_SOUND = True
+    SUPPORTED_PRINTING = True
+    SUPPORTED_FOLDERSHARING = True
+
 else:
     import exceptions
     class OSNotSupportedException(exceptions.StandardError): pass
diff --git a/x2go/session.py b/x2go/session.py
index 1b614c3..354069a 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -41,6 +41,8 @@ from x2go.backends.info import X2goServerSessionList
 from x2go.backends.proxy import X2goProxy
 from x2go.backends.profiles import X2goSessionProfiles
 
+from defaults import SUPPORTED_SOUND, SUPPORTED_PRINTING, SUPPORTED_FOLDERSHARING
+
 # options of the paramiko.SSHClient().connect()
 _X2GO_SESSION_PARAMS = ('geometry', 'depth', 'link', 'pack',
                         'cache_type', 'kblayout', 'kbtype',
@@ -298,19 +300,19 @@ class X2goSession(object):
         self.terminal_session = _terminal
         if _terminal is not None:
 
-            if _terminal.params.snd_system is not 'none':
+            if SUPPORTED_SOUND and _terminal.params.snd_system is not 'none':
                 _terminal.start_sound()
 
-            if self.printing or self.share_local_folders:
+            if (SUPPORTED_PRINTING and self.printing) or (SUPPORTED_FOLDERSHARING and self.share_local_folders):
                 _terminal.start_sshfs()
 
             try:
-                if self.printing:
+                if SUPPORTED_PRINTING and self.printing:
                     _terminal.start_printing()
             except X2goPrintException:
                 pass
 
-            if self.share_local_folders:
+            if SUPPORTED_FOLDERSHARING and self.share_local_folders:
                 if _control.get_transport().reverse_tunnels[_terminal.get_session_name()]['sshfs'][1] is not None:
                     for _folder in self.share_local_folders:
                         _terminal.share_local_folder(_folder)


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).