x2go-commits

x2go-commits@lists.x2go.org

1 participants
37903 discussions

x2goserver.git - master (branch) updated: 3.1.0.0-5-gc3a457c
by git-admin＠x2go.org 25 Feb '12

25 Feb '12

The branch, master has been updated via c3a457cf4ffe605dc8d200084925ad9fe5812171 (commit) via 5cd74c75ba45c8844686e1e8bdca74dee28a6149 (commit) from 6c88e6857b0742963705e35a44d889d8a8becab4 (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 c3a457cf4ffe605dc8d200084925ad9fe5812171 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Feb 25 11:05:15 2012 +0100 Be tolerant against x2go_logout script failures. commit 5cd74c75ba45c8844686e1e8bdca74dee28a6149 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Feb 25 11:03:15 2012 +0100 Do only run session cleanup scripts from within x2goruncommand. Dropping them from x2goterminate-session. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ x2goserver/bin/x2goruncommand | 3 +++ x2goserver/bin/x2goterminate-session | 9 --------- x2goserver/etc/x2go_logout | 3 ++- 4 files changed, 8 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index aa623c8..d5664c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ x2goserver (3.1.0.1-0~x2go1) UNRELEASED; urgency=low * New upstream version (3.1.0.1): - Provide infrastructure for on-logout script calls. + - Do only run session cleanup scripts from within + x2goruncommand. Dropping them from x2goterminate-session. + - Be tolerant against x2go_logout script failures. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 Feb 2012 15:10:12 +0100 diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 0a664b6..fd9f82d 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -167,6 +167,9 @@ $X2GO_LIB_PATH/x2gochangestatus 'F' "$X2GO_SESSION" > /dev/null export HOSTNAME x2goumount-session "$X2GO_SESSION" +# run logout scripts +test -r /etc/x2go/x2go_logout && . /etc/x2go/x2go_logout + # clean up session dir if not in debug mode and if session has been successful if [ "$($X2GO_LIB_PATH/x2gologlevel)" != "7" ] && [ "x$successful_run" = "xtrue" ]; then (sleep 10; rm -Rf "$HOME/.x2go/C-$X2GO_SESSION")& diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session index 8743d7d..a661dfc 100755 --- a/x2goserver/bin/x2goterminate-session +++ b/x2goserver/bin/x2goterminate-session @@ -60,13 +60,4 @@ kill -TERM $X2GO_AGENT_PID &>/dev/null && { } -export HOSTNAME -x2goumount-session "$SESSION_NAME" -# run logout scripts -test -r /etc/x2go/x2go_logout && . /etc/x2go/x2go_logout - -# if we are not running in log level debug (=7) then clean up session dir -if [ "$($X2GO_LIB_PATH/x2gologlevel)" != "7" ]; then - (sleep 10; rm -Rf "$HOME/.x2go/C-$X2GO_SESSION")& -fi diff --git a/x2goserver/etc/x2go_logout b/x2goserver/etc/x2go_logout index b32fde1..39296d6 100644 --- a/x2goserver/etc/x2go_logout +++ b/x2goserver/etc/x2go_logout @@ -4,7 +4,8 @@ if [ -d /etc/x2go/x2go_logout.d ]; then for subscript in /etc/x2go_logout.d/*; do if [ -r $subscript ]; then - . $subscript + # subscripts may fail, we ignore that here... + . $subscript || true fi done unset subscript hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.1.0.0-3-g6c88e68
by git-admin＠x2go.org 24 Feb '12

24 Feb '12

The branch, master has been updated via 6c88e6857b0742963705e35a44d889d8a8becab4 (commit) from a21e0dc286c89e94790fe13de7a083cf8be5f5b9 (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 6c88e6857b0742963705e35a44d889d8a8becab4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Feb 24 22:14:53 2012 +0100 fix missing dest path in x2goserver.install ----------------------------------------------------------------------- Summary of changes: debian/x2goserver.install | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/x2goserver.install b/debian/x2goserver.install index a1fb231..4ed8986 100644 --- a/debian/x2goserver.install +++ b/debian/x2goserver.install @@ -1,7 +1,7 @@ x2goserver/bin/x2go* /usr/bin/ x2goserver/sbin/x2go* /usr/sbin/ x2goserver/lib/x2go* /usr/lib/x2go/ -x2goserver/etc/* +x2goserver/etc/* /etc/x2go/ x2goserver/VERSION.x2goserver /usr/share/x2go/versions/ x2goserver/x2gosqlitewrapper /usr/lib/x2go/ x2goserver/share/x2gofeature.d /usr/share/x2go/ hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.1.0.0-2-ga21e0dc
by git-admin＠x2go.org 24 Feb '12

24 Feb '12

The branch, master has been updated via a21e0dc286c89e94790fe13de7a083cf8be5f5b9 (commit) from dd4e3c8884977e33ca053a93bb80b0a3102fc557 (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 a21e0dc286c89e94790fe13de7a083cf8be5f5b9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Feb 24 22:08:27 2012 +0100 Provide infrastructure for on-logout script calls. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- debian/x2goserver.install | 3 +-- x2goserver/bin/x2goterminate-session | 3 +++ x2goserver/etc/x2go_logout | 11 +++++++++++ x2goserver/etc/x2go_logout.d/010_userscripts.sh | 3 +++ 5 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 x2goserver/etc/x2go_logout create mode 100644 x2goserver/etc/x2go_logout.d/010_userscripts.sh The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d08a77f..aa623c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ x2goserver (3.1.0.1-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (3.1.0.1): + - Provide infrastructure for on-logout script calls. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 Feb 2012 15:10:12 +0100 diff --git a/debian/x2goserver.install b/debian/x2goserver.install index ea91840..a1fb231 100644 --- a/debian/x2goserver.install +++ b/debian/x2goserver.install @@ -1,8 +1,7 @@ x2goserver/bin/x2go* /usr/bin/ x2goserver/sbin/x2go* /usr/sbin/ x2goserver/lib/x2go* /usr/lib/x2go/ -x2goserver/etc/x2gosql/sql /etc/x2go/x2gosql/ -x2goserver/etc/x2goserver.conf /etc/x2go/ +x2goserver/etc/* x2goserver/VERSION.x2goserver /usr/share/x2go/versions/ x2goserver/x2gosqlitewrapper /usr/lib/x2go/ x2goserver/share/x2gofeature.d /usr/share/x2go/ diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session index 271f714..8743d7d 100755 --- a/x2goserver/bin/x2goterminate-session +++ b/x2goserver/bin/x2goterminate-session @@ -63,6 +63,9 @@ kill -TERM $X2GO_AGENT_PID &>/dev/null && { export HOSTNAME x2goumount-session "$SESSION_NAME" +# run logout scripts +test -r /etc/x2go/x2go_logout && . /etc/x2go/x2go_logout + # if we are not running in log level debug (=7) then clean up session dir if [ "$($X2GO_LIB_PATH/x2gologlevel)" != "7" ]; then (sleep 10; rm -Rf "$HOME/.x2go/C-$X2GO_SESSION")& diff --git a/x2goserver/etc/x2go_logout b/x2goserver/etc/x2go_logout new file mode 100644 index 0000000..b32fde1 --- /dev/null +++ b/x2goserver/etc/x2go_logout @@ -0,0 +1,11 @@ +# /etc/x2go/x2go_logout: system-wide .x2go_logout file for X2Go sessions +# for Bash and Bash compatible shells (bash(1), ksh(1), ash(1), ...). + +if [ -d /etc/x2go/x2go_logout.d ]; then + for subscript in /etc/x2go_logout.d/*; do + if [ -r $subscript ]; then + . $subscript + fi + done + unset subscript +fi diff --git a/x2goserver/etc/x2go_logout.d/010_userscripts.sh b/x2goserver/etc/x2go_logout.d/010_userscripts.sh new file mode 100644 index 0000000..5ba1edf --- /dev/null +++ b/x2goserver/etc/x2go_logout.d/010_userscripts.sh @@ -0,0 +1,3 @@ +# call $HOME/.x2go_logout script... + +test -r $HOME/.x2go_logout && . $HOME/.x2go_logout hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

x2goclient.git - master (branch) updated: 3.99.1.0-8-g437e34c
by git-admin＠x2go.org 24 Feb '12

24 Feb '12

The branch, master has been updated via 437e34c48f017b0014bb422da512f2bcd0e07710 (commit) from 236d841becb21398f6137f6e8c569494f10ab11f (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 437e34c48f017b0014bb422da512f2bcd0e07710 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Feb 24 16:41:06 2012 +0100 Power button icon: make inner part transparent. Needed for people with a dark GUI theme. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ png/power-button.png | Bin 742 -> 762 bytes 2 files changed, 2 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2412314..cbf4a4b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ x2goclient (3.99.1.1-0~x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] * New upstream version (3.99.1.1): - Update copyright year in about window. Including all translations. + - Power button icon: make inner part transparent. Needed for people + with a dark GUI theme. [ Daniel Lindgren ] * New upstream version (3.99.1.1): diff --git a/png/power-button.png b/png/power-button.png index 03b1d1b..584cf2a 100644 Binary files a/png/power-button.png and b/png/power-button.png differ hooks/post-receive -- x2goclient.git (X2Go Client) 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 "x2goclient.git" (X2Go Client).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.5-15-g85609f9
by git-admin＠x2go.org 24 Feb '12

24 Feb '12

The branch, master has been updated via 85609f9567c20e2d654f2030586dc27416ac35bb (commit) from 37e3cdf2cf596f7956a0da19979c29c086d3753e (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 85609f9567c20e2d654f2030586dc27416ac35bb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Feb 24 13:45:11 2012 +0100 Depend on x2goclient (>= 3.99.1.1). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a970260..4ced52e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ x2gothinclient (1.0.1.6-0~x2go1) UNRELEASED; urgency=low - Add new boot splash background image. - New look'n'feel for boot splash menu. * Let x2gothinclient break and replace x2gothinshutdown. + * Depend on x2goclient (>= 3.99.1.1). [ Oleksandr Shneyder ] * New upstream version (1.0.1.6): diff --git a/debian/control b/debian/control index e1336c4..f3b9c59 100644 --- a/debian/control +++ b/debian/control @@ -47,7 +47,7 @@ Architecture: all Depends: ${misc:Depends}, psmisc, - x2goclient, + x2goclient (>= 3.99.1.1), xauth, xinit, locales 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).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.5-14-g37e3cdf
by git-admin＠x2go.org 24 Feb '12

24 Feb '12

The branch, master has been updated via 37e3cdf2cf596f7956a0da19979c29c086d3753e (commit) via f951027eb109ef40124555e0ed70053d863945e7 (commit) from 4eca45ff7d4625b038405a5bad7e4d09ff9fe272 (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 37e3cdf2cf596f7956a0da19979c29c086d3753e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Feb 24 13:43:58 2012 +0100 Let x2gothinclient break and replace x2gothinshutdown. commit f951027eb109ef40124555e0ed70053d863945e7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Feb 24 13:42:38 2012 +0100 Revert "Break and replace x2gothinshutdown via /debian/control file." This reverts commit 4eca45ff7d4625b038405a5bad7e4d09ff9fe272. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- debian/control | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 25b8b74..a970260 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ x2gothinclient (1.0.1.6-0~x2go1) UNRELEASED; urgency=low - Add background image support. - Add new boot splash background image. - New look'n'feel for boot splash menu. - * Break and replace x2gothinshutdown via /debian/control file. + * Let x2gothinclient break and replace x2gothinshutdown. [ Oleksandr Shneyder ] * New upstream version (1.0.1.6): diff --git a/debian/control b/debian/control index b758394..e1336c4 100644 --- a/debian/control +++ b/debian/control @@ -25,10 +25,6 @@ Recommends: nfs-kernel-server Suggests: dhcp3-server | dnsmasq | isc-dhcp-server -Breaks: - x2gothinshutdown -Replaces: - x2gothinshutdown Description: Management tools for X2Go thin client chroot server X2Go is a server based computing environment with - session resuming @@ -66,6 +62,10 @@ Recommends: mc, acpid, memtest86+ +Breaks: + x2gothinshutdown +Replaces: + x2gothinshutdown Description: login daemon starting x2goclient in displaymanager mode X2Go is a server based computing environment with - session resuming 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).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.5-12-g4eca45f
by git-admin＠x2go.org 24 Feb '12

24 Feb '12

The branch, master has been updated via 4eca45ff7d4625b038405a5bad7e4d09ff9fe272 (commit) from 7d5e1990195c50c3df475157ebfa641eb32d3465 (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 4eca45ff7d4625b038405a5bad7e4d09ff9fe272 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Feb 24 13:41:26 2012 +0100 Break and replace x2gothinshutdown via /debian/control file. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/control | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d118043..25b8b74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ x2gothinclient (1.0.1.6-0~x2go1) UNRELEASED; urgency=low - Add background image support. - Add new boot splash background image. - New look'n'feel for boot splash menu. + * Break and replace x2gothinshutdown via /debian/control file. [ Oleksandr Shneyder ] * New upstream version (1.0.1.6): diff --git a/debian/control b/debian/control index 4c562b0..b758394 100644 --- a/debian/control +++ b/debian/control @@ -25,6 +25,10 @@ Recommends: nfs-kernel-server Suggests: dhcp3-server | dnsmasq | isc-dhcp-server +Breaks: + x2gothinshutdown +Replaces: + x2gothinshutdown Description: Management tools for X2Go thin client chroot server X2Go is a server based computing environment with - session resuming 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).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.5-11-g7d5e199
by git-admin＠x2go.org 24 Feb '12

24 Feb '12

The branch, master has been updated via 7d5e1990195c50c3df475157ebfa641eb32d3465 (commit) from cbd84540554db2861d2fd431d12e1ca7754c9fe2 (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 7d5e1990195c50c3df475157ebfa641eb32d3465 Author: Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Date: Fri Feb 24 13:06:48 2012 +0100 Support for new features of X2Go Client ----------------------------------------------------------------------- Summary of changes: debian/changelog | 10 ++++ debian/control | 30 +----------- debian/rules | 3 - debian/x2gothinshutdown.install | 1 - debian/x2gothinshutdown.manpages | 1 - x2gothinclient/sbin/x2gothinclientd | 37 +++++----------- .../share/x2gothinclient_start | 4 ++ x2gothinshutdown/man/thinshutdown.1 | 25 ----------- x2gothinshutdown/thinshutdown/mb.cpp | 18 -------- x2gothinshutdown/thinshutdown/mb.h | 13 ------ x2gothinshutdown/thinshutdown/power-button.png | Bin 742 -> 0 bytes x2gothinshutdown/thinshutdown/resources.rcc | 5 -- x2gothinshutdown/thinshutdown/thinshutdown.cpp | 46 -------------------- x2gothinshutdown/thinshutdown/thinshutdown.pro | 13 ------ 14 files changed, 29 insertions(+), 177 deletions(-) delete mode 100644 debian/x2gothinshutdown.install delete mode 100644 debian/x2gothinshutdown.manpages delete mode 100644 x2gothinshutdown/man/thinshutdown.1 delete mode 100644 x2gothinshutdown/thinshutdown/mb.cpp delete mode 100644 x2gothinshutdown/thinshutdown/mb.h delete mode 100644 x2gothinshutdown/thinshutdown/power-button.png delete mode 100644 x2gothinshutdown/thinshutdown/resources.rcc delete mode 100644 x2gothinshutdown/thinshutdown/thinshutdown.cpp delete mode 100644 x2gothinshutdown/thinshutdown/thinshutdown.pro The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 37f7dbb..d118043 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,20 @@ x2gothinclient (1.0.1.6-0~x2go1) UNRELEASED; urgency=low + [ Mike Gabriel ] * New upstream version (1.0.1.6): - Add background image support. - Add new boot splash background image. - New look'n'feel for boot splash menu. + [ Oleksandr Shneyder ] + * New upstream version (1.0.1.6): + - x2gothinshutdown is removed. + - Options --thinclient and --haltbt added to x2gothinclient_sessions. + - x2gothinclientd is modified to use x2goclient shutdown button + instead of x2gothinshutdown. + - gnupg-agent, pinentry-x2go and gpgsm added to "Recommends" section + for package x2gothinclient. + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 13:51:00 +0100 x2gothinclient (1.0.1.5-0~x2go1) unstable; urgency=low diff --git a/debian/control b/debian/control index 4348bf8..4c562b0 100644 --- a/debian/control +++ b/debian/control @@ -48,15 +48,16 @@ Depends: ${misc:Depends}, psmisc, x2goclient, - x2gothinshutdown, xauth, xinit, locales Recommends: x2gocdmanager, - x2gothinshutdown, x2gousbmount, x2gosmartcardrules, + gnupg-agent, + pinentry-x2go, + gpgsm, vim, mc, acpid, @@ -130,31 +131,6 @@ Description: clientside daemon enabling automatic CD-Rom mounting This package adds a client-side daemon to your X2Go thin client that enables automatic CD-ROM mounting within thin client X2Go sessions. -Package: x2gothinshutdown -Architecture: any -Depends: - ${shlibs:Depends}, - ${misc:Depends}, - libqt4-gui, -Conflicts: - x2gocdmanager (<= 1.0.1.2-0~) -Description: shutdown button for X2Go thin client - X2Go is a server based computing environment with - - session resuming - - low bandwith support - - LDAP support - - client side mass storage mounting support - - audio support - - authentication by smartcard and USB stick - . - x2gothinshutdown: - -------------- - IMPORTANT: Use this Package only for the x2go THIN CLIENT ENVIRONMENT - (This package is meant to be installed in a CHROOT environment!!!) - . - This package provides an on-screen power-off button (Qt4) for shutting - down your X2Go thin client. - Package: x2gosmartcardrules Architecture: all Depends: diff --git a/debian/rules b/debian/rules index d10f2e9..d2fdbb4 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,6 @@ configure: configure-stamp configure-stamp: dh_testdir cd x2gocdmanager/powerej && qmake-qt4 powerej.pro - cd x2gothinshutdown/thinshutdown && qmake-qt4 thinshutdown.pro touch $@ build: build-stamp @@ -20,14 +19,12 @@ build-stamp: configure-stamp dh_testdir dh_prep $(MAKE) -C x2gocdmanager/powerej - $(MAKE) -C x2gothinshutdown/thinshutdown touch $@ clean: dh_testdir dh_testroot [ ! -f x2gocdmanager/powerej/Makefile ] || $(MAKE) -C x2gocdmanager/powerej distclean - [ ! -f x2gothinshutdown/thinshutdown/Makefile ] || $(MAKE) -C x2gothinshutdown/thinshutdown distclean dh_clean build-stamp configure-stamp binary-indep: build diff --git a/debian/x2gothinshutdown.install b/debian/x2gothinshutdown.install deleted file mode 100644 index 225868f..0000000 --- a/debian/x2gothinshutdown.install +++ /dev/null @@ -1 +0,0 @@ -x2gothinshutdown/thinshutdown/thinshutdown usr/sbin diff --git a/debian/x2gothinshutdown.manpages b/debian/x2gothinshutdown.manpages deleted file mode 100644 index dca66a8..0000000 --- a/debian/x2gothinshutdown.manpages +++ /dev/null @@ -1 +0,0 @@ -x2gothinshutdown/man/thinshutdown.1 \ No newline at end of file diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd index a7f4af0..eb0be03 100755 --- a/x2gothinclient/sbin/x2gothinclientd +++ b/x2gothinclient/sbin/x2gothinclientd @@ -89,15 +89,15 @@ elsif ($pid == 0 ) while(sleep 1) { - - my $thinshutdown_delay = 4; - + # test if shutdown button on X2Go Client was clicked + if ( -e "/home/x2goclient/.halt") + { + system("shutdown -h now"); + } # 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... @@ -114,26 +114,13 @@ elsif ($pid == 0 ) $x2goclient_pid = eval { open3( \*IN, \*OUT, \*ERR, "su - x2goclient -c 'DISPLAY=:0 bash -c \"/etc/x2go/x2gothinclient_start &\"'"); }; - } - - # handle availability of the thinshutdown button GUI... - my $outp=`ps ax`; - my $CLIENT=($outp =~ m/x2goclient/); - my $PROXY=($outp =~ m/nxproxy/); - my $SHUTD=($outp =~ m/thinshutdown/); - if ( $SHUTD && $PROXY ) - { - system("killall thinshutdown"); - } - if ( !$SHUTD && !$PROXY && $CLIENT) - { - system("sleep $thinshutdown_delay; DISPLAY=:0 thinshutdown &"); - } - - ## wait for x2goclient to finish - if ( check_client() ) - { - waitpid( $x2goclient_pid, 0 ); + ## give X2Go Client some time to start + sleep(3); + ## wait for x2goclient to finish + if ( check_client() ) + { + waitpid( $x2goclient_pid, 0 ); + } } } } diff --git a/x2gothinclientmanagement/share/x2gothinclient_start b/x2gothinclientmanagement/share/x2gothinclient_start index abc1b6f..b603c00 100755 --- a/x2gothinclientmanagement/share/x2gothinclient_start +++ b/x2gothinclientmanagement/share/x2gothinclient_start @@ -27,6 +27,8 @@ --kbd-type=pc105/de \ --set-kbd=1 \ --geometry=fullscreen \ + --thinclient \ + --haltbt \ --read-exports-from=/home/x2goclient/export \ --background=/etc/x2go/x2goclient-background.svg \ --no-session-edit \ @@ -39,6 +41,8 @@ # --no-menu \ # --maximize \ # --link=lan \ +# --thinclient \ +# --haltbt \ # --kbd-layout=de \ # --kbd-type=pc105/de \ # --set-kbd=1 \ diff --git a/x2gothinshutdown/man/thinshutdown.1 b/x2gothinshutdown/man/thinshutdown.1 deleted file mode 100644 index ead3d4a..0000000 --- a/x2gothinshutdown/man/thinshutdown.1 +++ /dev/null @@ -1,25 +0,0 @@ -'\" -*- coding: utf-8 -*- -.if \n(.g .ds T< \\FC -.if \n(.g .ds T> \\F[\n[.fam]] -.de URL -\\$2 \(la\\$1\(ra\\$3 -.. -.if \n(.g .mso www.tmac -.TH thinshutdown 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" -.SH NAME -thinshutdown \- Shutdown tool for X2Go Thin Clients. -.SH SYNOPSIS -'nh -.fi -.ad l -\fBthinshutdown\fR - -.SH DESCRIPTION -\fBthinshutdown\fR is a tool that allows session-controlled shutdown of X2Go thin clients. -.PP -.SH OPTIONS -\fBthinshutdown\fR has no known options. -.PP -.SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2Go project -(http://www.x2go.org). diff --git a/x2gothinshutdown/thinshutdown/mb.cpp b/x2gothinshutdown/thinshutdown/mb.cpp deleted file mode 100644 index 7d81e04..0000000 --- a/x2gothinshutdown/thinshutdown/mb.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "mb.h" -#include <QProcess> -#include <QFile> -#include <QTextStream> -#include <QDebug> - -MPushButton::MPushButton():QPushButton("",0) -{ - QPixmap p(":/power-button.png"); - setIcon(p); - setFlat(true); - connect(this,SIGNAL(clicked()),this,SLOT(slot_cl())); -} - -void MPushButton::slot_cl() -{ - QProcess::startDetached("halt"); -} diff --git a/x2gothinshutdown/thinshutdown/mb.h b/x2gothinshutdown/thinshutdown/mb.h deleted file mode 100644 index 7fc94ea..0000000 --- a/x2gothinshutdown/thinshutdown/mb.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _______MB_H_ -#define _______MB_H_ - -#include <QPushButton> -class MPushButton: public QPushButton -{ -Q_OBJECT - public: - MPushButton(); - private slots: - void slot_cl(); -}; -#endif diff --git a/x2gothinshutdown/thinshutdown/power-button.png b/x2gothinshutdown/thinshutdown/power-button.png deleted file mode 100644 index 03b1d1b..0000000 Binary files a/x2gothinshutdown/thinshutdown/power-button.png and /dev/null differ diff --git a/x2gothinshutdown/thinshutdown/resources.rcc b/x2gothinshutdown/thinshutdown/resources.rcc deleted file mode 100644 index fa02634..0000000 --- a/x2gothinshutdown/thinshutdown/resources.rcc +++ /dev/null @@ -1,5 +0,0 @@ -<RCC> - <qresource> - <file>power-button.png</file> - </qresource> -</RCC> diff --git a/x2gothinshutdown/thinshutdown/thinshutdown.cpp b/x2gothinshutdown/thinshutdown/thinshutdown.cpp deleted file mode 100644 index 796adad..0000000 --- a/x2gothinshutdown/thinshutdown/thinshutdown.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2005-2012 by Oleksandr Shneyder * - * oleksandr.shneyder(a)obviously-nice.de * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <QApplication> -#include <QTranslator> -#include <QLocale> -#include <QFrame> -#include <mb.h> -#include <QPlastiqueStyle> -#include <QDesktopWidget> - -using namespace std; -int main(int argc, char *argv[]) -{ - QApplication app(argc,argv); - app.setStyle(new QPlastiqueStyle()); - -// QFrame*fr =new QFrame(0,Qt::WindowStaysOnTopHint|Qt::X11BypassWindowManagerHint); - MPushButton*fr =new MPushButton(); - fr->setFixedSize(24,24); - fr->move(6,6); - fr->show(); - return app.exec(); -} diff --git a/x2gothinshutdown/thinshutdown/thinshutdown.pro b/x2gothinshutdown/thinshutdown/thinshutdown.pro deleted file mode 100644 index 344c8e9..0000000 --- a/x2gothinshutdown/thinshutdown/thinshutdown.pro +++ /dev/null @@ -1,13 +0,0 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Fr Jun 1 09:19:29 2007 -###################################################################### - -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . - -# Input -HEADERS += mb.h -SOURCES += thinshutdown.cpp mb.cpp -RESOURCES += resources.rcc 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).

1 0

x2gothinclient.git - master (branch) updated: 1.0.1.5-11-gfe09501
by git-admin＠x2go.org 24 Feb '12

24 Feb '12

The branch, master has been updated via fe095012e879566e5a782b791f3aed8a2b150d7a (commit) from cbd84540554db2861d2fd431d12e1ca7754c9fe2 (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 fe095012e879566e5a782b791f3aed8a2b150d7a Author: Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Date: Fri Feb 24 13:06:48 2012 +0100 Support for new fetures of X2Go Client ----------------------------------------------------------------------- Summary of changes: debian/changelog | 10 ++++ debian/control | 30 +----------- debian/rules | 3 - debian/x2gothinshutdown.install | 1 - debian/x2gothinshutdown.manpages | 1 - x2gothinclient/sbin/x2gothinclientd | 37 +++++----------- .../share/x2gothinclient_start | 4 ++ x2gothinshutdown/man/thinshutdown.1 | 25 ----------- x2gothinshutdown/thinshutdown/mb.cpp | 18 -------- x2gothinshutdown/thinshutdown/mb.h | 13 ------ x2gothinshutdown/thinshutdown/power-button.png | Bin 742 -> 0 bytes x2gothinshutdown/thinshutdown/resources.rcc | 5 -- x2gothinshutdown/thinshutdown/thinshutdown.cpp | 46 -------------------- x2gothinshutdown/thinshutdown/thinshutdown.pro | 13 ------ 14 files changed, 29 insertions(+), 177 deletions(-) delete mode 100644 debian/x2gothinshutdown.install delete mode 100644 debian/x2gothinshutdown.manpages delete mode 100644 x2gothinshutdown/man/thinshutdown.1 delete mode 100644 x2gothinshutdown/thinshutdown/mb.cpp delete mode 100644 x2gothinshutdown/thinshutdown/mb.h delete mode 100644 x2gothinshutdown/thinshutdown/power-button.png delete mode 100644 x2gothinshutdown/thinshutdown/resources.rcc delete mode 100644 x2gothinshutdown/thinshutdown/thinshutdown.cpp delete mode 100644 x2gothinshutdown/thinshutdown/thinshutdown.pro The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 37f7dbb..d118043 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,20 @@ x2gothinclient (1.0.1.6-0~x2go1) UNRELEASED; urgency=low + [ Mike Gabriel ] * New upstream version (1.0.1.6): - Add background image support. - Add new boot splash background image. - New look'n'feel for boot splash menu. + [ Oleksandr Shneyder ] + * New upstream version (1.0.1.6): + - x2gothinshutdown is removed. + - Options --thinclient and --haltbt added to x2gothinclient_sessions. + - x2gothinclientd is modified to use x2goclient shutdown button + instead of x2gothinshutdown. + - gnupg-agent, pinentry-x2go and gpgsm added to "Recommends" section + for package x2gothinclient. + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 13:51:00 +0100 x2gothinclient (1.0.1.5-0~x2go1) unstable; urgency=low diff --git a/debian/control b/debian/control index 4348bf8..4c562b0 100644 --- a/debian/control +++ b/debian/control @@ -48,15 +48,16 @@ Depends: ${misc:Depends}, psmisc, x2goclient, - x2gothinshutdown, xauth, xinit, locales Recommends: x2gocdmanager, - x2gothinshutdown, x2gousbmount, x2gosmartcardrules, + gnupg-agent, + pinentry-x2go, + gpgsm, vim, mc, acpid, @@ -130,31 +131,6 @@ Description: clientside daemon enabling automatic CD-Rom mounting This package adds a client-side daemon to your X2Go thin client that enables automatic CD-ROM mounting within thin client X2Go sessions. -Package: x2gothinshutdown -Architecture: any -Depends: - ${shlibs:Depends}, - ${misc:Depends}, - libqt4-gui, -Conflicts: - x2gocdmanager (<= 1.0.1.2-0~) -Description: shutdown button for X2Go thin client - X2Go is a server based computing environment with - - session resuming - - low bandwith support - - LDAP support - - client side mass storage mounting support - - audio support - - authentication by smartcard and USB stick - . - x2gothinshutdown: - -------------- - IMPORTANT: Use this Package only for the x2go THIN CLIENT ENVIRONMENT - (This package is meant to be installed in a CHROOT environment!!!) - . - This package provides an on-screen power-off button (Qt4) for shutting - down your X2Go thin client. - Package: x2gosmartcardrules Architecture: all Depends: diff --git a/debian/rules b/debian/rules index d10f2e9..d2fdbb4 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,6 @@ configure: configure-stamp configure-stamp: dh_testdir cd x2gocdmanager/powerej && qmake-qt4 powerej.pro - cd x2gothinshutdown/thinshutdown && qmake-qt4 thinshutdown.pro touch $@ build: build-stamp @@ -20,14 +19,12 @@ build-stamp: configure-stamp dh_testdir dh_prep $(MAKE) -C x2gocdmanager/powerej - $(MAKE) -C x2gothinshutdown/thinshutdown touch $@ clean: dh_testdir dh_testroot [ ! -f x2gocdmanager/powerej/Makefile ] || $(MAKE) -C x2gocdmanager/powerej distclean - [ ! -f x2gothinshutdown/thinshutdown/Makefile ] || $(MAKE) -C x2gothinshutdown/thinshutdown distclean dh_clean build-stamp configure-stamp binary-indep: build diff --git a/debian/x2gothinshutdown.install b/debian/x2gothinshutdown.install deleted file mode 100644 index 225868f..0000000 --- a/debian/x2gothinshutdown.install +++ /dev/null @@ -1 +0,0 @@ -x2gothinshutdown/thinshutdown/thinshutdown usr/sbin diff --git a/debian/x2gothinshutdown.manpages b/debian/x2gothinshutdown.manpages deleted file mode 100644 index dca66a8..0000000 --- a/debian/x2gothinshutdown.manpages +++ /dev/null @@ -1 +0,0 @@ -x2gothinshutdown/man/thinshutdown.1 \ No newline at end of file diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd index a7f4af0..eb0be03 100755 --- a/x2gothinclient/sbin/x2gothinclientd +++ b/x2gothinclient/sbin/x2gothinclientd @@ -89,15 +89,15 @@ elsif ($pid == 0 ) while(sleep 1) { - - my $thinshutdown_delay = 4; - + # test if shutdown button on X2Go Client was clicked + if ( -e "/home/x2goclient/.halt") + { + system("shutdown -h now"); + } # 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... @@ -114,26 +114,13 @@ elsif ($pid == 0 ) $x2goclient_pid = eval { open3( \*IN, \*OUT, \*ERR, "su - x2goclient -c 'DISPLAY=:0 bash -c \"/etc/x2go/x2gothinclient_start &\"'"); }; - } - - # handle availability of the thinshutdown button GUI... - my $outp=`ps ax`; - my $CLIENT=($outp =~ m/x2goclient/); - my $PROXY=($outp =~ m/nxproxy/); - my $SHUTD=($outp =~ m/thinshutdown/); - if ( $SHUTD && $PROXY ) - { - system("killall thinshutdown"); - } - if ( !$SHUTD && !$PROXY && $CLIENT) - { - system("sleep $thinshutdown_delay; DISPLAY=:0 thinshutdown &"); - } - - ## wait for x2goclient to finish - if ( check_client() ) - { - waitpid( $x2goclient_pid, 0 ); + ## give X2Go Client some time to start + sleep(3); + ## wait for x2goclient to finish + if ( check_client() ) + { + waitpid( $x2goclient_pid, 0 ); + } } } } diff --git a/x2gothinclientmanagement/share/x2gothinclient_start b/x2gothinclientmanagement/share/x2gothinclient_start index abc1b6f..b603c00 100755 --- a/x2gothinclientmanagement/share/x2gothinclient_start +++ b/x2gothinclientmanagement/share/x2gothinclient_start @@ -27,6 +27,8 @@ --kbd-type=pc105/de \ --set-kbd=1 \ --geometry=fullscreen \ + --thinclient \ + --haltbt \ --read-exports-from=/home/x2goclient/export \ --background=/etc/x2go/x2goclient-background.svg \ --no-session-edit \ @@ -39,6 +41,8 @@ # --no-menu \ # --maximize \ # --link=lan \ +# --thinclient \ +# --haltbt \ # --kbd-layout=de \ # --kbd-type=pc105/de \ # --set-kbd=1 \ diff --git a/x2gothinshutdown/man/thinshutdown.1 b/x2gothinshutdown/man/thinshutdown.1 deleted file mode 100644 index ead3d4a..0000000 --- a/x2gothinshutdown/man/thinshutdown.1 +++ /dev/null @@ -1,25 +0,0 @@ -'\" -*- coding: utf-8 -*- -.if \n(.g .ds T< \\FC -.if \n(.g .ds T> \\F[\n[.fam]] -.de URL -\\$2 \(la\\$1\(ra\\$3 -.. -.if \n(.g .mso www.tmac -.TH thinshutdown 8 "02 May 2011" "Version 1.0.1.x" "X2go Thin Client Environment" -.SH NAME -thinshutdown \- Shutdown tool for X2Go Thin Clients. -.SH SYNOPSIS -'nh -.fi -.ad l -\fBthinshutdown\fR - -.SH DESCRIPTION -\fBthinshutdown\fR is a tool that allows session-controlled shutdown of X2Go thin clients. -.PP -.SH OPTIONS -\fBthinshutdown\fR has no known options. -.PP -.SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2Go project -(http://www.x2go.org). diff --git a/x2gothinshutdown/thinshutdown/mb.cpp b/x2gothinshutdown/thinshutdown/mb.cpp deleted file mode 100644 index 7d81e04..0000000 --- a/x2gothinshutdown/thinshutdown/mb.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "mb.h" -#include <QProcess> -#include <QFile> -#include <QTextStream> -#include <QDebug> - -MPushButton::MPushButton():QPushButton("",0) -{ - QPixmap p(":/power-button.png"); - setIcon(p); - setFlat(true); - connect(this,SIGNAL(clicked()),this,SLOT(slot_cl())); -} - -void MPushButton::slot_cl() -{ - QProcess::startDetached("halt"); -} diff --git a/x2gothinshutdown/thinshutdown/mb.h b/x2gothinshutdown/thinshutdown/mb.h deleted file mode 100644 index 7fc94ea..0000000 --- a/x2gothinshutdown/thinshutdown/mb.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _______MB_H_ -#define _______MB_H_ - -#include <QPushButton> -class MPushButton: public QPushButton -{ -Q_OBJECT - public: - MPushButton(); - private slots: - void slot_cl(); -}; -#endif diff --git a/x2gothinshutdown/thinshutdown/power-button.png b/x2gothinshutdown/thinshutdown/power-button.png deleted file mode 100644 index 03b1d1b..0000000 Binary files a/x2gothinshutdown/thinshutdown/power-button.png and /dev/null differ diff --git a/x2gothinshutdown/thinshutdown/resources.rcc b/x2gothinshutdown/thinshutdown/resources.rcc deleted file mode 100644 index fa02634..0000000 --- a/x2gothinshutdown/thinshutdown/resources.rcc +++ /dev/null @@ -1,5 +0,0 @@ -<RCC> - <qresource> - <file>power-button.png</file> - </qresource> -</RCC> diff --git a/x2gothinshutdown/thinshutdown/thinshutdown.cpp b/x2gothinshutdown/thinshutdown/thinshutdown.cpp deleted file mode 100644 index 796adad..0000000 --- a/x2gothinshutdown/thinshutdown/thinshutdown.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2005-2012 by Oleksandr Shneyder * - * oleksandr.shneyder(a)obviously-nice.de * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <QApplication> -#include <QTranslator> -#include <QLocale> -#include <QFrame> -#include <mb.h> -#include <QPlastiqueStyle> -#include <QDesktopWidget> - -using namespace std; -int main(int argc, char *argv[]) -{ - QApplication app(argc,argv); - app.setStyle(new QPlastiqueStyle()); - -// QFrame*fr =new QFrame(0,Qt::WindowStaysOnTopHint|Qt::X11BypassWindowManagerHint); - MPushButton*fr =new MPushButton(); - fr->setFixedSize(24,24); - fr->move(6,6); - fr->show(); - return app.exec(); -} diff --git a/x2gothinshutdown/thinshutdown/thinshutdown.pro b/x2gothinshutdown/thinshutdown/thinshutdown.pro deleted file mode 100644 index 344c8e9..0000000 --- a/x2gothinshutdown/thinshutdown/thinshutdown.pro +++ /dev/null @@ -1,13 +0,0 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Fr Jun 1 09:19:29 2007 -###################################################################### - -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . - -# Input -HEADERS += mb.h -SOURCES += thinshutdown.cpp mb.cpp -RESOURCES += resources.rcc 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).

1 0

x2goclient.git - master (branch) updated: 3.99.1.0-7-g236d841
by git-admin＠x2go.org 24 Feb '12

24 Feb '12

The branch, master has been updated via 236d841becb21398f6137f6e8c569494f10ab11f (commit) from 0cf7b36b26b81dd2bbb650474ee8af71f82e2ff1 (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 236d841becb21398f6137f6e8c569494f10ab11f Author: Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Date: Fri Feb 24 11:36:19 2012 +0100 Improved support for use in Thin Client Environment. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++ onmainwindow.cpp | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ onmainwindow.h | 5 +++- onmainwindow_part3.cpp | 13 ++++++++++ png/power-button.png | Bin 0 -> 742 bytes resources.rcc | 1 + 6 files changed, 81 insertions(+), 1 deletions(-) create mode 100644 png/power-button.png The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b5cacc8..2412314 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ x2goclient (3.99.1.1-0~x2go1) UNRELEASED; urgency=low - not including <netinet/in.h> on Q_OS_WIN platform. - not updating Xinerama configuration in "fullscreen" mode. - command line argument "--xinerama": use Xinerama by default. + - improved support for use in TCE + command line argument --thinclient - running without window manager + command line argument --haltbt - button to shutdown the thin client [ Mike Gabriel ] * New upstream version (3.99.1.1): diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 87f9b94..344c993 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -57,6 +57,8 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) extLogin=false; startMaximized=false; startHidden=false; + thinMode=false; + showHaltBtn=false; defaultUseSound=true; defaultSetKbd=true; defaultSetDPI=false; @@ -393,6 +395,28 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) SLOT ( slotResize ( const QSize ) ) ); slotResize ( fr->size() ); + + +#ifdef Q_OS_LINUX + if (thinMode) + { + QTimer *timer = new QTimer(this); + connect(timer, SIGNAL(timeout()), this, SLOT(slotSyncX())); + timer->start(200); + } +#endif + if (showHaltBtn) + { + QPushButton* bHalt=new QPushButton(bgFrame); + QPixmap p(":/png/power-button.png"); + bHalt->setIcon(p); + bHalt->setFocusPolicy(Qt::NoFocus); + bHalt->setFixedSize(32,32); + bHalt->move(10,10); + bHalt->show(); + connect(bHalt,SIGNAL(clicked()),this, SLOT(slotShutdownThinClient())); + } + if (brokerMode) { broker=new HttpBrokerClient ( this, &config ); @@ -419,6 +443,12 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) connect( xineramaTimer, SIGNAL(timeout()), this, SLOT(slotConfigXinerama())); x2goDebug<<"ONMainWindows constructor finished, home Directory is:"<<homeDir<<endl; + if (thinMode) + { + showMaximized(); + activateWindow(); + raise(); + } } @@ -430,8 +460,38 @@ ONMainWindow::~ONMainWindow() x2goDebug<<"end of ONMainWindow destructor"; } +void ONMainWindow::slotShutdownThinClient() +{ + QFile file(QDir::homePath()+"/.halt"); + if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) + return; + + QTextStream out(&file); + out << "\n"; + file.close(); +} +void ONMainWindow::slotSyncX() +{ + if (proxyWinId) + { + if (!isHidden()) + hide(); +#ifdef Q_OS_LINUX + XSync(QX11Info::display(),false); +#endif + } + else + { + if (isHidden()) + { + showMaximized(); + activateWindow(); + raise(); + } + } +} void ONMainWindow::installTranslator() diff --git a/onmainwindow.h b/onmainwindow.h index 5aa76f6..1f2f08f 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -476,6 +476,7 @@ private: bool changeBrokerPass; bool connTest; bool embedMode; + bool thinMode; QString statusString; int defaultLink; int defaultQuality; @@ -628,6 +629,7 @@ private: bool proxyWinEmbedded; bool useLdap; bool showToolBar; + bool showHaltBtn; bool newSession; bool ldapOnly; bool isScDaemonOk; @@ -822,7 +824,6 @@ private slots: void slotChangeBrokerPass(); void slotTestConnection(); void slotCheckPortableDir(); - void readUsers(); void slotSelectedFromList ( UserButton* user ); void slotUnameEntered(); @@ -837,6 +838,8 @@ private slots: void slotSshConnectionOk(); void slotServSshConnectionOk(QString server); void slotChangeKbdLayout(const QString& layout); + void slotSyncX(); + void slotShutdownThinClient(); public slots: void slotConfig(); diff --git a/onmainwindow_part3.cpp b/onmainwindow_part3.cpp index 69a0493..fb6a3ba 100644 --- a/onmainwindow_part3.cpp +++ b/onmainwindow_part3.cpp @@ -252,6 +252,17 @@ bool ONMainWindow::parseParameter ( QString param ) defaultXinerama=true; return true; } + if (param == "--thinclient") + { + thinMode=true; + startMaximized=true; + return true; + } + if (param == "--haltbt") + { + showHaltBtn=true; + return true; + } if ( param=="--hide" ) { startHidden=true; @@ -701,6 +712,8 @@ void ONMainWindow::showHelp() "--pgp-card\t\t\t use openPGP card authentication\n" "--xinerama\t\t\t use Xinerama by default\n" "--ldap-printing\t\t\t allow client side printing in LDAP mode\n" + "--thinclient\t\t\t run without window manager\n" + "--haltbt\t\t\t show shutdown button\n" "--add-to-known-hosts\t\t add RSA key fingerprint to " ".ssh/known_hosts\n" "\t\t\t\t if authenticity of server can't be established\n\n" diff --git a/png/power-button.png b/png/power-button.png new file mode 100644 index 0000000..03b1d1b Binary files /dev/null and b/png/power-button.png differ diff --git a/resources.rcc b/resources.rcc index e3b6a5e..0b2996e 100644 --- a/resources.rcc +++ b/resources.rcc @@ -12,6 +12,7 @@ <file>png/ico_mini.png</file> <file>png/sess_ico.png</file> <file>png/ico_440x180.png</file> + <file>png/power-button.png</file> <file>icons/128x128/x2go.png</file> <file>icons/128x128/x2gosession.png</file> <file>icons/128x128/create_file.png</file> hooks/post-receive -- x2goclient.git (X2Go Client) 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 "x2goclient.git" (X2Go Client).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits