[X2Go-Commits] [x2godesktopsharing] 01/01: use current Qt API to set the X2GO_CLIENT variable

git-admin at x2go.org git-admin at x2go.org
Tue Nov 18 08:06:32 CET 2014


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2godesktopsharing.

commit e770503c046905237167be87975326b063ae7d6b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Nov 18 08:06:23 2014 +0100

    use current Qt API to set the X2GO_CLIENT variable
---
 debian/changelog |    3 ++-
 sharetray.cpp    |    6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7bf0ec1..66b1fd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,8 @@ x2godesktopsharing (3.1.1.2-0x2go1) UNRELEASED; urgency=low
       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.
+      output for desktop sharing sessions. Use current Qt API to
+      achieve this.
   * debian/control:
     + Raise versioned D (x2godesktopsharing): x2goserver (>= 4.0.1.19).
   * x2godesktopsharing.spec:
diff --git a/sharetray.cpp b/sharetray.cpp
index bf77ba5..1879432 100644
--- a/sharetray.cpp
+++ b/sharetray.cpp
@@ -393,9 +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);
+		QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+		env.insert("X2GO_CLIENT", client);
+		proc.setProcessEnvironment(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


More information about the x2go-commits mailing list