x2go-commits

x2go-commits@lists.x2go.org

1 participants
37903 discussions

nx-libs.git - build-main (branch) updated: redist-client/3.5.0.12
by git-admin＠x2go.org 07 Mar '12

07 Mar '12

The branch, build-main has been updated via 1b1a26ae66725db1d8e8a3b3b5b3f755457f5068 (commit) via 4f7c8d079014b28204f6733a4e11708be012b215 (commit) via 95929b8a50ce2ea07c1a0784b58a94fb0b23e36a (commit) via 9b17e8a96af48181c60a2dcbd3f94445bdc18623 (commit) via fb274937dea4838ff18724f556305a05282cd45a (commit) via 055436f481b323da2e354eddb76b3099cd96e6ff (commit) via 3776a6f417d4844f92b035eec2ca3d06466ec4e8 (commit) via a71cebf0418d1d2c4fbc1012957bf1f1b54742cc (commit) via 22d41ae20a02f10f7dd4245e426c0a007d42710c (commit) via 7e5c04b5db4e859b326ece329099d849906f2bb9 (commit) via 655173ff215dde1a167193eafe29bfc955a19561 (commit) via be86627adf0392f94d70ad28cb9c6867b3bef0f5 (commit) via 0586f0d6e83cfa9ea12a3bf6a0015a4e84d09ae2 (commit) via a8bf2dd819ac55535b11e38848ffc9b076a5d307 (commit) from 50690ea177ee39011a235bac6887a213f27e7f54 (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 | 25 ++++++ debian/libnx-x11.links | 2 - debian/libnx-x11.postinst | 55 +++++++++++++ debian/libnx-x11.prerm | 42 ++++++++++ .../patches/001_add-main-makefile.full+lite.patch | 10 +- debian/patches/005_nxcomp_gcc43.full+lite.patch | 20 +++--- .../051_nxcomp_macos105-fdisset.full+lite.patch | 82 ++++++++++++++++++++ .../203_nxagent_disable-rootless-exit.full.patch | 60 ++++++++++++++ debian/patches/series | 2 + debian/post-build-nx.sh | 2 - 10 files changed, 281 insertions(+), 19 deletions(-) create mode 100755 debian/libnx-x11.postinst create mode 100755 debian/libnx-x11.prerm create mode 100644 debian/patches/051_nxcomp_macos105-fdisset.full+lite.patch create mode 100644 debian/patches/203_nxagent_disable-rootless-exit.full.patch The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 742e1b1..d1c14d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,28 @@ +nx-libs (2:3.5.0.12-0) unstable; urgency=low + + [ Mike Gabriel ] + * Update patch: 001_add-main-makefile.full+lite.patch, adapt patch from + packaging. Test for Makefiles in subfolders before calling them. + Fixes build failure during ,,make distclean'' calls. + * Provide temporary workaround for installation on Debian 64bit with + multiarch support (via libnx-x11.postinst and .prerm). + * Re-introduce proper Xinerama support on non-multiarch systems. + + [ Mihai Moldovan ] + * Add patch: 051_nxcomp_macos105-fdisset.full+lite.patch, work around + issue in Mac OS X 10.5 SDK. Pass address of fd_set structs on the stack + to the FD_ISSET macro/function, instead of the struct itself. + * Update patch: 005_nxcomp_gcc43.full+lite.patch, fix faulty path to + nxcomp/Split.cpp. + + [ Oleksandr Shneyder ] + * Add patch: 203_nxagent_disable-rootless-exit.full.patch, add command line + argument "-norootlessexit". Usually, nxagent exits after 30 seconds if + running in rootless mode and no X-Clients are present. Starting nxagent + with option "-norootlessexit" will change this behaviour. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Mar 2012 20:50:14 +0100 + nx-libs (2:3.5.0.11-0) unstable; urgency=low [ Mike Gabriel ] diff --git a/debian/libnx-x11.links b/debian/libnx-x11.links index 82c245f..7331e79 100644 --- a/debian/libnx-x11.links +++ b/debian/libnx-x11.links @@ -1,4 +1,2 @@ -usr/lib/libX11.so.6 usr/lib/nx/X11/Xinerama/libNX_X11.so.6 -usr/lib/libXext.so.6 usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 usr/lib/nx/X11/libNX_Xinerama.so usr/lib/nx/X11/Xinerama/libXinerama.so usr/lib/nx/X11/libNX_Xinerama.so.1 usr/lib/nx/X11/Xinerama/libXinerama.so.1 diff --git a/debian/libnx-x11.postinst b/debian/libnx-x11.postinst new file mode 100755 index 0000000..f584054 --- /dev/null +++ b/debian/libnx-x11.postinst @@ -0,0 +1,55 @@ +#!/bin/sh +# postinst script for libnx-x11 +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <postinst> `configure' <most-recently-configured-version> +# * <old-postinst> `abort-upgrade' <new version> +# * <conflictor's-postinst> `abort-remove' `in-favour' <package> +# <new-version> +# * <postinst> `abort-remove' +# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' +# <failed-install-package> <version> `removing' +# <conflicting-package> <version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + configure) + ### FIXME: this is a work-around while we have not implemented + ### multiarch support into the Debian source package of + ### nx-libs. + if dpkg-architecture -qDEB_BUILD_MULTIARCH 1>/dev/null 2>/dev/null; then + libdir=/usr/lib/$(dpkg-architecture -qDEB_BUILD_MULTIARCH) + else + libdir=/usr/lib + fi + rm -f /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 + rm -f /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 + if test -e $libdir/libX11.so.6; then + ln -s $libdir/libX11.so.6 /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 + fi + if test -e $libdir/libXext.so.6; then + ln -s $libdir/libXext.so.6 /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/libnx-x11.prerm b/debian/libnx-x11.prerm new file mode 100755 index 0000000..3fcd330 --- /dev/null +++ b/debian/libnx-x11.prerm @@ -0,0 +1,42 @@ +#!/bin/sh +# postrm script for x2goserver-fmbindings +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <postrm> `remove' +# * <postrm> `purge' +# * <old-postrm> `upgrade' <new-version> +# * <new-postrm> `failed-upgrade' <old-version> +# * <new-postrm> `abort-install' +# * <new-postrm> `abort-install' <old-version> +# * <new-postrm> `abort-upgrade' <old-version> +# * <disappearer's-postrm> `disappear' <overwriter> +# <overwriter-version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + if test -e /usr/lib/nx/X11/Xinerama/libNX_X11.so.6; then + rm -f /usr/lib/nx/X11/Xinerama/libNX_X11.so.6 + fi + if test -e /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6; then + rm -f /usr/lib/nx/X11/Xinerama/libNX_Xext.so.6 + fi + ;; + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch index 3c236b9..fffa4dc 100644 --- a/debian/patches/001_add-main-makefile.full+lite.patch +++ b/debian/patches/001_add-main-makefile.full+lite.patch @@ -11,12 +11,12 @@ Last-Update: 2011-12-31 +CONFIGURE=./configure + +%: -+ ${MAKE} -C nxcomp $@ -+ ${MAKE} -C nxproxy $@ ++ if test -f nxcomp/Makefile; then ${MAKE} -C nxcomp $@; fi ++ if test -f nxproxy/Makefile; then ${MAKE} -C nxproxy $@; fi + if test -d nx-X11; then \ -+ ${MAKE} -C nxcompext $@; \ -+ ${MAKE} -C nxcompshad; \ -+ ${MAKE} -C nx-X11 $@; \ ++ if test -f nxcompext/Makefile; then ${MAKE} -C nxcompext $@; fi; \ ++ if test -f nxcompshad/Makefile; then ${MAKE} -C nxcompshad $@; fi; \ ++ if test -f nx-X11/Makefile; then ${MAKE} -C nx-X11 $@; fi; \ + fi + +all: build diff --git a/debian/patches/005_nxcomp_gcc43.full+lite.patch b/debian/patches/005_nxcomp_gcc43.full+lite.patch index 31cb984..bb758c2 100644 --- a/debian/patches/005_nxcomp_gcc43.full+lite.patch +++ b/debian/patches/005_nxcomp_gcc43.full+lite.patch @@ -5,8 +5,8 @@ Description: gcc43 fix Forwarded: not-yet Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Last-Update: 2011-12-31 ---- a/nxcomp/Message.cpp 2010-03-18 19:32:44.476930493 -0300 -+++ b/nxcomp/Message.cpp 2010-03-18 19:40:48.669719034 -0300 +--- a/nxcomp/Message.cpp 2012-03-01 03:46:39.220943822 +0100 ++++ b/nxcomp/Message.cpp 2012-03-01 03:47:27.605712530 +0100 @@ -15,9 +15,9 @@ /* */ /**************************************************************************/ @@ -19,8 +19,8 @@ Last-Update: 2011-12-31 #include <algorithm> ---- a/nxcomp/Misc.cpp 2010-03-18 19:32:44.488465101 -0300 -+++ b/nxcomp/Misc.cpp 2010-03-18 19:40:48.669719034 -0300 +--- a/nxcomp/Misc.cpp 2012-03-01 03:46:39.220943822 +0100 ++++ b/nxcomp/Misc.cpp 2012-03-01 03:47:27.605712530 +0100 @@ -15,11 +15,11 @@ /* */ /**************************************************************************/ @@ -37,8 +37,8 @@ Last-Update: 2011-12-31 #include <errno.h> #include <string.h> ---- a/nxcomp/Misc.h 2010-03-18 19:32:44.488465101 -0300 -+++ b/nxcomp/Misc.h 2010-03-18 19:40:48.669719034 -0300 +--- a/nxcomp/Misc.h 2012-03-01 03:46:39.220943822 +0100 ++++ b/nxcomp/Misc.h 2012-03-01 03:47:27.605712530 +0100 @@ -21,8 +21,8 @@ #include <iostream> #include <fstream> @@ -50,8 +50,8 @@ Last-Update: 2011-12-31 #ifdef __sun ---- a/nxcomp/Proxy.cpp 2010-03-18 19:32:44.547273410 -0300 -+++ b/nxcomp/Proxy.cpp 2010-03-18 19:40:48.669719034 -0300 +--- a/nxcomp/Proxy.cpp 2012-03-01 03:46:39.224943897 +0100 ++++ b/nxcomp/Proxy.cpp 2012-03-01 03:47:27.605712530 +0100 @@ -15,9 +15,9 @@ /* */ /**************************************************************************/ @@ -64,8 +64,8 @@ Last-Update: 2011-12-31 #include <sys/types.h> #include <sys/stat.h> ---- a/nxcomp/Split.cpp 2010-03-18 19:32:44.688465322 -0300 -+++ nxcomp-ubuntu/Split.cpp 2010-03-18 19:40:48.669719034 -0300 +--- a/nxcomp/Split.cpp 2012-03-01 03:46:39.224943897 +0100 ++++ b/nxcomp/Split.cpp 2012-03-01 03:47:27.605712530 +0100 @@ -16,7 +16,7 @@ /**************************************************************************/ diff --git a/debian/patches/051_nxcomp_macos105-fdisset.full+lite.patch b/debian/patches/051_nxcomp_macos105-fdisset.full+lite.patch new file mode 100644 index 0000000..6b78a6b --- /dev/null +++ b/debian/patches/051_nxcomp_macos105-fdisset.full+lite.patch @@ -0,0 +1,82 @@ +Description: workaround for Mac OS X 10.5 + The Mac OS X 10.5 SDK requires the second argument of FD_ISSET to be + writeable, although it does only access the data. Given that we have a + const pointer for a const struct, copy and pass that. + . + Note that this is merely a workaround for OS X 10.5, as 10.6 and later + define the second argument of FD_ISSET as const struct const *foo, too. + . + It is safe, as data is accessed read-only by FD_ISSET, even on 10.5. +Forward: pending +Author: Mihai Moldovan <ionic(a)ionic.de> +--- + nxcomp/Agent.h | 28 ++++++++++++++++++++-------- + 1 files changed, 20 insertions(+), 8 deletions(-) + +--- a/nxcomp/Agent.h ++++ b/nxcomp/Agent.h +@@ -149,30 +149,38 @@ + + int remoteCanRead(const fd_set * const readSet) + { ++ // OS X 10.5 requires the second argument to be non-const, so copy readSet. ++ // It's safe though, as FD_ISSET does not operate on it. ++ fd_set readWorkSet = *readSet; ++ + #if defined(TEST) || defined(INFO) + *logofs << "Agent: remoteCanRead() is " << +- (FD_ISSET(remoteFd_, readSet) && transport_ -> dequeuable() != 0) +- << " with FD_ISSET() " << (int) FD_ISSET(remoteFd_, readSet) ++ (FD_ISSET(remoteFd_, &readWorkSet) && transport_ -> dequeuable() != 0) ++ << " with FD_ISSET() " << (int) FD_ISSET(remoteFd_, &readWorkSet) + << " and dequeuable " << transport_ -> dequeuable() + << ".\n" << logofs_flush; + #endif + +- return (FD_ISSET(remoteFd_, readSet) && ++ return (FD_ISSET(remoteFd_, &readWorkSet) && + transport_ -> dequeuable() != 0); + } + + int remoteCanWrite(const fd_set * const writeSet) + { ++ // OS X 10.5 requires the second argument to be non-const, so copy writeSet. ++ // It's safe though, as FD_ISSET does not operate on it. ++ fd_set writeWorkSet = *writeSet; ++ + #if defined(TEST) || defined(INFO) + *logofs << "Agent: remoteCanWrite() is " << +- (FD_ISSET(remoteFd_, writeSet) && transport_ -> ++ (FD_ISSET(remoteFd_, &writeWorkSet) && transport_ -> + queuable() != 0 && canRead_ == 1) << " with FD_ISSET() " +- << (int) FD_ISSET(remoteFd_, writeSet) << " queueable " ++ << (int) FD_ISSET(remoteFd_, &writeWorkSet) << " queueable " + << transport_ -> queuable() << " channel can read " + << canRead_ << ".\n" << logofs_flush; + #endif + +- return (FD_ISSET(remoteFd_, writeSet) && ++ return (FD_ISSET(remoteFd_, &writeWorkSet) && + transport_ -> queuable() != 0 && + canRead_ == 1); + } +@@ -203,13 +211,17 @@ + + int proxyCanRead(const fd_set * const readSet) + { ++ // OS X 10.5 requires the second argument to be non-const, so copy readSet. ++ // It's safe though, as FD_ISSET does not operate on it. ++ fd_set readWorkSet = *readSet; ++ + #if defined(TEST) || defined(INFO) + *logofs << "Agent: proxyCanRead() is " +- << ((int) FD_ISSET(proxy -> getFd(), readSet) ++ << ((int) FD_ISSET(proxy -> getFd(), &readWorkSet) + << ".\n" << logofs_flush; + #endif + +- return (FD_ISSET(proxy -> getFd(), readSet)); ++ return (FD_ISSET(proxy -> getFd(), &readWorkSet)); + } + + int enqueueData(const char *data, const int size) const diff --git a/debian/patches/203_nxagent_disable-rootless-exit.full.patch b/debian/patches/203_nxagent_disable-rootless-exit.full.patch new file mode 100644 index 0000000..03154bb --- /dev/null +++ b/debian/patches/203_nxagent_disable-rootless-exit.full.patch @@ -0,0 +1,60 @@ +--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c +@@ -656,6 +656,12 @@ + return 1; + } + ++ if (!strcmp(argv[i], "-norootlessexit")) { ++ nxagentChangeOption(NoRootlessExit, True); ++ return 1; ++ } ++ ++ + if (!strcmp(argv[i], "-noonce")) + { + nxagentOnce = False; +@@ -1837,6 +1843,7 @@ + ErrorF("The NX system adds the following arguments:\n"); + ErrorF("-forcenx force use of NX protocol messages assuming communication through nxproxy\n"); + ErrorF("-timeout int auto-disconnect timeout in seconds (minimum allowed: 60)\n"); ++ ErrorF("-norootlessexit don't exit if there are no clients in rootless mode\n"); + #ifdef RENDER + ErrorF("-norender disable the use of the render extension\n"); + ErrorF("-nocomposite disable the use of the composite extension\n"); +--- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c +@@ -217,7 +217,7 @@ + + if (nxagentOption(Rootless) && + nxagentLastWindowDestroyed && nxagentRootlessDialogPid == 0 && +- now > nxagentLastWindowDestroyedTime + 30 * 1000) ++ now > nxagentLastWindowDestroyedTime + 30 * 1000 && !nxagentOption(NoRootlessExit)) + { + #ifdef WARNING + fprintf(stderr, "nxagentBlockHandler: No application running. Closing the session.\n"); +--- a/nx-X11/programs/Xserver/hw/nxagent/Options.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Options.c +@@ -56,6 +56,7 @@ + nxagentOptions.Persistent = 1; + nxagentOptions.Rootless = UNDEFINED; + nxagentOptions.Fullscreen = UNDEFINED; ++ nxagentOptions.NoRootlessExit = False; + + nxagentOptions.X = 0; + nxagentOptions.Y = 0; +--- a/nx-X11/programs/Xserver/hw/nxagent/Options.h ++++ b/nx-X11/programs/Xserver/hw/nxagent/Options.h +@@ -369,6 +369,13 @@ + + int CopyBufferSize; + ++ /* ++ * True if agent should not exit if there are no ++ * clients in rootless mode ++ */ ++ ++ int NoRootlessExit; ++ + } AgentOptionsRec; + + typedef AgentOptionsRec *AgentOptionsPtr; diff --git a/debian/patches/series b/debian/patches/series index cf194f1..dc42d85 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -25,6 +25,7 @@ 030_nx-X11_configure-args.full.patch 031_nx-X11_parallel-make.full.patch 032_no-x11r6.full.patch +051_nxcomp_macos105-fdisset.full+lite.patch 101_nxagent_set-rgb-path.full.patch 102_xserver-xext_set-securitypolicy-path.full.patch 103_nxagent_set-X0-config-path.full.patch @@ -37,6 +38,7 @@ 200_nxagent_check-binary-x2go-flavour.full.patch 201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch 202_nx-x11_enable-xinerama.full.patch +203_nxagent_disable-rootless-exit.full.patch 209_x2goagent-add-man-page.full.patch 300_nxagent_set-wm-class.full.patch 301_nx-X11_use-shared-libs.full.patch diff --git a/debian/post-build-nx.sh b/debian/post-build-nx.sh index 2d1f8d2..94f18ac 100755 --- a/debian/post-build-nx.sh +++ b/debian/post-build-nx.sh @@ -20,8 +20,6 @@ find nx-X11/exports/lib/ | egrep "^.*\.so$" | while read libpath; do find $libdir/$libfile.* | while read symlink; do ln -s $libfile ${libdir//exports/.build-exports}/$(basename $symlink) done - - done exit 0 hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)).

1 0

nx-libs.git - master (branch) updated: redist-client/3.5.0.11-14-g1b1a26a
by git-admin＠x2go.org 07 Mar '12

07 Mar '12

The branch, master has been updated via 1b1a26ae66725db1d8e8a3b3b5b3f755457f5068 (commit) from 4f7c8d079014b28204f6733a4e11708be012b215 (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 1b1a26ae66725db1d8e8a3b3b5b3f755457f5068 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Mar 7 20:51:27 2012 +0100 release 3.5.0.12 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9660afd..d1c14d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -nx-libs (2:3.5.0.12-0) UNRELEASED; urgency=low +nx-libs (2:3.5.0.12-0) unstable; urgency=low [ Mike Gabriel ] * Update patch: 001_add-main-makefile.full+lite.patch, adapt patch from @@ -21,7 +21,7 @@ nx-libs (2:3.5.0.12-0) UNRELEASED; urgency=low running in rootless mode and no X-Clients are present. Starting nxagent with option "-norootlessexit" will change this behaviour. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 Feb 2012 15:05:38 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Mar 2012 20:50:14 +0100 nx-libs (2:3.5.0.11-0) unstable; urgency=low hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)).

