[X2Go-Commits] python-x2go.git - brokerclient (branch) updated: 0.4.0.8-23-g696f1b0

[X2Go dev team]

The branch, brokerclient has been updated
       via  696f1b0a0c3a0f66f4c8a1bcec3211e7c9792f47 (commit)
      from  596f0cb06a0c2f1e2f4f0f56826612e208521daf (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/backends/terminal/_stdout.py |    7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 0857e1f..a7f79ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,8 @@ python-x2go (0.4.0.9-0~x2go1) UNRELEASED; urgency=low
     - Report about found session window / session window retitling in debug mode.
     - Fix session window detection when local session manager is the i3 session manager
       (which uses _NET_CLIENT_LIST_STACKING instead of _NET_CLIENT_LIST).
+    - Check for pulse cookie file in old (~/.pulse-cookie) and new
+      (~/.config/pulse/cookie) location.
 
   [ Orion Poplawski ]
   * debian/control:
diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py
index 9d06ccd..b602341 100644
--- a/x2go/backends/terminal/_stdout.py
+++ b/x2go/backends/terminal/_stdout.py
@@ -529,13 +529,18 @@ class X2GoTerminalSessionSTDOUT(object):
                 ###
                 ### PULSEAUDIO
                 ###
+                cookie_filepath = None
                 if os.path.exists(os.path.normpath('%s/.pulse-cookie' % _LOCAL_HOME)):
+                    cookie_filepath = os.path.normpath('%s/.pulse-cookie' % _LOCAL_HOME)
+                elif os.path.exists(os.path.normpath('%s/.config/pulse/cookie' % _LOCAL_HOME)):
+                    cookie_filepath = os.path.normpath('%s/.config/pulse/cookie' % _LOCAL_HOME)
+                if cookie_filepath is not None:
                     # setup pulse client config file on X2Go server
                     cmd_line = "echo 'default-server=127.0.0.1:%s'>%s/.pulse-client.conf;" % (self.session_info.snd_port, self.session_info.remote_container) + \
                                "echo 'cookie-file=%s/.pulse-cookie'>>%s/.pulse-client.conf" % (self.session_info.remote_container, self.session_info.remote_container)
                     (stdin, stdout, stderr) = self.control_session._x2go_exec_command(cmd_line)
 
-                    self.control_session._x2go_sftp_put(local_path='%s/.pulse-cookie' % _LOCAL_HOME, remote_path='%s/.pulse-cookie' % self.session_info.remote_container)
+                    self.control_session._x2go_sftp_put(local_path=cookie_filepath, remote_path='%s/.pulse-cookie' % self.session_info.remote_container)
 
                     # start reverse SSH tunnel for pulse stream
                     _tunnel = rforward.X2GoRevFwTunnel(server_port=self.session_info.snd_port, 


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