[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.1.1.4-178-g2b4f8d4

X2Go dev team git-admin at x2go.org
Wed Jan 8 15:26:56 CET 2014


The branch, build-baikal has been updated
       via  2b4f8d4b2707295cce434da9e83fd8ef5398ccb9 (commit)
      from  5b425f7235bca1f4c49cc176172e230b63d3296c (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/backends/terminal/_stdout.py |   18 ++++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index f2d9527..6d4259f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -83,6 +83,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
     - If the SSH proxy connection tries to bind to a used port, detect an
       unused local port and write this port change to the session profile.
     - Use double-quotes for pulseaudio options.
+    - Export X2GO_SESSION and PULSE_CLIENTCONFIG to published applications.
   * Depend on python-xlib.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sat, 28 Sep 2012 01:44:21 +0100
diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py
index 076ae8f..2328925 100644
--- a/x2go/backends/terminal/_stdout.py
+++ b/x2go/backends/terminal/_stdout.py
@@ -1036,10 +1036,20 @@ class X2goTerminalSessionSTDOUT(object):
         @param exec_name: application to be executed
         @type exec_name: C{str}
         """
-        cmd_line = [ "export DISPLAY=:%s && " % str(self.session_info.display),
-                     "setsid %s" % exec_name, 
-                     "&> /dev/null & exit",
-                   ]
+        cmd_line = [
+            "export DISPLAY=:%s &&" % str(self.session_info.display),
+            "export X2GO_SESSION=%s &&" % str(self.get_session_name()),
+        ]
+
+        if self.params.snd_system == 'pulse':
+            cmd_line.append("export PULSE_CLIENTCONFIG=%s/.pulse-client.conf &&" % self.session_info.remote_container)
+
+        cmd_line.extend(
+            [
+                "setsid %s" % exec_name,
+                "&> /dev/null & exit",
+            ]
+        )
         self.logger('executing published application %s for %s with command line: %s' % (exec_name, self.profile_name, cmd_line), loglevel=log.loglevel_DEBUG)
         (stdin, stdout, stderr) = self.control_session._x2go_exec_command(cmd_line)
 


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