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