x2godesktopsharing.git - master (branch) updated: 3.0.1.3-5-g2ff6a8d - x2go-commits

25 Nov 2011

The branch, master has been updated
       via  2ff6a8d69fbd38a1762001ad596d684dd687bbbc (commit)
      from  27b99c493435ff3eff5d35b6ea6017c43ab687d8 (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 -----------------------------------------------------------------
commit 2ff6a8d69fbd38a1762001ad596d684dd687bbbc
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Fri Nov 25 10:30:11 2011 +0100

    Pass username of user who requests desktop sharing to x2gostartagent.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    3 ++-
 sharetray.cpp    |    1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index c2d6c7b..0179dde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ x2godesktopsharing (3.0.1.4-0~x2go1) UNRELEASED; urgency=low
   * New upstream version (3.0.1.4):
     - Always use /tmp for lock and session sharing socket
       (Fixes user individual temp dirs in Debian Edu / Skolelinux).
+    - Pass username of user who requests desktop sharing to x2gostartagent.
 
- -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Thu, 13 Oct 2011 02:01:18 +0200
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Fri, 25 Nov 2011 10:28:29 +0100
 
 x2godesktopsharing (3.0.1.3-0~x2go1) unstable; urgency=low
 
diff --git a/sharetray.cpp b/sharetray.cpp
index c20e7af..586a5b5 100644
--- a/sharetray.cpp
+++ b/sharetray.cpp
@@ -370,7 +370,6 @@ QString ShareTray::getSocketAnswer ( QString message )
 		trayMessage ( tr ( "Access granted" ),QString ( tr ( "%1(%2): access granted" ) ).arg (remote_user ).arg ( client ) );
 		//start agent
 		QProcess proc ( this );
-		lst.removeAt ( 10 );;
 		lst.removeAt ( 0 );;
 		proc.start ( "x2gostartagent",lst );
 		if ( !proc.waitForFinished ( 5000 ) )


hooks/post-receive
-- 
x2godesktopsharing.git (Desktop Sharing for X2go)

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 "x2godesktopsharing.git" (Desktop Sharing for X2go).

    