x2go-commits March 2013

x2go-commits@lists.x2go.org

2 participants
1021 discussions

x2goserver.git - build-main (branch) updated: 4.0.0.0-8-g6a78a84
by git-admin＠x2go.org 22 Mar '13

22 Mar '13

The branch, build-main has been updated via 6a78a843e29b9169ed7e64735908f308eacd4951 (commit) via cbf163e5cc48f8b02caccf6cdc1b5e0c41aa6f01 (commit) via c12aa8e82a53f041c64a8f8de68abba2e1108d35 (commit) via df45ea1b2327e0ec7672234a7370002fc8347529 (commit) via 5a29dae3550069dc53ffb2d12b25bac51e02596d (commit) via a147c0c3885d856a22f0fbba1191223b05564f64 (commit) via 397b7e0a06353a42189269334f0c889212218b9f (commit) via c1be0db4c047e623650f3888ab9d9c767da38038 (commit) from 3bb58b5faea060b778de8a35d6f509f42a8a7e0d (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: debian/changelog | 19 ++++++++++++++++++- x2goserver-compat/VERSION.x2goserver-compat | 2 +- x2goserver-compat/man/man8/x2gosuspend-agent.8 | 2 +- x2goserver-compat/man/man8/x2gosuspend.8 | 2 +- x2goserver-compat/man/man8/x2goterminate.8 | 2 +- .../VERSION.x2goserver-extensions | 2 +- .../man/man8/x2goserver-run-extensions.8 | 2 +- .../VERSION.x2goserver-fmbindings | 2 +- x2goserver-fmbindings/man/man8/x2gofm.8 | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver-printing/man/man8/x2goprint.8 | 2 +- x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 2 +- x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- x2goserver/Makefile | 6 +++++- x2goserver/VERSION.x2goserver | 2 +- x2goserver/bin/x2gogetapps | 3 ++- x2goserver/bin/x2goruncommand | 12 ++++++------ x2goserver/man/man8/x2gobasepath.8 | 2 +- x2goserver/man/man8/x2gocleansessions.8 | 2 +- x2goserver/man/man8/x2gocmdexitmessage.8 | 2 +- x2goserver/man/man8/x2godbadmin.8 | 2 +- x2goserver/man/man8/x2gofeature.8 | 2 +- x2goserver/man/man8/x2gofeaturelist.8 | 2 +- x2goserver/man/man8/x2gogetservers.8 | 2 +- x2goserver/man/man8/x2golistdesktops.8 | 2 +- x2goserver/man/man8/x2golistmounts.8 | 2 +- x2goserver/man/man8/x2golistsessions.8 | 4 ++-- x2goserver/man/man8/x2golistsessions_root.8 | 2 +- x2goserver/man/man8/x2gomountdirs.8 | 2 +- x2goserver/man/man8/x2goresume-session.8 | 2 +- x2goserver/man/man8/x2goruncommand.8 | 2 +- x2goserver/man/man8/x2gosessionlimit.8 | 2 +- x2goserver/man/man8/x2gosetkeyboard.8 | 2 +- x2goserver/man/man8/x2goshowblocks.8 | 2 +- x2goserver/man/man8/x2gostartagent.8 | 2 +- x2goserver/man/man8/x2gosuspend-session.8 | 2 +- x2goserver/man/man8/x2goterminate-session.8 | 2 +- x2goserver/man/man8/x2goumount-session.8 | 2 +- x2goserver/man/man8/x2goversion.8 | 2 +- 39 files changed, 67 insertions(+), 45 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 263eb22..1ce3e5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +x2goserver (4.0.0.1-0~x2go1) unstable; urgency=low + + [ Bernard Cafarelli ] + * New upstream version (4.0.0.1): + - Make CFLAGS usable in x2goserver. (Fixes: #83). + + [ Matthew L. Dailey ] + * New upstream version (4.0.0.1): + - Fix command/version detection for GNOME/Unity on Ubuntu. (Fixes: #105). + + [ Mike Gabriel ] + * New upstream version (4.0.0.1): + - Allow for deploying X2Go Published Applications system-wide on a + per-user basis (in /etc/x2go/applications-per-user/<username>). + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 22 Mar 2013 13:52:43 +0100 + x2goserver (4.0.0.0-0~x2go1) unstable; urgency=low [ Jan Engelhardt ] @@ -20,7 +37,7 @@ x2goserver (4.0.0.0-0~x2go1) unstable; urgency=low [ Oleksandr Shneyder ] * New upstream version (4.0.0.0): - Fix SSHFS mounting from Ubuntu clients. - - Create /tmp/.X11-unix if not exists. + - Create /tmp/.X11-unix if not exists. (Fixes: #93). [ Reinhard Tartler ] * New upstream version (4.0.0.0): diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index f69d489..4b0a782 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -4.0.0.0 \ No newline at end of file +4.0.0.1 \ No newline at end of file diff --git a/x2goserver-compat/man/man8/x2gosuspend-agent.8 b/x2goserver-compat/man/man8/x2gosuspend-agent.8 index bb91061..01b73fe 100644 --- a/x2goserver-compat/man/man8/x2gosuspend-agent.8 +++ b/x2goserver-compat/man/man8/x2gosuspend-agent.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosuspend-agent 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool (compat)" +.TH x2gosuspend-agent 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool (compat)" .SH NAME x2gosuspend-agent \- X2Go Server Script (deprecated, shipped for compatibility with old clients) .SH SYNOPSIS diff --git a/x2goserver-compat/man/man8/x2gosuspend.8 b/x2goserver-compat/man/man8/x2gosuspend.8 index a0c59ac..adcea7b 100644 --- a/x2goserver-compat/man/man8/x2gosuspend.8 +++ b/x2goserver-compat/man/man8/x2gosuspend.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosuspend 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool (compat)" +.TH x2gosuspend 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool (compat)" .SH NAME x2gosuspend \- X2Go Server Script (deprecated, shipped for compatibility with old clients) .SH SYNOPSIS diff --git a/x2goserver-compat/man/man8/x2goterminate.8 b/x2goserver-compat/man/man8/x2goterminate.8 index f91d6b8..6b3b3ef 100644 --- a/x2goserver-compat/man/man8/x2goterminate.8 +++ b/x2goserver-compat/man/man8/x2goterminate.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goterminate 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool (compat)" +.TH x2goterminate 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool (compat)" .SH NAME x2goterminate \- X2Go Server Script (deprecated, shipped for compatibility with old clients) .SH SYNOPSIS diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index f69d489..4b0a782 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -4.0.0.0 \ No newline at end of file +4.0.0.1 \ No newline at end of file diff --git a/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 b/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 index b8ae127..90abcc4 100644 --- a/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 +++ b/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goserver-run-extensions 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2goserver-run-extensions 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool" .SH NAME x2goserver-run-extensions \- Run X2Go Server Extensions .SH SYNOPSIS diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index f69d489..4b0a782 100644 --- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -1 +1 @@ -4.0.0.0 \ No newline at end of file +4.0.0.1 \ No newline at end of file diff --git a/x2goserver-fmbindings/man/man8/x2gofm.8 b/x2goserver-fmbindings/man/man8/x2gofm.8 index 576d5e4..37bac63 100644 --- a/x2goserver-fmbindings/man/man8/x2gofm.8 +++ b/x2goserver-fmbindings/man/man8/x2gofm.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gofm 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server" +.TH x2gofm 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server" .SH NAME x2gofm \- X2Go wrapper for Browsing X2Go Shared Folders .SH SYNOPSIS diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index f69d489..4b0a782 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -4.0.0.0 \ No newline at end of file +4.0.0.1 \ No newline at end of file diff --git a/x2goserver-printing/man/man8/x2goprint.8 b/x2goserver-printing/man/man8/x2goprint.8 index c22276a..93942b0 100644 --- a/x2goserver-printing/man/man8/x2goprint.8 +++ b/x2goserver-printing/man/man8/x2goprint.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goprint 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2goprint 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool" .SH NAME x2goprint \- Process X2Go Print Job .SH SYNOPSIS diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index f69d489..4b0a782 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -4.0.0.0 \ No newline at end of file +4.0.0.1 \ No newline at end of file diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index f69d489..4b0a782 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -4.0.0.0 \ No newline at end of file +4.0.0.1 \ No newline at end of file diff --git a/x2goserver/Makefile b/x2goserver/Makefile index 43fdccf..4287478 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -3,6 +3,10 @@ SRC_DIR=$(CURDIR) SHELL=/bin/bash +CC ?= gcc +CFLAGS += -fPIE +LDFLAGS += -pie + INSTALL_DIR=install -d -o root -g root -m 755 INSTALL_FILE=install -o root -g root -m 644 INSTALL_PROGRAM=install -o root -g root -m 755 @@ -37,7 +41,7 @@ build: build-arch build-indep build-arch: build_setgidwrappers build_setgidwrappers: - gcc -fPIE -pie $(CFLAGS) -o x2gosqlitewrapper x2gosqlitewrapper.c + $(CC) $(CFLAGS) $(LDFLAGS) -o x2gosqlitewrapper x2gosqlitewrapper.c build-indep: build_man2html diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index f69d489..4b0a782 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -4.0.0.0 \ No newline at end of file +4.0.0.1 \ No newline at end of file diff --git a/x2goserver/bin/x2gogetapps b/x2goserver/bin/x2gogetapps index dbcd8c1..8414daa 100755 --- a/x2goserver/bin/x2gogetapps +++ b/x2goserver/bin/x2gogetapps @@ -180,7 +180,8 @@ my $file; my @dirs; @dirs[0]="/etc/x2go/applications"; my ($name, $pass, $uid, $gid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwnam(getlogin || getpwuid($<)); -@dirs[1]="$homedir/.x2go/applications"; +@dirs[1]="/etc/x2go/applications-per-user/$name"; +@dirs[2]="$homedir/.x2go/applications"; foreach(@dirs) { my $dirname=$_; diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 2414b2c..2f95341 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -91,13 +91,13 @@ fi if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then cmd="/usr/bin/gnome-session" - if [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE >= 11.10" | bc); then + if [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE >= 11.10" | bc)" == "1" ]; then export DESKTOP_SESSION="gnome-fallback" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE == 11.04" | bc); then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE == 11.04" | bc)" == "1" ]; then export DESKTOP_SESSION="2d-gnome" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE <= 10.10" | bc); then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE <= 10.10" | bc)" == "1" ]; then export DESKTOP_SESSION="gnome" elif cat /etc/debian_version | egrep "^(squeeze|6\.).*" >/dev/null; then export DESKTOP_SESSION="gnome" @@ -108,13 +108,13 @@ if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]); then cmd="/usr/bin/gnome-session" - if [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE" >= 12.10 | bc); then + if [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE" >= 12.10 | bc)" == "1" ]; then export DESKTOP_SESSION="ubuntu" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ $(echo "$DISTRIB_RELEASE" == 11.10 | bc) || $(echo $DISTRIB_RELEASE == 12.04 | bc) ]; then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE" == 11.10 | bc)" == "1" -o "$(echo $DISTRIB_RELEASE == 12.04 | bc)" == "1" ]; then export DESKTOP_SESSION="ubuntu-2d" args=" --session=$DESKTOP_SESSION" - elif [ "$DISTRIB_ID" == "Ubuntu" ] && $(echo "$DISTRIB_RELEASE" == 11.04 | bc); then + elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE" == 11.04 | bc)" == "1" ]; then export DESKTOP_SESSION="2d-ubuntu" args=" --session=$DESKTOP_SESSION" fi diff --git a/x2goserver/man/man8/x2gobasepath.8 b/x2goserver/man/man8/x2gobasepath.8 index 3388820..509768a 100644 --- a/x2goserver/man/man8/x2gobasepath.8 +++ b/x2goserver/man/man8/x2gobasepath.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gobasepath 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2gobasepath 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool" .SH NAME x2gobasepath \- Detect Base Path of X2Go Server Installation .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gocleansessions.8 b/x2goserver/man/man8/x2gocleansessions.8 index 0fc587b..a135867 100644 --- a/x2goserver/man/man8/x2gocleansessions.8 +++ b/x2goserver/man/man8/x2gocleansessions.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gocleansessions 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2gocleansessions 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool" .SH NAME x2gocleansessions \- X2Go Server Cleanup Daemon .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gocmdexitmessage.8 b/x2goserver/man/man8/x2gocmdexitmessage.8 index 7752080..db6afee 100644 --- a/x2goserver/man/man8/x2gocmdexitmessage.8 +++ b/x2goserver/man/man8/x2gocmdexitmessage.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gocmdexitmessage 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2gocmdexitmessage 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool" .SH NAME x2gocmdexitmessage \- Exit Message of X2Go Command .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2godbadmin.8 b/x2goserver/man/man8/x2godbadmin.8 index 314e68b..d58e160 100644 --- a/x2goserver/man/man8/x2godbadmin.8 +++ b/x2goserver/man/man8/x2godbadmin.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2godbadmin 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Admin Tool" +.TH x2godbadmin 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Admin Tool" .SH NAME x2godbadmin \- X2Go Server Database Administrator .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gofeature.8 b/x2goserver/man/man8/x2gofeature.8 index facc29f..32f489b 100644 --- a/x2goserver/man/man8/x2gofeature.8 +++ b/x2goserver/man/man8/x2gofeature.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gofeature 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2gofeature 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool" .SH NAME x2gofeature \- Query X2Go Feature Availability on X2Go Server .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gofeaturelist.8 b/x2goserver/man/man8/x2gofeaturelist.8 index e3ec8e6..454869e 100644 --- a/x2goserver/man/man8/x2gofeaturelist.8 +++ b/x2goserver/man/man8/x2gofeaturelist.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gofeaturelist 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2gofeaturelist 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool" .SH NAME x2gofeaturelist \- Query X2Go Feature List for X2Go Server .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gogetservers.8 b/x2goserver/man/man8/x2gogetservers.8 index a0b03df..e0d9641 100644 --- a/x2goserver/man/man8/x2gogetservers.8 +++ b/x2goserver/man/man8/x2gogetservers.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gogetservers 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2gogetservers 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool" .SH NAME x2gogetservers \- Retrieve list of available X2Go servers .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2golistdesktops.8 b/x2goserver/man/man8/x2golistdesktops.8 index 6dc25cf..6ea19c2 100644 --- a/x2goserver/man/man8/x2golistdesktops.8 +++ b/x2goserver/man/man8/x2golistdesktops.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistdesktops 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2golistdesktops 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool" .SH NAME x2golistdesktops \- List Available X Desktops .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2golistmounts.8 b/x2goserver/man/man8/x2golistmounts.8 index d876851..2589389 100644 --- a/x2goserver/man/man8/x2golistmounts.8 +++ b/x2goserver/man/man8/x2golistmounts.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistmounts 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2golistmounts 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool" .SH NAME x2golistmounts \- List Mounted Shares for an X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2golistsessions.8 b/x2goserver/man/man8/x2golistsessions.8 index c872745..0ee151c 100644 --- a/x2goserver/man/man8/x2golistsessions.8 +++ b/x2goserver/man/man8/x2golistsessions.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistsessions 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2golistsessions 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool" .SH NAME x2golistsessions \- List Available X2Go Sessions for User .SH SYNOPSIS @@ -23,7 +23,7 @@ a list of available X2Go sessions. .SH X2GO CLUSTER MODE If \fBx2golistsessions\fR is executed with the \fI--all-servers\fR option then the central database of your X2Go cluster is queried for running/suspended sessions belonging to the user executing this command. -These sessions may be active on any of the X2Go servers within you cluster. +These sessions may be active on any of the X2Go servers within your cluster. .SH RETURN VALUES A line-by-line list of available X2Go sessions. Each line consists of several session attribute fields separated by the pipe symbol (,,|''). diff --git a/x2goserver/man/man8/x2golistsessions_root.8 b/x2goserver/man/man8/x2golistsessions_root.8 index 41e89e6..67db266 100644 --- a/x2goserver/man/man8/x2golistsessions_root.8 +++ b/x2goserver/man/man8/x2golistsessions_root.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2golistsessions_root 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Admin Tool" +.TH x2golistsessions_root 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Admin Tool" .SH NAME x2golistsessions_root \- List X2Go Sessions for System .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gomountdirs.8 b/x2goserver/man/man8/x2gomountdirs.8 index b58544a..3856b59 100644 --- a/x2goserver/man/man8/x2gomountdirs.8 +++ b/x2goserver/man/man8/x2gomountdirs.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gomountdirs 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2gomountdirs 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool" .SH NAME x2gomountdirs \- Share Client-Side Folder with X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goresume-session.8 b/x2goserver/man/man8/x2goresume-session.8 index 6a8c2a1..b31ca7e 100644 --- a/x2goserver/man/man8/x2goresume-session.8 +++ b/x2goserver/man/man8/x2goresume-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goresume-session 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2goresume-session 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool" .SH NAME x2goresume-session \- Resume X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goruncommand.8 b/x2goserver/man/man8/x2goruncommand.8 index 0952072..f37b828 100644 --- a/x2goserver/man/man8/x2goruncommand.8 +++ b/x2goserver/man/man8/x2goruncommand.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goruncommand 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2goruncommand 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool" .SH NAME x2goruncommand \- Launch Command inside an X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gosessionlimit.8 b/x2goserver/man/man8/x2gosessionlimit.8 index 5f35c98..68bf2fb 100644 --- a/x2goserver/man/man8/x2gosessionlimit.8 +++ b/x2goserver/man/man8/x2gosessionlimit.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosessionlimit 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2gosessionlimit 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool" .SH NAME x2gosessionlimit \- Detect Session Limit for User or Group .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gosetkeyboard.8 b/x2goserver/man/man8/x2gosetkeyboard.8 index 3e9baaf..095386b 100644 --- a/x2goserver/man/man8/x2gosetkeyboard.8 +++ b/x2goserver/man/man8/x2gosetkeyboard.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosetkeyboard 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool (PyHoca)" +.TH x2gosetkeyboard 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool (PyHoca)" .SH NAME x2gosetkeyboard \- Allow server-side Keyboard Setting Updates issued by X2Go Client .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goshowblocks.8 b/x2goserver/man/man8/x2goshowblocks.8 index 282ebde..c8f68a6 100644 --- a/x2goserver/man/man8/x2goshowblocks.8 +++ b/x2goserver/man/man8/x2goshowblocks.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goshowblocks 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2goshowblocks 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool" .SH NAME x2goshowblocks \- Show X2Go-Mounted Block Devices .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gostartagent.8 b/x2goserver/man/man8/x2gostartagent.8 index 7c86d2e..b87b7e8 100644 --- a/x2goserver/man/man8/x2gostartagent.8 +++ b/x2goserver/man/man8/x2gostartagent.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gostartagent 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2gostartagent 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool" .SH NAME x2gostartagent \- Start a New X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2gosuspend-session.8 b/x2goserver/man/man8/x2gosuspend-session.8 index 4646a9c..9758928 100644 --- a/x2goserver/man/man8/x2gosuspend-session.8 +++ b/x2goserver/man/man8/x2gosuspend-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gosuspend-session 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2gosuspend-session 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool" .SH NAME x2gosuspend-session \- Suspend an X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goterminate-session.8 b/x2goserver/man/man8/x2goterminate-session.8 index 2c72b9c..935394d 100644 --- a/x2goserver/man/man8/x2goterminate-session.8 +++ b/x2goserver/man/man8/x2goterminate-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goterminate-session 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2goterminate-session 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool" .SH NAME x2goterminate-session \- Terminate an X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goumount-session.8 b/x2goserver/man/man8/x2goumount-session.8 index f256d5a..2681aba 100644 --- a/x2goserver/man/man8/x2goumount-session.8 +++ b/x2goserver/man/man8/x2goumount-session.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goumount-session 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2goumount-session 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool" .SH NAME x2goumount-session \- Unshare mounted Folders from X2Go Session .SH SYNOPSIS diff --git a/x2goserver/man/man8/x2goversion.8 b/x2goserver/man/man8/x2goversion.8 index a7675a7..a12e2ac 100644 --- a/x2goserver/man/man8/x2goversion.8 +++ b/x2goserver/man/man8/x2goversion.8 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goversion 8 "Mar 2012" "Version 3.1.1.x" "X2Go Server Tool" +.TH x2goversion 8 "Mar 2012" "Version 4.0.x.y" "X2Go Server Tool" .SH NAME x2goversion \- Retrieve Code Versions of X2Go Server Components .SH SYNOPSIS 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.1.3-134-gcfedfe3
by git-admin＠x2go.org 22 Mar '13

22 Mar '13

The branch, master has been updated via cfedfe3d9c048c7beeea10e5bfb85286db6729e1 (commit) from 97378841e2201ccc3dd2eec5736e607d2d2da45e (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 cfedfe3d9c048c7beeea10e5bfb85286db6729e1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Mar 22 13:50:49 2013 +0100 fix changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ 1 file changed, 3 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b6dd930..543f7e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -50,6 +50,9 @@ x2goserver (4.0.0.1-0~x2go1) UNRELEASED; urgency=low [ Matthew L. Dailey ] * New upstream version (4.0.0.1): - Fix command/version detection for GNOME/Unity on Ubuntu. (Fixes: #105). + + [ Mike Gabriel ] + * New upstream version (4.0.0.1): - Allow for deploying X2Go Published Applications system-wide on a per-user basis (in /etc/x2go/applications-per-user/<username>). 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 - release/4.0.0.x (branch) updated: 4.0.0.0-8-g6a78a84
by git-admin＠x2go.org 22 Mar '13

22 Mar '13

The branch, release/4.0.0.x has been updated via 6a78a843e29b9169ed7e64735908f308eacd4951 (commit) via cbf163e5cc48f8b02caccf6cdc1b5e0c41aa6f01 (commit) from c12aa8e82a53f041c64a8f8de68abba2e1108d35 (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 6a78a843e29b9169ed7e64735908f308eacd4951 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Mar 22 13:53:48 2013 +0100 release 4.0.0.1 commit cbf163e5cc48f8b02caccf6cdc1b5e0c41aa6f01 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Mar 22 13:50:49 2013 +0100 fix changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 +++++-- x2goserver-compat/VERSION.x2goserver-compat | 2 +- .../VERSION.x2goserver-extensions | 2 +- .../VERSION.x2goserver-fmbindings | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 2 +- x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- x2goserver/VERSION.x2goserver | 2 +- 8 files changed, 12 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ed4ee9d..1ce3e5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2goserver (4.0.0.1-0~x2go1) UNRELEASED; urgency=low +x2goserver (4.0.0.1-0~x2go1) unstable; urgency=low [ Bernard Cafarelli ] * New upstream version (4.0.0.1): @@ -7,10 +7,13 @@ x2goserver (4.0.0.1-0~x2go1) UNRELEASED; urgency=low [ Matthew L. Dailey ] * New upstream version (4.0.0.1): - Fix command/version detection for GNOME/Unity on Ubuntu. (Fixes: #105). + + [ Mike Gabriel ] + * New upstream version (4.0.0.1): - Allow for deploying X2Go Published Applications system-wide on a per-user basis (in /etc/x2go/applications-per-user/<username>). - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 11 Feb 2013 11:42:32 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 22 Mar 2013 13:52:43 +0100 x2goserver (4.0.0.0-0~x2go1) unstable; urgency=low diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index f69d489..4b0a782 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -4.0.0.0 \ No newline at end of file +4.0.0.1 \ No newline at end of file diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index f69d489..4b0a782 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -4.0.0.0 \ No newline at end of file +4.0.0.1 \ No newline at end of file diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index f69d489..4b0a782 100644 --- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -1 +1 @@ -4.0.0.0 \ No newline at end of file +4.0.0.1 \ No newline at end of file diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index f69d489..4b0a782 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -4.0.0.0 \ No newline at end of file +4.0.0.1 \ No newline at end of file diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index f69d489..4b0a782 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -4.0.0.0 \ No newline at end of file +4.0.0.1 \ No newline at end of file diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index f69d489..4b0a782 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -4.0.0.0 \ No newline at end of file +4.0.0.1 \ No newline at end of file diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index f69d489..4b0a782 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -4.0.0.0 \ No newline at end of file +4.0.0.1 \ No newline at end of file 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

page changed: doc:sponsors
by wiki-admin＠x2go.org 21 Mar '13

21 Mar '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/03/21 14:41 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:18.0) Gecko/20100101 Firefox/18.0 Iceweasel/18.0.1 IP-Address : 46.142.179.186 Hostname : 186-179-142-46.pool.kielnet.net Old Revision: http://wiki.x2go.org/doku.php/doc:sponsors?rev=1363696682 New Revision: http://wiki.x2go.org/doku.php/doc:sponsors Edit Summary: User : sunweaver @@ -14,14 +14,8 @@ * The remote login feature in LightDM uses UCCS for session brokerage. The UCCS is a very public service. The main caveat is: UCCS offers to store user passwords and these passwords (at time of Ubuntu 12.10 and Ubuntu 13.04) get stored in plaintext at Canonical (or at least can be easily unhashed). A site admin surely would love to have such a web portal as UCCS at hand, so that the remote login feature can be used on the local network without Canonical as the brokerage provide in the loop. * This sponsored project is to provide a drop-in replacement for the Ubuntu package ''lightdm-remote-session-uccsconfigure'' that replaces UCCS with the X2Go Session Broker as session brokerage provider * The users shall then be able to use LightDM's remote login feature to launch X2Go and RDP sessions. The session profiles will be provided by the X2Go Session Broker - - ==== Documentation: MsWin-Builder for X2Go Client ==== - - //Sponsored by [[https://netitwork.net|NEiT_work]] (Michael Kromer):// - - * Documentation of the MS Windows build environment of X2Go Client ===== Companies sponsoring X2Go Development on a regular basis ===== In alphabetical order... @@ -47,8 +41,9 @@ * [[http://www.lindix.nl|LinDix NL]] * General PyHoca-GUI / Python X2Go development * [[http://netitwork.net/|NETitWork Security Solutions]] * Installable RPM packages for SUSE + * Documentation of the MS Windows build environment of X2Go Client * [[http://www.rohloff.de|Rohloff AG]] * X2Go Thin Client Environment (based on Debian squeeze) * DirectRDP feature in X2Go Client -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: wiki:advanced:nx-keyboard-shortcuts
by wiki-admin＠x2go.org 20 Mar '13

20 Mar '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/03/20 14:15 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:19.0) Gecko/20100101 Firefox/19.0 IP-Address : 131.188.34.51 Hostname : faui48e.informatik.uni-erlangen.de Old Revision: https://wiki.x2go.org/doku.php/wiki:advanced:nx-keyboard-shortcuts?rev=1363… New Revision: https://wiki.x2go.org/doku.php/wiki:advanced:nx-keyboard-shortcuts Edit Summary: Syntax User : morty @@ -1,11 +1,8 @@ ====== Customize NX Keyboard Shortcuts ====== ===== General Remarks ===== - ==== Necessary X2Go Version ==== - - The feature described below has only recently (as of 2012-12-06) been added to X2go and is currently **experimental**, further testing is necessary. You will need a new nightly build to try it out. ==== About this Wiki Page ==== This Wiki page is largely a copy of the ''README.keystrokes'' in @@ -14,9 +11,9 @@ ==== About nxagent ==== ''nxagent'' is the process that an X2Go Server executes. Therefore the configuration described below - is evaluated on an X2Go Server and you have to place your configuration file on the server. + is evaluated on an **X2Go Server** and you have to place your configuration file on the **server**. ===== Configurable Key Bindings in nxagent ===== Key bindings in the redistributed X2Go version of nxagent (aka nx-libs, NX redistributed) can now be configured @@ -25,20 +22,20 @@ ===== File Location ===== nxagent searches for the configuration file in the following order: * in the location given by the ''-keystrokefile'' command line parameter - * in the location given by the NXAGENT_KEYSTROKEFILE environment variable - * in ~/.nx/config/keystroke.cfg - * in /etc/nx/keystroke.cfg + * in the location given by the ''NXAGENT_KEYSTROKEFILE'' environment variable + * in ''~/.nx/config/keystroke.cfg'' + * in ''/etc/nx/keystroke.cfg'' If none of those files is accessible, the default configuration is used which is the same as the old, traditional nxagent keybindings. ===== File Format ===== The configuration file is XML with the following format: - <code xml> + <file xml keystroke.cfg> <!DOCTYPE NXKeystroke> <keystrokes> <keystroke action="fullscreen" AltMeta="1" Control="1" key="b" /> <keystroke action="minimize" AltMeta="1" Control="1" key="space" /> @@ -48,24 +45,24 @@ <keystroke action="fullscreen" key="F6" Mod1="1" /> <keystroke action="force_synchronization" key="f" /> <keystroke action="fullscreen" key="space" Mod1="0" Mod2="0" Control="0" Shift="0" AltMeta="0" /> </keystrokes> - </code> + </file> Each ''action'' defines an action to be executed when receiving that keystroke. A list of possible actions is given below. Some of those actions are only available with debug builds of nxagent. Keys are given as a combination of ''key'' and (optionally) a number of modifiers. The key attribute is evaluated into a X11 key via the usual - XStringToKeysym function. A list of possible keys can be found in - /usr/include/X11/keysymdef.h, the names are specified without the leading + ''XStringToKeysym'' function. A list of possible keys can be found in + ''/usr/include/X11/keysymdef.h'', the names are specified without the leading ''XK_''. Evaluation is case-sensitive, so, ''space'' and ''Escape'' will work while ''Space'' and ''escape'' won't. - Modifiers are given as boolean attributes, possible modifiers are Mod1, Mod2, - Mod3, Mod4, Control, Shift, Lock. Sensible combinations strongly depend on your - keyboard configuration, but usually you will need Mod1 and Control. Boolean in + Modifiers are given as boolean attributes, possible modifiers are ''Mod1'', ''Mod2'', + ''Mod3'', ''Mod4'', ''Control'', ''Shift'', ''Lock''. Sensible combinations strongly depend on your + keyboard configuration, but usually you will need ''Mod1'' and ''Control''. Boolean in this context means ''0'', ''false'' and an unspecified attribute are false, anything else is considered true. Everything in this file is case-sensitive. Unknown lines are ignored. -- This mail was generated by DokuWiki at https://wiki.x2go.org/

1 0

x2goclient2.git - master (branch) updated: 110bbeba16404474f940ea66658b818dcbea220a
by git-admin＠x2go.org 20 Mar '13

20 Mar '13

The branch, master has been updated via 110bbeba16404474f940ea66658b818dcbea220a (commit) from fd0ba68dad5db7ecd7608623c64811ee58d64895 (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 110bbeba16404474f940ea66658b818dcbea220a Author: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de> Date: Wed Mar 20 14:45:43 2013 +0100 continue developing ----------------------------------------------------------------------- Summary of changes: messagebox.h | 1 + sessionlistframe.cpp | 1 + sessionlistframe.ui | 2 +- sessionselecter.cpp | 45 +++++++++++++++++++++++++++++++++++---------- sessionselecter.h | 13 +++++++++++-- x2gosession.cpp | 36 ++++++++++++++++++++++++++++++------ x2gosession.h | 1 + x2gosessiondata.cpp | 2 +- 8 files changed, 81 insertions(+), 20 deletions(-) The diff of changes is: diff --git a/messagebox.h b/messagebox.h index da40703..7348ccf 100644 --- a/messagebox.h +++ b/messagebox.h @@ -38,6 +38,7 @@ protected: QEventLoop* loop; private slots: void slotResize(QResizeEvent* event); +protected slots: void slotYesClicked(); void slotNoClicked(); void slotOkClicked(); diff --git a/sessionlistframe.cpp b/sessionlistframe.cpp index 923347a..661b72c 100644 --- a/sessionlistframe.cpp +++ b/sessionlistframe.cpp @@ -30,6 +30,7 @@ SessionListFrame::SessionListFrame(QWidget* parent, Qt::WindowFlags f): QFrame(p "border-bottom: 0px transparent;border-right: 0px transparent; border-left: 0px transparent"); treeWidget->verticalScrollBar()->setStyleSheet("border-image: url(:/svg/transparent.svg);border-top: 0px transparent; " "border-bottom: 0px transparent;border-right: 0px transparent; border-left: 0px transparent"); + for(int i=0; i<treeWidget->header()->count(); ++i) treeWidget->headerItem()->setBackgroundColor(i,QColor(0xed,0xed,0xed,255)); checkBox->setChecked(false); diff --git a/sessionlistframe.ui b/sessionlistframe.ui index ec14d94..0c38cee 100644 --- a/sessionlistframe.ui +++ b/sessionlistframe.ui @@ -68,7 +68,7 @@ <bool>true</bool> </attribute> <attribute name="headerStretchLastSection"> - <bool>false</bool> + <bool>true</bool> </attribute> <column> <property name="text"> diff --git a/sessionselecter.cpp b/sessionselecter.cpp index 208c20e..d1d6851 100644 --- a/sessionselecter.cpp +++ b/sessionselecter.cpp @@ -23,15 +23,19 @@ #include "x2goapplication.h" #include "workarea.h" +#include "profile.h" + #include <QDateTime> -SessionSelecter::SessionSelecter(const QList<X2GoSessionData>& sessions) +SessionSelecter::SessionSelecter(const QList<X2GoSessionData>& sessions, Profile* profile) { + this->sessions=(QList< X2GoSessionData >*)&sessions; pbNo->hide(); pbYes->setText(tr("Resume selected")); pbYes->setEnabled(false); pbOk->setText(tr("New session")); lPixmap->hide(); + lText->setText("<b>"+profile->get_profileName()+"</b><br><br>"+tr("Select X2Go session to resume:")); listFrame=new SessionListFrame(frame); vlDisplayLayout->insertWidget(1,listFrame); foreach (X2GoSessionData data, sessions) @@ -42,36 +46,38 @@ SessionSelecter::SessionSelecter(const QList<X2GoSessionData>& sessions) name=X2GoApplication::instance()->getReadableAppName(data.get_command()); if(name.length()<=0) name=data.get_command(); - item->setText(0, name); + item->setText(NAME, name); switch(data.get_sessionType()) { case X2GoSessionData::DESKTOP: - item->setText(1, tr("Desktop")); + item->setText(TYPE, tr("Desktop")); break; case X2GoSessionData::ROOTLESS: - item->setText(1, tr("Single application")); + item->setText(TYPE, tr("Single application")); break; case X2GoSessionData::SHADOW: break; } if(data.get_status()=="S") { - item->setText(2, tr("Suspended")); + item->setText(STATUS, tr("Suspended")); } else { - item->setText(2, tr("Running")); + item->setText(STATUS, tr("Running")); } - item->setText(3,data.get_display()); + item->setText(DISPLAY, data.get_display()); QDateTime dt=QDateTime::fromString(data.get_creationTime(), Qt::ISODate); - item->setText(4,dt.toString(Qt::SystemLocaleShortDate)); - item->setText(5,data.get_clientIp()); - item->setText(6,data.get_sessionId()); + item->setText(CRTIME, dt.toString(Qt::SystemLocaleShortDate)); + item->setText(CLIENT, data.get_clientIp()); + item->setText(ID, data.get_sessionId()); } for(int i=0; i<listFrame->treeWidget->header()->count(); ++i) listFrame->treeWidget->resizeColumnToContents(i); connect(listFrame->treeWidget, SIGNAL(itemSelectionChanged()), this, SLOT(slotEnableButton())); + connect(listFrame->treeWidget, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), + this, SLOT(slotSessionDoubleClicked(QTreeWidgetItem*,int))); } void SessionSelecter::slotEnableButton() @@ -93,3 +99,22 @@ MessageBox::Buttons SessionSelecter::exec() X2GoApplication::instance()->get_workArea()->setEnabled(false); return (MessageBox::Buttons)loop->exec(); } + +X2GoSessionData* SessionSelecter::getSelectedSession() +{ + if(listFrame->treeWidget->selectedItems().count()<=0) + return 0; + QString id=listFrame->treeWidget->selectedItems()[0]->text(ID); + for(int i=0; i<sessions->count(); ++i) + { + if((*sessions)[i].get_sessionId()==id) + return &((*sessions)[i]); + } + return 0; +} + + +void SessionSelecter::slotSessionDoubleClicked(QTreeWidgetItem*, int) +{ + slotYesClicked(); +} diff --git a/sessionselecter.h b/sessionselecter.h index 4a333c7..dfb93fd 100644 --- a/sessionselecter.h +++ b/sessionselecter.h @@ -24,18 +24,27 @@ class SessionListFrame;/******************************************************** #include "messagebox.h" #include "x2gosessiondata.h" +#include "x2goapplication.h" + +class Profile; class SessionListFrame; +class QTreeWidgetItem; + class SessionSelecter: public MessageBox { Q_OBJECT public: - SessionSelecter(const QList< X2GoSessionData >& sessions); + enum {NAME, TYPE, STATUS, DISPLAY, CRTIME, CLIENT, ID}; + SessionSelecter(const QList< X2GoSessionData >& sessions, Profile* profile); ~SessionSelecter(); virtual Buttons exec(); + X2GoSessionData* getSelectedSession(); private: SessionListFrame* listFrame; -public slots: + QList< X2GoSessionData >* sessions; +private slots: void slotEnableButton(); + void slotSessionDoubleClicked ( QTreeWidgetItem*, int ); }; #endif // SESSIONSELECTER_H diff --git a/x2gosession.cpp b/x2gosession.cpp index bce8864..e1df84b 100644 --- a/x2gosession.cpp +++ b/x2gosession.cpp @@ -75,7 +75,7 @@ void X2GoSession::startSession() } -void X2GoSession::slotSshConnectionFailed(int, QString) +void X2GoSession::setSessionNotRunning() { status=NOTRUNNING; emit signalStatusChanged(status); @@ -86,6 +86,12 @@ void X2GoSession::slotSshConnectionFailed(int, QString) } } + +void X2GoSession::slotSshConnectionFailed(int, QString) +{ + setSessionNotRunning(); +} + void X2GoSession::slotListSessions(bool success, QString answer, int id) { if(!success) @@ -114,15 +120,33 @@ void X2GoSession::slotListSessions(bool success, QString answer, int id) } } selectSession(sessions); - - } + void X2GoSession::selectSession(const QList<X2GoSessionData>& sessions) { - SessionSelecter* sel=new SessionSelecter(sessions); - sel->exec(); + SessionSelecter* sel=new SessionSelecter(sessions, profile); + switch(sel->exec()) + { + case MessageBox::OK: + createNewSession(); + break; + case MessageBox::YES: + if(!sel->getSelectedSession()) + { + qDebug()<<"selected session is NULL, aborting..."; + setSessionNotRunning(); + } + else + { + resumeSession(*(sel->getSelectedSession())); + } + break; + default: + qDebug()<<"canceling session"; + setSessionNotRunning(); + break; + } delete sel; - } diff --git a/x2gosession.h b/x2gosession.h index 81589c0..870073f 100644 --- a/x2gosession.h +++ b/x2gosession.h @@ -41,6 +41,7 @@ public: void startSession(); void resumeSession(const X2GoSessionData& sessionData); void createNewSession(); + void setSessionNotRunning(); private: void selectSession(const QList<X2GoSessionData> & sessions); public slots: diff --git a/x2gosessiondata.cpp b/x2gosessiondata.cpp index 164fb5b..2bc3840 100644 --- a/x2gosessiondata.cpp +++ b/x2gosessiondata.cpp @@ -57,7 +57,7 @@ X2GoSessionData X2GoSessionData::getSessionFromString(const QString& string) s.set_sessionId(lst[1]); s.set_display(lst[2]); s.set_server(lst[3]); - s.set_server(lst[4]); + s.set_status(lst[4]); s.set_creationTime(lst[5]); s.set_cookie(lst[6]); s.set_clientIp(lst[7]); hooks/post-receive -- x2goclient2.git (X2Go Client 2 (rewrite of x2goclient.git)) 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 "x2goclient2.git" (X2Go Client 2 (rewrite of x2goclient.git)).

1 0

page changed: wiki:development:build-howto-mswin:x2goclient
by wiki-admin＠x2go.org 19 Mar '13

19 Mar '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/03/19 15:32 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:10.0.12) Gecko/20100101 Firefox/10.0.12 Iceweasel/10.0.12 IP-Address : 188.194.93.10 Hostname : 188-194-93-10-dynip.superkabel.de Old Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:x2goclient… New Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:x2goclient Edit Summary: [Open SSH Server] User : ncryer @@ -214,9 +214,9 @@ X2Go Client for Windows using modified Cygwin Open SSH Server for file sharing. You can download it [[http://code.x2go.org/releases/binary-win32/3rd-party/openssh-server|here]] If you want to build it from source, you should [[wiki:development:build-howto-mswin:x2goclient/#installing_cygwin|install Cygwin]] first. - After that run Cygwin installer (setup.exe), navigate to "Select Packages" page and install packages, you need to build Open SSH Server: + After that run Cygwin installer (setup.exe), navigate to "Select Packages" page and install additional packages, you need to build Open SSH Server: *libedit *libedit-devel *libkrb5-devel *libncurses-devel -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: wiki:development:build-howto-mswin:x2goclient
by wiki-admin＠x2go.org 19 Mar '13

19 Mar '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/03/19 15:29 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:10.0.12) Gecko/20100101 Firefox/10.0.12 Iceweasel/10.0.12 IP-Address : 188.194.93.10 Hostname : 188-194-93-10-dynip.superkabel.de Old Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:x2goclient… New Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:x2goclient Edit Summary: [X2Go Client package directory] User : ncryer @@ -89,9 +89,9 @@ This directory should consist: * VcXsrv * PulseAudio (optional) * nxproxy with libraries - * Open SSH Server with libraries + * Open SSH Server with libraries (optional) * X2Go Client with libraries === Libraries needed by X2Go Client === -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: wiki:development:build-howto-mswin:x2goclient
by wiki-admin＠x2go.org 19 Mar '13

19 Mar '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/03/19 15:28 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:10.0.12) Gecko/20100101 Firefox/10.0.12 Iceweasel/10.0.12 IP-Address : 188.194.93.10 Hostname : 188-194-93-10-dynip.superkabel.de Old Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:x2goclient… New Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:x2goclient Edit Summary: [Configuring Qt] User : ncryer @@ -33,9 +33,11 @@ It is recommended to configure Qt to build statically linked applications. It will take some time and you can skip that step, but in this case you must provide a Qt libraries with your X2Go Client binary. As X2Go Client need a Qt with SSL support you must install OpenSSL for windows. You can download OpenSSL for Windows [[http://slproweb.com/download/Win32OpenSSL-1_0_1e.exe|here]] or from [[http://code.x2go.org/releases/binary-win32/3rd-party/Win32OpenSSL/|our site]]. Install it to your system (for example to directory d:\OpenSSL-Win32) - After installation, copy OpenSSL header files into include directory from MinGW d:\OpenSSL-Win32\include\openssl -> d:\mingw\include\openssl + After installation, copy OpenSSL header files into include directory from MinGW + + d:\OpenSSL-Win32\include\openssl -> d:\mingw\include\openssl Open Qt Command Prompt and start configuration script <code> >configure -release -static -openssl -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: wiki:development:build-howto-mswin:x2goclient
by wiki-admin＠x2go.org 19 Mar '13

19 Mar '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/03/19 13:45 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:10.0.12) Gecko/20100101 Firefox/10.0.12 Iceweasel/10.0.12 IP-Address : 188.194.93.10 Hostname : 188-194-93-10-dynip.superkabel.de Old Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:x2goclient… New Revision: http://wiki.x2go.org/doku.php/wiki:development:build-howto-mswin:x2goclient Edit Summary: [Create X2Go Client installer] User : ncryer @@ -109,9 +109,8 @@ Take a look in to the installation directory created by official X2Go Client installer to find how package directory should look like. - ==== Create X2Go Client installer ==== ===== nxproxy ===== -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits March 2013