The branch, build-main has been updated via 658b666654a419cf18bd68a3d8b3df54400287c4 (commit) via a690be5601d3c174e75cfd969b6f5c7486644c60 (commit) via 2ff6a8d69fbd38a1762001ad596d684dd687bbbc (commit) via 27b99c493435ff3eff5d35b6ea6017c43ab687d8 (commit) via 1b133bce09ea92fda776803912eed3df8ecbb1ab (commit) via 3e0d14bdbf662648486030df7c70e4c787963a4c (commit) via b25cff23ce2bdddc3632e2b8f9fd39e7581afef6 (commit) from 0d8c6ada8efc63d78d114cd49cff08cbe281257e (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: VERSION.x2godesktopsharing | 2 +- debian/changelog | 10 ++++++++++ debian/control | 2 +- sharetray.cpp | 15 +++++++++------ 4 files changed, 21 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/VERSION.x2godesktopsharing b/VERSION.x2godesktopsharing index e9aef23..9bbc0c1 100644 --- a/VERSION.x2godesktopsharing +++ b/VERSION.x2godesktopsharing @@ -1 +1 @@ -3.0.1.3 +3.0.1.4 diff --git a/debian/changelog b/debian/changelog index 97f169f..2126ba0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +x2godesktopsharing (3.0.1.4-0~x2go1) unstable; 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. + * Depend on x2goserver (>=3.0.99.9). + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 22 Feb 2012 15:00:54 +0100 + x2godesktopsharing (3.0.1.3-0~x2go1) unstable; urgency=low * New upstream version (3.0.1.3): diff --git a/debian/control b/debian/control index 94119f0..e9908a3 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, - x2goserver (>= 3.0.99.6-0~), + x2goserver (>= 3.0.99.9-0~), libqt4-gui, Recommends: Description: share X2go desktops with other users (via shadow sessions) diff --git a/sharetray.cpp b/sharetray.cpp index 2bf7dee..586a5b5 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -35,7 +35,7 @@ #include <QProcess> #define STAT_ACT_COUNT 10 -#define VERSION "3.0.1.3" +#define VERSION "3.0.1.4" //needed to not get an undefined reference to static members int ShareTray::sigkeybintFd[2]; @@ -74,10 +74,14 @@ ShareTray::ShareTray() setWindowFlags ( flags ); QString dispname=getenv ( "DISPLAY" ); - socketFname=QDir::tempPath() +"/x2godesktopsharing_@"+ - getenv ( "LOGNAME" ) +"@"+dispname; - lockFname=QDir::tempPath() +"/x2godesktopsharing.lock_"+ - getenv ( "LOGNAME" ) +"@"+dispname; + // socketFname=QDir::tempPath() +"x2godesktopsharing_@"+ + socketFname = "/tmp/x2godesktopsharing_@"; + socketFname += getenv ( "LOGNAME" ); + socketFname += "@" + dispname; + // lockFname=QDir::tempPath() +"x2godesktopsharing.lock_"+ + lockFname = "/tmp/x2godesktopsharing.lock_"; + lockFname += getenv ( "LOGNAME" ); + lockFname += "@" + dispname; if ( QFile::exists ( lockFname ) ) { QFile file ( lockFname ); @@ -366,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).