[X2go-Commits] x2gothinclient.git - master (branch) updated: 29884c0ea40aeb6664be0f2e2b83305584da321b

[X2go dev team]

The branch, master has been updated
       via  29884c0ea40aeb6664be0f2e2b83305584da321b (commit)
       via  93121f78c4aa8fdb055220937d1c38d3b3fa3f5c (commit)
      from  e3988859da138f3295a712ebbc9cd88cd651783a (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 29884c0ea40aeb6664be0f2e2b83305584da321b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Aug 29 10:21:08 2011 +0200

    Delay thinshutdown button appearance for 6 more seconds on X server (re)start (that is: 10s on tce start or X server restart and 4s after session logout).

commit 93121f78c4aa8fdb055220937d1c38d3b3fa3f5c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Aug 18 12:10:01 2011 +0200

    Use --no-session-edit option when starting x2goclient on TCE.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    4 ++++
 x2gothinclient/sbin/x2gothinclientd                |    6 +++++-
 .../share/x2gothinclient_start                     |    1 +
 3 files changed, 10 insertions(+), 1 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 623f06e..a52edad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,10 @@ x2gothinclient (1.0.1.3-0~x2go1) UNRELEASED; urgency=low
   * Move kernel/initrd symlinks after install rather than copying. 
   * Add detection of kernel upgrades to x2gothinclient_upgrade script. 
   * Adapt chroot file created by x2gothinclient_upgrade, escaping $-signs. 
+  * Use --no-session-edit option when starting x2goclient on TCE.
+  * Delay thinshutdown button appearance for 6 more seconds on X server
+    (re)start (that is: 10s on tce start or X server restart and 4s after session
+    logout).
 
   [Coco]
   * Replace tmpfs mount on /etc/network/run with symlink /etc/network/run -> /dev/shm.
diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd
index 63e3984..2ba42ca 100755
--- a/x2gothinclient/sbin/x2gothinclientd
+++ b/x2gothinclient/sbin/x2gothinclientd
@@ -90,10 +90,14 @@ elsif ($pid == 0 )
 	while(sleep 1)
 	{
 
+		my $thinshutdown_delay = 4
+
 		# test if XServer is running, if not launch it...
 		if ( check_x() ==0 )
 		{
 			system("/usr/bin/Xorg -br &");
+			# delay appearance of thinshutdown button a little longer on X server (re)start
+			$thinshutdown_delay = 10
 		}
 
 		# test if pulseaudio is running, if not launch it...
@@ -123,7 +127,7 @@ elsif ($pid == 0 )
 		}
 		if (  !$SHUTD && !$PROXY && $CLIENT)
 		{
-			system("sleep 4; DISPLAY=:0 thinshutdown &");
+			system("sleep $thinshutdown_delay; DISPLAY=:0 thinshutdown &");
 		}
 
 		## wait for x2goclient to finish
diff --git a/x2gothinclientmanagement/share/x2gothinclient_start b/x2gothinclientmanagement/share/x2gothinclient_start
index 90158cd..68c4a05 100755
--- a/x2gothinclientmanagement/share/x2gothinclient_start
+++ b/x2gothinclientmanagement/share/x2gothinclient_start
@@ -28,6 +28,7 @@
                     --set-kbd=1 \
                     --geometry=fullscreen \
                     --read-exports-from=/home/x2goclient/export \
+                    --no-session-edit \
                     --add-to-known-hosts &
 
 # for use with LDAP on Skolelinux network


hooks/post-receive
-- 
x2gothinclient.git (X2go Thin Client Environment)

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 "x2gothinclient.git" (X2go Thin Client Environment).