[X2Go-Commits] x2godesktopsharing.git - build-main (branch) updated: 3.0.1.2-10-g3f88229

X2Go dev team git-admin at x2go.org
Sat Jun 8 01:13:22 CEST 2013


The branch, build-main has been updated
       via  3f8822957798a3b61415f9bf358fd08266144854 (commit)
      from  e9168f26a14d6d2c5215285966a534b73b974118 (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:
 sharetray.cpp |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

The diff of changes is:
diff --git a/sharetray.cpp b/sharetray.cpp
index dafb0e1..4bdca29 100644
--- a/sharetray.cpp
+++ b/sharetray.cpp
@@ -257,16 +257,13 @@ QString ShareTray::getSocketAnswer ( QString message )
     }
     QString client=lst[0];
     QString user=params[1];
-    QString remote_user=params[11];
+    QString remote_user=params[10];
     if ( getAccess ( user, client ) ==QMessageBox::Yes )
     {
-        trayMessage ( tr ( "Access granted" ),QString (
-                          tr (
-                              "%1(%2): access granted" ) ).arg (
-                          user ).arg ( client ) );
+        trayMessage ( tr ( "Access granted" ),QString ( tr ( "%1(%2): access granted" ) ).arg (remote_user ).arg ( client ) );
         //start agent
         QProcess proc ( this );
-        lst.removeAt ( 11 );;
+        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).




More information about the x2go-commits mailing list