This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2godesktopsharing. from f827dc4 Revert "Change in desktop sharing startup. We have to be able to extend the number of session parameters in x2gostartagent (we added the clipboard field recently). So, relevant informtion for x2godesktopsharing needs to be listed first, then the unimportant options (for desktop sharing). Moving the $USER variable to the front then..." new 1fe91df Wait 20s (instead of 5s) for cross-user desktopsharing to come up. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 ++ sharetray.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 1fe91df02c4fbfd4de5971e264693dbd5e9e7b04 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Nov 14 13:59:58 2014 +0100 Wait 20s (instead of 5s) for cross-user desktopsharing to come up. --- debian/changelog | 2 ++ sharetray.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d38e33d..91b8bce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ x2godesktopsharing (3.1.1.2-0x2go1) UNRELEASED; urgency=low - Set Categories= field in x2godesktopsharing.desktop to Qt;KDE;Application;Network;RemoteAccess; - Provide debug output when we DENY session startup. + - Wait 20s (instead of 5s) for cross-user desktopsharing to + come up. * debian/control: + Raise versioned D (x2godesktopsharing): x2goserver (>= 4.0.1.19). * x2godesktopsharing.spec: diff --git a/sharetray.cpp b/sharetray.cpp index 712af15..c3d76fb 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -394,9 +394,9 @@ QString ShareTray::getSocketAnswer ( QString message ) QProcess proc ( this ); lst.removeAt ( 0 );; proc.start ( "x2gostartagent",lst ); - if ( !proc.waitForFinished ( 5000 ) ) + if ( !proc.waitForFinished ( 20000 ) ) { - return "DENY x2gostartagent timed out"; + return "DENY x2gostartagent timed out after 20s"; } else { -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
-
git-admin＠x2go.org