The branch, master has been updated via 27b99c493435ff3eff5d35b6ea6017c43ab687d8 (commit) from 1b133bce09ea92fda776803912eed3df8ecbb1ab (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 27b99c493435ff3eff5d35b6ea6017c43ab687d8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Oct 28 18:14:56 2011 +0200 fix string concatenation... ----------------------------------------------------------------------- Summary of changes: sharetray.cpp | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/sharetray.cpp b/sharetray.cpp index 6bc632d..c20e7af 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -75,11 +75,13 @@ ShareTray::ShareTray() QString dispname=getenv ( "DISPLAY" ); // socketFname=QDir::tempPath() +"x2godesktopsharing_@"+ - socketFname=tr( "/tmp/x2godesktopsharing_@" )+ - getenv ( "LOGNAME" ) +tr ("@") +dispname; + socketFname = "/tmp/x2godesktopsharing_@"; + socketFname += getenv ( "LOGNAME" ); + socketFname += "@" + dispname; // lockFname=QDir::tempPath() +"x2godesktopsharing.lock_"+ - lockFname=tr( "/tmp/x2godesktopsharing.lock_" ) + - getenv ( "LOGNAME" ) +tr ("@") +dispname; + lockFname = "/tmp/x2godesktopsharing.lock_"; + lockFname += getenv ( "LOGNAME" ); + lockFname += "@" + dispname; if ( QFile::exists ( lockFname ) ) { QFile file ( lockFname ); 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).