1 0

x2gothinclient.git - build-main (branch) updated: 1.0.1.6
by git-admin＠x2go.org 07 Mar '12

07 Mar '12

The branch, build-main has been updated via d64d625129a79804040ea6fe6059675135034ee3 (commit) via be299f72e904310704fb6385128637226a1adbcb (commit) via 7108aa320b81f2328d4d334e0a52f144500c21fd (commit) via 85609f9567c20e2d654f2030586dc27416ac35bb (commit) via 37e3cdf2cf596f7956a0da19979c29c086d3753e (commit) via f951027eb109ef40124555e0ed70053d863945e7 (commit) via 4eca45ff7d4625b038405a5bad7e4d09ff9fe272 (commit) via 7d5e1990195c50c3df475157ebfa641eb32d3465 (commit) via cbd84540554db2861d2fd431d12e1ca7754c9fe2 (commit) via 696eb25fbf77be21c7ea533f5558e65d56987d65 (commit) via 4eecd1c05c8383bcbe42627aedf1221f8d319fcc (commit) via 60ae7466f84477e3459fa12ef195f3b14005a3e4 (commit) via e050d7bd54f124e913d0ecf1658ec1a96d0f9fcb (commit) via 79675568402ebb0f7e908698a876adb955e34522 (commit) via d219b0c2ad609b13c204ad8fe5ebc436f9f9fab3 (commit) via 80cc30a96a18f076d23eb6dc8a185ca34db80653 (commit) via b3183e568be6d346452c6727b4798812e6646f4a (commit) via 8c924cc190db585497aeb8bd22cdc1a880f32f12 (commit) from d1df454db152fbcea7e1340b43ae4c9aa2c9ef9c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: VERSION | 2 +- debian/changelog | 23 +++ debian/control | 36 +---- debian/rules | 3 - debian/x2gothinclientmanagement.install | 1 + debian/x2gothinshutdown.install | 1 - debian/x2gothinshutdown.manpages | 1 - x2gothinclient/sbin/x2gothinclientd | 42 ++---- .../sbin/x2gothinclient_create | 1 + .../sbin/x2gothinclient_update | 23 ++- .../share/tftpboot/default.cfg | 26 +++- .../{x2go-splash.png => x2go-simple-splash.png} | Bin 4314 -> 4314 bytes .../share/tftpboot/x2go-splash.png | Bin 4314 -> 18746 bytes .../share/x2goclient-background.svg | 158 ++++++++++++++++++++ .../share/x2gothinclient_start | 5 + 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 -- 22 files changed, 251 insertions(+), 191 deletions(-) delete mode 100644 debian/x2gothinshutdown.install delete mode 100644 debian/x2gothinshutdown.manpages copy x2gothinclientmanagement/share/tftpboot/{x2go-splash.png => x2go-simple-splash.png} (100%) create mode 100644 x2gothinclientmanagement/share/x2goclient-background.svg 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/VERSION b/VERSION index ef63c57..cd263f0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.1.5 +1.0.1.6 diff --git a/debian/changelog b/debian/changelog index ebeb447..2ca6b3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,26 @@ +x2gothinclient (1.0.1.6-0~x2go1) unstable; 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. + * Let x2gothinclient break and replace x2gothinshutdown. + * Depend on x2goclient (>= 3.99.1.1). + + [ 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. + - Changes in x2gothinclientd, pulseaudio parameter "--exit-idle-time=65535", + breaking pulseaudio start command into in to several lines. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Mar 2012 20:47:20 +0100 + x2gothinclient (1.0.1.5-0~x2go1) unstable; urgency=low * New upstream version (1.0.1.5): diff --git a/debian/control b/debian/control index 4348bf8..f3b9c59 100644 --- a/debian/control +++ b/debian/control @@ -47,20 +47,25 @@ Architecture: all Depends: ${misc:Depends}, psmisc, - x2goclient, - x2gothinshutdown, + x2goclient (>= 3.99.1.1), xauth, xinit, locales Recommends: x2gocdmanager, - x2gothinshutdown, x2gousbmount, x2gosmartcardrules, + gnupg-agent, + pinentry-x2go, + gpgsm, vim, 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 @@ -130,31 +135,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/x2gothinclientmanagement.install b/debian/x2gothinclientmanagement.install index 8b44295..98eca2a 100644 --- a/debian/x2gothinclientmanagement.install +++ b/debian/x2gothinclientmanagement.install @@ -1,4 +1,5 @@ x2gothinclientmanagement/sbin/x2gothinclient_* usr/sbin/ x2gothinclientmanagement/etc/x2gothinclient_* etc/x2go/ x2gothinclientmanagement/share/x2gothinclient_* usr/share/x2go/tce/ +x2gothinclientmanagement/share/x2goclient-background.svg usr/share/x2go/tce/ x2gothinclientmanagement/share/tftpboot usr/share/x2go/tce/ 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..49e04a9 100755 --- a/x2gothinclient/sbin/x2gothinclientd +++ b/x2gothinclient/sbin/x2gothinclientd @@ -89,21 +89,24 @@ 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... if ( !check_pulse() ) { - system("su - x2goclient -c \"DISPLAY=:0 pulseaudio -D -n -L 'module-native-protocol-tcp port=4713' -L 'module-esound-protocol-tcp port=16001' -L 'module-udev-detect'\""); + system("su - x2goclient -c \"DISPLAY=:0 pulseaudio -D -n \\ + -L 'module-native-protocol-tcp port=4713' \\ + -L 'module-esound-protocol-tcp port=16001' \\ + -L 'module-udev-detect' --exit-idle-time=65535\""); } # test if x2goclient is running, if not launch it... @@ -114,26 +117,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/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index e0da318..a14ae17 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -63,6 +63,7 @@ mkdir -p $TC_CONFIG test -f $TC_CONFIG/x2gothinclient_init || cp $SHAREDIR/x2gothinclient_init $TC_CONFIG test -f $TC_CONFIG/x2gothinclient_start || cp $SHAREDIR/x2gothinclient_start $TC_CONFIG test -f $TC_CONFIG/x2gothinclient_sessions || cp $SHAREDIR/x2gothinclient_sessions $TC_CONFIG +test -f $TC_CONFIG/x2goclient-background.svg || cp $SHAREDIR/x2goclient-background.svg $TC_CONFIG apt-get install debootstrap mkdir -p $TC_CHROOT diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_update b/x2gothinclientmanagement/sbin/x2gothinclient_update index 4a83145..4df9ff3 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_update +++ b/x2gothinclientmanagement/sbin/x2gothinclient_update @@ -57,14 +57,25 @@ mkdir -p "$TC_CHROOT/etc/x2go" echo "Installing X2Go TCE configuration into chroot environment..." echo "------------------------------------------------------------" -cp -v "$TC_CONFIG/x2gothinclient_init" "$TC_CHROOT/etc/x2go/x2gothinclient_init" -chmod a+rx $TC_CHROOT/etc/x2go/x2gothinclient_init +if test -f $TC_CONFIG/x2gothinclient_init; then + cp -v "$TC_CONFIG/x2gothinclient_init" "$TC_CHROOT/etc/x2go/x2gothinclient_init" + chmod a+rx $TC_CHROOT/etc/x2go/x2gothinclient_init +fi -cp -v "$TC_CONFIG/x2gothinclient_start" "$TC_CHROOT/etc/x2go/x2gothinclient_start" -chmod a+rx "$TC_CHROOT/etc/x2go/x2gothinclient_start" +if test -f $TC_CONFIG/x2gothinclient_start; then + cp -v "$TC_CONFIG/x2gothinclient_start" "$TC_CHROOT/etc/x2go/x2gothinclient_start" + chmod a+rx "$TC_CHROOT/etc/x2go/x2gothinclient_start" +fi -cp -v "$TC_CONFIG/x2gothinclient_sessions" "$TC_CHROOT/etc/x2go/x2gothinclient_sessions" -chmod a+rx "$TC_CHROOT/etc/x2go/x2gothinclient_sessions" +if test -f $TC_CONFIG/x2gothinclient_sessions; then + cp -v "$TC_CONFIG/x2gothinclient_sessions" "$TC_CHROOT/etc/x2go/x2gothinclient_sessions" + chmod a+rx "$TC_CHROOT/etc/x2go/x2gothinclient_sessions" +fi + +if test -f $TC_CONFIG/x2goclient-background.svg; then + cp -v "$TC_CONFIG/x2goclient-background.svg" "$TC_CHROOT/etc/x2go/x2goclient-background.svg" + chmod a+rx $TC_CHROOT/etc/x2go/x2goclient-background.svg +fi echo diff --git a/x2gothinclientmanagement/share/tftpboot/default.cfg b/x2gothinclientmanagement/share/tftpboot/default.cfg index 33bac2b..49a25de 100644 --- a/x2gothinclientmanagement/share/tftpboot/default.cfg +++ b/x2gothinclientmanagement/share/tftpboot/default.cfg @@ -13,18 +13,34 @@ MENU SEPARATOR include memtest.cfg # menu settings -MENU VSHIFT 12 -MENU WIDTH 80 +MENU VSHIFT 3 +MENU HSHIFT 18 +MENU WIDTH 60 MENU MARGIN 10 MENU ROWS 12 MENU TABMSGROW 13 -MENU CMDLINEROW 14 +MENU CMDLINEROW 23 MENU ENDROW 12 -MENU TIMEOUTROW 15 +MENU TIMEOUTROW 18 + +MENU COLOR border 30;44 #40ffffff #a0000000 std +MENU COLOR title 1;36;44 #9033ccff #a0000000 std +MENU COLOR sel 7;37;40 #e0000000 #20ffffff all +MENU COLOR unsel 37;44 #50ffffff #a0000000 std +MENU COLOR help 37;40 #c0ffffff #a0000000 std +MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std +MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std +MENU COLOR msg07 37;40 #90ffffff #a0000000 std +MENU COLOR tabmsg 37;40 #e0ffffff #a0000000 std +MENU COLOR disabled 37;44 #50ffffff #a0000000 std +MENU COLOR hotkey 1;30;47 #ffff0000 #a0000000 std +MENU COLOR hotsel 1;7;30;47 #ffff0000 #20ffffff all +MENU COLOR scrollbar 30;47 #ffff0000 #00000000 std +MENU COLOR cmdmark 1;36;47 #e0ff0000 #00000000 std +MENU COLOR cmdline 30;47 #ff000000 #00000000 none # possible boot profiles for ONTIMEOUT: # localboot, x2go-tce-686, x2go-tce-486 # (... or any other profile you defined in your customized menu) ONTIMEOUT localboot TIMEOUT 100 - diff --git a/x2gothinclientmanagement/share/tftpboot/x2go-splash.png b/x2gothinclientmanagement/share/tftpboot/x2go-splash.png index 0886917..159ecff 100644 Binary files a/x2gothinclientmanagement/share/tftpboot/x2go-splash.png and b/x2gothinclientmanagement/share/tftpboot/x2go-splash.png differ diff --git a/x2gothinclientmanagement/share/x2goclient-background.svg b/x2gothinclientmanagement/share/x2goclient-background.svg new file mode 100644 index 0000000..e3c6580 --- /dev/null +++ b/x2gothinclientmanagement/share/x2goclient-background.svg @@ -0,0 +1,158 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.0" + width="361.04999" + height="271.92001" + viewBox="0 0 361.244 270.933" + id="svg2" + xml:space="preserve" + inkscape:version="0.47 r22583" + sodipodi:docname="bg-anim.svg"><metadata + id="metadata30"><rdf:RDF><cc:Work + rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1598" + inkscape:window-height="879" + id="namedview28" + showgrid="false" + inkscape:zoom="2" + inkscape:cx="132.20018" + inkscape:cy="132.38275" + inkscape:window-x="0" + inkscape:window-y="19" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" /> + <defs + id="defs4"><inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="0 : 135.96001 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="361.04999 : 135.96001 : 1" + inkscape:persp3d-origin="180.52499 : 90.640004 : 1" + id="perspective32" /><linearGradient + id="linearGradient2802"><stop + style="stop-color:#ffffff;stop-opacity:1" + offset="0" + id="stop2804" /><stop + style="stop-color:#ffffff;stop-opacity:0" + offset="1" + id="stop2806" /></linearGradient><linearGradient + id="linearGradient2852"><stop + style="stop-color:#ffffff;stop-opacity:1" + offset="0" + id="stop2854" /><stop + style="stop-color:#6699ff;stop-opacity:0" + offset="1" + id="stop2856" /></linearGradient><linearGradient + id="linearGradient2844"><stop + style="stop-color:#deeaed;stop-opacity:1" + offset="0" + id="stop2846" /><stop + style="stop-color:#ffffff;stop-opacity:1" + offset="1" + id="stop2848" /></linearGradient><linearGradient + id="linearGradient1948"><stop + style="stop-color:#b2856b;stop-opacity:0.4235808;" + offset="0" + id="stop1950" /><stop + style="stop-color:#6699ff;stop-opacity:0" + offset="1" + id="stop1952" /></linearGradient> + <style + type="text/css" + id="style6" /> + <linearGradient + x1="202.494" + y1="135.464" + x2="207.00999" + y2="135.464" + id="id0" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#000000;stop-opacity:1" + offset="0" + id="stop9" /> + <stop + style="stop-color:#6e707f;stop-opacity:1" + offset="1" + id="stop11" /> + </linearGradient> + + + + + + + + + + <linearGradient + x1="202.494" + y1="135.464" + x2="207.00999" + y2="135.464" + id="linearGradient1942" + xlink:href="#id0" + gradientUnits="userSpaceOnUse" /><linearGradient + x1="107.24445" + y1="268.11078" + x2="107.64762" + y2="207.717" + id="linearGradient1954" + xlink:href="#linearGradient1948" + gradientUnits="userSpaceOnUse" /><linearGradient + x1="278.59366" + y1="-49.590809" + x2="133.85397" + y2="120.54888" + id="linearGradient2808" + xlink:href="#linearGradient2802" + gradientUnits="userSpaceOnUse" /></defs> + + + <rect + style="fill:#800000;fill-opacity:1" + id="hintergrund" + height="270.92899" + width="361.23801" + y="0.00456294" + x="-361.23801" + class="fil0" + transform="scale(-1,1)"> + <animateColor + attributeName="fill" + attributeType="XML" + from="#000000" + to="#246ed8" + begin="0s" + dur="4s" + fill="freeze" + id="animateColor24" /> + </rect> + + + <path + d="M 162.557,0.0045 L 0,0.0045 L 0,57.8027 C 0,146.6071 334.145,182.1287 334.145,270.9327 L 334.145,270.9327 C 334.145,182.1283 162.557,88.8087 162.557,0.0037 L 162.557,0.0045 z " + style="fill:url(#linearGradient2808);fill-opacity:1" + id="path19" /> + + +</svg> \ No newline at end of file diff --git a/x2gothinclientmanagement/share/x2gothinclient_start b/x2gothinclientmanagement/share/x2gothinclient_start index d006485..b603c00 100755 --- a/x2gothinclientmanagement/share/x2gothinclient_start +++ b/x2gothinclientmanagement/share/x2gothinclient_start @@ -27,7 +27,10 @@ --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 \ --session=X2Go.Example \ --add-to-known-hosts & @@ -38,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-18-gd64d625
by git-admin＠x2go.org 07 Mar '12

07 Mar '12

The branch, master has been updated via d64d625129a79804040ea6fe6059675135034ee3 (commit) via be299f72e904310704fb6385128637226a1adbcb (commit) from 7108aa320b81f2328d4d334e0a52f144500c21fd (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 d64d625129a79804040ea6fe6059675135034ee3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Mar 7 20:47:31 2012 +0100 release 1.0.1.6 commit be299f72e904310704fb6385128637226a1adbcb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Mar 7 20:47:18 2012 +0100 changelog cleanup ----------------------------------------------------------------------- Summary of changes: debian/changelog | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8518cd2..2ca6b3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2gothinclient (1.0.1.6-0~x2go1) UNRELEASED; urgency=low +x2gothinclient (1.0.1.6-0~x2go1) unstable; urgency=low [ Mike Gabriel ] * New upstream version (1.0.1.6): @@ -16,11 +16,10 @@ x2gothinclient (1.0.1.6-0~x2go1) UNRELEASED; urgency=low instead of x2gothinshutdown. - gnupg-agent, pinentry-x2go and gpgsm added to "Recommends" section for package x2gothinclient. - * Changes in x2gothinclientd - - pulseaudio parameter "--exit-idle-time=65535". - - Breaking pulseaudio start command into in to several lines. + - Changes in x2gothinclientd, pulseaudio parameter "--exit-idle-time=65535", + breaking pulseaudio start command into in to several lines. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 13:51:00 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Mar 2012 20:47:20 +0100 x2gothinclient (1.0.1.5-0~x2go1) unstable; urgency=low 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 - build-main (branch) updated: 3.99.1.1
by git-admin＠x2go.org 07 Mar '12

07 Mar '12

The branch, build-main has been updated via 188aa3277110f48cdc58754b69a7b1c9a9e63cdc (commit) via e43d7eb9a0e8654bbfc6c6a667c30d2f48eaf7df (commit) via f9f9efef4450485b53cf43100d1ad14ea8f96b16 (commit) via 3b20e0e71cf3c01b1f73ecee2014c4ddf5c07a3f (commit) via 93d11591928f54ff28a06edd10cb13494ef10d41 (commit) via db39c41e27721872a3c235298c42c41d202d35b6 (commit) via acc0632ba462e6e3be91bb70e812c00fcfb176c6 (commit) via 178a4015b4928a708fa37dd507c0a5f89fa152cf (commit) via c8b59f5802e87941dd8c8a462b8b6173e32eb8d9 (commit) via 437e34c48f017b0014bb422da512f2bcd0e07710 (commit) via 236d841becb21398f6137f6e8c569494f10ab11f (commit) via 0cf7b36b26b81dd2bbb650474ee8af71f82e2ff1 (commit) via ad93ba72500277997ffb92b966dc7d14a5fbe14a (commit) via 4a931302e089e07c9d9f01ca263c1c682ce00974 (commit) via a783ba67041653511cff25031dc9c81995225e66 (commit) via c56b99a96b23d2978231b5d3a892b658a727e363 (commit) via 4375d10a6834c67ddf638ea52a121d8e04840a0a (commit) from 5f90e9ae43cecf2e82ec10ae93e64a854383f763 (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: .gitignore | 17 ++++ Makefile | 4 +- VERSION | 2 +- config_win.bat | 1 + configdialog.cpp | 2 +- debian/changelog | 36 ++++++++ desktop/x2goclient.desktop | 2 +- onmainwindow.cpp | 69 ++++++++++++++- onmainwindow.h | 7 ++- onmainwindow_part2.cpp | 11 ++- onmainwindow_part3.cpp | 93 +++++++++------------ onmainwindow_part4.cpp | 34 +++++--- onmainwindow_privat.h | 6 +- png/power-button.png | Bin 0 -> 762 bytes resources.rcc | 1 + sshmasterconnection.cpp | 4 + sshprocess.h | 5 +- version.h | 2 +- x2goclient.pro | 201 ++++++++++++++++++++++---------------------- x2goclient_de.ts | 4 +- x2goclient_en.ts | 2 +- x2goclient_fr.ts | 2 +- x2goclient_nb_no.ts | 4 +- x2goclient_ru.ts | 4 +- x2goclient_sv.ts | 39 +++++---- x2goclient_zh_tw.ts | 2 +- x2goplugin.rc | 10 +- 27 files changed, 348 insertions(+), 216 deletions(-) create mode 100644 .gitignore create mode 100644 png/power-button.png The diff of changes is: diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..721e32c --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +# Temporary object files/static libs. +*.[oa] + +# Generated by qmake. +moc_*.cpp +ui_*.h +qrc_resources.cpp + +# VIM temporary files. +.*.sw* + +# Generated by lrelease. +x2goclient_*.qm + +# Generated by qmake when building on OS X. +x2goclient.app + diff --git a/Makefile b/Makefile index 5831516..30c12dc 100755 --- a/Makefile +++ b/Makefile @@ -28,12 +28,12 @@ all: build build: build_client build_plugin build_man build_client: - lrelease-qt4 x2goclient.pro + lrelease x2goclient.pro mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && qmake-qt4 ../x2goclient.pro cd $(CLIENT_DIR) && $(MAKE) build_plugin: - lrelease-qt4 x2goclient.pro + lrelease x2goclient.pro mkdir -p $(PLUGIN_DIR) && cd $(PLUGIN_DIR) && X2GO_CLIENT_TARGET=plugin qmake-qt4 ../x2goclient.pro cd $(PLUGIN_DIR) && $(MAKE) diff --git a/VERSION b/VERSION index 57055b8..bac3e99 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.99.1.0 +3.99.1.1 diff --git a/config_win.bat b/config_win.bat index 98f1987..695b3e2 100755 --- a/config_win.bat +++ b/config_win.bat @@ -1,4 +1,5 @@ mingw32-make distclean +lrelease x2goclient.pro set X2GO_CLIENT_TARGET= qmake diff --git a/configdialog.cpp b/configdialog.cpp index 6dad751..e8e2a43 100644 --- a/configdialog.cpp +++ b/configdialog.cpp @@ -4,7 +4,7 @@ // Description: // // -// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2006-2011 +// Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de>, (C) 2006-2012 // // Copyright: See COPYING file that comes with this distribution // diff --git a/debian/changelog b/debian/changelog index db8002c..43f67dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,39 @@ +x2goclient (3.99.1.1-0~x2go1) unstable; urgency=low + + [ Oleksandr Shneyder ] + * New upstream version (3.99.1.1): + - 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 + - Fix comments in copyright headers. + + [ 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. + - Prettify x2goclient.pro. + + [ Mihai Moldovan ] + * New upstream version (3.99.1.1): + - Use the Mac OS X 10.5 SDK instead 10.6 to remain compatible with + Leopard. + - Add .gitignore file. + - The default of a 10 seconds SSH connection timeout is pretty low, + especially when using tcp_wrappers with the identd option turned on. + Wait for a 60 seconds timeout. + - On Mac OS X connect to Xserver via Unix file socket. + - Properly set DISPLAY environment variable on Mac OS X. + + [ Daniel Lindgren ] + * New upstream version (3.99.1.1): + - Update/improve Swedish translation after testing x2goclient on Windows. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Mar 2012 20:42:36 +0100 + x2goclient (3.99.1.0-0~x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/desktop/x2goclient.desktop b/desktop/x2goclient.desktop index ba3e4ac..fd29411 100644 --- a/desktop/x2goclient.desktop +++ b/desktop/x2goclient.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Version=3.99.1.0 +Version=3.99.1.1 Type=Application Name=X2Go Client Exec=/usr/bin/x2goclient diff --git a/onmainwindow.cpp b/onmainwindow.cpp index a543ce1..aa15ae6 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -1,9 +1,9 @@ -/*************************************************************************** -* Copyright (C) 2005-2012 by Oleksandr Shneyder * -* oleksandr.shneyder(a)obviously-nice.de * +/************************************************************************** +* 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 F* +* 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. * * * @@ -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; @@ -64,6 +66,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) extStarted=false; defaultLink=2; defaultFullscreen=false; + defaultXinerama=false; acceptRsa=false; cardStarted=false; cardReady=false; @@ -392,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 ); @@ -418,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(); + } } @@ -429,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 79d60e4..1f2f08f 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -132,6 +132,7 @@ struct x2goSession QString sndPort; QString fsPort; int colorDepth; + bool fullscreen; enum {DESKTOP,ROOTLESS,SHADOW} sessionType; QString command; void operator = ( const x2goSession& s ); @@ -464,6 +465,7 @@ private: bool startMaximized; bool startHidden; bool defaultUseSound; + bool defaultXinerama; bool cardStarted; bool defaultSetKbd; bool showExport; @@ -474,6 +476,7 @@ private: bool changeBrokerPass; bool connTest; bool embedMode; + bool thinMode; QString statusString; int defaultLink; int defaultQuality; @@ -626,6 +629,7 @@ private: bool proxyWinEmbedded; bool useLdap; bool showToolBar; + bool showHaltBtn; bool newSession; bool ldapOnly; bool isScDaemonOk; @@ -820,7 +824,6 @@ private slots: void slotChangeBrokerPass(); void slotTestConnection(); void slotCheckPortableDir(); - void readUsers(); void slotSelectedFromList ( UserButton* user ); void slotUnameEntered(); @@ -835,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_part2.cpp b/onmainwindow_part2.cpp index 7d1a206..e8df279 100644 --- a/onmainwindow_part2.cpp +++ b/onmainwindow_part2.cpp @@ -730,6 +730,7 @@ void ONMainWindow::startNewSession() cmd+=sessTypeStr+QString::number ( shadowMode ) +"XSHAD"+ shadowUser+"XSHAD"+shadowDisplay; } + resumingSession.fullscreen=fullscreen; x2goDebug<<cmd<<endl; if ( managedMode ) { @@ -908,6 +909,7 @@ void ONMainWindow::resumeSession ( const x2goSession& s ) geometry=QString::number ( width ) +"x"+ QString::number ( height ); } + resumingSession.fullscreen=fullscreen; QString link; switch ( speed ) { @@ -1898,12 +1900,17 @@ void ONMainWindow::slotTunnelOk() env << "NX_CLIENT="+QCoreApplication::applicationFilePath (); #if defined ( Q_OS_WIN ) || defined ( Q_OS_DARWIN ) + // On Mac OS X, we want to make sure that DISPLAY is set to a proper value, + // but at the same time don't want to set the value ourselves but keep + // the provided one. QString disp=getXDisplay(); if ( disp==QString::null ) { //slotProxyerror ( QProcess::FailedToStart ); return; } +#endif // Q_OS_WIN || Q_OS_DARWIN +#if defined ( Q_OS_WIN ) if ( dispInd==-1 ) { env <<"DISPLAY=localhost:"+disp; @@ -1915,8 +1922,8 @@ void ONMainWindow::slotTunnelOk() /* x2goDebug<<"existing env DISPLAY("<<dispInd<< ") DISPLAY=localhost:"+disp<<endl;*/ } -#endif -#ifdef Q_OS_DARWIN +#endif // Q_OS_WIN +#if defined ( Q_OS_DARWIN ) //setting /usr/X11/bin to find xauth env.insert ( 0, diff --git a/onmainwindow_part3.cpp b/onmainwindow_part3.cpp index a2ff1e6..21434e2 100644 --- a/onmainwindow_part3.cpp +++ b/onmainwindow_part3.cpp @@ -1,9 +1,9 @@ -/*************************************************************************** -* Copyright (C) 2005-2012 by Oleksandr Shneyder * -* oleksandr.shneyder(a)obviously-nice.de * +/************************************************************************** +* 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 F* +* 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. * * * @@ -247,6 +247,22 @@ bool ONMainWindow::parseParameter ( QString param ) startMaximized=true; return true; } + if ( param=="--xinerama" ) + { + 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; @@ -694,7 +710,10 @@ void ONMainWindow::showHelp() "--hide\t\t\t\t start hidden\n" "--portable\t\t\t start in \"portable\" mode\n" "--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" @@ -1520,7 +1539,7 @@ void ONMainWindow::slotSupport() void ONMainWindow::slotAbout() { QString aboutStr=tr ( - " (C. 2006-2011 obviously nice: " + " (C. 2006-2012 obviously nice: " "Oleksandr Shneyder, Heinz-Markus Graesing) " ); if ( embedMode ) aboutStr+=tr ( " x2goplugin mode was sponsored by " @@ -2035,63 +2054,29 @@ bool ONMainWindow::checkAgentProcess() #if defined ( Q_OS_DARWIN ) QString ONMainWindow::getXDisplay() { - QTcpSocket tcpSocket ( this ); - uint dispNumber=0; - QString xname,xdir,xopt; - dispNumber=0; - xdir=ConfigDialog::getXDarwinDirectory(); - xname=xdir+"/Contents/MacOS/X11"; - xopt=" -rootless :0"; + QLocalSocket unixSocket (this); + QString xsocket (getenv ("DISPLAY")); - //for newer versions of XQuartz start startx instead of X11.app - xname="/usr/X11/bin/startx"; - xopt=""; - tcpSocket.connectToHost ( "127.0.0.1",6000+dispNumber ); - - if ( tcpSocket.waitForConnected ( 3000 ) ) - { - tcpSocket.close(); - return QString::number ( dispNumber ); - } - if ( xname==QString::null ) + // OS X starts the X11 server automatically, as soon as the launchd UNIX socket + // is accessed. + // On user login, the DISPLAY environment variable is set to this said existing + // socket. + // By now, we should have a socket. Test, if connecting works. + if ((!xsocket.isEmpty ())) { - QMessageBox::critical ( - this,tr ( "Can't connect to X-Server" ), - tr ( - "Can't connect to X-Server\nPlease check your settings" - ) ); - slotConfig(); - return QString::null; - } - QProcess* pr=new QProcess ( this ); - pr->setWorkingDirectory ( xdir ); - pr->start ( xname+" "+xopt,QIODevice::NotOpen ); - if ( pr->waitForStarted ( 3000 ) ) - { -#ifdef Q_OS_DARWIN - //FIXME: the call of unistd.h sleep() do not work on all - // Mac OS X systems - system ( "sleep 3" ); -#endif + unixSocket.connectToServer (xsocket); - tcpSocket.connectToHost ( "127.0.0.1",6000+dispNumber ); - if ( tcpSocket.waitForConnected ( 1000 ) ) + if (unixSocket.waitForConnected (10000)) { - tcpSocket.close(); - return QString::number ( dispNumber ); + unixSocket.disconnectFromServer (); + return (xsocket); } - QMessageBox::critical ( - this,tr ( "Can't connect to X-Server" ), - tr ( - "Can't connect to X-Server\nPlease check your settings" - ) ); - slotConfig(); - return QString::null; } + // And if not, error out. QMessageBox::critical ( - this,QString::null, + this,tr ( "Can't connect to X server\nPlease check your settings" ), tr ( - "Can't start X Server\nPlease check your settings" ) ); + "Can't start X server\nPlease check your settings" ) ); slotConfig(); return QString::null; } diff --git a/onmainwindow_part4.cpp b/onmainwindow_part4.cpp index 39343a1..25ca9a1 100644 --- a/onmainwindow_part4.cpp +++ b/onmainwindow_part4.cpp @@ -1107,18 +1107,22 @@ void ONMainWindow::slotConfigXinerama() if (newGeometry==lastDisplayGeometry) return; lastDisplayGeometry=newGeometry; - x2goDebug<<"New proxy geometry: "<<lastDisplayGeometry<<endl; + x2goDebug<<"New proxy geometry: "<<lastDisplayGeometry<<endl; QDesktopWidget* root=QApplication::desktop(); QList<QRect> newXineramaScreens; for (int i=0; i< root->numScreens();++i) { - QRect intersection=root->screenGeometry(i).intersected(lastDisplayGeometry); + QRect intersection; + if (resumingSession.fullscreen) + intersection=root->screenGeometry(i); + else + intersection=root->screenGeometry(i).intersected(lastDisplayGeometry); if (!intersection.isNull()) { - x2goDebug<<"intersected with "<<i<<": "<<intersection<<endl; + x2goDebug<<"intersected with "<<i<<": "<<intersection<<endl; intersection.moveLeft(intersection.x()-lastDisplayGeometry.x()); intersection.moveTop(intersection.y()-lastDisplayGeometry.y()); - x2goDebug<<"xinerama screen: "<<intersection<<endl; + x2goDebug<<"xinerama screen: "<<intersection<<endl; newXineramaScreens<<intersection; } } @@ -1143,6 +1147,8 @@ void ONMainWindow::slotConfigXinerama() void ONMainWindow::slotXineramaConfigured() { + if (resumingSession.fullscreen) + return; if (xinSizeInc == -1) xinSizeInc=1; else @@ -1167,8 +1173,8 @@ void ONMainWindow::slotFindProxyWin() { #ifndef Q_OS_DARWIN x2goDebug<<"search proxy win: "<<"X2GO-"+resumingSession.sessionId; - proxyWinId=findWindow ( "X2GO-"+resumingSession.sessionId ); + bool xinerama=defaultXinerama; if ( proxyWinId ) { x2goDebug<<"proxy win found:"<<proxyWinId; @@ -1188,14 +1194,8 @@ void ONMainWindow::slotFindProxyWin() else st= new X2goSettings( "sessions" ); uint displays=QApplication::desktop()->numScreens(); - if (st->setting()->value ( sid+"/xinerama", - ( QVariant ) false ).toBool()) - { - x2goDebug<<"Starting xinerama timer\n"; - lastDisplayGeometry=QRect(); - xineramaScreens.clear(); - xineramaTimer->start(500); - } + xinerama=st->setting()->value ( sid+"/xinerama", + ( QVariant ) defaultXinerama ).toBool(); if (st->setting()->value ( sid+"/multidisp", ( QVariant ) false ).toBool()) { @@ -1209,6 +1209,14 @@ void ONMainWindow::slotFindProxyWin() return; } } + if (xinerama) + { + x2goDebug<<"Starting xinerama timer\n"; + lastDisplayGeometry=QRect(); + xineramaScreens.clear(); + xineramaTimer->start(500); + } + if ( embedMode ) { if ( config.rootless ) diff --git a/onmainwindow_privat.h b/onmainwindow_privat.h index 9e4375a..aa049f7 100644 --- a/onmainwindow_privat.h +++ b/onmainwindow_privat.h @@ -1,6 +1,6 @@ /*************************************************************************** - * Copyright (C) 2005-2012 by Oleksandr Shneyder * - * oleksandr.shneyder(a)obviously-nice.de * + * 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 * @@ -66,7 +66,7 @@ #include <QFileDialog> #include <QHttp> #include <QUrl> -#include <QTcpSocket> +#include <QLocalSocket> #include <QPlastiqueStyle> #include "sshprocess.h" #include "imgframe.h" diff --git a/png/power-button.png b/png/power-button.png new file mode 100644 index 0000000..584cf2a 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> diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp index 2626346..9c6626a 100644 --- a/sshmasterconnection.cpp +++ b/sshmasterconnection.cpp @@ -137,6 +137,7 @@ void SshMasterConnection::run() #endif // int verbosity=SSH_LOG_PROTOCOL; + long timeout = 60; my_ssh_session = ssh_new(); if ( my_ssh_session == NULL ) @@ -153,6 +154,9 @@ void SshMasterConnection::run() ssh_options_set ( my_ssh_session, SSH_OPTIONS_SSH_DIR, (mainWnd->getHomeDirectory()+"/ssh").toAscii()); #endif // ssh_options_set(my_ssh_session, SSH_OPTIONS_LOG_VERBOSITY, &verbosity); + + ssh_options_set(my_ssh_session, SSH_OPTIONS_TIMEOUT, &timeout); + if ( !sshConnect() ) { QString err=ssh_get_error ( my_ssh_session ); diff --git a/sshprocess.h b/sshprocess.h index 9d7a2b1..54e94b5 100644 --- a/sshprocess.h +++ b/sshprocess.h @@ -22,10 +22,13 @@ #ifndef SSHPROCESS_H #define SSHPROCESS_H -#include <netinet/in.h> #include <libssh/libssh.h> #include <QObject> +#ifndef Q_OS_WIN +#include <netinet/in.h> +#endif + class SshMasterConnection; diff --git a/version.h b/version.h index 00471b6..60acdf9 100644 --- a/version.h +++ b/version.h @@ -1 +1 @@ -#define VERSION "3.99.1.0" +#define VERSION "3.99.1.1" diff --git a/x2goclient.pro b/x2goclient.pro index 5c96688..16c5f06 100755 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -12,13 +12,14 @@ CONFIG += $$(X2GO_LINUX_STATIC) FORMS += cupsprintsettingsdialog.ui cupsprintwidget.ui printdialog.ui printercmddialog.ui printwidget.ui xsettingsui.ui brokerpassdialog.ui contest.ui -TRANSLATIONS += x2goclient_en.ts -TRANSLATIONS += x2goclient_de.ts -TRANSLATIONS += x2goclient_ru.ts -TRANSLATIONS += x2goclient_nb_no.ts -TRANSLATIONS += x2goclient_sv.ts -TRANSLATIONS += x2goclient_fr.ts -TRANSLATIONS += x2goclient_zh_tw.ts +TRANSLATIONS += x2goclient_en.ts \ + x2goclient_de.ts \ + x2goclient_ru.ts \ + x2goclient_nb_no.ts \ + x2goclient_sv.ts \ + x2goclient_fr.ts \ + x2goclient_zh_tw.ts + HEADERS += configdialog.h \ editconnectiondialog.h \ exportdialog.h \ @@ -31,78 +32,78 @@ HEADERS += configdialog.h \ sshprocess.h \ SVGFrame.h \ userbutton.h \ - x2goclientconfig.h \ - x2gologdebug.h \ - printprocess.h \ - cupsprint.h \ - cupsprintwidget.h \ - cupsprintersettingsdialog.h \ - printwidget.h \ - printercmddialog.h \ - printdialog.h \ - wapi.h \ - sessionwidget.h \ - configwidget.h \ - connectionwidget.h \ - settingswidget.h \ - sharewidget.h \ - clicklineedit.h \ - httpbrokerclient.h \ - ongetpass.h \ - onmainwindow_privat.h \ - x2gosettings.h \ - brokerpassdlg.h \ - contest.h \ - xsettingswidget.h + x2goclientconfig.h \ + x2gologdebug.h \ + printprocess.h \ + cupsprint.h \ + cupsprintwidget.h \ + cupsprintersettingsdialog.h \ + printwidget.h \ + printercmddialog.h \ + printdialog.h \ + wapi.h \ + sessionwidget.h \ + configwidget.h \ + connectionwidget.h \ + settingswidget.h \ + sharewidget.h \ + clicklineedit.h \ + httpbrokerclient.h \ + ongetpass.h \ + onmainwindow_privat.h \ + x2gosettings.h \ + brokerpassdlg.h \ + contest.h \ + xsettingswidget.h SOURCES += sharewidget.cpp \ - settingswidget.cpp\ - configwidget.cpp \ - sessionwidget.cpp \ - connectionwidget.cpp \ - configdialog.cpp \ - editconnectiondialog.cpp \ - exportdialog.cpp \ - imgframe.cpp \ - LDAPSession.cpp \ - onmainwindow.cpp \ - onmainwindow_part2.cpp \ - onmainwindow_part3.cpp \ - onmainwindow_part4.cpp \ - sessionbutton.cpp \ - sessionmanagedialog.cpp \ - sshmasterconnection.cpp \ - sshprocess.cpp \ - SVGFrame.cpp \ - userbutton.cpp \ - x2gologdebug.cpp \ - printprocess.cpp \ - cupsprint.cpp \ - cupsprintwidget.cpp \ - cupsprintersettingsdialog.cpp \ - printwidget.cpp \ - printercmddialog.cpp \ - printdialog.cpp \ - wapi.cpp \ - clicklineedit.cpp \ - httpbrokerclient.cpp \ - ongetpass.cpp \ - x2gosettings.cpp \ - brokerpassdlg.cpp \ - contest.cpp \ - xsettingswidget.cpp + settingswidget.cpp\ + configwidget.cpp \ + sessionwidget.cpp \ + connectionwidget.cpp \ + configdialog.cpp \ + editconnectiondialog.cpp \ + exportdialog.cpp \ + imgframe.cpp \ + LDAPSession.cpp \ + onmainwindow.cpp \ + onmainwindow_part2.cpp \ + onmainwindow_part3.cpp \ + onmainwindow_part4.cpp \ + sessionbutton.cpp \ + sessionmanagedialog.cpp \ + sshmasterconnection.cpp \ + sshprocess.cpp \ + SVGFrame.cpp \ + userbutton.cpp \ + x2gologdebug.cpp \ + printprocess.cpp \ + cupsprint.cpp \ + cupsprintwidget.cpp \ + cupsprintersettingsdialog.cpp \ + printwidget.cpp \ + printercmddialog.cpp \ + printdialog.cpp \ + wapi.cpp \ + clicklineedit.cpp \ + httpbrokerclient.cpp \ + ongetpass.cpp \ + x2gosettings.cpp \ + brokerpassdlg.cpp \ + contest.cpp \ + xsettingswidget.cpp LIBS += -lssh plugin { -TARGET = x2goplugin + TARGET = x2goplugin } else{ -RC_FILE = x2goclient.rc -SOURCES += x2goclient.cpp -TARGET = x2goclient -DEFINES += CFGCLIENT -message(if you want to build x2goplugin you should export X2GO_CLIENT_TARGET=plugin) + RC_FILE = x2goclient.rc + SOURCES += x2goclient.cpp + TARGET = x2goclient + DEFINES += CFGCLIENT + message(if you want to build x2goplugin you should export X2GO_CLIENT_TARGET=plugin) } TEMPLATE = app @@ -111,47 +112,49 @@ INCLUDEPATH += . RESOURCES += resources.rcc linux-g++ { - message(building $$TARGET with ldap and cups) - LIBS += -lldap -lcups -lX11 -lXpm + message(building $$TARGET with ldap and cups) + LIBS += -lldap -lcups -lX11 -lXpm } linux-g++-64 { - message(building $$TARGET with ldap and cups) - LIBS += -lldap -lcups -lX11 -lXpm + message(building $$TARGET with ldap and cups) + LIBS += -lldap -lcups -lX11 -lXpm } x2go_linux_static { - message (linking all libs statically) - LIBS -= -lssh - LIBS += -lssh_static -lssl -lXpm - QMAKE_LFLAGS = -Bstatic $$QMAKE_LFLAGS + message (linking all libs statically) + LIBS -= -lssh + LIBS += -lssh_static -lssl -lXpm + QMAKE_LFLAGS = -Bstatic $$QMAKE_LFLAGS } macx { - message(building $$TARGET with ldap and cups) - LIBS += -lldap -lcups + message(building $$TARGET with ldap and cups) + LIBS += -framework LDAP -lcups -lcrypto -lssl -lz + CONFIG += x86 x86_64 } win32-* { - message(building $$TARGET for windows without ldap and cups) - LIBS += -lwinspool -lws2_32 - CONFIG += static release + message(building $$TARGET for windows without ldap and cups) + LIBS += -lwinspool -lws2_32 + CONFIG += static release } QT += svg network ICON =icons/x2go-mac.icns -QMAKE_MAC_SDK =/Developer/SDKs/MacOSX10.6.sdk - +QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.5.sdk +QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 plugin{ -DEFINES += CFGPLUGIN - linux-g++ { - include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri) - } - linux-g++-64 { - include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri) - } - win32-* { - DEFINES += QT_NODLL - CONFIG += qaxserver - include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri) - } -RC_FILE = x2goplugin.rc + DEFINES += CFGPLUGIN + linux-g++ { + include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri) + } + linux-g++-64 { + include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri) + } + win32-* { + DEFINES += QT_NODLL + CONFIG += qaxserver + include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri) + } + RC_FILE = x2goplugin.rc + } diff --git a/x2goclient_de.ts b/x2goclient_de.ts index 09baf25..157a4f2 100644 --- a/x2goclient_de.ts +++ b/x2goclient_de.ts @@ -1415,8 +1415,8 @@ sound system connections through firewalls</source> </message> <message> <location filename="onmainwindow_part3.cpp" line="1522"/> - <source> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> - <translation> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> + <source> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> + <translation> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="1588"/> diff --git a/x2goclient_en.ts b/x2goclient_en.ts index ff3ab11..1dfa80c 100644 --- a/x2goclient_en.ts +++ b/x2goclient_en.ts @@ -1364,7 +1364,7 @@ Unsaved documents will be lost</source> </message> <message> <location filename="onmainwindow_part3.cpp" line="1522"/> - <source> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> + <source> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> <translation type="unfinished"></translation> </message> <message> diff --git a/x2goclient_fr.ts b/x2goclient_fr.ts index 02cf546..78387f4 100644 --- a/x2goclient_fr.ts +++ b/x2goclient_fr.ts @@ -1358,7 +1358,7 @@ Unsaved documents will be lost</source> </message> <message> <location filename="onmainwindow_part3.cpp" line="1522"/> - <source> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> + <source> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> <translation type="unfinished"></translation> </message> <message> diff --git a/x2goclient_nb_no.ts b/x2goclient_nb_no.ts index f541e95..d14dbcf 100644 --- a/x2goclient_nb_no.ts +++ b/x2goclient_nb_no.ts @@ -1057,8 +1057,8 @@ </message> <message> <location filename="onmainwindow_part3.cpp" line="1522"/> - <source> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> - <translation> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> + <source> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> + <translation> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="1588"/> diff --git a/x2goclient_ru.ts b/x2goclient_ru.ts index 3bc79f4..ba0ed9b 100644 --- a/x2goclient_ru.ts +++ b/x2goclient_ru.ts @@ -1604,8 +1604,8 @@ Public key hash: </source> </message> <message> <location filename="onmainwindow_part3.cpp" line="1522"/> - <source> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> - <translation> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> + <source> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> + <translation> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> </message> <message> <source>Can't read host rsa key:</source> diff --git a/x2goclient_sv.ts b/x2goclient_sv.ts index 94fcf10..32025c8 100644 --- a/x2goclient_sv.ts +++ b/x2goclient_sv.ts @@ -165,7 +165,7 @@ <message> <location filename="contest.cpp" line="150"/> <source>Socket operation timed out</source> - <translatorcomment>Hittade ingen bra översättning för socket</translatorcomment> + <translatorcomment>Couldn't find a good translation for socket</translatorcomment> <translation>Socketoperation överskred tidsgräns</translation> </message> <message> @@ -479,7 +479,7 @@ <message> <location filename="editconnectiondialog.cpp" line="109"/> <source>Session preferences - </source> - <translation>Sessionspreferenser - </translation> + <translation>Sessionsinställningar - </translation> </message> </context> <context> @@ -497,8 +497,7 @@ <message> <location filename="exportdialog.cpp" line="45"/> <source>&Preferences ...</source> - <translatorcomment>Kanske skulle "Egna inställningar" vara bättre.</translatorcomment> - <translation>&Preferenser...</translation> + <translation>&Inställningar...</translation> </message> <message> <location filename="exportdialog.cpp" line="46"/> @@ -527,13 +526,13 @@ <message> <location filename="httpbrokerclient.cpp" line="178"/> <source>us</source> - <translatorcomment>Språkkod för svenska i X.org</translatorcomment> + <translatorcomment>Swedish keyboard layout</translatorcomment> <translation>se</translation> </message> <message> <location filename="httpbrokerclient.cpp" line="181"/> <source>pc105/us</source> - <translatorcomment>Svenskt tangentbord</translatorcomment> + <translatorcomment>Swedish keyboard model</translatorcomment> <translation>pc105/se</translation> </message> <message> @@ -786,6 +785,7 @@ <message> <location filename="onmainwindow.cpp" line="673"/> <source>Session management...</source> + <translatorcomment>Added Alt shortcut, same letter as Ctrl shortcut (like &New session...)</translatorcomment> <translation>S&essionshantering...</translation> </message> <message> @@ -973,7 +973,7 @@ Använd dolt läge?</translation> <message> <location filename="onmainwindow.cpp" line="1905"/> <source>X2Go Link to session </source> - <translation>X2Go Länk till session</translation> + <translation>Länk till X2Go-session</translation> </message> <message> <location filename="onmainwindow.cpp" line="1955"/> @@ -1096,7 +1096,7 @@ Publik nyckel: </translation> <message> <location filename="onmainwindow_part2.cpp" line="417"/> <source>unknown</source> - <translation>okänd</translation> + <translation>okänt</translation> </message> <message> <location filename="onmainwindow_part2.cpp" line="482"/> @@ -1183,13 +1183,13 @@ Publik nyckel: </translation> <message> <location filename="onmainwindow_part2.cpp" line="1170"/> <source>24 or 32</source> - <translation>24- eller 32-</translation> + <translation>24 eller 32</translation> </message> <message> <location filename="onmainwindow_part2.cpp" line="1171"/> <location filename="onmainwindow_part2.cpp" line="1191"/> <source> bit and restart your X-server before you reconnect to this x2go-session. Resume this session anyway?</source> - <translation>bitar och startar om X-servern innan du återansluter till denna X2Go-session. Återanslut session ändå?</translation> + <translation> bitar och startar om X-servern innan du återansluter till denna X2Go-session. Återanslut session ändå?</translation> </message> <message> <location filename="onmainwindow_part2.cpp" line="1258"/> @@ -1381,8 +1381,8 @@ Data som ej sparats kommer att förloras</translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="1522"/> - <source> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> - <translation> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> + <source> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> + <translation> (&copy; 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </translation> </message> <message> <location filename="onmainwindow_part3.cpp" line="1526"/> @@ -1503,7 +1503,7 @@ Uppdatera till en nyare version av x2goserver</translation> <message> <location filename="onmainwindow_part4.cpp" line="1658"/> <source>Keyboard layout:</source> - <translatorcomment>Verkar vara vanligt förekommande "svengelskt" ord</translatorcomment> + <translatorcomment>Swenglish, but commonly used.</translatorcomment> <translation>Tangentbordslayout:</translation> </message> <message> @@ -1740,7 +1740,7 @@ du kan installera sshd med (Debian/Ubuntu) <message> <location filename="printwidget.cpp" line="53"/> <source>Please configure your client side printing settings. If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghost… and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a… can find further information <a href="http://www.x2go.org/index.php?id=49">here</a>.</source> - <translation>Konfigurera utskriftsinställningar för klienten. Om du vill skriva ut den skapade filen så behöver du en extern applikation. Du kan oftast använda <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghost… och<a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a… information finns <a href="http://www.x2go.org/index.php?id=49">här</a>.</translation> + <translation>Konfigurera utskriftsinställningar för klienten. Om du vill skriva ut den skapade filen så behöver du en extern applikation. Du kan oftast använda <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghost… och <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a… information finns <a href="http://www.x2go.org/index.php?id=49">här</a>.</translation> </message> </context> <context> @@ -1824,7 +1824,7 @@ Example: <message> <location filename="sessionbutton.cpp" line="116"/> <source>Session preferences...</source> - <translation>Sessionspreferenser...</translation> + <translation>Sessionsinställningar...</translation> </message> <message> <location filename="sessionbutton.cpp" line="120"/> @@ -1937,7 +1937,7 @@ Example: <message> <location filename="sessionmanagedialog.cpp" line="35"/> <source>E&xit</source> - <translation>&Avsluta</translation> + <translation>&Avbryt</translation> </message> <message> <location filename="sessionmanagedialog.cpp" line="41"/> @@ -1947,7 +1947,8 @@ Example: <message> <location filename="sessionmanagedialog.cpp" line="42"/> <source>&Session preferences</source> - <translation>&Sessionspreferenser</translation> + <translatorcomment>There are "..." on every other button so why not here ...</translatorcomment> + <translation>&Sessionsinställningar...</translation> </message> <message> <location filename="sessionmanagedialog.cpp" line="43"/> @@ -1981,7 +1982,7 @@ Example: <message> <location filename="sessionwidget.cpp" line="57"/> <source><< change icon</source> - <translation><< ändra ikon</translation> + <translation><< klicka för att ändra ikon</translation> </message> <message> <location filename="sessionwidget.cpp" line="60"/> @@ -2230,7 +2231,7 @@ Example: <location filename="settingswidget.cpp" line="178"/> <source>Use SSH port forwarding to tunnel sound system connections through firewalls</source> - <translatorcomment>Hittade ingen bra översättning för "port forwarding"</translatorcomment> + <translatorcomment>Couldn't find a good translation for port forwarding.</translatorcomment> <translation>Använd SSH port forwarding för att tunnla ljudström genom brandväggar</translation> </message> diff --git a/x2goclient_zh_tw.ts b/x2goclient_zh_tw.ts index 142418c..9525470 100644 --- a/x2goclient_zh_tw.ts +++ b/x2goclient_zh_tw.ts @@ -1372,7 +1372,7 @@ Unsaved documents will be lost</source> </message> <message> <location filename="onmainwindow_part3.cpp" line="1522"/> - <source> (C. 2006-2011 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> + <source> (C. 2006-2012 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) </source> <translation type="unfinished"></translation> </message> <message> diff --git a/x2goplugin.rc b/x2goplugin.rc index dde2abb..73ed229 100644 --- a/x2goplugin.rc +++ b/x2goplugin.rc @@ -1,8 +1,8 @@ 1 TYPELIB "x2goplugin.rc" 1 VERSIONINFO - FILEVERSION 3,99,1,0 - PRODUCTVERSION 3,99,1,0 + FILEVERSION 3,99,1,1 + PRODUCTVERSION 3,99,1,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -21,13 +21,13 @@ BEGIN VALUE "FileDescription", "Allows you to start X2Go session in a webbrowser\0" VALUE "FileExtents", "x2go\0" VALUE "FileOpenName", "Configuration File for X2Go Session (*.x2go)\0" - VALUE "FileVersion", "3, 99, 1 ,0\0" + VALUE "FileVersion", "3, 99, 1 ,1\0" VALUE "InternalName", "x2goplugin\0" VALUE "LegalCopyright", "Copyright � 2010-2012 Obviously Nice\0" VALUE "MIMEType", "application/x2go\0" VALUE "OriginalFilename", "npx2goplugin.dll\0" - VALUE "ProductName", "X2GoClient Plug-in 3.99.1.0\0" - VALUE "ProductVersion", "3, 99, 1, 0\0" + VALUE "ProductName", "X2GoClient Plug-in 3.99.1.1\0" + VALUE "ProductVersion", "3, 99, 1, 1\0" END END BLOCK "VarFileInfo" 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

x2goclient.git - master (branch) updated: 3.99.1.0-17-g188aa32
by git-admin＠x2go.org 07 Mar '12

07 Mar '12

The branch, master has been updated via 188aa3277110f48cdc58754b69a7b1c9a9e63cdc (commit) from e43d7eb9a0e8654bbfc6c6a667c30d2f48eaf7df (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 188aa3277110f48cdc58754b69a7b1c9a9e63cdc Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Mar 7 20:42:57 2012 +0100 release 3.99.1.1 ----------------------------------------------------------------------- Summary of changes: Makefile | 4 ++-- debian/changelog | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/Makefile b/Makefile index 5831516..30c12dc 100755 --- a/Makefile +++ b/Makefile @@ -28,12 +28,12 @@ all: build build: build_client build_plugin build_man build_client: - lrelease-qt4 x2goclient.pro + lrelease x2goclient.pro mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && qmake-qt4 ../x2goclient.pro cd $(CLIENT_DIR) && $(MAKE) build_plugin: - lrelease-qt4 x2goclient.pro + lrelease x2goclient.pro mkdir -p $(PLUGIN_DIR) && cd $(PLUGIN_DIR) && X2GO_CLIENT_TARGET=plugin qmake-qt4 ../x2goclient.pro cd $(PLUGIN_DIR) && $(MAKE) diff --git a/debian/changelog b/debian/changelog index a777c16..43f67dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2goclient (3.99.1.1-0~x2go1) UNRELEASED; urgency=low +x2goclient (3.99.1.1-0~x2go1) unstable; urgency=low [ Oleksandr Shneyder ] * New upstream version (3.99.1.1): @@ -32,7 +32,7 @@ x2goclient (3.99.1.1-0~x2go1) UNRELEASED; urgency=low * New upstream version (3.99.1.1): - Update/improve Swedish translation after testing x2goclient on Windows. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 Feb 2012 15:11:58 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Mar 2012 20:42:36 +0100 x2goclient (3.99.1.0-0~x2go1) unstable; urgency=low 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

python-x2go.git - master (branch) updated: 0.1.1.4-123-ga181afe
by git-admin＠x2go.org 06 Mar '12

06 Mar '12

The branch, master has been updated via a181afeb662be2a2c6fb39f8216b520041c57059 (commit) from b4189b0632564c023a3edc48a9db5c56c28b740e (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 a181afeb662be2a2c6fb39f8216b520041c57059 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Mar 6 12:36:00 2012 +0100 __doc__ string fixes ----------------------------------------------------------------------- Summary of changes: x2go/backends/control/_stdout.py | 6 +++--- x2go/utils.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 6353f69..9d59807 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -836,7 +836,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): C{False} else. @param session_name: X2Go name of the session to be queried - @type session_name: str + @type session_name: C{str} @return: X2Go session running? @rtype: C{bool} @@ -893,7 +893,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): corresponding session. @param session_name: X2Go name of the session to be suspended - @type session_name: str + @type session_name: C{str} @return: True if the session could be successfully suspended @rtype: C{bool} @@ -933,7 +933,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): corresponding session. @param session_name: X2Go name of the session to be terminated - @type session_name: str + @type session_name: C{str} @return: True if the session could be successfully terminate @rtype: C{bool} diff --git a/x2go/utils.py b/x2go/utils.py index 1a3361c..979e645 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -496,7 +496,7 @@ def set_session_window_title(session_window): Set title of session window. @param session_window: session window instance - @type session_name: C{obj} + @type session_window: C{obj} """ if _X2GOCLIENT_OS != 'Windows': @@ -509,7 +509,7 @@ def raise_session_window(session_window): Raise session window. @param session_window: session window instance - @type session_name: C{obj} + @type session_window: C{obj} """ pass \ No newline at end of file hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-122-gb4189b0
by git-admin＠x2go.org 06 Mar '12

06 Mar '12

The branch, master has been updated via b4189b0632564c023a3edc48a9db5c56c28b740e (commit) from 8cfeeadf4e47660f6f4123915c91a326eade3256 (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 b4189b0632564c023a3edc48a9db5c56c28b740e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Mar 6 12:30:30 2012 +0100 fix faking of WindowsError ----------------------------------------------------------------------- Summary of changes: x2go/mimeboxactions.py | 3 ++- x2go/printactions.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2go/mimeboxactions.py b/x2go/mimeboxactions.py index 319369f..20cb823 100644 --- a/x2go/mimeboxactions.py +++ b/x2go/mimeboxactions.py @@ -37,7 +37,8 @@ if _X2GOCLIENT_OS in ("Windows"): import win32api else: import gevent_subprocess as subprocess - import x2go_exceptions.WindowsError as WindowsError + import x2go_exceptions + WindowsErrror = x2go_exceptions.WindowsError # Python X2Go modules import log diff --git a/x2go/printactions.py b/x2go/printactions.py index 6dcf0cb..45504e9 100644 --- a/x2go/printactions.py +++ b/x2go/printactions.py @@ -42,7 +42,8 @@ if _X2GOCLIENT_OS in ("Windows"): import win32print else: import gevent_subprocess as subprocess - import x2go_exceptions.WindowsError as WindowsError + import x2go_exceptions + WindowsError = x2go_exceptions.WindowsError # Python X2Go modules import log hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

x2goclient.git - master (branch) updated: 3.99.1.0-16-ge43d7eb
by git-admin＠x2go.org 05 Mar '12

05 Mar '12

The branch, master has been updated via e43d7eb9a0e8654bbfc6c6a667c30d2f48eaf7df (commit) from f9f9efef4450485b53cf43100d1ad14ea8f96b16 (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 e43d7eb9a0e8654bbfc6c6a667c30d2f48eaf7df Author: Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Date: Mon Mar 5 10:24:12 2012 +0100 Fix comments in copyright headers. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + onmainwindow.cpp | 2 +- onmainwindow_part3.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d9bcfaf..a777c16 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ x2goclient (3.99.1.1-0~x2go1) UNRELEASED; urgency=low - improved support for use in TCE command line argument --thinclient - running without window manager command line argument --haltbt - button to shutdown the thin client + - Fix comments in copyright headers. [ Mike Gabriel ] * New upstream version (3.99.1.1): diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 904ab79..aa15ae6 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -1,4 +1,4 @@ -***************************************************************************/ +/************************************************************************** * Copyright (C) 2005-2012 by Oleksandr Shneyder * * oleksandr.shneyder(a)obviously-nice.de * * * diff --git a/onmainwindow_part3.cpp b/onmainwindow_part3.cpp index 363eecc..21434e2 100644 --- a/onmainwindow_part3.cpp +++ b/onmainwindow_part3.cpp @@ -1,4 +1,4 @@ -***************************************************************************/ +/************************************************************************** * Copyright (C) 2005-2012 by Oleksandr Shneyder * * oleksandr.shneyder(a)obviously-nice.de * * * 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

pyhoca-gui.git - master (branch) updated: 0.1.0.10-91-g87fd34c
by git-admin＠x2go.org 04 Mar '12

04 Mar '12

The branch, master has been updated via 87fd34c75e2764f3776a285d6422437684ff901f (commit) from 8af9e69cfc2ab18dd3c302363751d929e8c92ade (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 87fd34c75e2764f3776a285d6422437684ff901f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Mar 5 00:17:25 2012 +0100 Beautify MIME box configuration block in profile manager. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pyhoca/wxgui/profilemanager.py | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e2d147e..24dfea8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -50,6 +50,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low to the running PyHoca-GUI client. - Fix icon and button sizes in profile manager. - Use different textfield sizes for wxMSWin and wxGTK. + - Beautify MIME box configuration block in profile manager. * Depend on Python X2Go 0.1.2.0. * Install GNOME icons via dh_links. * Install X2Go icons with explicit install paths. diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 3ef65ab..3186d4c 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -429,8 +429,9 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.ClientEncoding.SetMinSize((140, self._textfield_height)) self.ServerEncoding.SetMinSize((140, self._textfield_height)) - self.FileMIMEboxExtensions.SetMinSize((140, self._textfield_height)) - self.FileMIMEboxAction.SetMinSize((180, self._textfield_height)) + self.FileMIMEboxAction.SetMinSize((-1, self._textfield_height)) + _field_width = self.FileMIMEboxAction.GetBestSize().GetWidth() + self.FileMIMEboxExtensions.SetMinSize((_field_width, self._textfield_height)) self.OKButton.SetMinSize((-1, 30)) self.CancelButton.SetMinSize((-1, 30)) @@ -657,7 +658,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): sizer_5_1_1_2_2 = wx.BoxSizer(wx.HORIZONTAL) sizer_5_1_1_2_3 = wx.BoxSizer(wx.HORIZONTAL) sizer_5_1_1_2_3.Add(self.AddSharedFolderPathButton, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_5_1_1_2_3.Add(self.DeleteSharedFolderPathButton, flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_5_1_1_2_3.Add(self.DeleteSharedFolderPathButton, flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=2) sizer_5_1_1_2.Add(sizer_5_1_1_2_1, flag=wx.EXPAND|wx.ALIGN_LEFT) sizer_5_1_1_2.Add(sizer_5_1_1_2_2, proportion=1, flag=wx.EXPAND|wx.ALIGN_LEFT) sizer_5_1_1_2.Add(sizer_5_1_1_2_3, flag=wx.EXPAND|wx.ALIGN_RIGHT) @@ -686,14 +687,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog): sizer_5_2_1 = wx.BoxSizer(wx.VERTICAL) sizer_5_2_1_1 = wx.BoxSizer(wx.HORIZONTAL) sizer_5_2_1_1.Add(self.UseFileMIMEbox, flag=wx.BOTTOM, border=5) - sizer_5_2_1_2 = wx.BoxSizer(wx.HORIZONTAL) - sizer_5_2_1_2.Add(self.FileMIMEboxExtensionsLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_5_2_1_2.Add((8,0)) - sizer_5_2_1_2.Add(self.FileMIMEboxExtensions) - sizer_5_2_1_2.Add((16,0)) - sizer_5_2_1_2.Add(self.FileMIMEboxActionLabel, flag=wx.ALIGN_CENTRE_VERTICAL) - sizer_5_2_1_2.Add((8,0)) - sizer_5_2_1_2.Add(self.FileMIMEboxAction) + sizer_5_2_1_2 = wx.GridBagSizer(vgap=2, hgap=3) + sizer_5_2_1_2.Add(self.FileMIMEboxActionLabel, pos=(0,0), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_5_2_1_2.Add(self.FileMIMEboxAction, pos=(0,2)) + sizer_5_2_1_2.Add((8,0), pos=(0,1)) + sizer_5_2_1_2.Add((8,0), pos=(1,1)) + sizer_5_2_1_2.Add(self.FileMIMEboxExtensionsLabel, pos=(1,0), flag=wx.ALIGN_CENTRE_VERTICAL) + sizer_5_2_1_2.Add(self.FileMIMEboxExtensions, pos=(1,2)) sizer_5_2_1.Add(sizer_5_2_1_1, flag=wx.EXPAND) sizer_5_2_1.Add(sizer_5_2_1_2, flag=wx.EXPAND) sizer_5_2.Add(sizer_5_2_1, flag=wx.EXPAND|wx.ALL, border=7) hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits