This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2godesktopsharing. from 1fe91df Wait 20s (instead of 5s) for cross-user desktopsharing to come up. new 0cc22e2 Set X2GO_CLIENT env variable before launching x2gostartagent. This correctly sets the <client> field in the session list output for desktop sharing sessions. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 3 +++ sharetray.cpp | 3 +++ 2 files changed, 6 insertions(+) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 0cc22e20453d16cbddc227da4b1d139c185aa2b7 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Nov 15 23:39:31 2014 +0100 Set X2GO_CLIENT env variable before launching x2gostartagent. This correctly sets the <client> field in the session list output for desktop sharing sessions. --- debian/changelog | 3 +++ sharetray.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 91b8bce..7bf0ec1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,9 @@ x2godesktopsharing (3.1.1.2-0x2go1) UNRELEASED; urgency=low - Provide debug output when we DENY session startup. - Wait 20s (instead of 5s) for cross-user desktopsharing to come up. + - Set X2GO_CLIENT env variable before launching x2gostartagent. + This correctly sets the <client> field in the session list + output for desktop sharing sessions. * debian/control: + Raise versioned D (x2godesktopsharing): x2goserver (>= 4.0.1.19). * x2godesktopsharing.spec: diff --git a/sharetray.cpp b/sharetray.cpp index c3d76fb..bf77ba5 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -393,6 +393,9 @@ QString ShareTray::getSocketAnswer ( QString message ) //start agent QProcess proc ( this ); lst.removeAt ( 0 );; + QStringList env = proc.systemEnvironment(); + env << "X2GO_CLIENT=" << client; + proc.setEnvironment(env); proc.start ( "x2gostartagent",lst ); if ( !proc.waitForFinished ( 20000 ) ) { -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
-
git-admin＠x2go.org