The branch, master has been updated via 3e0d14bdbf662648486030df7c70e4c787963a4c (commit) from b25cff23ce2bdddc3632e2b8f9fd39e7581afef6 (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 3e0d14bdbf662648486030df7c70e4c787963a4c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Oct 28 15:47:57 2011 +0200 Always use /tmp for lock and session sharing socket (Fixes user individual temp dirs in Debian Edu / Skolelinux). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- sharetray.cpp | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index cf003a2..c2d6c7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ x2godesktopsharing (3.0.1.4-0~x2go1) UNRELEASED; urgency=low * New upstream version (3.0.1.4): - - Continue development... + - Always use /tmp for lock and session sharing socket + (Fixes user individual temp dirs in Debian Edu / Skolelinux). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 13 Oct 2011 02:01:18 +0200 diff --git a/sharetray.cpp b/sharetray.cpp index ba3072f..2a655ea 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -74,9 +74,10 @@ ShareTray::ShareTray() setWindowFlags ( flags ); QString dispname=getenv ( "DISPLAY" ); - socketFname=QDir::tempPath() +"/x2godesktopsharing_@"+ + // socketFname=QDir::tempPath() +"x2godesktopsharing_@"+ + socketFname="/tmp/x2godesktopsharing_@"+ getenv ( "LOGNAME" ) +"@"+dispname; - lockFname=QDir::tempPath() +"/x2godesktopsharing.lock_"+ + lockFname="/tmp/x2godesktopsharing.lock_"+ getenv ( "LOGNAME" ) +"@"+dispname; if ( QFile::exists ( 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).