x2go-commits

x2go-commits@lists.x2go.org

1 participants
37903 discussions

nxcomp.git - backport-lenny (branch) updated: 3.4.0.8-14-g5911145
by git-admin＠x2go.org 17 Jul '11

17 Jul '11

The branch, backport-lenny has been updated via 591114534f18b6f2feba64e13a3c1b4f299bc183 (commit) from 56b5ac06630ad2b615f7a4c9b8760099e4ded161 (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 591114534f18b6f2feba64e13a3c1b4f299bc183 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jul 17 21:14:07 2011 +0200 Breaks/replaces nxcomp package ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- debian/control | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2868683..15c3af5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ nxcomp (3.5.0-1-0~x2go-bpo2) UNRELEASED; urgency=low * Debian lenny backport. - * conflict with nxcomp package + * Breaks/replaces nxcomp package -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 04 Jul 2011 15:35:13 +0200 diff --git a/debian/control b/debian/control index 1c24385..1e6bc1a 100644 --- a/debian/control +++ b/debian/control @@ -22,8 +22,8 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: - nxcomp +Breaks: nxcomp +Replaces: nxcomp Description: NX X compression library NX provides a differential X compression library for X11. . @@ -35,8 +35,8 @@ Architecture: any Depends: libxcomp3 (= ${binary:Version}), ${misc:Depends} -Conflicts: - nxcomp-dev +Breaks: nxcomp-dev +Replaces: nxcomp-dev Description: NX X compression library-headers NX provides a differential X compression library for X11. . hooks/post-receive -- nxcomp.git (NX comp library) 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 "nxcomp.git" (NX comp library).

1 0

nxcomp.git - master (branch) updated: 3.4.0.8-8-gc9af53b
by git-admin＠x2go.org 17 Jul '11

17 Jul '11

The branch, master has been updated via c9af53b1a2373baf71282e65ba260171d2a22687 (commit) from de5e4c62a278547a610a0ab58aa4d2b76753271b (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 c9af53b1a2373baf71282e65ba260171d2a22687 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jul 17 21:12:46 2011 +0200 Breaks/replaces nxcomp package. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- debian/control | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 53e150a..bc6aedc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,7 @@ nxcomp (3.5.0-1-0~x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] * User mkinstalldirs to create install paths. * Don't let Makefile run fail if ldconfig fails. - * Conflict with nxcomp package. + * Breaks/replaces nxcomp package. -- Reinhard Tartler <siretart(a)tauware.de> Wed, 29 Jun 2011 15:41:10 +0200 diff --git a/debian/control b/debian/control index c5ec5e3..4cefc39 100644 --- a/debian/control +++ b/debian/control @@ -23,8 +23,8 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: - nxcomp +Breaks: nxcomp +Replaces: nxcomp Description: NX X compression library NX provides a differential X compression library for X11. . @@ -34,10 +34,10 @@ Package: libxcomp-dev Section: libdevel Architecture: any Depends: - libxcomp3 (= ${binary:Version}), + libxcoBmp3 (= ${binary:Version}), ${misc:Depends} -Conflicts: - nxcomp-dev +Breaks: nxcomp-dev +Replaces: nxcomp-dev Description: NX X compression library-headers NX provides a differential X compression library for X11. . hooks/post-receive -- nxcomp.git (NX comp library) 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 "nxcomp.git" (NX comp library).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-85-g9628cb5
by git-admin＠x2go.org 14 Jul '11

14 Jul '11

The branch, master has been updated via 9628cb541a6618e1ad96c8a49411028133e4b1cb (commit) via b64868c5c11843ee44b12fd6cc171946e63bca88 (commit) via 3223f23c40474d8a5062274c9b54beca6a336850 (commit) via 82c6545adef362a9d759b5ddf41473af052156c7 (commit) via a694aaca92f9f8c6cbc81d200b09beb48b06b79d (commit) via 04fc757c55d1e6a3f95b1e1058865569033d4bfb (commit) via 1f1ea43f2bfbfce51bf153b512db1f38d377cd6c (commit) via 5c60ad18f7db28c0e397c0f74715eedc1ae1cbf4 (commit) from ac7854d8ba9599f09a3861365a7b504c1e97a954 (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 9628cb541a6618e1ad96c8a49411028133e4b1cb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 14 14:07:37 2011 +0200 Provide C wrapper for setuid call of x2gosqlitewrapper.pl. Remove dependency from perlsuid. ----------------------------------------------------------------------- Summary of changes: Makefile | 4 ++ debian/changelog | 2 + debian/control | 6 +- debian/rules | 1 + debian/x2goserver.install | 6 ++- debian/x2goserver.postinst | 8 +++- .../html/man8/x2gosetkeyboard.8.html | 2 +- .../.build_man2html/html/man8/x2goversion.8.html | 2 +- x2goserver-extensions/Makefile | 2 + .../html/man8/x2gocleansessions.8.html | 2 +- .../html/man8/x2gocmdexitmessage.8.html | 2 +- .../html/man8/x2golistdesktops.8.html | 2 +- .../html/man8/x2golistsessions.8.html | 2 +- .../.build_man2html/html/man8/x2gomountdirs.8.html | 2 +- .../.build_man2html/html/man8/x2goprint.8.html | 2 +- .../html/man8/x2goresume-session.8.html | 2 +- .../html/man8/x2goruncommand.8.html | 2 +- .../html/man8/x2goshowblocks.8.html | 2 +- .../html/man8/x2gostartagent.8.html | 2 +- .../html/man8/x2gosuspend-session.8.html | 2 +- .../html/man8/x2goterminate-session.8.html | 2 +- .../html/man8/x2goumount-session.8.html | 2 +- x2goserver/Makefile | 8 +++- x2goserver/lib/x2godbwrapper.pm | 2 +- .../{x2gosqlitewrapper => x2gosqlitewrapper.pl} | 13 ++++-- x2goserver/x2gosqlitewrapper.c | 45 ++++++++++++++++++++ 26 files changed, 100 insertions(+), 27 deletions(-) rename x2goserver/lib/{x2gosqlitewrapper => x2gosqlitewrapper.pl} (97%) create mode 100644 x2goserver/x2gosqlitewrapper.c The diff of changes is: diff --git a/Makefile b/Makefile index 444112f..eee6d3d 100755 --- a/Makefile +++ b/Makefile @@ -8,6 +8,10 @@ clean: cd x2goserver && make $@ cd x2goserver-extensions && make $@ +build-arch: + cd x2goserver && make $@ + cd x2goserver-extensions && make $@ + build-indep: cd x2goserver && make $@ cd x2goserver-extensions && make $@ diff --git a/debian/changelog b/debian/changelog index df33435..f5b8dd6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low * Tab'ified all script files, proper indentation, coding style. * Fix for x2gomountdirs, now also usernames containing blanks can use local folder sharing. + * Provide C wrapper for setuid call of x2gosqlitewrapper.pl. Remove dependency + from perlsuid. [Martin Oehler] * Removes old debug code fragment, fixes x2golistsessions parsing. diff --git a/debian/control b/debian/control index 8fcc957..3919e2a 100644 --- a/debian/control +++ b/debian/control @@ -13,11 +13,11 @@ Vcs-Git: git://code.x2go.org/x2goserver.git Vcs-Browser: http://code.x2go.org/gitweb?p=x2goserver.git;a=summary Package: x2goserver -Architecture: all +Architecture: any Depends: + ${shlibs:Depends}, ${misc:Depends}, x2goagent, - perl-suid, lsof, openssh-client, openssh-server, @@ -65,7 +65,7 @@ Package: x2goserver-extensions Architecture: all Depends: ${misc:Depends}, - x2goserver (= ${source:Version}), + x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~), x11-xkb-utils Description: X2go server daemon scripts (extensions) X2go is a serverbased computing environment with diff --git a/debian/rules b/debian/rules index c34429d..a5143a5 100755 --- a/debian/rules +++ b/debian/rules @@ -4,3 +4,4 @@ dh $@ override_dh_auto_install: + make -f Makefile build-arch \ No newline at end of file diff --git a/debian/x2goserver.install b/debian/x2goserver.install index acfb3b8..33c7f5a 100644 --- a/debian/x2goserver.install +++ b/debian/x2goserver.install @@ -3,10 +3,13 @@ x2goserver/sbin/x2go* /usr/sbin/ x2goserver/etc/x2gosql/sql /etc/x2go/x2gosql/ x2goserver/etc/x2goserver.conf /etc/x2go/ x2goserver/lib/x2godbwrapper.pm /usr/lib/x2go/ +x2goserver/lib/x2gosqlitewrapper.pl /usr/lib/x2go/ x2goserver/VERSION.x2goserver /usr/share/x2go/versions/ +x2goserver/x2gosqlitewrapper /usr/bin # the following executables should go to /usr/lib/x2go x2goserver/lib/x2gochangestatus /usr/bin x2goserver/lib/x2gocreatesession /usr/bin +x2goserver/lib/x2goresume /usr/bin x2goserver/lib/x2gogetagent /usr/bin x2goserver/lib/x2gogetdisplays /usr/bin x2goserver/lib/x2gogetports /usr/bin @@ -14,8 +17,7 @@ x2goserver/lib/x2gogetservers /usr/bin x2goserver/lib/x2goinsertport /usr/bin x2goserver/lib/x2goinsertsession /usr/bin x2goserver/lib/x2gosessionlimit /usr/bin -x2goserver/lib/x2gosqlitewrapper /usr/bin x2goserver/lib/x2golistsessions_sql /usr/bin x2goserver/lib/x2golistsessions_root /usr/bin # compatibility -x2goserver/bin/compat/x2go* /usr/bin +x2goserver/compat/bin/x2go* /usr/bin diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index 4e75de8..bed72b7 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -44,7 +44,13 @@ case "$1" in x2godbadmin --createdb fi - dpkg-statoverride --add --update x2gouser x2gousers 6755 /usr/bin/x2gosqlitewrapper || true + # the sqlite db has to be accessed as uid x2gouser + dpkg-statoverride --add --update x2gouser x2gousers 6755 /usr/lib/x2go/x2gosqlitewrapper.pl || true + + # we may be upgrading versions of x2goserver that used perlsuid, so make sure setuid is removed + # from /usr/bin/x2gosqlitewrapper + dpkg-statoverride --remove /usr/bin/x2gosqlitewrapper && chown root:root /usr/bin/x2gosqlitewrapper && chmod 0755 /usr/bin/x2gosqlitewrapper || true + ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html b/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html index b533a4f..d787004 100644 --- a/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html +++ b/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html @@ -56,6 +56,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html b/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html index 453e0a5..eeae817 100644 --- a/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html +++ b/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html @@ -64,6 +64,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile index d95bc71..ae6b3c1 100755 --- a/x2goserver-extensions/Makefile +++ b/x2goserver-extensions/Makefile @@ -35,6 +35,8 @@ build: build-indep build-indep: build_man2html +build-arch: + build_man2html: mkdir -p $(MAN2HTML_DEST) for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done diff --git a/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html b/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html index 08725c0..e25e5d8 100644 --- a/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html +++ b/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html b/x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html index eac9b6d..c7cab5d 100644 --- a/x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html +++ b/x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html b/x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html index fe856a4..843c9a0 100644 --- a/x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html +++ b/x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html b/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html index bce89d4..5f938d9 100644 --- a/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html +++ b/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html b/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html index d4e6bf7..e187787 100644 --- a/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html +++ b/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goprint.8.html b/x2goserver/.build_man2html/html/man8/x2goprint.8.html index 501439b..fe9e175 100644 --- a/x2goserver/.build_man2html/html/man8/x2goprint.8.html +++ b/x2goserver/.build_man2html/html/man8/x2goprint.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html b/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html index 16b27b9..a6f792d 100644 --- a/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html +++ b/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html b/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html index a8b934e..4c2720d 100644 --- a/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html +++ b/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html b/x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html index a8b934e..4c2720d 100644 --- a/x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html +++ b/x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html b/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html index 9f7ce24..45fb4f5 100644 --- a/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html +++ b/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html @@ -60,6 +60,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html b/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html index 5a8eeb9..2fe037d 100644 --- a/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html +++ b/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html b/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html index 9010bfd..ef27d29 100644 --- a/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html +++ b/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html b/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html index f39b688..68f48b9 100644 --- a/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html +++ b/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/Makefile b/x2goserver/Makefile index 765f17f..a4fec0f 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -31,7 +31,12 @@ MAN2HTML_DEST = .build_man2html/html all: clean build -build: build-indep +build: build-arch build-indep + +build-arch: build_setuidwrapper + +build_setuidwrapper: + gcc -o x2gosqlitewrapper x2gosqlitewrapper.c build-indep: build_man2html @@ -52,6 +57,7 @@ install_scripts: $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ + $(INSTALL_PROGRAM) compat/bin/* $(DESTDIR)$(BINDIR)/ $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/ $(INSTALL_FILE) lib/* $(DESTDIR)$(LIBDIR)/ diff --git a/x2goserver/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm index b30185b..044faac 100644 --- a/x2goserver/lib/x2godbwrapper.pm +++ b/x2goserver/lib/x2godbwrapper.pm @@ -138,7 +138,7 @@ sub dbsys_listsessionsroot_all if ($backend eq 'postgres') { my @strings; - my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $; + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, to_char(init_time,'DD.MM.YY*HH24:MI:SS'),cookie,client,gr_port, sound_port,to_char(last_time,'DD.MM.YY*HH24:MI:SS'),uname, diff --git a/x2goserver/lib/x2gosqlitewrapper b/x2goserver/lib/x2gosqlitewrapper.pl similarity index 97% rename from x2goserver/lib/x2gosqlitewrapper rename to x2goserver/lib/x2gosqlitewrapper.pl index 9cbf663..a566fc1 100755 --- a/x2goserver/lib/x2gosqlitewrapper +++ b/x2goserver/lib/x2gosqlitewrapper.pl @@ -25,10 +25,15 @@ use strict; use DBI; use POSIX; -if ($< eq $>) -{ - die "Please install this program as SUID x2gouser!\n"; -} +### +### We are not using perlsuid anymore as it is deprecated as of Perl 5.12. +### Instead we ship our own setuidwrapper... +### + +#if ($< eq $>) +#{ +# die "Please install this program as SUID x2gouser!\n"; +#} my $realuser=$<; my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid($>); diff --git a/x2goserver/x2gosqlitewrapper.c b/x2goserver/x2gosqlitewrapper.c new file mode 100644 index 0000000..b702aa7 --- /dev/null +++ b/x2goserver/x2gosqlitewrapper.c @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org + * + * 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. + * + * Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> + * Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> + */ + +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <libgen.h> + +int main( int argc, char *argv[] ) { + + char buffer[BUFSIZ]; + char * x2gosqlitewrapper = NULL; + + // resolve link of /proc/self/exe + readlink("/proc/self/exe", buffer, BUFSIZ); + + // derive the full path of x2gosqlitewrapper.pl from path of this binary + asprintf(&x2gosqlitewrapper, "%s/%s", dirname(dirname(buffer)), "lib/x2go/x2gosqlitewrapper.pl"); + + // execute the script, taking setuid bit into consideration if set... + execv(x2gosqlitewrapper, argv); + + // fake a successful return value + return 0; + +} hooks/post-receive -- x2goserver.git (X2go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2go Server).

1 0

x2goserver.git - setuidwrapper (branch) updated: 3.0.99-2-84-gb64868c
by git-admin＠x2go.org 14 Jul '11

14 Jul '11

The branch, setuidwrapper has been updated via b64868c5c11843ee44b12fd6cc171946e63bca88 (commit) via 3223f23c40474d8a5062274c9b54beca6a336850 (commit) via 82c6545adef362a9d759b5ddf41473af052156c7 (commit) from a694aaca92f9f8c6cbc81d200b09beb48b06b79d (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 b64868c5c11843ee44b12fd6cc171946e63bca88 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 14 14:04:50 2011 +0200 let package build with setuidwrapper commit 3223f23c40474d8a5062274c9b54beca6a336850 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 14 14:04:02 2011 +0200 fix for typo that stem from indentation cleanup commit 82c6545adef362a9d759b5ddf41473af052156c7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 14 14:03:40 2011 +0200 disabled perlsuid check... ----------------------------------------------------------------------- Summary of changes: Makefile | 4 ++++ debian/rules | 1 + debian/x2goserver.postinst | 6 ++++++ x2goserver-extensions/Makefile | 2 ++ x2goserver/lib/x2godbwrapper.pm | 2 +- x2goserver/lib/x2gosqlitewrapper.pl | 13 +++++++++---- 6 files changed, 23 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/Makefile b/Makefile index 444112f..eee6d3d 100755 --- a/Makefile +++ b/Makefile @@ -8,6 +8,10 @@ clean: cd x2goserver && make $@ cd x2goserver-extensions && make $@ +build-arch: + cd x2goserver && make $@ + cd x2goserver-extensions && make $@ + build-indep: cd x2goserver && make $@ cd x2goserver-extensions && make $@ diff --git a/debian/rules b/debian/rules index c34429d..a5143a5 100755 --- a/debian/rules +++ b/debian/rules @@ -4,3 +4,4 @@ dh $@ override_dh_auto_install: + make -f Makefile build-arch \ No newline at end of file diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index 760e1fa..bed72b7 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -44,7 +44,13 @@ case "$1" in x2godbadmin --createdb fi + # the sqlite db has to be accessed as uid x2gouser dpkg-statoverride --add --update x2gouser x2gousers 6755 /usr/lib/x2go/x2gosqlitewrapper.pl || true + + # we may be upgrading versions of x2goserver that used perlsuid, so make sure setuid is removed + # from /usr/bin/x2gosqlitewrapper + dpkg-statoverride --remove /usr/bin/x2gosqlitewrapper && chown root:root /usr/bin/x2gosqlitewrapper && chmod 0755 /usr/bin/x2gosqlitewrapper || true + ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile index d95bc71..ae6b3c1 100755 --- a/x2goserver-extensions/Makefile +++ b/x2goserver-extensions/Makefile @@ -35,6 +35,8 @@ build: build-indep build-indep: build_man2html +build-arch: + build_man2html: mkdir -p $(MAN2HTML_DEST) for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done diff --git a/x2goserver/lib/x2godbwrapper.pm b/x2goserver/lib/x2godbwrapper.pm index b30185b..044faac 100644 --- a/x2goserver/lib/x2godbwrapper.pm +++ b/x2goserver/lib/x2godbwrapper.pm @@ -138,7 +138,7 @@ sub dbsys_listsessionsroot_all if ($backend eq 'postgres') { my @strings; - my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $; + my $dbh=DBI->connect("dbi:Pg:dbname=$db;host=$host;port=$port;sslmode=$sslmode", "$dbuser", "$dbpass",{AutoCommit => 1}) or die $_; my $sth=$dbh->prepare("select agent_pid, session_id, display, server, status, to_char(init_time,'DD.MM.YY*HH24:MI:SS'),cookie,client,gr_port, sound_port,to_char(last_time,'DD.MM.YY*HH24:MI:SS'),uname, diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl index 9cbf663..a566fc1 100755 --- a/x2goserver/lib/x2gosqlitewrapper.pl +++ b/x2goserver/lib/x2gosqlitewrapper.pl @@ -25,10 +25,15 @@ use strict; use DBI; use POSIX; -if ($< eq $>) -{ - die "Please install this program as SUID x2gouser!\n"; -} +### +### We are not using perlsuid anymore as it is deprecated as of Perl 5.12. +### Instead we ship our own setuidwrapper... +### + +#if ($< eq $>) +#{ +# die "Please install this program as SUID x2gouser!\n"; +#} my $realuser=$<; my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid($>); hooks/post-receive -- x2goserver.git (X2go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2go Server).

1 0

x2goserver.git - setuidwrapper (branch) updated: 3.0.99-2-81-ga694aac
by git-admin＠x2go.org 14 Jul '11

14 Jul '11

The branch, setuidwrapper has been updated via a694aaca92f9f8c6cbc81d200b09beb48b06b79d (commit) via 04fc757c55d1e6a3f95b1e1058865569033d4bfb (commit) via 1f1ea43f2bfbfce51bf153b512db1f38d377cd6c (commit) from 5c60ad18f7db28c0e397c0f74715eedc1ae1cbf4 (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 a694aaca92f9f8c6cbc81d200b09beb48b06b79d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 14 14:03:00 2011 +0200 fix setuidwrapper script (accept options as x2gosqlitewrapper.pl does) commit 04fc757c55d1e6a3f95b1e1058865569033d4bfb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 14 14:02:29 2011 +0200 rebuilt html man pages commit 1f1ea43f2bfbfce51bf153b512db1f38d377cd6c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 14 14:00:17 2011 +0200 Fixup for Conflicts stanza, make x2goserver-extensions binNMUable again. ----------------------------------------------------------------------- Summary of changes: debian/control | 6 +++--- .../html/man8/x2gosetkeyboard.8.html | 2 +- .../.build_man2html/html/man8/x2goversion.8.html | 2 +- .../html/man8/x2gocleansessions.8.html | 2 +- .../html/man8/x2gocmdexitmessage.8.html | 2 +- .../html/man8/x2golistdesktops.8.html | 2 +- .../html/man8/x2golistsessions.8.html | 2 +- .../.build_man2html/html/man8/x2gomountdirs.8.html | 2 +- .../.build_man2html/html/man8/x2goprint.8.html | 2 +- .../html/man8/x2goresume-session.8.html | 2 +- .../html/man8/x2goruncommand.8.html | 2 +- .../html/man8/x2goshowblocks.8.html | 2 +- .../html/man8/x2gostartagent.8.html | 2 +- .../html/man8/x2gosuspend-session.8.html | 2 +- .../html/man8/x2goterminate-session.8.html | 2 +- .../html/man8/x2goumount-session.8.html | 2 +- x2goserver/x2gosqlitewrapper.c | 6 ++++-- 17 files changed, 22 insertions(+), 20 deletions(-) The diff of changes is: diff --git a/debian/control b/debian/control index ceb7be3..3919e2a 100644 --- a/debian/control +++ b/debian/control @@ -15,9 +15,9 @@ Vcs-Browser: http://code.x2go.org/gitweb?p=x2goserver.git;a=summary Package: x2goserver Architecture: any Depends: + ${shlibs:Depends}, ${misc:Depends}, x2goagent, - perl-suid, lsof, openssh-client, openssh-server, @@ -37,7 +37,7 @@ Recommends: x11-xserver-utils, xinit, x2goserver-extensions (= ${source:Version}) -ConflictsB: +Conflicts: x2goserver-one, x2goserver-home, x2goprint @@ -65,7 +65,7 @@ Package: x2goserver-extensions Architecture: all Depends: ${misc:Depends}, - x2goserver (= ${source:Version}), + x2goserver (>= ${source:Version}), x2goserver (<< ${source:Version}.1~), x11-xkb-utils Description: X2go server daemon scripts (extensions) X2go is a serverbased computing environment with diff --git a/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html b/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html index b533a4f..d787004 100644 --- a/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html +++ b/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html @@ -56,6 +56,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html b/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html index 453e0a5..eeae817 100644 --- a/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html +++ b/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html @@ -64,6 +64,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html b/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html index 08725c0..e25e5d8 100644 --- a/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html +++ b/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html b/x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html index eac9b6d..c7cab5d 100644 --- a/x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html +++ b/x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html b/x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html index fe856a4..843c9a0 100644 --- a/x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html +++ b/x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html b/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html index bce89d4..5f938d9 100644 --- a/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html +++ b/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html b/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html index d4e6bf7..e187787 100644 --- a/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html +++ b/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goprint.8.html b/x2goserver/.build_man2html/html/man8/x2goprint.8.html index 501439b..fe9e175 100644 --- a/x2goserver/.build_man2html/html/man8/x2goprint.8.html +++ b/x2goserver/.build_man2html/html/man8/x2goprint.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html b/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html index 16b27b9..a6f792d 100644 --- a/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html +++ b/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html b/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html index a8b934e..4c2720d 100644 --- a/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html +++ b/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html b/x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html index a8b934e..4c2720d 100644 --- a/x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html +++ b/x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html b/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html index 9f7ce24..45fb4f5 100644 --- a/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html +++ b/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html @@ -60,6 +60,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html b/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html index 5a8eeb9..2fe037d 100644 --- a/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html +++ b/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html b/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html index 9010bfd..ef27d29 100644 --- a/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html +++ b/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html b/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html index f39b688..68f48b9 100644 --- a/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html +++ b/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html @@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel@da This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages. -Time: 07:17:02 GMT, July 13, 2011 +Time: 11:58:19 GMT, July 14, 2011 </BODY> </HTML> diff --git a/x2goserver/x2gosqlitewrapper.c b/x2goserver/x2gosqlitewrapper.c index b23037b..b702aa7 100644 --- a/x2goserver/x2gosqlitewrapper.c +++ b/x2goserver/x2gosqlitewrapper.c @@ -25,7 +25,8 @@ #include <unistd.h> #include <libgen.h> -int main() { +int main( int argc, char *argv[] ) { + char buffer[BUFSIZ]; char * x2gosqlitewrapper = NULL; @@ -36,8 +37,9 @@ int main() { asprintf(&x2gosqlitewrapper, "%s/%s", dirname(dirname(buffer)), "lib/x2go/x2gosqlitewrapper.pl"); // execute the script, taking setuid bit into consideration if set... - execl(x2gosqlitewrapper, ""); + execv(x2gosqlitewrapper, argv); // fake a successful return value return 0; + } hooks/post-receive -- x2goserver.git (X2go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2go Server).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-77-gac7854d
by git-admin＠x2go.org 14 Jul '11

14 Jul '11

The branch, master has been updated via ac7854d8ba9599f09a3861365a7b504c1e97a954 (commit) via 46939a7413d12c1761f8e2cfc40896f8d10c1c49 (commit) from a73fc6308c8f9985698d3e9e5ddb76256469f81d (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: x2goserver/bin/compat/x2goumount_session | 1 - .../{lib/x2gogetservers => compat/bin/x2gosuspend} | 10 +++------- .../{bin/compat => compat/bin}/x2gosuspend-agent | 0 .../{bin/compat => compat/bin}/x2goterminate | 0 x2goserver/{bin/compat => compat/bin}/x2goumount | 0 .../bin/x2goumount_session} | 10 +++------- x2goserver/{bin/compat => lib}/x2goresume | 0 7 files changed, 6 insertions(+), 15 deletions(-) delete mode 120000 x2goserver/bin/compat/x2goumount_session copy x2goserver/{lib/x2gogetservers => compat/bin/x2gosuspend} (89%) rename x2goserver/{bin/compat => compat/bin}/x2gosuspend-agent (100%) rename x2goserver/{bin/compat => compat/bin}/x2goterminate (100%) rename x2goserver/{bin/compat => compat/bin}/x2goumount (100%) copy x2goserver/{lib/x2gogetservers => compat/bin/x2goumount_session} (89%) rename x2goserver/{bin/compat => lib}/x2goresume (100%) The diff of changes is: diff --git a/x2goserver/bin/compat/x2goumount_session b/x2goserver/bin/compat/x2goumount_session deleted file mode 120000 index b33a4dc..0000000 --- a/x2goserver/bin/compat/x2goumount_session +++ /dev/null @@ -1 +0,0 @@ -x2goumount-session \ No newline at end of file diff --git a/x2goserver/lib/x2gogetservers b/x2goserver/compat/bin/x2gosuspend similarity index 89% copy from x2goserver/lib/x2gogetservers copy to x2goserver/compat/bin/x2gosuspend index 38aa496..4ddd3df 100755 --- a/x2goserver/lib/x2gogetservers +++ b/x2goserver/compat/bin/x2gosuspend @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/bin/bash # Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org # @@ -20,9 +20,5 @@ # Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -use strict; - -use lib "/usr/lib/x2go"; -use x2godbwrapper; - -print join("\n", db_getservers); +# this script is here for reasons of backwards compatibility with older clients +x2gosuspend-session $@ \ No newline at end of file diff --git a/x2goserver/bin/compat/x2gosuspend-agent b/x2goserver/compat/bin/x2gosuspend-agent similarity index 100% rename from x2goserver/bin/compat/x2gosuspend-agent rename to x2goserver/compat/bin/x2gosuspend-agent diff --git a/x2goserver/bin/compat/x2goterminate b/x2goserver/compat/bin/x2goterminate similarity index 100% rename from x2goserver/bin/compat/x2goterminate rename to x2goserver/compat/bin/x2goterminate diff --git a/x2goserver/bin/compat/x2goumount b/x2goserver/compat/bin/x2goumount similarity index 100% rename from x2goserver/bin/compat/x2goumount rename to x2goserver/compat/bin/x2goumount diff --git a/x2goserver/lib/x2gogetservers b/x2goserver/compat/bin/x2goumount_session similarity index 89% copy from x2goserver/lib/x2gogetservers copy to x2goserver/compat/bin/x2goumount_session index 38aa496..5814b34 100755 --- a/x2goserver/lib/x2gogetservers +++ b/x2goserver/compat/bin/x2goumount_session @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/bin/bash # Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org # @@ -20,9 +20,5 @@ # Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -use strict; - -use lib "/usr/lib/x2go"; -use x2godbwrapper; - -print join("\n", db_getservers); +# this script is here for reasons of backwards compatibility with older clients +x2goumount-session $@ \ No newline at end of file diff --git a/x2goserver/bin/compat/x2goresume b/x2goserver/lib/x2goresume similarity index 100% rename from x2goserver/bin/compat/x2goresume rename to x2goserver/lib/x2goresume hooks/post-receive -- x2goserver.git (X2go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2go Server).

1 0

x2goserver.git - setuidwrapper (branch) created: 3.0.99-2-78-g5c60ad1
by git-admin＠x2go.org 14 Jul '11

14 Jul '11

The branch, setuidwrapper has been created at 5c60ad18f7db28c0e397c0f74715eedc1ae1cbf4 (commit) - Log ----------------------------------------------------------------- commit 5c60ad18f7db28c0e397c0f74715eedc1ae1cbf4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 14 13:00:01 2011 +0200 Add setuidwrapper to x2goserver package to replace usage of perlsuid. commit ac7854d8ba9599f09a3861365a7b504c1e97a954 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 14 12:59:01 2011 +0200 x2goresume is no compat script, moving it to /lib dir commit 46939a7413d12c1761f8e2cfc40896f8d10c1c49 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 14 12:58:30 2011 +0200 re-arranged compat scripts ----------------------------------------------------------------------- hooks/post-receive -- x2goserver.git (X2go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2go Server).

1 0

python-x2go.git - build-main (branch) updated: 0.1.1.4
by git-admin＠x2go.org 14 Jul '11

14 Jul '11

The branch, build-main has been updated via ecc77798d8aee9c04f60c2c11ee14a1ec5c299e5 (commit) via f83ed022b958f589b0cbb4438256d59ed772d5fc (commit) via 0a5516e496d1c1fe9ee4ae06e69fac9242bcdd1a (commit) from 1e88fc4810c4a2ab6e3fa9073f61347f538ac93a (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 ecc77798d8aee9c04f60c2c11ee14a1ec5c299e5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jul 13 20:38:44 2011 +0200 released 0.1.1.4 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 +++++++ x2go/__init__.py | 2 +- x2go/backends/terminal/_stdout.py | 6 +++--- 3 files changed, 11 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1d263ac..b47ec6e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-x2go (0.1.1.4-0~x2go1) unstable; urgency=low + + * New upstream version (0.1.1.4): + - bugfix for x2gmountdirs calls that occurred if the client username contained blanks. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 13 Jul 2011 20:38:33 +0200 + python-x2go (0.1.1.3-0~x2go1) unstable; urgency=low * New upstream version (0.1.1.3): diff --git a/x2go/__init__.py b/x2go/__init__.py index 1c6beca..539b1fc 100644 --- a/x2go/__init__.py +++ b/x2go/__init__.py @@ -158,7 +158,7 @@ Contact """ __NAME__ = 'python-x2go' -__VERSION__ = '0.1.1.3' +__VERSION__ = '0.1.1.4' from gevent import monkey monkey.patch_all() diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 24fc74e..88ff516 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -642,7 +642,7 @@ class X2goTerminalSessionSTDOUT(object): 'x2gomountdirs', 'dir', str(self.session_info.name), - _CURRENT_LOCAL_USER, + '"%s"' % _CURRENT_LOCAL_USER, _x2go_key_fname, '%s__REVERSESSH_PORT__%s; ' % (folder_name, self.session_info.sshfs_port), 'rm -f %s %s.ident' % (_x2go_key_fname, _x2go_key_fname), @@ -654,7 +654,7 @@ class X2goTerminalSessionSTDOUT(object): 'x2gomountdirs', 'dir', str(self.session_info.name), - _CURRENT_LOCAL_USER, + '"%s"' % _CURRENT_LOCAL_USER, _x2go_key_fname, '%s__PRINT_SPOOL___REVERSESSH_PORT__%s; ' % (folder_name, self.session_info.sshfs_port), 'rm -f %s %s.ident' % (_x2go_key_fname, _x2go_key_fname), @@ -666,7 +666,7 @@ class X2goTerminalSessionSTDOUT(object): 'x2gomountdirs', 'dir', str(self.session_info.name), - _CURRENT_LOCAL_USER, + '"%s"' % _CURRENT_LOCAL_USER, _x2go_key_fname, '%s__MIMEBOX_SPOOL___REVERSESSH_PORT__%s; ' % (folder_name, self.session_info.sshfs_port), 'rm -f %s %s.ident' % (_x2go_key_fname, _x2go_key_fname), 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.0.1.18-47-g34f3989
by git-admin＠x2go.org 14 Jul '11

14 Jul '11

The branch, master has been updated via 34f39898b958bc37bd93c24f5605e0c90c0ac78e (commit) via e73a88d9f7f53e102ddac38122b52c4a089514e6 (commit) via 7377e0ea98f56cdf97fff63d3ea69d7a20c8eb1f (commit) from 23cc0c462239bc27076a475fb541bf5c3c6767ec (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 34f39898b958bc37bd93c24f5605e0c90c0ac78e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 14 09:46:07 2011 +0200 bundle commit, worked in unreleased non-Git versions 3.01-19, 3.01-20, 3.01-21, bumping towards version 3.0.99.0. commit e73a88d9f7f53e102ddac38122b52c4a089514e6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 14 09:17:04 2011 +0200 re-refer to NoMachine as NXv3 source (as they became active again...) commit 7377e0ea98f56cdf97fff63d3ea69d7a20c8eb1f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 14 09:16:51 2011 +0200 remove build files ----------------------------------------------------------------------- Summary of changes: .DS_Store | Bin 6148 -> 0 bytes .kdev4/x2goclient-3.01-libssh.kdev4 | 20 - INSTALL | 2 +- VERSION | 2 +- brokerpassdialog.ui | 182 ++++++++ brokerpassdlg.cpp | 71 +++ xsettingswidget.h => brokerpassdlg.h | 26 +- build_win_plugin.bat | 7 + config_linux_static.sh | 2 +- config_linux_static_plugin.sh | 1 + debian/changelog | 31 ++- desktop/x2goclient.desktop | 2 +- httpbrokerclient.cpp | 824 +++++++++++++++++++--------------- httpbrokerclient.h | 63 ++- icons/32x32/auth.png | Bin 0 -> 1686 bytes object_script.x2goclient.Debug | 2 + object_script.x2goclient.Release | 2 + onmainwindow.cpp | 252 ++++++++++- onmainwindow.h | 33 ++- onmainwindow_part2.cpp | 143 ++++-- onmainwindow_part3.cpp | 130 +++++- onmainwindow_part4.cpp | 152 +++++-- onmainwindow_privat.h | 1 + resources.rcc | 1 + sessionbutton.cpp | 111 ++++-- sessionbutton.h | 1 + sshmasterconnection.cpp | 26 +- sshmasterconnection.h | 7 +- sshprocess.cpp | 2 +- version.h | 2 +- wapi.cpp | 32 ++ wapi.h | 2 + x2goclient.pro | 17 +- x2goclientconfig.h | 2 +- x2goplugin.rc | 10 +- x2gosettings.cpp | 50 ++- x2gosettings.h | 4 +- xsettingsui.ui | 29 +-- xsettingswidget.cpp | 14 +- 39 files changed, 1626 insertions(+), 632 deletions(-) delete mode 100644 .DS_Store delete mode 100644 .kdev4/x2goclient-3.01-libssh.kdev4 create mode 100644 brokerpassdialog.ui create mode 100644 brokerpassdlg.cpp copy xsettingswidget.h => brokerpassdlg.h (63%) create mode 100755 build_win_plugin.bat create mode 100644 icons/32x32/auth.png The diff of changes is: diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 5008ddf..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.kdev4/x2goclient-3.01-libssh.kdev4 b/.kdev4/x2goclient-3.01-libssh.kdev4 deleted file mode 100644 index 4e0da72..0000000 --- a/.kdev4/x2goclient-3.01-libssh.kdev4 +++ /dev/null @@ -1,20 +0,0 @@ -[Buildset] -BuildItems=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x01\x00\x00\x00\x0b\x00\x00\x00\x00\x01\x00\x00\x00,\x00x\x002\x00g\x00o\x00c\x00l\x00i\x00e\x00n\x00t\x00-\x003\x00.\x000\x001\x00-\x00l\x00i\x00b\x00s\x00s\x00h) - -[Launch] -Launch Configurations=Launch Configuration 0 - -[Launch][Launch Configuration 0] -Configured Launch Modes=execute -Configured Launchers=nativeAppLauncher -Name=New Native Application Configuration -Type=Native Application - -[Launch][Launch Configuration 0][Data] -Arguments= -Dependencies=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x00) -Dependency Action=Nothing -EnvironmentGroup=default -Executable=file:///usr/src.cur/db-builds/x2goclient/x2goclient-3.01/x2goclient -Working Directory= -isExecutable=true diff --git a/INSTALL b/INSTALL index 6bef37b..05d9730 100644 --- a/INSTALL +++ b/INSTALL @@ -7,7 +7,7 @@ Qt4: http://www.trolltech.com nxcomp+nxproxy: -http://code.x2go.org/releases +http://www.nomachine.com/sources.php You may want also install pulseaudio sound server to enable sound support http://www.pulseaudio.org/wiki/DownloadPulseAudio diff --git a/VERSION b/VERSION index df46582..14e681e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.1.18 +3.0.99.0 diff --git a/brokerpassdialog.ui b/brokerpassdialog.ui new file mode 100644 index 0000000..333a577 --- /dev/null +++ b/brokerpassdialog.ui @@ -0,0 +1,182 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>BrokerPassDialogUi</class> + <widget class="QDialog" name="BrokerPassDialogUi"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>311</width> + <height>160</height> + </rect> + </property> + <property name="windowTitle"> + <string>Dialog</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Old password:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLineEdit" name="leOldPas"> + <property name="echoMode"> + <enum>QLineEdit::Password</enum> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>New password:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLineEdit" name="lePass1"> + <property name="echoMode"> + <enum>QLineEdit::Password</enum> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Confirm password:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QLineEdit" name="lePass2"> + <property name="echoMode"> + <enum>QLineEdit::Password</enum> + </property> + </widget> + </item> + </layout> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QLabel" name="statusLabel"> + <property name="text"> + <string>TextLabel</string> + </property> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>BrokerPassDialogUi</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>292</x> + <y>143</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>153</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>BrokerPassDialogUi</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>286</x> + <y>143</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>153</y> + </hint> + </hints> + </connection> + <connection> + <sender>lePass1</sender> + <signal>textChanged(QString)</signal> + <receiver>BrokerPassDialogUi</receiver> + <slot>slotPassChanged()</slot> + <hints> + <hint type="sourcelabel"> + <x>167</x> + <y>46</y> + </hint> + <hint type="destinationlabel"> + <x>103</x> + <y>113</y> + </hint> + </hints> + </connection> + <connection> + <sender>lePass2</sender> + <signal>textChanged(QString)</signal> + <receiver>BrokerPassDialogUi</receiver> + <slot>slotPassChanged()</slot> + <hints> + <hint type="sourcelabel"> + <x>215</x> + <y>79</y> + </hint> + <hint type="destinationlabel"> + <x>208</x> + <y>105</y> + </hint> + </hints> + </connection> + </connections> + <slots> + <slot>slotPassChanged()</slot> + </slots> +</ui> diff --git a/brokerpassdlg.cpp b/brokerpassdlg.cpp new file mode 100644 index 0000000..b3a7571 --- /dev/null +++ b/brokerpassdlg.cpp @@ -0,0 +1,71 @@ +/* + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) 2011 Oleksandr Shneyder + + 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 3 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, see <http://www.gnu.org/licenses/>. + +*/ + +#include "brokerpassdlg.h" +#include <QPushButton> + +BrokerPassDlg::BrokerPassDlg(QWidget* parent, Qt::WindowFlags f): QDialog(parent, f) +{ + setupUi(this); + statusLabel->setText(QString::null); + buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); +} + +BrokerPassDlg::~BrokerPassDlg() +{ + +} + +void BrokerPassDlg::slotPassChanged() +{ + bool passEq=false; + if (lePass1->text()!=lePass2->text()) + { + passEq=false; + statusLabel->setText(tr("Passwords do not match")); + } + else + { + passEq=true; + statusLabel->setText(QString::null); + } + buttonBox->button(QDialogButtonBox::Ok)->setEnabled(passEq && + lePass1->text().size()>0 && + leOldPas->text().size()>0); +} + +void BrokerPassDlg::accept() +{ + QDialog::accept(); +} + +void BrokerPassDlg::reject() +{ + QDialog::reject(); +} + +QString BrokerPassDlg::newPass() +{ + return lePass1->text(); +} + +QString BrokerPassDlg::oldPass() +{ + return leOldPas->text(); +} diff --git a/xsettingswidget.h b/brokerpassdlg.h similarity index 63% copy from xsettingswidget.h copy to brokerpassdlg.h index 0a441cf..90b3ba2 100644 --- a/xsettingswidget.h +++ b/brokerpassdlg.h @@ -1,6 +1,6 @@ /* <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> + Copyright (C) 2011 Oleksandr Shneyder 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 @@ -17,23 +17,25 @@ */ -#ifndef XSETTINGSWIDGET_H -#define XSETTINGSWIDGET_H +#ifndef BROKERPASSDLG_H +#define BROKERPASSDLG_H -#include <QWidget> -#include "ui_xsettingsui.h" +#include <QDialog> +#include "ui_brokerpassdialog.h" -class XSettingsWidget : public QWidget, private Ui_XSettingsWidgetUI +class BrokerPassDlg: public QDialog, private Ui_BrokerPassDialogUi { Q_OBJECT public: - XSettingsWidget(QWidget* parent = 0); - virtual ~XSettingsWidget(); - void setDefaults(); - void saveSettings(); + BrokerPassDlg(QWidget* parent = 0, Qt::WindowFlags f = 0); + virtual ~BrokerPassDlg(); + virtual void accept(); + virtual void reject(); + QString oldPass(); + QString newPass(); private slots: - void slotSetExecutable(); + void slotPassChanged(); }; -#endif // XSETTINGSWIDGET_H +#endif // BROKERPASSDLG_H diff --git a/build_win_plugin.bat b/build_win_plugin.bat new file mode 100755 index 0000000..61989d0 --- /dev/null +++ b/build_win_plugin.bat @@ -0,0 +1,7 @@ +mingw32-make +copy release\npx2goplugin.dll d:\share\plugin\x2goplugin\ +d: +cd \share\plugin\x2goplugin\ +idc.exe npx2goplugin.dll /idl npx2goplugin.idl -version 1.0 +midl npx2goplugin.idl /nologo /tlb npx2goplugin.tlb +idc.exe npx2goplugin.dll /tlb npx2goplugin.tlb diff --git a/config_linux_static.sh b/config_linux_static.sh index 294b1d3..a51bac9 100755 --- a/config_linux_static.sh +++ b/config_linux_static.sh @@ -1,5 +1,5 @@ #!/bin/bash make distclean -/usr/local/Trolltech/Qt-4.7.1/bin/qmake -config release -spec linux-g++ +X2GO_LINUX_STATIC=x2go_linux_static /usr/local/Trolltech/Qt-4.7.1/bin/qmake -config release -spec linux-g++ diff --git a/config_linux_static_plugin.sh b/config_linux_static_plugin.sh index b3ad0d9..4776a3c 100755 --- a/config_linux_static_plugin.sh +++ b/config_linux_static_plugin.sh @@ -2,4 +2,5 @@ make distclean +export X2GO_LINUX_STATIC=x2go_linux_static X2GO_CLIENT_TARGET=plugin /usr/local/Trolltech/Qt-4.7.1/bin/qmake -config release -spec linux-g++ diff --git a/debian/changelog b/debian/changelog index 16cf113..ac2dd58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,37 @@ -x2goclient (3.0.1.18-0~x2go3) UNRELEASED; urgency=low +x2goclient (3.0.99.0-0~x2go1) UNRELEASED; urgency=low + + * nothing yet. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 14 Jul 2011 09:08:10 +0200 + +x2goclient (3.0.1.21-0~x2go1) unstable; urgency=low + + * changes in windows plugin + + -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Thu, 30 Jun 2011 18:45:25 +0200 + +x2goclient (3.0.1.20-0~x2go1) unstable; urgency=low + + * support menu + * custom background + * custom icon on broker auth dialog + * fixed creation of desktop icons on windows + + -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Fri, 08 Apr 2011 19:18:30 +0200 + +x2goclient (3.0.1.19-0~x2go1) unstable; urgency=low + + * Support to get sessions from for web broker + + -- Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Thu, 29 Mar 2011 18:34:08 +0200 + +x2goclient (3.0.1.18-0~x2go3) unstable; urgency=low * Add ssh (server) as runtime dependency * React to bug #627990, prefer man2html-base over man2html. * Use x2goumount-session instead of old x2goumount_session command. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 16 Jun 2011 17:13:57 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 14 Jul 2011 09:07:59 +0200 x2goclient (3.0.1.18-0~x2go2) unstable; urgency=low diff --git a/desktop/x2goclient.desktop b/desktop/x2goclient.desktop index 29283c1..58f2ce0 100644 --- a/desktop/x2goclient.desktop +++ b/desktop/x2goclient.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Version=3.0.1.18 +Version=3.0.99.0 Type=Application Name=X2Go Client Exec=/usr/bin/x2goclient diff --git a/httpbrokerclient.cpp b/httpbrokerclient.cpp index 2d7fcc4..0e0a6ab 100644 --- a/httpbrokerclient.cpp +++ b/httpbrokerclient.cpp @@ -24,195 +24,263 @@ #include <QTimer> #include "SVGFrame.h" #include "onmainwindow.h" +#include <QTemporaryFile> HttpBrokerClient::HttpBrokerClient ( ONMainWindow* wnd, ConfigFile* cfg ) { - config=cfg; - mainWindow=wnd; - cmdRequest=sinfoKeyRequest=sinfoRequest=-1; - QUrl lurl ( config->brokerurl ); - http=new QHttp ( this ); - - if ( config->brokerurl.indexOf ( "https://" ) !=-1 ) - http->setHost ( lurl.host(),QHttp::ConnectionModeHttps, - lurl.port ( 443 ) ); - else - http->setHost ( lurl.host(),QHttp::ConnectionModeHttp, - lurl.port ( 80 ) ); - - connect ( http,SIGNAL ( requestFinished ( int,bool ) ),this, - SLOT ( slotRequestFinished ( int,bool ) ) ); - connect ( http,SIGNAL ( sslErrors ( const QList<QSslError>& ) ),this, - SLOT ( slotSslErrors ( const QList<QSslError>& ) ) ); - getSInfoFromBroker ( true ); + config=cfg; + mainWindow=wnd; + cmdRequest=sinfoKeyRequest=sinfoRequest=-1; + QUrl lurl ( config->brokerurl ); + http=new QHttp ( this ); + + if ( config->brokerurl.indexOf ( "https://" ) !=-1 ) + http->setHost ( lurl.host(),QHttp::ConnectionModeHttps, + lurl.port ( 443 ) ); + else + http->setHost ( lurl.host(),QHttp::ConnectionModeHttp, + lurl.port ( 80 ) ); + + connect ( http,SIGNAL ( requestFinished ( int,bool ) ),this, + SLOT ( slotRequestFinished ( int,bool ) ) ); + connect ( http,SIGNAL ( sslErrors ( const QList<QSslError>& ) ),this, + SLOT ( slotSslErrors ( const QList<QSslError>& ) ) ); + if (!wnd->brokerMode) + getSInfoFromBroker ( true ); } HttpBrokerClient::~HttpBrokerClient() { + +} + +void HttpBrokerClient::getUserSessions() +{ + QString req; + QTextStream ( &req ) << + "task=listsessions&"<< + "user="<<config->brokerUser<<"&"<< + "password="<<config->brokerPass<<"&"<< + "authid="<<config->brokerUserId; + QUrl lurl ( config->brokerurl ); + httpSessionAnswer.close(); + httpSessionAnswer.setData ( 0,0 ); + sessionsRequest=http->post ( lurl.path(),req.toUtf8(),&httpSessionAnswer ); + config->sessiondata=QString::null; + +} + +void HttpBrokerClient::selectUserSession(const QString& session) +{ +// x2goDebug<<"selected sid: "<<session; + QString req; + QTextStream ( &req ) << + "task=selectsession&"<< + "sid="<<session<<"&"<< + "user="<<config->brokerUser<<"&"<< + "password="<<config->brokerPass<<"&"<< + "authid="<<config->brokerUserId; + QUrl lurl ( config->brokerurl ); + httpSessionAnswer.close(); + httpSessionAnswer.setData ( 0,0 ); + selSessRequest=http->post ( lurl.path(),req.toUtf8(),&httpSessionAnswer ); + +} + +void HttpBrokerClient::changePassword(QString newPass) +{ + newBrokerPass=newPass; + QString req; + QTextStream ( &req ) << + "task=setpass&"<< + "newpass="<<newPass<<"&"<< + "user="<<config->brokerUser<<"&"<< + "password="<<config->brokerPass<<"&"<< + "authid="<<config->brokerUserId; + QUrl lurl ( config->brokerurl ); + httpSessionAnswer.close(); + httpSessionAnswer.setData ( 0,0 ); + chPassRequest=http->post ( lurl.path(),req.toUtf8(),&httpSessionAnswer ); + +} + + +void HttpBrokerClient::createIniFile(const QString& content) +{ + QString cont; + QStringList lines=content.split("START_USER_SESSIONS "); + if (lines.count()>1) + { + cont=lines[1]; + cont=cont.split("END_USER_SESSIONS")[0]; + cont.replace("\n",""); + cont.replace(" ","\n"); + } + mainWindow->config.iniFile=cont; } QString HttpBrokerClient::getSInfoFromBroker ( bool getKey ) { - QString pack; - bool fullscreen; - int height; - int width; - int quality; - int speed; - bool usekbd; - bool setDPI=false; - uint dpi=96; - QString layout; - QString type; - QString homeDir=QDir::homePath(); - X2goSettings st( "sessions" ); - - QString sid; - sid="embedded"; - pack=st.setting()->value ( sid+"/pack", - ( QVariant ) "16m-jpeg" ).toString(); - fullscreen=st.setting()->value ( sid+"/fullscreen", - ( QVariant ) - false ).toBool(); - height=st.setting()->value ( sid+"/height", - ( QVariant ) 600 ).toInt(); - width=st.setting()->value ( sid+"/width", - ( QVariant ) 800 ).toInt(); - setDPI=st.setting()->value ( sid+"/setdpi", - ( QVariant ) false ).toBool(); - dpi=st.setting()->value ( sid+"/dpi", - ( QVariant ) 96 ).toUInt(); - quality=st.setting()->value ( - sid+"/quality", - ( QVariant ) 9 ).toInt(); - speed=st.setting()->value ( sid+"/speed", - ( QVariant ) 2 ).toInt(); - usekbd=st.setting()->value ( sid+"/usekbd", - ( QVariant ) true ).toBool(); - layout=st.setting()->value ( sid+"/layout", - ( QVariant ) - tr ( "us" ) ).toString(); - type=st.setting()->value ( sid+"/type", - ( QVariant ) - tr ( "pc105/us" ) ).toString(); - bool startEmbedded=false; - if ( st.setting()->value ( sid+"/startembed", - ( QVariant ) true ).toBool() ) - { - startEmbedded=true; - fullscreen=false; - QSize sz=mainWindow->getEmbedAreaSize(); - height=sz.height(); - width=sz.width(); - - } - - QString geometry; - if ( fullscreen ) - { - geometry="fullscreen"; + QString pack; + bool fullscreen; + int height; + int width; + int quality; + int speed; + bool usekbd; + bool setDPI=false; + uint dpi=96; + QString layout; + QString type; + QString homeDir=mainWindow->getHomeDirectory(); + X2goSettings st( "sessions" ); + + QString sid; + sid="embedded"; + pack=st.setting()->value ( sid+"/pack", + ( QVariant ) "16m-jpeg" ).toString(); + fullscreen=st.setting()->value ( sid+"/fullscreen", + ( QVariant ) + false ).toBool(); + height=st.setting()->value ( sid+"/height", + ( QVariant ) 600 ).toInt(); + width=st.setting()->value ( sid+"/width", + ( QVariant ) 800 ).toInt(); + setDPI=st.setting()->value ( sid+"/setdpi", + ( QVariant ) false ).toBool(); + dpi=st.setting()->value ( sid+"/dpi", + ( QVariant ) 96 ).toUInt(); + quality=st.setting()->value ( + sid+"/quality", + ( QVariant ) 9 ).toInt(); + speed=st.setting()->value ( sid+"/speed", + ( QVariant ) 2 ).toInt(); + usekbd=st.setting()->value ( sid+"/usekbd", + ( QVariant ) true ).toBool(); + layout=st.setting()->value ( sid+"/layout", + ( QVariant ) + tr ( "us" ) ).toString(); + type=st.setting()->value ( sid+"/type", + ( QVariant ) + tr ( "pc105/us" ) ).toString(); + bool startEmbedded=false; + if ( st.setting()->value ( sid+"/startembed", + ( QVariant ) true ).toBool() ) + { + startEmbedded=true; + fullscreen=false; + QSize sz=mainWindow->getEmbedAreaSize(); + height=sz.height(); + width=sz.width(); + + } + + QString geometry; + if ( fullscreen ) + { + geometry="fullscreen"; #ifdef Q_OS_WIN - fullscreen=false; + fullscreen=false; #endif - } - if ( ! fullscreen ) - { - geometry=QString::number ( width ) +"x"+ - QString::number ( height ); - - } - QString link; - switch ( speed ) - { - case 0: - link="modem"; - break; - case 1: - link="isdn"; - break; - case 2: - link="adsl"; - break; - case 3: - link="wan"; - break; - case 4: - link="lan"; - break; - } - - QFile file ( ":/txt/packs" ); - file.open ( QIODevice::ReadOnly | QIODevice::Text ); - QTextStream in ( &file ); - while ( !in.atEnd() ) - { - QString pc=in.readLine(); - if ( pc.indexOf ( "-%" ) !=-1 ) - { - pc=pc.left ( pc.indexOf ( "-%" ) ); - if ( pc==pack ) - { - pack+="-"+QString::number ( quality ); - break; - } - } - } - file.close(); - - QDesktopWidget wd; - QString depth=QString::number ( wd.depth() ); + } + if ( ! fullscreen ) + { + geometry=QString::number ( width ) +"x"+ + QString::number ( height ); + + } + QString link; + switch ( speed ) + { + case 0: + link="modem"; + break; + case 1: + link="isdn"; + break; + case 2: + link="adsl"; + break; + case 3: + link="wan"; + break; + case 4: + link="lan"; + break; + } + + QFile file ( ":/txt/packs" ); + file.open ( QIODevice::ReadOnly | QIODevice::Text ); + QTextStream in ( &file ); + while ( !in.atEnd() ) + { + QString pc=in.readLine(); + if ( pc.indexOf ( "-%" ) !=-1 ) + { + pc=pc.left ( pc.indexOf ( "-%" ) ); + if ( pc==pack ) + { + pack+="-"+QString::number ( quality ); + break; + } + } + } + file.close(); + + QDesktopWidget wd; + QString depth=QString::number ( wd.depth() ); #ifdef Q_OS_DARWIN - usekbd=0; - type="query"; + usekbd=0; + type="query"; #endif - QString dpiS; - if ( setDPI ) - { - dpiS=QString::number ( dpi ); - } - else - dpiS="noset"; - QString useKbdS; - if ( usekbd ) - useKbdS="1"; - else - useKbdS="0"; - - - QString req; - QTextStream ( &req ) << - "mode=getsinfo&"<< - "geometry="<<geometry<<"&" - "link="<<link<<"&" - "pack="<<pack<<"&" - "depth="<<depth<<"&" - "layout="<<layout<<"&" - "type="<<type<<"&" - "usekbd="<<useKbdS<<"&" - "dpi="<<dpiS<<"&" - "user="<<config->user<<"&"<< - "connectionts="<<config->connectionts<<"&"<< - "cookie="<<config->cookie; - QUrl lurl ( config->brokerurl ); - httpSIAnswer.close(); - httpSIAnswer.setData ( 0,0 ); - if ( getKey ) - { - QTextStream ( &req ) <<"&" - "getkey=true"; - sinfoKeyRequest=http->post ( lurl.path(), - req.toUtf8(),&httpSIAnswer ); - x2goDebug<<"requested key :"<<sinfoKeyRequest; - } - else - { - sinfoRequest=http->post ( lurl.path(), - req.toUtf8(),&httpSIAnswer ); - x2goDebug<<"requested session :"<<sinfoRequest; - } - return QString::null; + QString dpiS; + if ( setDPI ) + { + dpiS=QString::number ( dpi ); + } + else + dpiS="noset"; + QString useKbdS; + if ( usekbd ) + useKbdS="1"; + else + useKbdS="0"; + + + QString req; + QTextStream ( &req ) << + "mode=getsinfo&"<< + "geometry="<<geometry<<"&" + "link="<<link<<"&" + "pack="<<pack<<"&" + "depth="<<depth<<"&" + "layout="<<layout<<"&" + "type="<<type<<"&" + "usekbd="<<useKbdS<<"&" + "dpi="<<dpiS<<"&" + "user="<<config->user<<"&"<< + "connectionts="<<config->connectionts<<"&"<< + "cookie="<<config->cookie; + QUrl lurl ( config->brokerurl ); + httpSIAnswer.close(); + httpSIAnswer.setData ( 0,0 ); + if ( getKey ) + { + QTextStream ( &req ) <<"&" + "getkey=true"; + sinfoKeyRequest=http->post ( lurl.path(), + req.toUtf8(),&httpSIAnswer ); + x2goDebug<<"requested key :"<<sinfoKeyRequest; + } + else + { + sinfoRequest=http->post ( lurl.path(), + req.toUtf8(),&httpSIAnswer ); + x2goDebug<<"requested session :"<<sinfoRequest; + } + return QString::null; } @@ -220,206 +288,250 @@ void HttpBrokerClient::slotRequestFinished ( int id, bool error ) { // x2goDebug<<"http request "<<id<<", finished with: "<<error; - if ( error ) - x2goDebug<<http->errorString(); - -// QString answer ( httpCmdAnswer.data() ); -// x2goDebug<<"cmd request answer: "<<answer; - - if ( id==sinfoKeyRequest || id==sinfoRequest ) - { + if ( error ) + { + x2goDebug<<http->errorString(); + QMessageBox::critical(0,tr("Error"),http->errorString()); + emit fatalHttpError(); + return; + } + +// QString answer ( httpSiAnswer.data() ); +// x2goDebug<<"cmd request answer: "<<answer; + if ( id== sessionsRequest || id == selSessRequest || id==chPassRequest) + { + QString answer ( httpSessionAnswer.data() ); + x2goDebug<<"cmd request answer: "<<answer; + if (answer.indexOf("Access granted")==-1) + { + QMessageBox::critical ( + 0,tr ( "Error" ), + tr ( "Login failed! " + "Please try again" ) ); + emit authFailed(); + return; + } + config->brokerAuthenticated=true; + if (id == sessionsRequest) + { + createIniFile(answer); + emit sessionsLoaded(); + } + if (id == selSessRequest) + { + emit getSession(answer); + } + if ( id == chPassRequest) + { + if (answer.indexOf("CHANGING PASS OK")!=-1) + { + emit passwordChanged(newBrokerPass); + } + else + { + emit passwordChanged(QString::null); + } + + } + } + + if ( id==sinfoKeyRequest || id==sinfoRequest ) + { // x2goDebug<<"Answer:"<<httpSIAnswer.data(); - QString key ( httpSIAnswer.data() ); - if ( key.indexOf ( "X2GO_BROKER_ERRORR-ACESS DENIED" ) !=-1 ) - { - QMessageBox::critical ( - 0,tr ( "Error" ), - tr ( "Your session was disconnected. " - "To get access to your running " - "session, please return to the login page " - "or use the \"reload\" function of " - "your browser." ) ); - emit fatalHttpError(); - return; - } - QStringList strings=key.split ( "\n" ); - for ( int i=0;i<strings.count();++i ) - { - if ( strings[i].indexOf ( "x2gosession=" ) !=-1 ) - { - QStringList vals=strings[i].split ( "=" ); - config->sessiondata=vals[1]; - } - if ( strings[i]=="rootless=false" ) - { - config->rootless=false; - } - if ( strings[i]=="rootless=true" ) - { - config->rootless=true; - } - } - if ( id==sinfoKeyRequest ) - { - emit haveSshKey ( key ); - QTimer::singleShot ( 5000, this, - SLOT ( slotGetConnectionCmd() ) ); - } - else - emit haveAgentInfo(); - } - if ( id==cmdRequest ) - { - QString answer ( httpCmdAnswer.data() ); + QString key ( httpSIAnswer.data() ); + if ( key.indexOf ( "X2GO_BROKER_ERRORR-ACESS DENIED" ) !=-1 ) + { + QMessageBox::critical ( + 0,tr ( "Error" ), + tr ( "Your session was disconnected. " + "To get access to your running " + "session, please return to the login page " + "or use the \"reload\" function of " + "your browser." ) ); + emit fatalHttpError(); + return; + } + QStringList strings=key.split ( "\n" ); + for ( int i=0;i<strings.count();++i ) + { + if ( strings[i].indexOf ( "x2gosession=" ) !=-1 ) + { + QStringList vals=strings[i].split ( "=" ); + config->sessiondata=vals[1]; + } + if ( strings[i]=="rootless=false" ) + { + config->rootless=false; + } + if ( strings[i]=="rootless=true" ) + { + config->rootless=true; + } + } + if ( id==sinfoKeyRequest ) + { + emit haveSshKey ( key ); + QTimer::singleShot ( 5000, this, + SLOT ( slotGetConnectionCmd() ) ); + } + else + emit haveAgentInfo(); + } + if ( id==cmdRequest ) + { + QString answer ( httpCmdAnswer.data() ); // x2goDebug<<"cmd request answer: "<<answer; - if ( !error ) - { - answer=answer.split ( - "<body onload=\"checkPlugin()\">" ) [1]; - answer=answer.split ( "</body>" ) [0]; - if ( answer.indexOf ( "CMD:0:" ) !=-1 ) - { - x2goDebug<<"brocker sent reconnect cmd"; - emit cmdReconnect(); - } - } - QTimer::singleShot ( 3000, this, - SLOT ( slotGetConnectionCmd() ) ); - } + if ( !error ) + { + answer=answer.split ( + "<body onload=\"checkPlugin()\">" ) [1]; + answer=answer.split ( "</body>" ) [0]; + if ( answer.indexOf ( "CMD:0:" ) !=-1 ) + { + x2goDebug<<"brocker sent reconnect cmd"; + emit cmdReconnect(); + } + } + QTimer::singleShot ( 3000, this, + SLOT ( slotGetConnectionCmd() ) ); + } } void HttpBrokerClient::slotSslErrors ( const QList<QSslError> & errors ) { - QStringList err; - QSslCertificate cert; - for ( int i=0;i<errors.count();++i ) - { - x2goDebug<<"sslError ,code:"<<errors[i].error() <<":"; - err<<errors[i].errorString(); - if ( !errors[i].certificate().isNull() ) - cert=errors[i].certificate(); - } - - - QString md5=getHexVal ( cert.digest() ); - QString fname=md5; - fname=fname.replace(":","_"); - QUrl lurl ( config->brokerurl ); - QString homeDir=QDir::homePath(); - if ( QFile::exists ( homeDir+"/.x2go/ssl/exceptions/"+ - lurl.host() +"/"+fname ) ) - { - QFile fl ( homeDir+"/.x2go/ssl/exceptions/"+ - lurl.host() +"/"+fname ); - fl.open ( QIODevice::ReadOnly | QIODevice::Text ); - QSslCertificate mcert ( &fl ); - if ( mcert==cert ) - { - http->ignoreSslErrors(); - return; - } - } - - QString text=tr ( " Server uses an invalid " - "security certificate. " ); - text+=err.join ( " " ); - text+=tr ( "" - "You should not add an exception " - "if you are using an internet connection " - "that you do not trust completely or if you are " - "not used to seeing a warning for this server." ); - QMessageBox mb ( QMessageBox::Warning,tr ( "Secure connection failed" ), - text ); - text=QString::null; - QTextStream ( &text ) <<err.join ( "\n" ) <<"\n"<< - "------------\n"<< - tr ( "Issued to:\n" ) << - tr ( "Common Name(CN)\t" ) << - cert.issuerInfo ( QSslCertificate::CommonName ) - <<endl<< - tr ( "Organization(O)\t" ) << - cert.issuerInfo ( QSslCertificate::Organization ) - <<endl<< - tr ( "Organizational Unit(OU)\t" ) << - cert.issuerInfo ( QSslCertificate::OrganizationalUnitName ) - <<endl<< - tr ( "Serial Number\t" ) <<getHexVal ( cert.serialNumber() ) - <<endl<<endl<< - tr ( "Issued by:\n" ) << - tr ( "Common Name(CN)\t" ) << - cert.subjectInfo ( QSslCertificate::CommonName ) - <<endl<< - tr ( "Organization(O)\t" ) << - cert.subjectInfo ( QSslCertificate::Organization ) - <<endl<< - tr ( "Organizational Unit(OU)\t" ) << - cert.subjectInfo ( QSslCertificate::OrganizationalUnitName ) - <<endl<<endl<< - - tr ( "Validity:\n" ) << - tr ( "Issued on\t" ) <<cert.effectiveDate().toString() <<endl<< - tr ( "expires on\t" ) <<cert.expiryDate().toString() <<endl<<endl<< - tr ( "Fingerprints:\n" ) << - tr ( "SHA1\t" ) << - getHexVal ( cert.digest ( QCryptographicHash::Sha1 ) ) <<endl<< - tr ( "MD5\t" ) <<md5; - - - - mb.setDetailedText ( text ); - mb.setEscapeButton ( - ( QAbstractButton* ) mb.addButton ( tr ( "Exit X2Go Client" ), - QMessageBox::RejectRole ) ); - QPushButton *okButton=mb.addButton ( tr ( "Add exception" ), - QMessageBox::AcceptRole ); - mb.setDefaultButton ( okButton ); - - mb.exec(); - if ( mb.clickedButton() == ( QAbstractButton* ) okButton ) - { - x2goDebug<<"accept certificate"; - QDir dr; - dr.mkpath ( homeDir+"/.x2go/ssl/exceptions/"+lurl.host() +"/" ); - QFile fl ( homeDir+"/.x2go/ssl/exceptions/"+ - lurl.host() +"/"+fname ); - fl.open ( QIODevice::WriteOnly | QIODevice::Text ); - QTextStream ( &fl ) <<cert.toPem(); - fl.close(); - http->ignoreSslErrors(); - } - else - emit fatalHttpError(); + QStringList err; + QSslCertificate cert; + for ( int i=0;i<errors.count();++i ) + { + x2goDebug<<"sslError ,code:"<<errors[i].error() <<":"; + err<<errors[i].errorString(); + if ( !errors[i].certificate().isNull() ) + cert=errors[i].certificate(); + } + + + QString md5=getHexVal ( cert.digest() ); + QString fname=md5; + fname=fname.replace(":","_"); + QUrl lurl ( config->brokerurl ); + QString homeDir=mainWindow->getHomeDirectory(); + if ( QFile::exists ( homeDir+"/ssl/exceptions/"+ + lurl.host() +"/"+fname ) ) + { + QFile fl ( homeDir+"/ssl/exceptions/"+ + lurl.host() +"/"+fname ); + fl.open ( QIODevice::ReadOnly | QIODevice::Text ); + QSslCertificate mcert ( &fl ); + if ( mcert==cert ) + { + http->ignoreSslErrors(); + return; + } + } + + QString text=tr ( " Server uses an invalid " + "security certificate. " ); + text+=err.join ( " " ); + text+=tr ( "" + "You should not add an exception " + "if you are using an internet connection " + "that you do not trust completely or if you are " + "not used to seeing a warning for this server." ); + QMessageBox mb ( QMessageBox::Warning,tr ( "Secure connection failed" ), + text ); + text=QString::null; + QTextStream ( &text ) <<err.join ( "\n" ) <<"\n"<< + "------------\n"<< + tr ( "Issued to:\n" ) << + tr ( "Common Name(CN)\t" ) << + cert.issuerInfo ( QSslCertificate::CommonName ) + <<endl<< + tr ( "Organization(O)\t" ) << + cert.issuerInfo ( QSslCertificate::Organization ) + <<endl<< + tr ( "Organizational Unit(OU)\t" ) << + cert.issuerInfo ( QSslCertificate::OrganizationalUnitName ) + <<endl<< + tr ( "Serial Number\t" ) <<getHexVal ( cert.serialNumber() ) + <<endl<<endl<< + tr ( "Issued by:\n" ) << + tr ( "Common Name(CN)\t" ) << + cert.subjectInfo ( QSslCertificate::CommonName ) + <<endl<< + tr ( "Organization(O)\t" ) << + cert.subjectInfo ( QSslCertificate::Organization ) + <<endl<< + tr ( "Organizational Unit(OU)\t" ) << + cert.subjectInfo ( QSslCertificate::OrganizationalUnitName ) + <<endl<<endl<< + + tr ( "Validity:\n" ) << + tr ( "Issued on\t" ) <<cert.effectiveDate().toString() <<endl<< + tr ( "expires on\t" ) <<cert.expiryDate().toString() <<endl<<endl<< + tr ( "Fingerprints:\n" ) << + tr ( "SHA1\t" ) << + getHexVal ( cert.digest ( QCryptographicHash::Sha1 ) ) <<endl<< + tr ( "MD5\t" ) <<md5; + + + + mb.setDetailedText ( text ); + mb.setEscapeButton ( + ( QAbstractButton* ) mb.addButton ( tr ( "Exit X2Go Client" ), + QMessageBox::RejectRole ) ); + QPushButton *okButton=mb.addButton ( tr ( "Add exception" ), + QMessageBox::AcceptRole ); + mb.setDefaultButton ( okButton ); + + mb.exec(); + if ( mb.clickedButton() == ( QAbstractButton* ) okButton ) + { + x2goDebug<<"accept certificate"; + QDir dr; + dr.mkpath ( homeDir+"/ssl/exceptions/"+lurl.host() +"/" ); + QFile fl ( homeDir+"/ssl/exceptions/"+ + lurl.host() +"/"+fname ); + fl.open ( QIODevice::WriteOnly | QIODevice::Text ); + QTextStream ( &fl ) <<cert.toPem(); + fl.close(); + http->ignoreSslErrors(); + x2goDebug<<"store certificate in "<<homeDir+"/ssl/exceptions/"+ + lurl.host() +"/"+fname; + + } + else + emit fatalHttpError(); } QString HttpBrokerClient::getHexVal ( const QByteArray& ba ) { - QStringList val; - for ( int i=0;i<ba.size();++i ) - { - QString bt; - bt.sprintf ( "%02X", ( unsigned char ) ba[i] ); - val<<bt; - } - return val.join ( ":" ); + QStringList val; + for ( int i=0;i<ba.size();++i ) + { + QString bt; + bt.sprintf ( "%02X", ( unsigned char ) ba[i] ); + val<<bt; + } + return val.join ( ":" ); } void HttpBrokerClient::slotGetConnectionCmd() { - QString req; - QTextStream ( &req ) << - "mode=getcmd&"<< - "user="<<config->user<<"&"<< - "connectionts="<<config->connectionts<<"&"<< - "cookie="<<config->cookie; - - QUrl lurl ( config->brokerurl ); - httpCmdAnswer.close(); - httpCmdAnswer.setData ( 0,0 ); - - cmdRequest=http->post ( lurl.path(), - req.toUtf8(),&httpCmdAnswer ); + QString req; + QTextStream ( &req ) << + "mode=getcmd&"<< + "user="<<config->user<<"&"<< + "connectionts="<<config->connectionts<<"&"<< + "cookie="<<config->cookie; + + QUrl lurl ( config->brokerurl ); + httpCmdAnswer.close(); + httpCmdAnswer.setData ( 0,0 ); + + cmdRequest=http->post ( lurl.path(), + req.toUtf8(),&httpCmdAnswer ); // x2goDebug<<"requested brocker cmd :"<<cmdRequest; } diff --git a/httpbrokerclient.h b/httpbrokerclient.h index 628817b..43d65e5 100644 --- a/httpbrokerclient.h +++ b/httpbrokerclient.h @@ -24,31 +24,46 @@ class ONMainWindow; class HttpBrokerClient: public QObject { - Q_OBJECT - public: - HttpBrokerClient ( ONMainWindow* wnd, ConfigFile* cfg ); - ~HttpBrokerClient(); - QString getSInfoFromBroker ( bool getKey=false ); - private: - QBuffer httpSIAnswer; - QBuffer httpCmdAnswer; - QHttp* http; - int sinfoRequest; - int sinfoKeyRequest; - int cmdRequest; - ConfigFile* config; - ONMainWindow* mainWindow; + Q_OBJECT +public: + HttpBrokerClient ( ONMainWindow* wnd, ConfigFile* cfg ); + ~HttpBrokerClient(); + QString getSInfoFromBroker ( bool getKey=false ); + void selectUserSession(const QString& session ); + void changePassword(QString newPass); +private: + QBuffer httpSIAnswer; + QBuffer httpCmdAnswer; + QBuffer httpSessionAnswer; + QHttp* http; + int sinfoRequest; + int sinfoKeyRequest; + int sessionsRequest; + int selSessRequest; + int cmdRequest; + int chPassRequest; + QString newBrokerPass; + ConfigFile* config; + ONMainWindow* mainWindow; + void createIniFile(const QString& content); - private slots: - void slotRequestFinished ( int id, bool error ); - void slotSslErrors ( const QList<QSslError> & errors ) ; - QString getHexVal ( const QByteArray& ba ); - void slotGetConnectionCmd(); - signals: - void haveSshKey ( QString ); - void fatalHttpError(); - void haveAgentInfo (); - void cmdReconnect (); +private slots: + void slotRequestFinished ( int id, bool error ); + void slotSslErrors ( const QList<QSslError> & errors ) ; + QString getHexVal ( const QByteArray& ba ); + void slotGetConnectionCmd(); +public slots: + void getUserSessions(); + +signals: + void haveSshKey ( QString ); + void fatalHttpError(); + void haveAgentInfo (); + void cmdReconnect (); + void authFailed(); + void sessionsLoaded(); + void getSession( QString ); + void passwordChanged( QString ); }; #endif diff --git a/icons/32x32/auth.png b/icons/32x32/auth.png new file mode 100644 index 0000000..e334fb6 Binary files /dev/null and b/icons/32x32/auth.png differ diff --git a/object_script.x2goclient.Debug b/object_script.x2goclient.Debug index 6a32207..8c972be 100644 --- a/object_script.x2goclient.Debug +++ b/object_script.x2goclient.Debug @@ -32,6 +32,7 @@ INPUT( ./debug\httpbrokerclient.o ./debug\ongetpass.o ./debug\x2gosettings.o +./debug\brokerpassdlg.o ./debug\xsettingswidget.o ./debug\x2goclient.o ./debug\moc_configdialog.o @@ -57,6 +58,7 @@ INPUT( ./debug\moc_sharewidget.o ./debug\moc_clicklineedit.o ./debug\moc_httpbrokerclient.o +./debug\moc_brokerpassdlg.o ./debug\moc_xsettingswidget.o ./debug\qrc_resources.o ); diff --git a/object_script.x2goclient.Release b/object_script.x2goclient.Release index 0b6487e..74e0753 100644 --- a/object_script.x2goclient.Release +++ b/object_script.x2goclient.Release @@ -32,6 +32,7 @@ INPUT( ./release\httpbrokerclient.o ./release\ongetpass.o ./release\x2gosettings.o +./release\brokerpassdlg.o ./release\xsettingswidget.o ./release\x2goclient.o ./release\moc_configdialog.o @@ -57,6 +58,7 @@ INPUT( ./release\moc_sharewidget.o ./release\moc_clicklineedit.o ./release\moc_httpbrokerclient.o +./release\moc_brokerpassdlg.o ./release\moc_xsettingswidget.o ./release\qrc_resources.o ); diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 7b08939..033aacc 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -48,6 +48,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) x2goDebug<<"ONMainWindow constructor"<<endl; setFocusPolicy ( Qt::StrongFocus ); installTranslator(); + cleanAllFiles=false; drawMenu=true; usePGPCard=false; extLogin=false; @@ -82,11 +83,14 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) defaultSshPort=sshPort=clientSshPort="22"; LDAPPrintSupport=false; managedMode=false; + brokerMode=false; sshProxy.use=false; startEmbedded=false; sshConnection=0; sessionStatusDlg=0; noSessionEdit=false; + lastSession=0l; + changeBrokerPass=false; #ifdef Q_OS_WIN clientSshPort="7022"; @@ -183,11 +187,17 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) embedMode=true; #endif + + +//set homedir as portable,etc + + #ifdef Q_OS_WIN - portableDataPath=u3DataPath(); + QString u3Path=u3DataPath(); //we have U3 System - if ( portableDataPath.length() >0 ) + if ( u3Path.length() >0 ) { + portableDataPath=u3Path; ONMainWindow::portable=true; setWindowTitle ( "X2Go client - U3" ); } @@ -201,6 +211,9 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) homeDir=portableDataPath; x2goDebug<<"running in \"portable\" mode\n"<< "Data Dir is "<<portableDataPath; + QTimer *timer = new QTimer(this); + connect(timer, SIGNAL(timeout()), this, SLOT(slotCheckPortableDir())); + timer->start(1000); } loadSettings(); @@ -252,7 +265,10 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) #ifndef Q_WS_HILDON - bgFrame=new SVGFrame ( ( QString ) ":/svg/bg.svg",true,fr ); + if(BGFile.size()) + bgFrame=new SVGFrame ( ( QString ) BGFile,true,fr ); + else + bgFrame=new SVGFrame ( ( QString ) ":/svg/bg.svg",true,fr ); #else bgFrame=new SVGFrame ( ( QString ) ":/svg/bg_hildon.svg",true,fr ); #endif @@ -291,7 +307,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) x2golay->addWidget ( x2g ); - QHBoxLayout* bgLay=new QHBoxLayout ( bgFrame ); + bgLay=new QHBoxLayout ( bgFrame ); bgLay->setSpacing ( 0 ); bgLay->setMargin ( 0 ); bgLay->addLayout ( onlay ); @@ -307,9 +323,19 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) act_set=new QAction ( QIcon ( iconsPath ( "/32x32/edit_settings.png" ) ), tr ( "&Settings ..." ),this ); - + + if(supportMenuFile!=QString::null) + { + act_support=new QAction ( tr ( "Support ..." ),this ); + connect ( act_support,SIGNAL ( triggered ( bool ) ),this, + SLOT ( slotSupport() ) ); + + } + act_abclient=new QAction ( QIcon ( ":icons/32x32/x2goclient.png" ), tr ( "About X2GO client" ),this ); + + @@ -324,7 +350,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) #endif -#if defined (Q_OS_WIN) && defined (CFGCLIENT ) +#if defined (Q_OS_WIN) //&& defined (CFGCLIENT ) xorgSettings(); #endif @@ -359,7 +385,27 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) connect ( fr,SIGNAL ( resized ( const QSize ) ),this, SLOT ( slotResize ( const QSize ) ) ); slotResize ( fr->size() ); - x2goDebug<<"ONMainWindows constructor finished"<<endl; + + if(brokerMode) + { + broker=new HttpBrokerClient ( this, &config ); + connect ( broker,SIGNAL ( haveSshKey ( QString ) ),this, + SLOT ( slotStartSshAgent ( QString ) ) ); + connect ( broker,SIGNAL ( haveAgentInfo () ),this, + SLOT ( slotStartNewBrokerSession () ) ); + connect ( broker,SIGNAL ( fatalHttpError() ),this, + SLOT ( close() ) ); + connect ( broker,SIGNAL ( cmdReconnect() ),this, + SLOT ( slotReconnectSession() ) ); + connect ( broker, SIGNAL ( authFailed()), this ,SLOT ( slotGetBrokerAuth())); + connect ( broker, SIGNAL( sessionsLoaded()), this, SLOT (slotReadSessions())); + connect ( broker, SIGNAL ( getSession(QString)), this, SLOT (slotGetBrokerSession(QString))); + connect ( broker, SIGNAL ( passwordChanged(QString)), this, SLOT ( slotPassChanged(QString))); + + + } + + x2goDebug<<"ONMainWindows constructor finished, home Directory is:"<<homeDir<<endl; } @@ -375,8 +421,6 @@ ONMainWindow::~ONMainWindow() - - void ONMainWindow::installTranslator() { QTranslator* x2goclientTranslator=new QTranslator(); @@ -630,6 +674,19 @@ void ONMainWindow::initWidgetsNormal() QIcon ( iconsPath ( "/32x32/create_file.png" ) ), tr ( "&Create session icon on desktop..." ), this ); + if(brokerMode) + act_sessicon->setEnabled(false); + + if(changeBrokerPass) + { + act_changeBrokerPass=new QAction ( + QIcon ( iconsPath ( "/32x32/auth.png" ) ), + tr ( "&Set broker password..." ), + this ); + connect ( act_changeBrokerPass,SIGNAL ( triggered(bool)),this, + SLOT ( slotChangeBrokerPass()) ); + act_changeBrokerPass->setEnabled(false); + } QAction *act_tb=new QAction ( tr ( "Show toolbar" ),this ); @@ -652,6 +709,7 @@ void ONMainWindow::initWidgetsNormal() SLOT ( trayQuit()) ) ; connect ( act_tb,SIGNAL ( toggled ( bool ) ),this, SLOT ( displayToolBar ( bool ) ) ); + stb=addToolBar ( tr ( "Show toolbar" ) ); QShortcut* ex=new QShortcut ( QKeySequence ( tr ( "Ctrl+Q","exit" ) ), @@ -662,7 +720,8 @@ void ONMainWindow::initWidgetsNormal() { QMenu* menu_sess=menuBar()->addMenu ( tr ( "&Session" ) ); QMenu* menu_opts=menuBar()->addMenu ( tr ( "&Options" ) ); - + if(!brokerMode) + { menu_sess->addAction ( act_new ); menu_sess->addAction ( act_edit ); #if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN) @@ -670,14 +729,21 @@ void ONMainWindow::initWidgetsNormal() menu_sess->addAction ( act_sessicon ); #endif menu_sess->addSeparator(); + } menu_sess->addAction ( act_exit ); menu_opts->addAction ( act_set ); menu_opts->addAction ( act_tb ); + if(changeBrokerPass) + menu_opts->addAction(act_changeBrokerPass); QMenu* menu_help=menuBar()->addMenu ( tr ( "&Help" ) ); + if(supportMenuFile!=QString::null) + menu_help->addAction ( act_support ); menu_help->addAction ( act_abclient ); menu_help->addAction ( act_abqt ); + if(!brokerMode) + { stb->addAction ( act_new ); stb->addAction ( act_edit ); #if (!defined Q_WS_HILDON) && (!defined Q_OS_DARWIN) @@ -685,7 +751,10 @@ void ONMainWindow::initWidgetsNormal() stb->addAction ( act_sessicon ); #endif stb->addSeparator(); + } stb->addAction ( act_set ); + if(changeBrokerPass) + stb->addAction(act_changeBrokerPass); if ( !showToolBar ) stb->hide(); @@ -708,7 +777,14 @@ void ONMainWindow::initWidgetsNormal() QTimer::singleShot ( 1500, this, SLOT ( readUsers() ) ); } else + { + if(!brokerMode) QTimer::singleShot ( 1, this, SLOT ( slotReadSessions() ) ); + else + { + QTimer::singleShot(1, this,SLOT(slotGetBrokerAuth())); + } + } QTimer* t=new QTimer ( this ); connect ( t,SIGNAL ( timeout() ),this,SLOT ( slotRereadUsers() ) ); t->start ( 20000 ); @@ -721,6 +797,95 @@ void ONMainWindow::initWidgetsNormal() } + +void ONMainWindow::slotPassChanged(const QString& result) +{ + + if(result==QString::null) + { + QMessageBox::critical(this, tr("Error"),tr("Operation failed")); + } + else + { + QMessageBox::information(this, tr("Password changed"),tr("Password changed")); + config.brokerPass=result; + } + setEnabled(true); + + slotClosePass(); + sessionStatusDlg->hide(); + +} + + +void ONMainWindow::slotChangeBrokerPass() +{ + x2goDebug<<"change broker pass"; + BrokerPassDlg passDlg; + if(passDlg.exec()!=QDialog::Accepted) + return; + if(passDlg.oldPass()!=config.brokerPass) + { + QMessageBox::critical(this,tr("Error"),tr("Wrong password!")); + return; + } + broker->changePassword(passDlg.newPass()); + setStatStatus ( tr ( "Connecting to broker" ) ); + stInfo->insertPlainText ( "broker url: "+config.brokerurl ); + setEnabled ( false ); + uname->hide(); + u->hide(); + return; +} + + +void ONMainWindow::slotCheckPortableDir() +{ + if(!QFile::exists(homeDir)) + { + x2goDebug<<"portable dir not exists, close"; + close(); + } +} + +void ONMainWindow::slotGetBrokerAuth() +{ + pass->clear(); + login->clear(); + QString pixFile=":icons/128x128/x2gosession.png"; + if(SPixFile!=QString::null) + pixFile=SPixFile; + QPixmap pix(pixFile); + if ( !miniMode ) + { + fotoLabel->setPixmap ( + pix.scaled ( 64,64, + Qt::IgnoreAspectRatio, + Qt::SmoothTransformation ) ); + fotoLabel->setFixedSize ( 64,64 ); + } + else + { + fotoLabel->setPixmap ( + pix.scaled ( 48,48, + Qt::IgnoreAspectRatio, + Qt::SmoothTransformation ) ); + fotoLabel->setFixedSize ( 48,48 ); + } + users->hide(); + ln->hide(); + bgLay->insertStretch(3); + QString text=tr("Authentication"); + /* if(config.brokerName.length()>0) + text+=config.brokerName; + else + text+=config.brokerurl;*/ + nameLabel->setText ( text ); + slotShowPassForm(); + config.brokerAuthenticated=false; +} + + void ONMainWindow::trayIconInit() { @@ -1241,6 +1406,11 @@ void ONMainWindow::slotSelectedFromList ( UserButton* user ) void ONMainWindow::slotClosePass() { + if(brokerMode) + { + if(!config.brokerAuthenticated) + close(); + } passForm->hide(); if ( !embedMode ) { @@ -1256,8 +1426,11 @@ void ONMainWindow::slotClosePass() } else { + if(lastSession) + { lastSession->show(); uname->setText ( lastSession->name() ); + } } uname->setEnabled ( true ); u->setEnabled ( true ); @@ -1270,6 +1443,7 @@ void ONMainWindow::slotClosePass() void ONMainWindow::slotPassEnter() { + shadowSession=false; #if defined ( Q_OS_WIN ) || defined (Q_OS_DARWIN ) QString disp=getXDisplay(); @@ -1664,7 +1838,6 @@ void ONMainWindow::slotCreateDesktopIcon ( SessionButton* bt ) QSettings xst ( "HKEY_LOCAL_MACHINE\\SOFTWARE\\x2goclient", QSettings::NativeFormat ); QString workDir=xst.value ( "Default" ).toString(); - workDir+="\\bin"; QString progname=workDir+"\\x2goclient.exe"; QString args="--sessionid="+bt->id(); if ( crHidden ) @@ -1691,11 +1864,45 @@ void ONMainWindow::slotCreateDesktopIcon ( SessionButton* bt ) void ONMainWindow::slotReadSessions() { - X2goSettings st ( "sessions" ); + + users->show(); + ln->show(); - QStringList slst=st.setting()->childGroups(); - for ( int i=0;i<slst.size();++i ) + X2goSettings *st; + lastSession=0; + + if(brokerMode) + { + if(changeBrokerPass) + act_changeBrokerPass->setEnabled(true); + config.key=QString::null; + config.user=QString::null; + config.sessiondata=QString::null; + for (int i=sessions.count()-1;i>=0;--i) + { + SessionButton* but=sessions.takeAt(i); + if(but) + delete but; + } + + st=new X2goSettings(config.iniFile,QSettings::IniFormat); + sessionStatusDlg->hide(); + selectSessionDlg->hide(); + setEnabled ( true ); + slotClosePass(); + } + else + st= new X2goSettings( "sessions" ); + + QStringList slst=st->setting()->childGroups(); + x2goDebug<<"read "<<slst.size()<<" sessions from config file"; + if(brokerMode && (slst.size()==0)) { + QMessageBox::critical(this,tr("Error"),tr("X2Go sessions not found")); + close(); + } + for ( int i=0;i<slst.size();++i ) + { if ( slst[i]!="embedded" ) createBut ( slst[i] ); } @@ -1757,6 +1964,7 @@ void ONMainWindow::slotReadSessions() raise(); } } + delete st; } @@ -1814,6 +2022,9 @@ void ONMainWindow::placeButtons() else sessions[i]->move ( ( users->width()-260 ) /2, i*155+i*20+5 ); + if(brokerMode) + sessions[i]->move ( ( users->width()-360 ) /2, + i*150+i*25+5 ); sessions[i]->show(); } if ( sessions.size() ) @@ -1824,6 +2035,9 @@ void ONMainWindow::placeButtons() else uframe->setFixedHeight ( sessions.size() *155+ ( sessions.size()-1 ) *20 ); + if(brokerMode) + uframe->setFixedHeight ( + sessions.size() *150+ ( sessions.size()-1 ) *25 ); } } @@ -2118,6 +2332,16 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session ) sessionName=session->name(); QString sid=session->id(); + if(brokerMode) + { + broker->selectUserSession(session->id()); + setStatStatus ( tr ( "Connecting to broker" ) ); + stInfo->insertPlainText ( "broker url: "+config.brokerurl ); + setEnabled ( false ); + uname->hide(); + u->hide(); + return; + } X2goSettings st ( "sessions" ); diff --git a/onmainwindow.h b/onmainwindow.h index a1ea247..0f7d892 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -1,3 +1,4 @@ + /*************************************************************************** * Copyright (C) 2005-2011 by Oleksandr Shneyder * * oleksandr.shneyder(a)obviously-nice.de * @@ -54,6 +55,7 @@ #if defined(CFGPLUGIN) && defined(Q_OS_LINUX) class QX11EmbedContainer; #endif +class QTemporaryFile; class QLineEdit; class QFrame; class QVBoxLayout; @@ -138,6 +140,12 @@ struct ConfigFile { QString session; QString user; + QString brokerUser; + QString brokerPass; + QString brokerUserId; + QString brokerName; + bool brokerAuthenticated; + QString iniFile; QString server; QString sshport; QString proxy; @@ -215,6 +223,7 @@ class ONMainWindow : public QMainWindow #endif { friend class HttpBrokerClient; + friend class SessionButton; #ifdef CFGPLUGIN Q_PROPERTY ( QString x2goconfig READ x2goconfig WRITE setX2goconfig ) Q_CLASSINFO ( "ClassID", "{5a20006d-118f-4185-9653-9f98958a0008}" ) @@ -455,6 +464,8 @@ private: bool usePGPCard; bool miniMode; bool managedMode; + bool brokerMode; + bool changeBrokerPass; bool embedMode; QString statusString; int defaultLink; @@ -468,6 +479,7 @@ private: bool printSupport; bool showTbTooltip; bool noSessionEdit; + bool cleanAllFiles; struct SshProxy sshProxy; QString sshPort; QString clientSshPort; @@ -542,6 +554,7 @@ private: QScrollArea* users; QVBoxLayout* userl; QHBoxLayout* mainL; + QHBoxLayout* bgLay; QList<UserButton*> names; QList<SessionButton*> sessions; UserButton* lastUser; @@ -569,12 +582,14 @@ private: QAction *act_set; QAction *act_abclient; + QAction *act_support; QAction *act_shareFolder; QAction *act_suspend; QAction *act_terminate; QAction *act_reconnect; QAction *act_embedContol; QAction *act_embedToolBar; + QAction *act_changeBrokerPass; QToolBar *stb; @@ -620,6 +635,10 @@ private: int ldapPort2; QString ldapDn; QString sessionCmd; + + QString supportMenuFile; + QString BGFile; + QString SPixFile; QString LDAPSndSys; QString LDAPSndPort; @@ -684,11 +703,11 @@ private: HttpBrokerClient* broker; -#if defined ( Q_OS_WIN) && defined (CFGCLIENT ) +#if defined ( Q_OS_WIN) //&& defined (CFGCLIENT ) void xorgSettings(); bool startXorgOnStart; - bool useXming; - int xorgDelay; + bool useInternalX; + enum {VCXSRV, XMING} internalX; QString xorgExe; QString xorgOptions; QString xorgWinOptions; @@ -697,6 +716,7 @@ private: enum {WIN,FS,SAPP} xorgMode; QString xorgWidth; QString xorgHeight; + int waitingForX; #endif // Tray icon stuff based on patch from Joachim Langenbach <joachim(a)falaba.de> @@ -764,13 +784,17 @@ private slots: void slotSetWinServersReady(); void startWinServers(); void slotCheckXOrgLog(); + void slotCheckXOrgConnection(); #endif private slots: void slotShowPassForm(); void displayUsers(); + void slotPassChanged(const QString& result); void slotResize ( const QSize sz ); void slotUnameChanged ( const QString& text ); void slotPassEnter(); + void slotChangeBrokerPass(); + void slotCheckPortableDir(); void readUsers(); void slotSelectedFromList ( UserButton* user ); @@ -809,6 +833,8 @@ private slots: void slotSuspendSessFromSt(); void slotTermSess(); void slotNewSess(); + void slotGetBrokerAuth(); + void slotGetBrokerSession(const QString& sinfo); void slotCmdMessage ( bool result,QString output, SshProcess* ); void slotListSessions ( bool result,QString output, @@ -849,6 +875,7 @@ private slots: void slotExportTimer(); void slotAboutQt(); void slotAbout(); + void slotSupport(); //trayIcon stuff void trayIconActivated(QSystemTrayIcon::ActivationReason reason); diff --git a/onmainwindow_part2.cpp b/onmainwindow_part2.cpp index d45bd6f..2826f87 100644 --- a/onmainwindow_part2.cpp +++ b/onmainwindow_part2.cpp @@ -136,6 +136,16 @@ void ONMainWindow::slotSessEnter() slotPassEnter(); return; } + if(brokerMode) + { + if(!config.brokerAuthenticated) + { + x2goDebug<<"starting broker request"; + slotStartBroker(); + return; + } + } + resumingSession.sessionId=QString::null; resumingSession.server=QString::null; resumingSession.display=QString::null; @@ -150,11 +160,16 @@ void ONMainWindow::slotSessEnter() void ONMainWindow::continueNormalSession() { x2goDebug<<"continue normal x2go session"<<endl; + if(brokerMode) + { + slotListSessions(true,QString::null,0); + return; + } SshProcess* proc=new SshProcess ( sshConnection, this ); connect ( proc,SIGNAL ( sshFinished ( bool,QString,SshProcess* ) ), this,SLOT ( slotListSessions ( bool, QString, SshProcess* ) ) ); - if ( !shadowSession ) + if ( !shadowSession ) proc->startNormal ( "export HOSTNAME && x2golistsessions" ); else proc->startNormal ( "export HOSTNAME && x2golistdesktops" ); @@ -189,7 +204,7 @@ bool ONMainWindow::startSession ( const QString& sid ) return true; } - if ( !embedMode ) + if ( !embedMode && !brokerMode ) { X2goSettings st ( "sessions" ); @@ -210,8 +225,20 @@ bool ONMainWindow::startSession ( const QString& sid ) sshPort=config.sshport; selectedCommand=config.command; } - - passwd=getCurrentPass(); + if(!brokerMode) + passwd=getCurrentPass(); + else + { + currentKey=config.key; + host=config.server; + X2goSettings st ( config.iniFile, QSettings::IniFormat ); + passForm->setEnabled ( false ); + user=st.setting()->value ( sid+"/user", + ( QVariant ) QString::null ).toString(); + login->setText(user); + sshPort=st.setting()->value ( sid+"/sshport", + ( QVariant ) "22" ).toString(); + } startSshConnection ( host,sshPort,acceptRsa,user,passwd,autologin ); return true; @@ -253,7 +280,7 @@ void ONMainWindow::slotListSessions ( bool result,QString output, uname->setEnabled ( false ); u->setEnabled ( false ); } - if ( managedMode ) + if ( managedMode || brokerMode ) { x2goDebug<<"sess data:"<<config.sessiondata; if ( config.sessiondata.indexOf ( "|S|" ) ==-1 ) @@ -419,51 +446,57 @@ void ONMainWindow::startNewSession() } else { - X2goSettings st ( "sessions" ); - QString sid; + X2goSettings* st; + + if(!brokerMode) + st=new X2goSettings( "sessions" ); + else + st= new X2goSettings(config.iniFile,QSettings::IniFormat); + + QString sid; if ( !embedMode ) sid=lastSession->id(); else sid="embedded"; - pack=st.setting()->value ( sid+"/pack", + pack=st->setting()->value ( sid+"/pack", ( QVariant ) defaultPack ).toString(); - fullscreen=st.setting()->value ( sid+"/fullscreen", + fullscreen=st->setting()->value ( sid+"/fullscreen", ( QVariant ) defaultFullscreen ).toBool(); - height=st.setting()->value ( sid+"/height", + height=st->setting()->value ( sid+"/height", ( QVariant ) defaultHeight ).toInt(); - width=st.setting()->value ( sid+"/width", + width=st->setting()->value ( sid+"/width", ( QVariant ) defaultWidth ).toInt(); - setDPI=st.setting()->value ( sid+"/setdpi", + setDPI=st->setting()->value ( sid+"/setdpi", ( QVariant ) defaultSetDPI ).toBool(); - dpi=st.setting()->value ( sid+"/dpi", + dpi=st->setting()->value ( sid+"/dpi", ( QVariant ) defaultDPI ).toUInt(); - quality=st.setting()->value ( + quality=st->setting()->value ( sid+"/quality", ( QVariant ) defaultQuality ).toInt(); - speed=st.setting()->value ( sid+"/speed", + speed=st->setting()->value ( sid+"/speed", ( QVariant ) defaultLink ).toInt(); - usekbd=st.setting()->value ( sid+"/usekbd", + usekbd=st->setting()->value ( sid+"/usekbd", ( QVariant ) defaultSetKbd ).toBool(); - layout=st.setting()->value ( sid+"/layout", + layout=st->setting()->value ( sid+"/layout", ( QVariant ) defaultLayout[0] ).toString(); - type=st.setting()->value ( sid+"/type", + type=st->setting()->value ( sid+"/type", ( QVariant ) defaultKbdType ).toString(); if ( !embedMode ) { - command=st.setting()->value ( sid+"/command", + command=st->setting()->value ( sid+"/command", ( QVariant ) defaultCmd ).toString(); - host=st.setting()->value ( + host=st->setting()->value ( sid+"/host", ( QVariant ) ( QString ) "localhost" ).toString(); - rootless=st.setting()->value ( sid+"/rootless", + rootless=st->setting()->value ( sid+"/rootless", ( QVariant ) false ).toBool(); - xdmcpServer=st.setting()->value ( sid+"/xdmcpserver", + xdmcpServer=st->setting()->value ( sid+"/xdmcpserver", ( QVariant ) "localhost" ).toString(); } @@ -473,7 +506,7 @@ void ONMainWindow::startNewSession() rootless= config.rootless; host=config.server; startEmbedded=false; - if ( st.setting()->value ( sid+"/startembed", + if ( st->setting()->value ( sid+"/startembed", ( QVariant ) true ).toBool() ) { startEmbedded=true; @@ -511,6 +544,7 @@ void ONMainWindow::startNewSession() { runRemoteCommand=false; } + delete st; } @@ -531,7 +565,7 @@ void ONMainWindow::startNewSession() maximizeProxyWin=false; proxyWinWidth=width; proxyWinHeight=height; -#ifdef CFGCLIENT +//#ifdef CFGCLIENT xorgMode=WIN; if(fullscreen) xorgMode=FS; @@ -539,9 +573,9 @@ void ONMainWindow::startNewSession() xorgMode=SAPP; xorgWidth=QString::number(width); xorgHeight=QString::number(height); - if(!useXming && ! startXorgOnStart) + if(! startXorgOnStart) startXOrg(); -#endif +//#endif #endif if ( fullscreen ) { @@ -709,43 +743,47 @@ void ONMainWindow::resumeSession ( const x2goSession& s ) sid=lastSession->id(); else sid="embedded"; - X2goSettings st ( "sessions" ); + X2goSettings* st; + if(!brokerMode) + st=new X2goSettings( "sessions" ); + else + st=new X2goSettings(config.iniFile,QSettings::IniFormat); - pack=st.setting()->value ( sid+"/pack", + pack=st->setting()->value ( sid+"/pack", ( QVariant ) defaultPack ).toString(); - fullscreen=st.setting()->value ( sid+"/fullscreen", + fullscreen=st->setting()->value ( sid+"/fullscreen", ( QVariant ) defaultFullscreen ).toBool(); - height=st.setting()->value ( sid+"/height", + height=st->setting()->value ( sid+"/height", ( QVariant ) defaultHeight ).toInt(); - width=st.setting()->value ( sid+"/width", + width=st->setting()->value ( sid+"/width", ( QVariant ) defaultWidth ).toInt(); - quality=st.setting()->value ( sid+"/quality", + quality=st->setting()->value ( sid+"/quality", ( QVariant ) defaultQuality ).toInt(); - speed=st.setting()->value ( sid+"/speed", + speed=st->setting()->value ( sid+"/speed", ( QVariant ) defaultLink ).toInt(); - usekbd=st.setting()->value ( sid+"/usekbd", + usekbd=st->setting()->value ( sid+"/usekbd", ( QVariant ) defaultSetKbd ).toBool(); - layout=st.setting()->value ( sid+"/layout", + layout=st->setting()->value ( sid+"/layout", ( QVariant ) defaultLayout[0] ).toString(); - type=st.setting()->value ( sid+"/type", + type=st->setting()->value ( sid+"/type", ( QVariant ) defaultKbdType ).toString(); - rootless=st.setting()->value ( sid+"/rootless", + rootless=st->setting()->value ( sid+"/rootless", ( QVariant ) false ).toBool(); if ( !embedMode ) { - host=st.setting()->value ( sid+"/host", + host=st->setting()->value ( sid+"/host", ( QVariant ) s.server ).toString(); } else { startEmbedded=false; - if ( st.setting()->value ( sid+"/startembed", + if ( st->setting()->value ( sid+"/startembed", ( QVariant ) true ).toBool() ) { fullscreen=false; @@ -773,6 +811,7 @@ void ONMainWindow::resumeSession ( const x2goSession& s ) usekbd=true; } } + delete st; } if(defaultLayout.size()>0) @@ -783,7 +822,7 @@ void ONMainWindow::resumeSession ( const x2goSession& s ) maximizeProxyWin=false; proxyWinWidth=width; proxyWinHeight=height; -#ifdef CFGCLIENT +// #ifdef CFGCLIENT xorgMode=WIN; if(fullscreen) xorgMode=FS; @@ -791,9 +830,9 @@ void ONMainWindow::resumeSession ( const x2goSession& s ) xorgMode=SAPP; xorgWidth=QString::number(width); xorgHeight=QString::number(height); - if(!useXming && ! startXorgOnStart) + if(! startXorgOnStart) startXOrg(); -#endif +// #endif #endif if ( fullscreen ) @@ -1815,9 +1854,10 @@ void ONMainWindow::slotTunnelOk() #ifdef Q_OS_WIN else { -#ifdef CFGCLIENT - if(useXming) -#endif +// #ifdef CFGCLIENT + // if using XMing, we must find proxy win for case, that we should make it fullscreen + if(useInternalX&& (internalX==XMING)) +// #endif proxyWinTimer->start ( 300 ); } #endif @@ -1899,8 +1939,8 @@ void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus ) #ifdef Q_OS_WIN else proxyWinTimer->stop(); -#ifdef CFGCLIENT - if(!useXming && ! startXorgOnStart) +// #ifdef CFGCLIENT + if(! startXorgOnStart) { if(xorg) { @@ -1912,7 +1952,7 @@ void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus ) } } } -#endif +// #endif #endif if ( closeEventSent ) return; @@ -1993,9 +2033,16 @@ void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus ) { if ( !embedMode ) { + if(!brokerMode) + { pass->setText ( "" ); QTimer::singleShot ( 2000,this, SLOT ( slotShowPassForm() ) ); + } + else + QTimer::singleShot ( 2000,broker, + SLOT ( getUserSessions() ) ); + } } else diff --git a/onmainwindow_part3.cpp b/onmainwindow_part3.cpp index acb533e..a2d10b8 100644 --- a/onmainwindow_part3.cpp +++ b/onmainwindow_part3.cpp @@ -51,7 +51,11 @@ void ONMainWindow::runCommand() bool rootless=false; if ( !embedMode ) { - X2goSettings st ( "sessions" ); + X2goSettings* st; + if(!brokerMode) + st=new X2goSettings( "sessions" ); + else + st=new X2goSettings(config.iniFile, QSettings::IniFormat); if ( useLdap ) @@ -59,29 +63,30 @@ void ONMainWindow::runCommand() else { QString sid=lastSession->id(); - command=st.setting()->value ( + command=st->setting()->value ( sid+"/command", ( QVariant ) tr ( "KDE" ) ).toString(); - rdpOpts=st.setting()->value ( + rdpOpts=st->setting()->value ( sid+"/rdpoptions", ( QVariant ) "" ).toString(); - rdpServer=st.setting()->value ( + rdpServer=st->setting()->value ( sid+"/rdpserver", ( QVariant ) "" ).toString(); - rootless=st.setting()->value ( sid+"/rootless", + rootless=st->setting()->value ( sid+"/rootless", ( QVariant ) false ).toBool(); - rdpFS=st.setting()->value ( + rdpFS=st->setting()->value ( sid+"/fullscreen", ( QVariant ) defaultFullscreen ).toBool(); - rdpHeight=st.setting()->value ( + rdpHeight=st->setting()->value ( sid+"/height", ( QVariant ) defaultHeight ).toString(); - rdpWidth=st.setting()->value ( + rdpWidth=st->setting()->value ( sid+"/width", ( QVariant ) defaultWidth ).toString(); } + delete st; } else { @@ -220,6 +225,11 @@ bool ONMainWindow::parseParameter ( QString param ) ONMainWindow::portable=true; return true; } + if ( param == "--clean-all-files" ) + { + cleanAllFiles=true; + return true; + } if ( param=="--no-menu" ) { @@ -257,6 +267,12 @@ bool ONMainWindow::parseParameter ( QString param ) noSessionEdit=true; return true; } + if( param=="--change-broker-pass") + { + changeBrokerPass=true; + return true; + } + QString setting,value; QStringList vals=param.split ( "=" ); @@ -368,6 +384,86 @@ bool ONMainWindow::parseParameter ( QString param ) embedParent=value.toLong(); return true; } + if( setting == "--broker-url") + { + brokerMode=true; + noSessionEdit=true; + config.brokerurl=value; + return true; + } + if( setting == "--broker-name") + { + config.brokerName=value; + return true; + } + if( setting == "--auth-id") + { + QFile file(value); + if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) + { + printError ( param + tr(" (can't open file)")); + return false; + } + QTextStream in(&file); + config.brokerUserId = in.readLine(); + return true; + } + if(setting == "--support-menu") + { + if(! QFile::exists(value)) + { + printError( param + tr(" (file not exists)")); + return false; + } + supportMenuFile=value; + return true; + } + if(setting == "--background") + { + if(! QFile::exists(value)) + { + printError( param + tr(" (file not exists)")); + return false; + } + BGFile=value; + return true; + } + if(setting == "--session-icon") + { + if(! QFile::exists(value)) + { + printError( param + tr(" (file not exists)")); + return false; + } + SPixFile=value; + return true; + } + if(setting == "--home") + { + QDir dr; + +#ifdef Q_OS_WIN + int find=value.indexOf("("); + int lind=value.indexOf(")"); + if(find!=-1 && lind !=-1) + { + QString label=value.mid(find+1,lind-find-1); + x2goDebug<< "searching for drive with label: "<<label; + QString drive=wapiGetDriveByLabel(label); + value.replace("("+label+")",drive); + x2goDebug<<"new path: "<<value; + } +#endif + if(! dr.exists(value)) + { + printError( param + tr(" (directory not exists)")); + return false; + } + homeDir=value; + portableDataPath=value; + return true; + } + printError ( param ); return false; } @@ -617,6 +713,7 @@ void ONMainWindow::showHelp() "--kbd-layout=<layout>\t\t set default keyboard layout or layouts\n" "comma separated\n" "--kbd-type=<typed>\t\t set default keyboard type\n" + "--home=<dir>\t\t set users home directory\n" "--set-kbd=<0|1>\t\t\t overwrite current keyboard settings\n" ; qCritical ( "%s",helpMsg.toLocal8Bit().data() ); QMessageBox::information ( this,tr ( "Options" ),helpMsg ); @@ -1388,7 +1485,7 @@ void ONMainWindow::slotExportTimer() { SshProcess* sproc=new SshProcess ( sshConnection, this ); - sproc->startNormal ( "export HOSTNAME && x2goumount-session "+ + sproc->startNormal ( "export HOSTNAME && x2goumount_session "+ sessionId+" "+args[i] ); } } @@ -1398,6 +1495,21 @@ void ONMainWindow::slotAboutQt() QMessageBox::aboutQt ( this ); } +void ONMainWindow::slotSupport() +{ + QFile file(supportMenuFile); + if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) + return; + + QTextStream in(&file); + QString sup; + while (!in.atEnd()) + { + sup+=in.readLine(); + } + QMessageBox::information (this,tr ( "Support" ),sup); +} + void ONMainWindow::slotAbout() { QString aboutStr=tr ( diff --git a/onmainwindow_part4.cpp b/onmainwindow_part4.cpp index 451c421..a6102d6 100644 --- a/onmainwindow_part4.cpp +++ b/onmainwindow_part4.cpp @@ -282,14 +282,18 @@ void ONMainWindow::startXOrg () QTextStream ( &dispString ) <<":"<<xDisplay; QStringList args; - QString exec=appDir+"\\xming\\Xming.exe"; - bool xming=true; + QString exec; + if(internalX==XMING) + exec=appDir+"\\xming\\Xming.exe"; + if(internalX==VCXSRV) + exec=appDir+"\\vcxsrv\\vcxsrv.exe"; winServersReady=false; -#ifdef CFGCLIENT - xming=useXming; - if (!xming) + x2goDebug<<"using internal X: "<<useInternalX; +//#ifdef CFGCLIENT + if (!useInternalX || internalX!=XMING) { - exec=xorgExe; + if(!useInternalX) + exec=xorgExe; QString cmdLine; if (startXorgOnStart) cmdLine=xorgOptions; @@ -320,9 +324,9 @@ void ONMainWindow::startXOrg () } args<<dispString; } -#endif +//#endif xorg=new QProcess ( 0 ); - if (xming) + if (useInternalX && (internalX==XMING)) { QString workingDir=appDir+"\\xming"; @@ -344,7 +348,7 @@ void ONMainWindow::startXOrg () xorg-> setWorkingDirectory ( workingDir); } - x2goDebug<<"running"<<exec; + x2goDebug<<"running"<<exec<<" "<<args.join(" "); xorg->start ( exec, args ); @@ -356,15 +360,41 @@ void ONMainWindow::startXOrg () "Please check your installation" ) ); close(); } -#ifdef CFGCLIENT - if (!xming) +// #ifdef CFGCLIENT + if ( !useInternalX || internalX!= XMING) { - x2goDebug<<"servers ready after"<<xorgDelay<<endl; - QTimer::singleShot(xorgDelay*1000, this, SLOT(slotSetWinServersReady())); + //check connection in slot and launch setWinServerReady + waitingForX=0; + QTimer::singleShot(1000, this, SLOT(slotCheckXOrgConnection())); } -#endif +// #endif } +void ONMainWindow::slotCheckXOrgConnection() +{ + ++waitingForX; + if(isServerRunning(6000+xDisplay)) + { + x2goDebug<<"X is started"; + slotSetWinServersReady(); + } + else + { + if(waitingForX > 10) + { + QMessageBox::critical ( + 0,QString::null, + tr ( "Can't start X Server\n" + "Please check your installation" ) ); + close(); + } + else + { + x2goDebug<<"waiting for X"; + QTimer::singleShot(1000, this, SLOT(slotCheckXOrgConnection())); + } + } +} WinServerStarter::WinServerStarter ( daemon server, ONMainWindow * par ) : QThread ( 0 ) @@ -421,17 +451,17 @@ void ONMainWindow::startWinServers() { pulseStarter->start(); } -#ifdef CFGCLIENT - x2goDebug<<"xorg settings: "<<startXorgOnStart <<" "<< useXming<<endl; - if (useXming) +// #ifdef CFGCLIENT +// x2goDebug<<"xorg settings: "<<startXorgOnStart <<" "<< useXming<<endl; + if ( useInternalX && (internalX== XMING)) { -#endif +// #endif xStarter->start(); xorgLogTimer=new QTimer ( this ); connect ( xorgLogTimer,SIGNAL ( timeout() ),this, SLOT ( slotCheckXOrgLog() ) ); xorgLogTimer->start ( 500 ); -#ifdef CFGCLIENT +// #ifdef CFGCLIENT } else { @@ -440,7 +470,7 @@ void ONMainWindow::startWinServers() startXOrg(); } } -#endif +// #endif } @@ -678,26 +708,45 @@ void ONMainWindow::startPulsed() } -#ifdef CFGCLIENT +// #ifdef CFGCLIENT void ONMainWindow::xorgSettings() { x2goDebug<<"getting xorg settings"<<endl; X2goSettings st ( "settings" ); - useXming=(st.setting()->value("usexming",true).toBool()); + + useInternalX=(st.setting()->value("useintx",true).toBool()); + xorgExe=(st.setting()->value("xexec","C:\\program files\\vcxsrv\\vcxsrv.exe").toString()); xorgOptions=(st.setting()->value("options","-multiwindow -notrayicon -clipboard").toString()); startXorgOnStart=(st.setting()->value("onstart",true).toBool()); xorgWinOptions=(st.setting()->value("optionswin","-screen 0 %wx%h -notrayicon -clipboard").toString()); xorgFSOptions=(st.setting()->value("optionsfs","-fullscreen -notrayicon -clipboard").toString()); xorgSAppOptions=(st.setting()->value("optionssingle","-multiwindow -notrayicon -clipboard").toString()); - xorgDelay=(st.setting()->value("delay",3).toInt()); + + if(QFile::exists(appDir+"\\vcxsrv")) + internalX=VCXSRV; + if(QFile::exists(appDir+"\\xming")) + internalX=XMING; + if(useInternalX) + { + startXorgOnStart=(internalX==XMING); + xorgOptions="-multiwindow -notrayicon -clipboard"; + if(internalX==VCXSRV) + { +// xorgWinOptions="-screen 0 %wx%h -notrayicon -clipboard"; + xorgWinOptions="-multiwindow -notrayicon -clipboard"; + xorgFSOptions="-fullscreen -notrayicon -clipboard"; + xorgSAppOptions="-multiwindow -notrayicon -clipboard"; + } + } } -#endif +// #endif void ONMainWindow::slotSetWinServersReady() { + x2goDebug<<"all winservers are started\n"; winServersReady=true; restoreCygnusSettings(); } @@ -906,7 +955,7 @@ QString ONMainWindow::getCurrentUname() QString ONMainWindow::getCurrentPass() { - return pass->text(); + return pass->text(); } void ONMainWindow::slotDetachProxyWindow() @@ -2117,22 +2166,43 @@ QSize ONMainWindow::getEmbedAreaSize() void ONMainWindow::slotStartBroker() { - broker=new HttpBrokerClient ( this, &config ); - connect ( broker,SIGNAL ( haveSshKey ( QString ) ),this, - SLOT ( slotStartSshAgent ( QString ) ) ); - connect ( broker,SIGNAL ( haveAgentInfo () ),this, - SLOT ( slotStartNewBrokerSession () ) ); - connect ( broker,SIGNAL ( fatalHttpError() ),this, - SLOT ( close() ) ); - connect ( broker,SIGNAL ( cmdReconnect() ),this, - SLOT ( slotReconnectSession() ) ); + config.brokerPass=pass->text(); + config.brokerUser=login->text(); setStatStatus ( tr ( "Connecting to broker" ) ); stInfo->insertPlainText ( "broker url: "+config.brokerurl ); setEnabled ( false ); - + broker->getUserSessions(); +} + +void ONMainWindow::slotGetBrokerSession(const QString& sinfo) +{ + //x2goDebug<<"broker session: "<<sinfo; + QStringList lst=sinfo.split("SERVER:",QString::SkipEmptyParts); + int keyStartPos=sinfo.indexOf("-----BEGIN DSA PRIVATE KEY-----"); + QString endStr="-----END DSA PRIVATE KEY-----"; + int keyEndPos=sinfo.indexOf(endStr); + if(keyEndPos == -1 || keyStartPos == -1 || lst.size()==0) + { + //throw error + QMessageBox::critical ( + 0,tr ( "Error" ), + tr ("Invalid reply from broker") +" "+sinfo); + + close(); + return; + } + config.server=(lst[1].split("\n"))[0]; + config.key=sinfo.mid(keyStartPos, keyEndPos+endStr.length()-keyStartPos); +// x2goDebug<<"server: "<<config.server<<endl<<" key: "<<config.key; + if(sinfo.indexOf("SESSION_INFO")!=-1) + { + QStringList lst=sinfo.split("SESSION_INFO:",QString::SkipEmptyParts); + config.sessiondata=(lst[1].split("\n"))[0]; +// x2goDebug<<"data: "<<config.sessiondata; + } + slotSessEnter(); } - void ONMainWindow::slotStartNewBrokerSession ( ) { if ( managedMode ) @@ -2176,19 +2246,21 @@ QString ONMainWindow::u3DataPath() void ONMainWindow::cleanPortable() { - QDir dr; - dr.rmdir ( QDir::homePath() +"/.ssh" ); - removeDir ( homeDir+"/.x2go/" ); + removeDir ( homeDir +"/.ssh" ); + removeDir ( homeDir +"/ssh" ); + removeDir ( homeDir+"/.x2go" ); + if(cleanAllFiles) + removeDir(homeDir+"/.x2goclient"); } void ONMainWindow::removeDir ( QString path ) { - x2goDebug<<"entering path"; + x2goDebug<<"entering " <<path; QDir dr ( path ); QStringList files=dr.entryList ( QDir::Files ); for ( int i=0;i<files.size();++i ) { - if ( files[i]!="known_hosts" ) + if ( files[i]!="known_hosts" || cleanAllFiles) { x2goDebug<<"cleaning file:"<<path+"/"+files[i]; dr.remove ( path+"/"+files[i] ); diff --git a/onmainwindow_privat.h b/onmainwindow_privat.h index 60d623e..a2d54aa 100644 --- a/onmainwindow_privat.h +++ b/onmainwindow_privat.h @@ -74,6 +74,7 @@ #include "clicklineedit.h" #include <QThread> +#include "brokerpassdlg.h" #include "sshmasterconnection.h" diff --git a/resources.rcc b/resources.rcc index 931afc1..a22aaa9 100644 --- a/resources.rcc +++ b/resources.rcc @@ -40,6 +40,7 @@ <file>icons/32x32/detach.png</file> <file>icons/32x32/suspend.png</file> <file>icons/32x32/stop.png</file> + <file>icons/32x32/auth.png</file> <file>icons/32x32/x2goclient.png</file> <file>icons/32x32/resolution.png</file> <file>icons/16x16/audio.png</file> diff --git a/sessionbutton.cpp b/sessionbutton.cpp index 197ad11..c5ec122 100644 --- a/sessionbutton.cpp +++ b/sessionbutton.cpp @@ -30,7 +30,7 @@ SessionButton::SessionButton ( ONMainWindow* mw,QWidget *parent, QString id ) : SVGFrame ( ":/svg/sessionbut.svg",false,parent ) { editable=mw->sessionEditEnabled(); - + QFont fnt=font(); if ( mw->retMiniMode() ) #ifdef Q_WS_HILDON @@ -71,6 +71,7 @@ SessionButton::SessionButton ( ONMainWindow* mw,QWidget *parent, QString id ) geomBox->setPalette ( cpal ); sessName=new QLabel ( this ); + sessStatus=new QLabel ( this ); fnt=sessName->font(); fnt.setBold ( true ); sessName->setFont ( fnt ); @@ -142,6 +143,7 @@ SessionButton::SessionButton ( ONMainWindow* mw,QWidget *parent, QString id ) if ( !miniMode ) { sessName->move ( 80,34 ); + sessStatus->move(80,50); editBut->move ( 307,156 ); serverIcon->move ( 58,84 ); server->move ( 80,84 ); @@ -158,6 +160,7 @@ SessionButton::SessionButton ( ONMainWindow* mw,QWidget *parent, QString id ) { editBut->move ( 218,113 ); sessName->move ( 64,11 ); + sessStatus->hide(); serverIcon->move ( 66,44 ); server->move ( 88,44 ); cmdIcon->move ( 66,68 ); @@ -169,6 +172,14 @@ SessionButton::SessionButton ( ONMainWindow* mw,QWidget *parent, QString id ) soundIcon->move ( 66,116 ); sound->move ( 86,116 ); } + + if(mw->brokerMode) + { + icon->move(10,30); + sessName->move(90,50); + sessStatus->move(90,70); + setFixedHeight(120); + } cmdBox->hide(); @@ -206,7 +217,18 @@ SessionButton::SessionButton ( ONMainWindow* mw,QWidget *parent, QString id ) cmdBox->hide(); geomBox->hide(); sessMenu->hide(); - sound->setEnabled(false); + sound->setEnabled(false); + } + if(mw->brokerMode) + { + cmd->hide(); + cmdIcon->hide(); + server->hide(); + serverIcon->hide(); + geom->hide(); + geomIcon->hide(); + sound->hide(); + soundIcon->hide(); } } @@ -232,36 +254,66 @@ void SessionButton::slotRemove() void SessionButton::redraw() { bool snd; - X2goSettings st ( "sessions" ); + + + X2goSettings *st; + + if (par->brokerMode) + st=new X2goSettings(par->config.iniFile,QSettings::IniFormat); + else + st= new X2goSettings( "sessions" ); + + + sessName->setText ( - st.setting()->value ( sid+"/name", - ( QVariant ) tr ( "New Session" ) ).toString() ); - QString sessIcon=st.setting()->value ( + st->setting()->value ( sid+"/name", + ( QVariant ) tr ( "New Session" ) ).toString()); + QString status=st->setting()->value ( sid+"/status", + ( QVariant ) QString::null ).toString(); + if (status == "R") + { + sessStatus->setText("("+tr("running")+")"); + } + if (status == "S") + { + sessStatus->setText("("+tr("suspended")+")"); + } + + QString sessIcon=st->setting()->value ( sid+"/icon", ( QVariant ) ":icons/128x128/x2gosession.png" ).toString(); - QPixmap pix ( sessIcon ); + QPixmap* pix; + + if (!par->brokerMode || sessIcon == ":icons/128x128/x2gosession.png") + pix=new QPixmap( sessIcon ); + else + { + pix=new QPixmap; + pix->loadFromData(QByteArray::fromBase64(sessIcon.toAscii())); + } if ( !par->retMiniMode() ) - icon->setPixmap ( pix.scaled ( 64,64,Qt::IgnoreAspectRatio, - Qt::SmoothTransformation ) ); + icon->setPixmap ( pix->scaled ( 64,64,Qt::IgnoreAspectRatio, + Qt::SmoothTransformation ) ); else - icon->setPixmap ( pix.scaled ( 48,48,Qt::IgnoreAspectRatio, - Qt::SmoothTransformation ) ); - - QString sv=st.setting()->value ( sid+"/host", ( QVariant ) - QString::null ).toString(); - QString uname=st.setting()->value ( sid+"/user", ( QVariant ) - QString::null ).toString(); + icon->setPixmap ( pix->scaled ( 48,48,Qt::IgnoreAspectRatio, + Qt::SmoothTransformation ) ); + + delete pix; + QString sv=st->setting()->value ( sid+"/host", ( QVariant ) + QString::null ).toString(); + QString uname=st->setting()->value ( sid+"/user", ( QVariant ) + QString::null ).toString(); server->setText ( uname+"@"+sv ); - QString command=st.setting()->value ( sid+"/command", - ( QVariant ) - tr ( - "KDE" ) ). + QString command=st->setting()->value ( sid+"/command", + ( QVariant ) + tr ( + "KDE" ) ). toString(); - rootless=st.setting()->value ( sid+"/rootless", - false ).toBool(); + rootless=st->setting()->value ( sid+"/rootless", + false ).toBool(); cmdBox->clear(); @@ -337,17 +389,17 @@ void SessionButton::redraw() #else geomBox->addItem ( tr ( "window" ) ); #endif - if ( st.setting()->value ( sid+"/fullscreen", - ( QVariant ) false ).toBool() ) + if ( st->setting()->value ( sid+"/fullscreen", + ( QVariant ) false ).toBool() ) { geom->setText ( tr ( "fullscreen" ) ); } else { #ifndef Q_WS_HILDON - QString g=QString::number ( st.setting()->value ( + QString g=QString::number ( st->setting()->value ( sid+"/width" ).toInt() ); - g+="x"+QString::number ( st.setting()->value ( + g+="x"+QString::number ( st->setting()->value ( sid+"/height" ).toInt() ); geom->setText ( g ); if ( geomBox->findText ( g ) ==-1 ) @@ -360,7 +412,7 @@ void SessionButton::redraw() } - snd=st.setting()->value ( sid+"/sound", ( QVariant ) true ).toBool(); + snd=st->setting()->value ( sid+"/sound", ( QVariant ) true ).toBool(); if ( snd ) sound->setText ( tr ( "Enabled" ) ); else @@ -374,6 +426,7 @@ void SessionButton::redraw() geom->setMinimumSize ( geom->sizeHint() ); cmd->setMinimumSize ( cmd->sizeHint() ); server->setMinimumSize ( server->sizeHint() ); + delete st; } void SessionButton::mousePressEvent ( QMouseEvent * event ) @@ -396,8 +449,8 @@ void SessionButton::mouseMoveEvent ( QMouseEvent * event ) { SVGFrame::mouseMoveEvent ( event ); - if(!editable) - return; + if (!editable) + return; if ( cmd->isVisible() ) if ( event->x() > cmd->x() && event->x() < cmd->x() + cmd->width() && diff --git a/sessionbutton.h b/sessionbutton.h index 8efaad4..b39bdb5 100644 --- a/sessionbutton.h +++ b/sessionbutton.h @@ -36,6 +36,7 @@ class SessionButton : public SVGFrame private: QString sid; QLabel* sessName; + QLabel* sessStatus; QLabel* icon; QComboBox* cmdBox; QLabel* cmd; diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp index d36d675..224b7bf 100644 --- a/sshmasterconnection.cpp +++ b/sshmasterconnection.cpp @@ -28,8 +28,10 @@ #include <arpa/inet.h> #endif +#include "onmainwindow.h" + #undef DEBUG -#define DEBUG +// #define DEBUG static bool isLibSshInited=false; @@ -44,11 +46,13 @@ SshMasterConnection::SshMasterConnection ( QString host, int port, bool acceptUn this->autologin=autologin; this->acceptUnknownServers=acceptUnknownServers; reverseTunnel=false; + mainWnd=(ONMainWindow*) parent; } SshMasterConnection::SshMasterConnection ( QString host, int port, bool acceptUnknownServers, QString user, QString pass, QString key, bool autologin, - int remotePort, QString localHost, int localPort, SshProcess* creator, QObject* parent ) : QThread ( parent ) + int remotePort, QString localHost, int localPort, SshProcess* creator, + QObject* parent, ONMainWindow* mwd ) : QThread ( parent ) { this->host=host; @@ -63,6 +67,7 @@ SshMasterConnection::SshMasterConnection ( QString host, int port, bool acceptUn reverseTunnelCreator=creator; reverseTunnel=true; reverseTunnelRemotePort=remotePort; + mainWnd=mwd; } SshMasterConnection* SshMasterConnection::reverseTunnelConnection ( SshProcess* creator, @@ -70,7 +75,7 @@ SshMasterConnection* SshMasterConnection::reverseTunnelConnection ( SshProcess* { SshMasterConnection* con=new SshMasterConnection ( host,port,acceptUnknownServers,user,pass, key,autologin, remotePort,localHost, - localPort,creator,this ); + localPort,creator,this, mainWnd); connect ( con,SIGNAL ( ioErr ( SshProcess*,QString,QString ) ),this,SIGNAL ( ioErr ( SshProcess*,QString,QString ) ) ); connect ( con,SIGNAL ( stdErr ( SshProcess*,QByteArray ) ),this,SIGNAL ( stdErr ( SshProcess*,QByteArray ) ) ); @@ -120,7 +125,9 @@ void SshMasterConnection::run() quit(); return; } - +#ifdef Q_OS_WIN + 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); if ( !sshConnect() ) { @@ -146,9 +153,18 @@ void SshMasterConnection::run() } ssh_options_set ( my_ssh_session, SSH_OPTIONS_USER, user.toAscii() ); +#ifdef Q_OS_WIN + ssh_options_set ( my_ssh_session, SSH_OPTIONS_SSH_DIR, (mainWnd->getHomeDirectory()+"/ssh").toAscii()); +#endif + x2goDebug<<"setting SSH DIR to "<<mainWnd->getHomeDirectory()+"/ssh"; if ( userAuth() ) + { + #ifdef DEBUG + x2goDebug<<"user auth OK\n"; + #endif emit connectionOk(); + } else { QString err=ssh_get_error ( my_ssh_session ); @@ -317,7 +333,7 @@ bool SshMasterConnection::userAuthWithKey() if ( key.indexOf ( "PRIVATE KEY" ) !=-1 ) { QDir dr; - QString keyPath=QDir::homePath() +"/.x2go/ssh/gen"; + QString keyPath=mainWnd->getHomeDirectory() +"/.x2go/ssh/gen"; dr.mkpath ( keyPath ); QTemporaryFile fl ( keyPath+"/key" ); fl.open(); diff --git a/sshmasterconnection.h b/sshmasterconnection.h index a68c0b4..15d9235 100644 --- a/sshmasterconnection.h +++ b/sshmasterconnection.h @@ -24,6 +24,7 @@ #include <QThread> #include <QStringList> +class ONMainWindow; class SshProcess; struct ChannelConnection { @@ -72,7 +73,8 @@ public: private: SshMasterConnection(QString host, int port, bool acceptUnknownServers, QString user, QString pass, QString key, bool autologin, - int remotePort, QString localHost, int localPort, SshProcess* creator, QObject* parent = 0); + int remotePort, QString localHost, int localPort, SshProcess* creator, + QObject* parent, ONMainWindow* parWnd); bool sshConnect(); bool userAuthWithPass(); bool userAuthAuto(); @@ -105,7 +107,8 @@ private: int reverseTunnelLocalPort; bool acceptUnknownServers; QString reverseTunnelLocalHost; - SshProcess* reverseTunnelCreator; + SshProcess* reverseTunnelCreator; + ONMainWindow* mainWnd; signals: void stdErr(SshProcess* caller, QByteArray data); diff --git a/sshprocess.cpp b/sshprocess.cpp index 83d1ce4..9e72e8f 100644 --- a/sshprocess.cpp +++ b/sshprocess.cpp @@ -25,7 +25,7 @@ #endif #undef DEBUG -#define DEBUG +// #define DEBUG SshProcess::SshProcess(SshMasterConnection* master, QObject* parent): QObject(parent) { diff --git a/version.h b/version.h index 119983c..b49a660 100644 --- a/version.h +++ b/version.h @@ -1 +1 @@ -#define VERSION "3.0.1.18" +#define VERSION "3.0.99.0" diff --git a/wapi.cpp b/wapi.cpp index 297ead3..e565cc6 100644 --- a/wapi.cpp +++ b/wapi.cpp @@ -177,6 +177,38 @@ QString wapiShortFileName ( const QString& longName ) } +QString wapiGetDriveByLabel(const QString& label) +{ + int len=GetLogicalDriveStrings(0,0); + if(len>0) + { + TCHAR* buf=new TCHAR[len+1]; + len=GetLogicalDriveStrings(len,buf); + for(int i=0;i<len;i+=4) + { + QString drive=QString::fromUtf16 ( ( const ushort* ) buf+i ); + x2goDebug<<"drive:"<<drive; + TCHAR vol[MAX_PATH+1]; + TCHAR fs[MAX_PATH+1]; + GetVolumeInformation(buf+i,vol,MAX_PATH,0,0,0,fs,MAX_PATH); + QString volume=QString::fromUtf16 ( ( const ushort* ) vol ); + x2goDebug<<"vol:"<<volume<< + "fs:"<<QString::fromUtf16 ( ( const ushort* ) fs ); + if(!volume.compare(label,Qt::CaseInsensitive)) + { + x2goDebug<<"matched! "; + + delete []buf; + return drive.replace(":\\",""); + } + } + delete []buf; + } + + return label; +} + + QString getNameFromSid ( PSID psid, QString* systemName ) { DWORD length=0; diff --git a/wapi.h b/wapi.h index e5e59d2..ffdd392 100644 --- a/wapi.h +++ b/wapi.h @@ -51,6 +51,8 @@ QString wapiGetDefaultPrinter(); QStringList wapiGetLocalPrinters(); long wapiSetFSWindow ( HWND hWnd, const QRect& desktopGeometry ); void wapiRestoreWindow ( HWND hWnd, long style, const QRect& desktopGeometry ); +QString wapiGetDriveByLabel(const QString& label); + #endif diff --git a/x2goclient.pro b/x2goclient.pro index 6e6eb9f..6393fcf 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -7,9 +7,10 @@ CONFIG += $$(X2GO_CLIENT_TARGET) +CONFIG += $$(X2GO_LINUX_STATIC) +#CONFIG += console - -FORMS += cupsprintsettingsdialog.ui cupsprintwidget.ui printdialog.ui printercmddialog.ui printwidget.ui xsettingsui.ui +FORMS += cupsprintsettingsdialog.ui cupsprintwidget.ui printdialog.ui printercmddialog.ui printwidget.ui xsettingsui.ui brokerpassdialog.ui TRANSLATIONS += x2goclient_de.ts TRANSLATIONS += x2goclient_ru.ts @@ -46,6 +47,7 @@ HEADERS += configdialog.h \ ongetpass.h \ onmainwindow_privat.h \ x2gosettings.h \ + brokerpassdlg.h \ xsettingswidget.h SOURCES += sharewidget.cpp \ @@ -81,8 +83,11 @@ SOURCES += sharewidget.cpp \ httpbrokerclient.cpp \ ongetpass.cpp \ x2gosettings.cpp \ + brokerpassdlg.cpp \ xsettingswidget.cpp +LIBS += -lssh + plugin { TARGET = x2goplugin } @@ -107,6 +112,13 @@ linux-g++-64 { message(building $$TARGET with ldap and cups) LIBS += -lldap -lcups -lX11 } +x2go_linux_static { + message (linking all libs statically) + LIBS -= -lssh + LIBS += -lssh_static -lssl + QMAKE_LFLAGS = -Bstatic $$QMAKE_LFLAGS +} + macx { message(building $$TARGET with ldap and cups) LIBS += -lldap -lcups @@ -116,7 +128,6 @@ win32-* { LIBS += -lwinspool CONFIG += static } -LIBS += -lssh QT += svg network ICON =icons/x2go-mac.icns QMAKE_MAC_SDK =/Developer/SDKs/MacOSX10.6.sdk diff --git a/x2goclientconfig.h b/x2goclientconfig.h index 0e4983a..48a8992 100644 --- a/x2goclientconfig.h +++ b/x2goclientconfig.h @@ -6,7 +6,7 @@ #include <qglobal.h> -//#define LOGFILE QDir::homePath()+"/x2goclient.log" +// #define LOGFILE QDir::homePath()+"/x2goclient.log" #if !defined Q_OS_WIN #define USELDAP diff --git a/x2goplugin.rc b/x2goplugin.rc index 7f5aa21..2db7f67 100644 --- a/x2goplugin.rc +++ b/x2goplugin.rc @@ -1,8 +1,8 @@ 1 TYPELIB "x2goplugin.rc" 1 VERSIONINFO - FILEVERSION 3,0,1,18 - PRODUCTVERSION 3,0,1,18 + FILEVERSION 3,0,99,0 + PRODUCTVERSION 3,0,99,0 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, 0, 1, 18\0" + VALUE "FileVersion", "3, 0, 99, 0\0" VALUE "InternalName", "x2goplugin\0" VALUE "LegalCopyright", "Copyright � 2010 Obviously Nice\0" VALUE "MIMEType", "application/x2go\0" VALUE "OriginalFilename", "npx2goplugin.dll\0" - VALUE "ProductName", "X2GoClient Plug-in 3.0.1.18\0" - VALUE "ProductVersion", "3, 0, 1, 18\0" + VALUE "ProductName", "X2GoClient Plug-in 3.0.99.0\0" + VALUE "ProductVersion", "3, 0, 99, 0\0" END END BLOCK "VarFileInfo" diff --git a/x2gosettings.cpp b/x2gosettings.cpp index 9a5f59b..57fbc4a 100644 --- a/x2gosettings.cpp +++ b/x2gosettings.cpp @@ -13,30 +13,44 @@ #include "x2goclientconfig.h" #include "x2gologdebug.h" #include "onmainwindow.h" +#include <QTemporaryFile> + +X2goSettings::X2goSettings(QString fileContent, QSettings::Format format) +{ + cfgFile=new QTemporaryFile(); + cfgFile->open(); + QTextStream out(cfgFile); + out<<fileContent; + cfgFile->close(); + set=new QSettings ( cfgFile->fileName(), + format ); +} + X2goSettings::X2goSettings ( QString group ) { + cfgFile=0l; #ifndef Q_OS_WIN - set=new QSettings ( ONMainWindow::getHomeDirectory() + - "/.x2goclient/"+group, - QSettings::NativeFormat ); + set=new QSettings ( ONMainWindow::getHomeDirectory() + + "/.x2goclient/"+group, + QSettings::NativeFormat ); #else - if ( !ONMainWindow::getPortable() ) - { - set=new QSettings ( "Obviously Nice","x2goclient" ); - set->beginGroup ( group ); + if ( !ONMainWindow::getPortable() ) + { + set=new QSettings ( "Obviously Nice","x2goclient" ); + set->beginGroup ( group ); // x2goDebug<<"settings in reg"; - } - else - { - set=new QSettings ( ONMainWindow::getHomeDirectory() + - "/.x2goclient/"+group, - QSettings::IniFormat ); + } + else + { + set=new QSettings ( ONMainWindow::getHomeDirectory() + + "/.x2goclient/"+group, + QSettings::IniFormat ); // x2goDebug<<"settings in ini:"<< - ONMainWindow::getHomeDirectory() + - "/.x2goclient/"+group; + ONMainWindow::getHomeDirectory() + + "/.x2goclient/"+group; - } + } #endif } @@ -44,7 +58,9 @@ X2goSettings::X2goSettings ( QString group ) X2goSettings::~X2goSettings() { - delete set; + delete set; + if (cfgFile) + delete cfgFile; } diff --git a/x2gosettings.h b/x2gosettings.h index c59ecd1..fffd350 100644 --- a/x2gosettings.h +++ b/x2gosettings.h @@ -16,7 +16,7 @@ #include <QSettings> - +class QTemporaryFile; /** @author Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> */ @@ -24,6 +24,7 @@ class X2goSettings { public: X2goSettings ( QString group ); + X2goSettings ( QString fileContent, QSettings::Format format); ~X2goSettings(); QSettings* setting() @@ -33,6 +34,7 @@ public: private: QSettings* set; + QTemporaryFile* cfgFile; }; diff --git a/xsettingsui.ui b/xsettingsui.ui index 43d6d61..fa06cbf 100644 --- a/xsettingsui.ui +++ b/xsettingsui.ui @@ -47,7 +47,7 @@ <item> <widget class="QRadioButton" name="rbXming"> <property name="text"> - <string>use integrated XMing</string> + <string>use integrated X-Server</string> </property> <property name="checked"> <bool>true</bool> @@ -158,33 +158,6 @@ </layout> </widget> </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_3"> - <item> - <widget class="QLabel" name="label_6"> - <property name="text"> - <string>delay after X-Server start (s):</string> - </property> - </widget> - </item> - <item> - <widget class="QSpinBox" name="spDelay"/> - </item> - <item> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </item> </layout> </widget> </item> diff --git a/xsettingswidget.cpp b/xsettingswidget.cpp index 3991552..7cd117b 100644 --- a/xsettingswidget.cpp +++ b/xsettingswidget.cpp @@ -26,8 +26,8 @@ XSettingsWidget::XSettingsWidget(QWidget* parent) setupUi(this); X2goSettings st ( "settings" ); - rbXming->setChecked(st.setting()->value("usexming",true).toBool()); - rbOther->setChecked(!(st.setting()->value("usexming",true).toBool())); + rbXming->setChecked(st.setting()->value("useintx",true).toBool()); + rbOther->setChecked(!(st.setting()->value("useintx",true).toBool())); leExec->setText(st.setting()->value("xexec","C:\\program files\\vcxsrv\\vcxsrv.exe").toString()); leCmdOptions->setText(st.setting()->value("options","-multiwindow -notrayicon -clipboard").toString()); @@ -37,7 +37,7 @@ XSettingsWidget::XSettingsWidget(QWidget* parent) leWinMod->setText(st.setting()->value("optionswin","-screen 0 %wx%h -notrayicon -clipboard").toString()); leFSMod->setText(st.setting()->value("optionsfs","-fullscreen -notrayicon -clipboard").toString()); leSingApp->setText(st.setting()->value("optionssingle","-multiwindow -notrayicon -clipboard").toString()); - spDelay->setValue(st.setting()->value("delay",3).toInt()); +// spDelay->setValue(st.setting()->value("delay",3).toInt()); pbExec->setIcon( QPixmap ( ":/icons/16x16/file-open.png" ) ); } @@ -58,21 +58,21 @@ void XSettingsWidget::slotSetExecutable() void XSettingsWidget::setDefaults() { - rbXming->setChecked("usexming"); + rbXming->setChecked(true); leExec->setText("C:\\program files\\vcxsrv\\vcxsrv.exe"); leCmdOptions->setText("-multiwindow -notrayicon -clipboard"); cbOnstart->setChecked(true); leWinMod->setText("-screen 0 %wx%h -notrayicon -clipboard"); leFSMod->setText("-fullscreen -notrayicon -clipboard"); leSingApp->setText("-multiwindow -notrayicon -clipboard"); - spDelay->setValue(3); +// spDelay->setValue(3); } void XSettingsWidget::saveSettings() { X2goSettings st ( "settings" ); - st.setting()->setValue("usexming",rbXming->isChecked()); + st.setting()->setValue("useintx",rbXming->isChecked()); st.setting()->setValue("xexec",leExec->text()); st.setting()->setValue("options",leCmdOptions->text()); st.setting()->setValue("onstart",cbOnstart->isChecked()); @@ -80,7 +80,7 @@ void XSettingsWidget::saveSettings() st.setting()->setValue("optionswin",leWinMod->text()); st.setting()->setValue("optionsfs",leFSMod->text()); st.setting()->setValue("optionssingle",leSingApp->text()); - st.setting()->setValue("delay",spDelay->value()); +// st.setting()->setValue("delay",spDelay->value()); st.setting()->sync(); } 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.6-3-g45bd114
by git-admin＠x2go.org 14 Jul '11

14 Jul '11

The branch, master has been updated via 45bd1144cd5138f161a30e58722e57cb0e934047 (commit) via c4671b43c67cccc81762cff1f1149aa9da7ed732 (commit) from c40caded6dfe02162301da9a647fe9819680931f (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 45bd1144cd5138f161a30e58722e57cb0e934047 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 14 08:07:51 2011 +0200 fixed 1 fuzzy translation (en, de, nl), rebuilt i18n .mo files commit c4671b43c67cccc81762cff1f1149aa9da7ed732 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jul 14 08:04:45 2011 +0200 utf8-fix for Umlauts in Dutch translation file. ----------------------------------------------------------------------- Summary of changes: build/mo/de/LC_MESSAGES/pyhoca-gui.mo | Bin 17068 -> 17120 bytes build/mo/en/LC_MESSAGES/pyhoca-gui.mo | Bin 15990 -> 16038 bytes build/mo/es/LC_MESSAGES/pyhoca-gui.mo | Bin 15225 -> 15225 bytes build/mo/nl/LC_MESSAGES/pyhoca-gui.mo | Bin 16227 -> 16282 bytes po/de.po | 133 ++++++++++++++++--------------- po/en.po | 133 ++++++++++++++++--------------- po/es.po | 131 ++++++++++++++++-------------- po/nl.po | 143 +++++++++++++++++---------------- po/pyhoca-gui.pot | 131 ++++++++++++++++-------------- 9 files changed, 348 insertions(+), 323 deletions(-) The diff of changes is: diff --git a/build/mo/de/LC_MESSAGES/pyhoca-gui.mo b/build/mo/de/LC_MESSAGES/pyhoca-gui.mo index eb413ba..279c216 100644 Binary files a/build/mo/de/LC_MESSAGES/pyhoca-gui.mo and b/build/mo/de/LC_MESSAGES/pyhoca-gui.mo differ diff --git a/build/mo/en/LC_MESSAGES/pyhoca-gui.mo b/build/mo/en/LC_MESSAGES/pyhoca-gui.mo index 4224784..8423cf4 100644 Binary files a/build/mo/en/LC_MESSAGES/pyhoca-gui.mo and b/build/mo/en/LC_MESSAGES/pyhoca-gui.mo differ diff --git a/build/mo/es/LC_MESSAGES/pyhoca-gui.mo b/build/mo/es/LC_MESSAGES/pyhoca-gui.mo index 6320c8c..02bd7c9 100644 Binary files a/build/mo/es/LC_MESSAGES/pyhoca-gui.mo and b/build/mo/es/LC_MESSAGES/pyhoca-gui.mo differ diff --git a/build/mo/nl/LC_MESSAGES/pyhoca-gui.mo b/build/mo/nl/LC_MESSAGES/pyhoca-gui.mo index 0e04bd7..02e9b25 100644 Binary files a/build/mo/nl/LC_MESSAGES/pyhoca-gui.mo and b/build/mo/nl/LC_MESSAGES/pyhoca-gui.mo differ diff --git a/po/de.po b/po/de.po index 95370ca..1f4ac9e 100644 --- a/po/de.po +++ b/po/de.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-27 11:14+0200\n" -"PO-Revision-Date: 2011-06-27 11:14+0100\n" +"POT-Creation-Date: 2011-07-14 08:07+0200\n" +"PO-Revision-Date: 2011-07-14 08:06+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: de <m.gabriel(a)das-netzwerkteam.de>\n" "Language: \n" @@ -55,16 +55,16 @@ msgid "Cancel" msgstr "Abbrechen" #: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:310 -#: ../pyhoca/wxgui/frontend.py:350 +#: ../pyhoca/wxgui/frontend.py:355 #, python-format msgid "%s - connect failure" msgstr "%s - Verbindung fehlgeschlagen" -#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:350 +#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:355 msgid "User is not allowed to start X2go sessions!" msgstr "Benutzer darf keine X2go Sitzungen starten!" -#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:357 +#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:362 #, python-format msgid "%s - connect" msgstr "%s - verbinden" @@ -91,20 +91,20 @@ msgid "Authentication to the SSH proxy server failed!" msgstr "Anmeldung am SSH Proxy Server ist fehlgeschlagen" #: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/logon.py:340 -#: ../pyhoca/wxgui/logon.py:359 ../pyhoca/wxgui/frontend.py:373 -#: ../pyhoca/wxgui/frontend.py:394 ../pyhoca/wxgui/frontend.py:401 -#: ../pyhoca/wxgui/frontend.py:408 +#: ../pyhoca/wxgui/logon.py:363 ../pyhoca/wxgui/frontend.py:378 +#: ../pyhoca/wxgui/frontend.py:399 ../pyhoca/wxgui/frontend.py:406 +#: ../pyhoca/wxgui/frontend.py:413 #, python-format msgid "%s - connect error" msgstr "%s - Verbindungsfehler" -#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:380 -#: ../pyhoca/wxgui/frontend.py:387 +#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:385 +#: ../pyhoca/wxgui/frontend.py:392 #, python-format msgid "%s - host key error" msgstr "%s - ungültiger Server-Schlüssel" -#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:380 +#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:385 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" @@ -116,7 +116,12 @@ msgstr "" msgid "%s - key error" msgstr "%s - ungültiger Schlüssel" -#: ../pyhoca/wxgui/logon.py:360 +#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:427 +#, python-format +msgid "%s - auth error" +msgstr "%s - Anmeldefehler" + +#: ../pyhoca/wxgui/logon.py:364 msgid "An unknown error occured during authentication!" msgstr "Ein unbekannter Fehler ist während der Serveranmeldung aufgetreten!" @@ -528,8 +533,8 @@ msgstr "Ordner zur Freigabe für Sitzungen auswählen" #: ../pyhoca/wxgui/profilemanager.py:1371 #: ../pyhoca/wxgui/profilemanager.py:1374 #: ../pyhoca/wxgui/profilemanager.py:1377 -#: ../pyhoca/wxgui/profilemanager.py:1383 -#: ../pyhoca/wxgui/profilemanager.py:1393 ../pyhoca/wxgui/menus_taskbar.py:87 +#: ../pyhoca/wxgui/profilemanager.py:1382 +#: ../pyhoca/wxgui/profilemanager.py:1392 ../pyhoca/wxgui/menus_taskbar.py:87 msgid "Profile Manager" msgstr "Profilmanager" @@ -543,12 +548,12 @@ msgstr "Der Profilname fehlt, Profil so nicht verwendbar!!!" msgid "Profile name %s already exists!!!" msgstr "Ein Sitzungsprofil mit dem Namen %s existiert bereits!!!" -#: ../pyhoca/wxgui/profilemanager.py:1383 +#: ../pyhoca/wxgui/profilemanager.py:1382 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" "Die SSH Proxy Konfiguration ist unvollständig. Bitte nochmal versuchen." -#: ../pyhoca/wxgui/profilemanager.py:1393 +#: ../pyhoca/wxgui/profilemanager.py:1392 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -559,21 +564,21 @@ msgstr "" "einen lokalen SSH Proxy Port daran zu binden. Bitte die SSH Proxy " "Einstellungen entsprechend ändern." -#: ../pyhoca/wxgui/profilemanager.py:1413 +#: ../pyhoca/wxgui/profilemanager.py:1412 #, python-format msgid "%s - profile added" msgstr "%s - Profil hinzugefügt" -#: ../pyhoca/wxgui/profilemanager.py:1414 +#: ../pyhoca/wxgui/profilemanager.py:1413 msgid "A new session profile has been added." msgstr "Ein neues Sitzungsprofil wurde hinzugefügt." -#: ../pyhoca/wxgui/profilemanager.py:1418 +#: ../pyhoca/wxgui/profilemanager.py:1417 #, python-format msgid "%s - modified" msgstr "%s - modifiziert" -#: ../pyhoca/wxgui/profilemanager.py:1419 +#: ../pyhoca/wxgui/profilemanager.py:1418 msgid "Changes to profile have been saved." msgstr "Änderungen am Profil wurden übernommen." @@ -675,69 +680,69 @@ msgstr "Serververbindung aufbauen" msgid "About %s ..." msgstr "Über %s ..." -#: ../pyhoca/wxgui/frontend.py:357 +#: ../pyhoca/wxgui/frontend.py:362 msgid "Public SSH key authentication has been successful." msgstr "Authentifizierung mit öffentlichem SSH Schlüssel war erfolgreich." -#: ../pyhoca/wxgui/frontend.py:387 +#: ../pyhoca/wxgui/frontend.py:392 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" "Der Host-Schlüssel des SSH Proxy-Servers ist ungültig oder wurde vom " "Benutzer nicht akzeptiert" -#: ../pyhoca/wxgui/frontend.py:408 +#: ../pyhoca/wxgui/frontend.py:413 msgid "Authentication protocol communication incomplete! Try again..." msgstr "" "Kommunikation während Authentifizierungsprotokoll unvollständig! Nochmal " "versuchen..." -#: ../pyhoca/wxgui/frontend.py:415 +#: ../pyhoca/wxgui/frontend.py:420 #, python-format msgid "%s - auth key error" msgstr "%s - ungültiger Benutzerschlüssel" -#: ../pyhoca/wxgui/frontend.py:422 +#: ../pyhoca/wxgui/frontend.py:434 msgid "An unknown error occurred during authentication!" msgstr "Ein unbekannter Fehler ist während der Serveranmeldung aufgetreten!" -#: ../pyhoca/wxgui/frontend.py:524 +#: ../pyhoca/wxgui/frontend.py:536 msgid "Cleaning X2go sessions..." msgstr "Beende X2go Sitzungen..." -#: ../pyhoca/wxgui/frontend.py:543 +#: ../pyhoca/wxgui/frontend.py:555 #, python-format msgid "%s - disconnect" msgstr "%s - trennen" -#: ../pyhoca/wxgui/frontend.py:543 +#: ../pyhoca/wxgui/frontend.py:555 msgid "X2go Profile is now disconnected." msgstr "X2go Profil ist nun nicht mehr verbunden." -#: ../pyhoca/wxgui/frontend.py:559 +#: ../pyhoca/wxgui/frontend.py:571 msgid "New Session Profile" msgstr "Neues Sitzungsprofil" -#: ../pyhoca/wxgui/frontend.py:586 +#: ../pyhoca/wxgui/frontend.py:598 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Das Sitzungsprofil ,,%s'' wirklich löschen?" -#: ../pyhoca/wxgui/frontend.py:592 +#: ../pyhoca/wxgui/frontend.py:604 #, python-format msgid "%s - profile deleted" msgstr "%s - Profil gelöscht" -#: ../pyhoca/wxgui/frontend.py:592 +#: ../pyhoca/wxgui/frontend.py:604 msgid "The session profile has been deleted." msgstr "Das Sitzungsprofil wurde gelöscht." -#: ../pyhoca/wxgui/frontend.py:607 +#: ../pyhoca/wxgui/frontend.py:619 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - lokalen Ordner für dieses Sitzungsprofile freigeben" -#: ../pyhoca/wxgui/frontend.py:659 +#: ../pyhoca/wxgui/frontend.py:671 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -750,17 +755,17 @@ msgstr "" "\n" "Sind Sie sicher, dass sie fortfahren möchten? " -#: ../pyhoca/wxgui/frontend.py:667 +#: ../pyhoca/wxgui/frontend.py:679 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Echtheit des Servers bestätigen" -#: ../pyhoca/wxgui/frontend.py:686 +#: ../pyhoca/wxgui/frontend.py:698 #, python-format msgid "%s - channel error" msgstr "%s - Verbindungsfehler" -#: ../pyhoca/wxgui/frontend.py:686 +#: ../pyhoca/wxgui/frontend.py:698 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -769,12 +774,12 @@ msgstr "" "Die Verbindung zum Server %s wurde unerwartet unterbrochen! Bitte versuchen " "Sie, sich neu am Server anzumelden..." -#: ../pyhoca/wxgui/frontend.py:696 ../pyhoca/wxgui/frontend.py:708 +#: ../pyhoca/wxgui/frontend.py:708 ../pyhoca/wxgui/frontend.py:720 #, python-format msgid "%s - session failure" msgstr "%s - Verbindung fehlgeschlagen" -#: ../pyhoca/wxgui/frontend.py:696 +#: ../pyhoca/wxgui/frontend.py:708 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" @@ -783,12 +788,12 @@ msgstr "" "Der Befehl ,,%s'' ist auf dem X2go Server nicht verfügbar\n" "%s" -#: ../pyhoca/wxgui/frontend.py:702 +#: ../pyhoca/wxgui/frontend.py:714 #, python-format msgid "%s - session warning" msgstr "%s - Sitzungsfunktion eingeschränkt" -#: ../pyhoca/wxgui/frontend.py:702 +#: ../pyhoca/wxgui/frontend.py:714 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -797,7 +802,7 @@ msgstr "" "Eine Reverse TCP Port Weiterleitungsanfrage für Sitzung %s an Serverport %s " "wurde vom X2go Server abgelehnt." -#: ../pyhoca/wxgui/frontend.py:708 +#: ../pyhoca/wxgui/frontend.py:720 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -806,37 +811,37 @@ msgstr "" "SSH Forwarding Tunnel zu [%s]:%s wurde für Sitzung %s vom X2go/SSH Server " "verweigert. Die Sitzung konnte nicht gestartet werden." -#: ../pyhoca/wxgui/frontend.py:720 +#: ../pyhoca/wxgui/frontend.py:732 #, python-format msgid "%s - audio warning" msgstr "%s - Warnung Audiosystem" -#: ../pyhoca/wxgui/frontend.py:720 +#: ../pyhoca/wxgui/frontend.py:732 msgid "" "The X2go PulseAudio system is not available within Remote Desktop sessions." msgstr "" "Das X2go PulseAudio System ist innerhalb von Remote Desktop Sitzungen nicht " "verfügbar." -#: ../pyhoca/wxgui/frontend.py:723 ../pyhoca/wxgui/frontend.py:726 +#: ../pyhoca/wxgui/frontend.py:735 ../pyhoca/wxgui/frontend.py:738 #, python-format msgid "%s - audio error" msgstr "%s - Audiofehler" -#: ../pyhoca/wxgui/frontend.py:723 +#: ../pyhoca/wxgui/frontend.py:735 msgid "The X2go PulseAudio system could not be started." msgstr "Das X2go PulseAudio System konnte nicht gestartet werden." -#: ../pyhoca/wxgui/frontend.py:726 +#: ../pyhoca/wxgui/frontend.py:738 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "Das X2go PulseAudio System ist soeben abgestürzt." -#: ../pyhoca/wxgui/frontend.py:729 +#: ../pyhoca/wxgui/frontend.py:741 #, python-format msgid "%s - audio problem" msgstr "%s - Audioproblem" -#: ../pyhoca/wxgui/frontend.py:729 +#: ../pyhoca/wxgui/frontend.py:741 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -845,12 +850,12 @@ msgstr "" "Die Audio-Verbindung für diese Sitzung konnte nicht aufgebaut werden.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:743 ../pyhoca/wxgui/frontend.py:745 +#: ../pyhoca/wxgui/frontend.py:755 ../pyhoca/wxgui/frontend.py:757 #, python-format msgid "%s - print error" msgstr "%s - Druckfehler" -#: ../pyhoca/wxgui/frontend.py:743 +#: ../pyhoca/wxgui/frontend.py:755 #, python-format msgid "" "%s\n" @@ -861,7 +866,7 @@ msgstr "" "...verursacht an Drucker durch Sitzung\n" "%s" -#: ../pyhoca/wxgui/frontend.py:745 +#: ../pyhoca/wxgui/frontend.py:757 #, python-format msgid "" "%s\n" @@ -872,12 +877,12 @@ msgstr "" "...verursacht von Sitzung\n" "%s" -#: ../pyhoca/wxgui/frontend.py:749 ../pyhoca/wxgui/frontend.py:753 +#: ../pyhoca/wxgui/frontend.py:761 ../pyhoca/wxgui/frontend.py:765 #, python-format msgid "%s - start" msgstr "%s - starten" -#: ../pyhoca/wxgui/frontend.py:749 +#: ../pyhoca/wxgui/frontend.py:761 #, python-format msgid "" "New X2go session starting up...\n" @@ -886,7 +891,7 @@ msgstr "" "Neue X2go Sitzung wird gestartet...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:753 +#: ../pyhoca/wxgui/frontend.py:765 #, python-format msgid "" "Another client started X2go session\n" @@ -895,12 +900,12 @@ msgstr "" "Ein anderes X2go Programm hat diese Sitzung gestartet\n" "%s" -#: ../pyhoca/wxgui/frontend.py:757 ../pyhoca/wxgui/frontend.py:761 +#: ../pyhoca/wxgui/frontend.py:769 ../pyhoca/wxgui/frontend.py:773 #, python-format msgid "%s - resume" msgstr "%s - fortsetzen" -#: ../pyhoca/wxgui/frontend.py:757 +#: ../pyhoca/wxgui/frontend.py:769 #, python-format msgid "" "Resuming X2go session...\n" @@ -909,7 +914,7 @@ msgstr "" "X2go Sitzung wird fortgesetzt...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:761 +#: ../pyhoca/wxgui/frontend.py:773 #, python-format msgid "" "Another client resumed X2go session\n" @@ -918,12 +923,12 @@ msgstr "" "Eine andere X2go Anwendung hat die Sitzung fortgesetzt\n" "%s" -#: ../pyhoca/wxgui/frontend.py:765 +#: ../pyhoca/wxgui/frontend.py:777 #, python-format msgid "%s - running" msgstr "%s - aktiv" -#: ../pyhoca/wxgui/frontend.py:765 +#: ../pyhoca/wxgui/frontend.py:777 #, python-format msgid "" "Found already running session\n" @@ -932,12 +937,12 @@ msgstr "" "Bereits aktive Sitzung gefunden\n" "%s" -#: ../pyhoca/wxgui/frontend.py:769 +#: ../pyhoca/wxgui/frontend.py:781 #, python-format msgid "%s - suspend" msgstr "%s - anhalten" -#: ../pyhoca/wxgui/frontend.py:769 +#: ../pyhoca/wxgui/frontend.py:781 #, python-format msgid "" "X2go Session has been suspended\n" @@ -946,12 +951,12 @@ msgstr "" "X2go Sitzung wurde angehalten\n" "%s" -#: ../pyhoca/wxgui/frontend.py:785 +#: ../pyhoca/wxgui/frontend.py:797 #, python-format msgid "%s - terminate" msgstr "%s - beenden" -#: ../pyhoca/wxgui/frontend.py:785 +#: ../pyhoca/wxgui/frontend.py:797 #, python-format msgid "" "X2go Session has terminated\n" diff --git a/po/en.po b/po/en.po index 84931d9..530d83c 100644 --- a/po/en.po +++ b/po/en.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-27 11:14+0200\n" -"PO-Revision-Date: 2011-06-27 11:13+0100\n" +"POT-Creation-Date: 2011-07-14 08:07+0200\n" +"PO-Revision-Date: 2011-07-14 08:06+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: en <m.gabriel(a)das-netzwerkteam.de>\n" "Language: \n" @@ -55,16 +55,16 @@ msgid "Cancel" msgstr "Cancel" #: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:310 -#: ../pyhoca/wxgui/frontend.py:350 +#: ../pyhoca/wxgui/frontend.py:355 #, python-format msgid "%s - connect failure" msgstr "%s - connect failure" -#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:350 +#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:355 msgid "User is not allowed to start X2go sessions!" msgstr "User is not allowed to start X2go sessions!" -#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:357 +#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:362 #, python-format msgid "%s - connect" msgstr "%s - connect" @@ -91,20 +91,20 @@ msgid "Authentication to the SSH proxy server failed!" msgstr "Authentication to the SSH proxy server failed!" #: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/logon.py:340 -#: ../pyhoca/wxgui/logon.py:359 ../pyhoca/wxgui/frontend.py:373 -#: ../pyhoca/wxgui/frontend.py:394 ../pyhoca/wxgui/frontend.py:401 -#: ../pyhoca/wxgui/frontend.py:408 +#: ../pyhoca/wxgui/logon.py:363 ../pyhoca/wxgui/frontend.py:378 +#: ../pyhoca/wxgui/frontend.py:399 ../pyhoca/wxgui/frontend.py:406 +#: ../pyhoca/wxgui/frontend.py:413 #, python-format msgid "%s - connect error" msgstr "%s - connect error" -#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:380 -#: ../pyhoca/wxgui/frontend.py:387 +#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:385 +#: ../pyhoca/wxgui/frontend.py:392 #, python-format msgid "%s - host key error" msgstr "%s - host key error" -#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:380 +#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:385 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" @@ -115,7 +115,12 @@ msgstr "" msgid "%s - key error" msgstr "%s - key error" -#: ../pyhoca/wxgui/logon.py:360 +#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:427 +#, python-format +msgid "%s - auth error" +msgstr "%s - auth error" + +#: ../pyhoca/wxgui/logon.py:364 msgid "An unknown error occured during authentication!" msgstr "An unknown error occured during authentication!" @@ -529,8 +534,8 @@ msgstr "Choose a folder to share within a session" #: ../pyhoca/wxgui/profilemanager.py:1371 #: ../pyhoca/wxgui/profilemanager.py:1374 #: ../pyhoca/wxgui/profilemanager.py:1377 -#: ../pyhoca/wxgui/profilemanager.py:1383 -#: ../pyhoca/wxgui/profilemanager.py:1393 ../pyhoca/wxgui/menus_taskbar.py:87 +#: ../pyhoca/wxgui/profilemanager.py:1382 +#: ../pyhoca/wxgui/profilemanager.py:1392 ../pyhoca/wxgui/menus_taskbar.py:87 msgid "Profile Manager" msgstr "Profile Manager" @@ -544,11 +549,11 @@ msgstr "Profile name is missing, profile unusable!!!" msgid "Profile name %s already exists!!!" msgstr "Profile name %s already exists!!!" -#: ../pyhoca/wxgui/profilemanager.py:1383 +#: ../pyhoca/wxgui/profilemanager.py:1382 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "The SSH proxy configuration is incomplete. Try again." -#: ../pyhoca/wxgui/profilemanager.py:1393 +#: ../pyhoca/wxgui/profilemanager.py:1392 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -559,21 +564,21 @@ msgstr "" "proxy to.\n" "Please change the SSH proxy settings accordingly." -#: ../pyhoca/wxgui/profilemanager.py:1413 +#: ../pyhoca/wxgui/profilemanager.py:1412 #, python-format msgid "%s - profile added" msgstr "%s - profile added" -#: ../pyhoca/wxgui/profilemanager.py:1414 +#: ../pyhoca/wxgui/profilemanager.py:1413 msgid "A new session profile has been added." msgstr "A new session profile has been added." -#: ../pyhoca/wxgui/profilemanager.py:1418 +#: ../pyhoca/wxgui/profilemanager.py:1417 #, python-format msgid "%s - modified" msgstr "%s - modified" -#: ../pyhoca/wxgui/profilemanager.py:1419 +#: ../pyhoca/wxgui/profilemanager.py:1418 msgid "Changes to profile have been saved." msgstr "Changes to profile have been saved." @@ -675,66 +680,66 @@ msgstr "Connect Server" msgid "About %s ..." msgstr "About %s ..." -#: ../pyhoca/wxgui/frontend.py:357 +#: ../pyhoca/wxgui/frontend.py:362 msgid "Public SSH key authentication has been successful." msgstr "Public SSH key authentication has been successful." -#: ../pyhoca/wxgui/frontend.py:387 +#: ../pyhoca/wxgui/frontend.py:392 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" "The SSH proxy's host key is invalid or has not been accepted by the user" -#: ../pyhoca/wxgui/frontend.py:408 +#: ../pyhoca/wxgui/frontend.py:413 msgid "Authentication protocol communication incomplete! Try again..." msgstr "Authentication protocol communication incomplete! Try again..." -#: ../pyhoca/wxgui/frontend.py:415 +#: ../pyhoca/wxgui/frontend.py:420 #, python-format msgid "%s - auth key error" msgstr "%s - auth key error" -#: ../pyhoca/wxgui/frontend.py:422 +#: ../pyhoca/wxgui/frontend.py:434 msgid "An unknown error occurred during authentication!" msgstr "An unknown error occurred during authentication!" -#: ../pyhoca/wxgui/frontend.py:524 +#: ../pyhoca/wxgui/frontend.py:536 msgid "Cleaning X2go sessions..." msgstr "Cleaning X2go sessions..." -#: ../pyhoca/wxgui/frontend.py:543 +#: ../pyhoca/wxgui/frontend.py:555 #, python-format msgid "%s - disconnect" msgstr "%s - disconnect" -#: ../pyhoca/wxgui/frontend.py:543 +#: ../pyhoca/wxgui/frontend.py:555 msgid "X2go Profile is now disconnected." msgstr "X2go Profile is now disconnected." -#: ../pyhoca/wxgui/frontend.py:559 +#: ../pyhoca/wxgui/frontend.py:571 msgid "New Session Profile" msgstr "New Session Profile" -#: ../pyhoca/wxgui/frontend.py:586 +#: ../pyhoca/wxgui/frontend.py:598 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Really Delete Session Profile ,,%s''?" -#: ../pyhoca/wxgui/frontend.py:592 +#: ../pyhoca/wxgui/frontend.py:604 #, python-format msgid "%s - profile deleted" msgstr "%s - profile deleted" -#: ../pyhoca/wxgui/frontend.py:592 +#: ../pyhoca/wxgui/frontend.py:604 msgid "The session profile has been deleted." msgstr "The session profile has been deleted." -#: ../pyhoca/wxgui/frontend.py:607 +#: ../pyhoca/wxgui/frontend.py:619 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - share local folder with sessions of this profile" -#: ../pyhoca/wxgui/frontend.py:659 +#: ../pyhoca/wxgui/frontend.py:671 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -747,17 +752,17 @@ msgstr "" "\n" "Are you sure you want to continue connecting?" -#: ../pyhoca/wxgui/frontend.py:667 +#: ../pyhoca/wxgui/frontend.py:679 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Confirm Host Authorization" -#: ../pyhoca/wxgui/frontend.py:686 +#: ../pyhoca/wxgui/frontend.py:698 #, python-format msgid "%s - channel error" msgstr "%s - channel error" -#: ../pyhoca/wxgui/frontend.py:686 +#: ../pyhoca/wxgui/frontend.py:698 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -766,12 +771,12 @@ msgstr "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " "server..." -#: ../pyhoca/wxgui/frontend.py:696 ../pyhoca/wxgui/frontend.py:708 +#: ../pyhoca/wxgui/frontend.py:708 ../pyhoca/wxgui/frontend.py:720 #, python-format msgid "%s - session failure" msgstr "%s - session failure" -#: ../pyhoca/wxgui/frontend.py:696 +#: ../pyhoca/wxgui/frontend.py:708 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" @@ -780,12 +785,12 @@ msgstr "" "The command ,,%s'' is not available on X2go server\n" "%s." -#: ../pyhoca/wxgui/frontend.py:702 +#: ../pyhoca/wxgui/frontend.py:714 #, python-format msgid "%s - session warning" msgstr "%s - session warning" -#: ../pyhoca/wxgui/frontend.py:702 +#: ../pyhoca/wxgui/frontend.py:714 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -794,7 +799,7 @@ msgstr "" "Reverse TCP port forwarding request for session %s to server port %s has " "been denied." -#: ../pyhoca/wxgui/frontend.py:708 +#: ../pyhoca/wxgui/frontend.py:720 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -803,36 +808,36 @@ msgstr "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " "X2go/SSH server. Session startup failed." -#: ../pyhoca/wxgui/frontend.py:720 +#: ../pyhoca/wxgui/frontend.py:732 #, python-format msgid "%s - audio warning" msgstr "%s - audio warning" -#: ../pyhoca/wxgui/frontend.py:720 +#: ../pyhoca/wxgui/frontend.py:732 msgid "" "The X2go PulseAudio system is not available within Remote Desktop sessions." msgstr "" "The X2go PulseAudio system is not available within Remote Desktop sessions." -#: ../pyhoca/wxgui/frontend.py:723 ../pyhoca/wxgui/frontend.py:726 +#: ../pyhoca/wxgui/frontend.py:735 ../pyhoca/wxgui/frontend.py:738 #, python-format msgid "%s - audio error" msgstr "%s - audio error" -#: ../pyhoca/wxgui/frontend.py:723 +#: ../pyhoca/wxgui/frontend.py:735 msgid "The X2go PulseAudio system could not be started." msgstr "The X2go PulseAudio system could not be started." -#: ../pyhoca/wxgui/frontend.py:726 +#: ../pyhoca/wxgui/frontend.py:738 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "The X2go PulseAudio system has died unexpectedly." -#: ../pyhoca/wxgui/frontend.py:729 +#: ../pyhoca/wxgui/frontend.py:741 #, python-format msgid "%s - audio problem" msgstr "%s - audio problem" -#: ../pyhoca/wxgui/frontend.py:729 +#: ../pyhoca/wxgui/frontend.py:741 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -841,12 +846,12 @@ msgstr "" "The audio connection could not be set up for this session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:743 ../pyhoca/wxgui/frontend.py:745 +#: ../pyhoca/wxgui/frontend.py:755 ../pyhoca/wxgui/frontend.py:757 #, python-format msgid "%s - print error" msgstr "%s - print error" -#: ../pyhoca/wxgui/frontend.py:743 +#: ../pyhoca/wxgui/frontend.py:755 #, python-format msgid "" "%s\n" @@ -857,7 +862,7 @@ msgstr "" "...caused on printer %s by session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:745 +#: ../pyhoca/wxgui/frontend.py:757 #, python-format msgid "" "%s\n" @@ -868,12 +873,12 @@ msgstr "" "...caused by session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:749 ../pyhoca/wxgui/frontend.py:753 +#: ../pyhoca/wxgui/frontend.py:761 ../pyhoca/wxgui/frontend.py:765 #, python-format msgid "%s - start" msgstr "%s - start" -#: ../pyhoca/wxgui/frontend.py:749 +#: ../pyhoca/wxgui/frontend.py:761 #, python-format msgid "" "New X2go session starting up...\n" @@ -882,7 +887,7 @@ msgstr "" "New X2go session starting up...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:753 +#: ../pyhoca/wxgui/frontend.py:765 #, python-format msgid "" "Another client started X2go session\n" @@ -891,12 +896,12 @@ msgstr "" "Another client started X2go session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:757 ../pyhoca/wxgui/frontend.py:761 +#: ../pyhoca/wxgui/frontend.py:769 ../pyhoca/wxgui/frontend.py:773 #, python-format msgid "%s - resume" msgstr "%s - resume" -#: ../pyhoca/wxgui/frontend.py:757 +#: ../pyhoca/wxgui/frontend.py:769 #, python-format msgid "" "Resuming X2go session...\n" @@ -905,7 +910,7 @@ msgstr "" "Resuming X2go session...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:761 +#: ../pyhoca/wxgui/frontend.py:773 #, python-format msgid "" "Another client resumed X2go session\n" @@ -914,12 +919,12 @@ msgstr "" "Another client resumed X2go session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:765 +#: ../pyhoca/wxgui/frontend.py:777 #, python-format msgid "%s - running" msgstr "%s - running" -#: ../pyhoca/wxgui/frontend.py:765 +#: ../pyhoca/wxgui/frontend.py:777 #, python-format msgid "" "Found already running session\n" @@ -928,12 +933,12 @@ msgstr "" "Found already running session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:769 +#: ../pyhoca/wxgui/frontend.py:781 #, python-format msgid "%s - suspend" msgstr "%s - suspend" -#: ../pyhoca/wxgui/frontend.py:769 +#: ../pyhoca/wxgui/frontend.py:781 #, python-format msgid "" "X2go Session has been suspended\n" @@ -942,12 +947,12 @@ msgstr "" "X2go Session has been suspended\n" "%s" -#: ../pyhoca/wxgui/frontend.py:785 +#: ../pyhoca/wxgui/frontend.py:797 #, python-format msgid "%s - terminate" msgstr "%s - terminate" -#: ../pyhoca/wxgui/frontend.py:785 +#: ../pyhoca/wxgui/frontend.py:797 #, python-format msgid "" "X2go Session has terminated\n" diff --git a/po/es.po b/po/es.po index e21d1b4..7480d8a 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-27 11:14+0200\n" +"POT-Creation-Date: 2011-07-14 08:07+0200\n" "PO-Revision-Date: 2011-06-23 15:48+0100\n" "Last-Translator: Mike Gabriel <m.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: es <oceanosoftlapalma(a)gmail.com>\n" @@ -55,16 +55,16 @@ msgid "Cancel" msgstr "Cancelar" #: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:310 -#: ../pyhoca/wxgui/frontend.py:350 +#: ../pyhoca/wxgui/frontend.py:355 #, python-format msgid "%s - connect failure" msgstr "%s - fallo en la conexión" -#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:350 +#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:355 msgid "User is not allowed to start X2go sessions!" msgstr "¡El usuario no tiene permisos para iniciar sesiones X2go!" -#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:357 +#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:362 #, python-format msgid "%s - connect" msgstr "%s - conectado" @@ -91,20 +91,20 @@ msgid "Authentication to the SSH proxy server failed!" msgstr "¡Nombre de usuario o contraseña erróneo en el servidor proxy SSH!" #: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/logon.py:340 -#: ../pyhoca/wxgui/logon.py:359 ../pyhoca/wxgui/frontend.py:373 -#: ../pyhoca/wxgui/frontend.py:394 ../pyhoca/wxgui/frontend.py:401 -#: ../pyhoca/wxgui/frontend.py:408 +#: ../pyhoca/wxgui/logon.py:363 ../pyhoca/wxgui/frontend.py:378 +#: ../pyhoca/wxgui/frontend.py:399 ../pyhoca/wxgui/frontend.py:406 +#: ../pyhoca/wxgui/frontend.py:413 #, python-format msgid "%s - connect error" msgstr "%s - error en la conexión" -#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:380 -#: ../pyhoca/wxgui/frontend.py:387 +#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:385 +#: ../pyhoca/wxgui/frontend.py:392 #, python-format msgid "%s - host key error" msgstr "%s - error en la clave del equipo" -#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:380 +#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:385 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" @@ -116,7 +116,12 @@ msgstr "" msgid "%s - key error" msgstr "%s - error en la clave" -#: ../pyhoca/wxgui/logon.py:360 +#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:427 +#, fuzzy, python-format +msgid "%s - auth error" +msgstr "%s - error en la clave de identificación" + +#: ../pyhoca/wxgui/logon.py:364 msgid "An unknown error occured during authentication!" msgstr "" "¡Error desconocido al tratar de validar el nombre de usuario y la contraseña!" @@ -533,8 +538,8 @@ msgstr "Elige la carpeta que quieres compartir en la conexión" #: ../pyhoca/wxgui/profilemanager.py:1371 #: ../pyhoca/wxgui/profilemanager.py:1374 #: ../pyhoca/wxgui/profilemanager.py:1377 -#: ../pyhoca/wxgui/profilemanager.py:1383 -#: ../pyhoca/wxgui/profilemanager.py:1393 ../pyhoca/wxgui/menus_taskbar.py:87 +#: ../pyhoca/wxgui/profilemanager.py:1382 +#: ../pyhoca/wxgui/profilemanager.py:1392 ../pyhoca/wxgui/menus_taskbar.py:87 msgid "Profile Manager" msgstr "Gestor de Perfiles" @@ -548,14 +553,14 @@ msgstr "¡¡¡Nombre de pefil no encontrado o no válido!!!" msgid "Profile name %s already exists!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1383 +#: ../pyhoca/wxgui/profilemanager.py:1382 #, fuzzy msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" "¡El protocolo de autenticación de comunicaciones está incompleto! Inténtalo " "otra vez..." -#: ../pyhoca/wxgui/profilemanager.py:1393 +#: ../pyhoca/wxgui/profilemanager.py:1392 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -563,21 +568,21 @@ msgid "" "Please change the SSH proxy settings accordingly." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1413 +#: ../pyhoca/wxgui/profilemanager.py:1412 #, python-format msgid "%s - profile added" msgstr "%s - perfil añadido" -#: ../pyhoca/wxgui/profilemanager.py:1414 +#: ../pyhoca/wxgui/profilemanager.py:1413 msgid "A new session profile has been added." msgstr "Se ha añadido un nuevo perfil de sesión." -#: ../pyhoca/wxgui/profilemanager.py:1418 +#: ../pyhoca/wxgui/profilemanager.py:1417 #, python-format msgid "%s - modified" msgstr "%s - modificado" -#: ../pyhoca/wxgui/profilemanager.py:1419 +#: ../pyhoca/wxgui/profilemanager.py:1418 msgid "Changes to profile have been saved." msgstr "Se han guardado los cambios en el perfil." @@ -681,70 +686,70 @@ msgstr "Conectar con el Servidor" msgid "About %s ..." msgstr "Acerca de %s ..." -#: ../pyhoca/wxgui/frontend.py:357 +#: ../pyhoca/wxgui/frontend.py:362 msgid "Public SSH key authentication has been successful." msgstr "Se ha iniciado sesión con éxito usando la clave pública SSH." -#: ../pyhoca/wxgui/frontend.py:387 +#: ../pyhoca/wxgui/frontend.py:392 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" "La clave SSH del proxy no es válida o no ha sido aceptada por el usuario" -#: ../pyhoca/wxgui/frontend.py:408 +#: ../pyhoca/wxgui/frontend.py:413 msgid "Authentication protocol communication incomplete! Try again..." msgstr "" "¡El protocolo de autenticación de comunicaciones está incompleto! Inténtalo " "otra vez..." -#: ../pyhoca/wxgui/frontend.py:415 +#: ../pyhoca/wxgui/frontend.py:420 #, python-format msgid "%s - auth key error" msgstr "%s - error en la clave de identificación" -#: ../pyhoca/wxgui/frontend.py:422 +#: ../pyhoca/wxgui/frontend.py:434 #, fuzzy msgid "An unknown error occurred during authentication!" msgstr "" "¡Error desconocido al tratar de validar el nombre de usuario y la contraseña!" -#: ../pyhoca/wxgui/frontend.py:524 +#: ../pyhoca/wxgui/frontend.py:536 msgid "Cleaning X2go sessions..." msgstr "Limpiando sesiones X2go..." -#: ../pyhoca/wxgui/frontend.py:543 +#: ../pyhoca/wxgui/frontend.py:555 #, python-format msgid "%s - disconnect" msgstr "%s - desconectado" -#: ../pyhoca/wxgui/frontend.py:543 +#: ../pyhoca/wxgui/frontend.py:555 msgid "X2go Profile is now disconnected." msgstr "Se ha desconectado el Perfil X2go." -#: ../pyhoca/wxgui/frontend.py:559 +#: ../pyhoca/wxgui/frontend.py:571 msgid "New Session Profile" msgstr "Nuevo Perfil de Sesión" -#: ../pyhoca/wxgui/frontend.py:586 +#: ../pyhoca/wxgui/frontend.py:598 #, fuzzy, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Nuevo Perfil de Sesión" -#: ../pyhoca/wxgui/frontend.py:592 +#: ../pyhoca/wxgui/frontend.py:604 #, python-format msgid "%s - profile deleted" msgstr "%s - perfil eliminado" -#: ../pyhoca/wxgui/frontend.py:592 +#: ../pyhoca/wxgui/frontend.py:604 msgid "The session profile has been deleted." msgstr "Se ha eliminado el perfil de sesión." -#: ../pyhoca/wxgui/frontend.py:607 +#: ../pyhoca/wxgui/frontend.py:619 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - compartir carpetas locales con las sesiones de este perfil" -#: ../pyhoca/wxgui/frontend.py:659 +#: ../pyhoca/wxgui/frontend.py:671 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -757,17 +762,17 @@ msgstr "" "\n" "¿Continuar con la conexión?" -#: ../pyhoca/wxgui/frontend.py:667 +#: ../pyhoca/wxgui/frontend.py:679 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Se confirma la autorización del equipo" -#: ../pyhoca/wxgui/frontend.py:686 +#: ../pyhoca/wxgui/frontend.py:698 #, python-format msgid "%s - channel error" msgstr "%s - error en el canal" -#: ../pyhoca/wxgui/frontend.py:686 +#: ../pyhoca/wxgui/frontend.py:698 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -776,12 +781,12 @@ msgstr "" "¡La conexión con el servidor %s ha finalizado inesperadamente! Intenta " "iniciar sesión nuevamente..." -#: ../pyhoca/wxgui/frontend.py:696 ../pyhoca/wxgui/frontend.py:708 +#: ../pyhoca/wxgui/frontend.py:708 ../pyhoca/wxgui/frontend.py:720 #, python-format msgid "%s - session failure" msgstr "%s - fallo en la sesión" -#: ../pyhoca/wxgui/frontend.py:696 +#: ../pyhoca/wxgui/frontend.py:708 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" @@ -790,12 +795,12 @@ msgstr "" "El comando ,,%s'' no está presente en el servidor X2go\n" "%s." -#: ../pyhoca/wxgui/frontend.py:702 +#: ../pyhoca/wxgui/frontend.py:714 #, python-format msgid "%s - session warning" msgstr "%s - advertencia durante la sesión" -#: ../pyhoca/wxgui/frontend.py:702 +#: ../pyhoca/wxgui/frontend.py:714 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -804,7 +809,7 @@ msgstr "" "Se ha denegado la redirección del túnel TCP inverso para la sesión %s al " "puerto %s del servidor X2go." -#: ../pyhoca/wxgui/frontend.py:708 +#: ../pyhoca/wxgui/frontend.py:720 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -813,37 +818,37 @@ msgstr "" "La solicitud de túnel a %s:%s para la sesión %s ha sido denegada por el " "servidor X2go/SSH . Fallo en el inicio de sesión." -#: ../pyhoca/wxgui/frontend.py:720 +#: ../pyhoca/wxgui/frontend.py:732 #, python-format msgid "%s - audio warning" msgstr "%s - advertencia en el sistema de audio" -#: ../pyhoca/wxgui/frontend.py:720 +#: ../pyhoca/wxgui/frontend.py:732 msgid "" "The X2go PulseAudio system is not available within Remote Desktop sessions." msgstr "" "El sistema X2go PulseAudio no está disponible en las sesiones del tipo " "Remote Desktop" -#: ../pyhoca/wxgui/frontend.py:723 ../pyhoca/wxgui/frontend.py:726 +#: ../pyhoca/wxgui/frontend.py:735 ../pyhoca/wxgui/frontend.py:738 #, python-format msgid "%s - audio error" msgstr "%s - error en el audio" -#: ../pyhoca/wxgui/frontend.py:723 +#: ../pyhoca/wxgui/frontend.py:735 msgid "The X2go PulseAudio system could not be started." msgstr "El sistema X2go PulseAudio no puede iniciarse" -#: ../pyhoca/wxgui/frontend.py:726 +#: ../pyhoca/wxgui/frontend.py:738 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "El sistema X2go PulseAudio ha finalizado inesperadamente" -#: ../pyhoca/wxgui/frontend.py:729 +#: ../pyhoca/wxgui/frontend.py:741 #, python-format msgid "%s - audio problem" msgstr "%s - problema en el audio" -#: ../pyhoca/wxgui/frontend.py:729 +#: ../pyhoca/wxgui/frontend.py:741 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -852,12 +857,12 @@ msgstr "" "La conexión de audio puede que no esté configurada para esta sesión.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:743 ../pyhoca/wxgui/frontend.py:745 +#: ../pyhoca/wxgui/frontend.py:755 ../pyhoca/wxgui/frontend.py:757 #, python-format msgid "%s - print error" msgstr "%s - error de impresión" -#: ../pyhoca/wxgui/frontend.py:743 +#: ../pyhoca/wxgui/frontend.py:755 #, python-format msgid "" "%s\n" @@ -868,7 +873,7 @@ msgstr "" "...provocado en la impresora %s por la sesión\n" "%s" -#: ../pyhoca/wxgui/frontend.py:745 +#: ../pyhoca/wxgui/frontend.py:757 #, python-format msgid "" "%s\n" @@ -879,12 +884,12 @@ msgstr "" "...provocado por la sesión\n" "%s" -#: ../pyhoca/wxgui/frontend.py:749 ../pyhoca/wxgui/frontend.py:753 +#: ../pyhoca/wxgui/frontend.py:761 ../pyhoca/wxgui/frontend.py:765 #, python-format msgid "%s - start" msgstr "%s - inicio" -#: ../pyhoca/wxgui/frontend.py:749 +#: ../pyhoca/wxgui/frontend.py:761 #, python-format msgid "" "New X2go session starting up...\n" @@ -893,7 +898,7 @@ msgstr "" "Iniciando nueva sesión X2go...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:753 +#: ../pyhoca/wxgui/frontend.py:765 #, python-format msgid "" "Another client started X2go session\n" @@ -902,12 +907,12 @@ msgstr "" "Otro cliente ha iniciado sesión X2go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:757 ../pyhoca/wxgui/frontend.py:761 +#: ../pyhoca/wxgui/frontend.py:769 ../pyhoca/wxgui/frontend.py:773 #, python-format msgid "%s - resume" msgstr "%s - retornar a la sesión" -#: ../pyhoca/wxgui/frontend.py:757 +#: ../pyhoca/wxgui/frontend.py:769 #, python-format msgid "" "Resuming X2go session...\n" @@ -916,7 +921,7 @@ msgstr "" "Retornando sesión X2go...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:761 +#: ../pyhoca/wxgui/frontend.py:773 #, python-format msgid "" "Another client resumed X2go session\n" @@ -925,12 +930,12 @@ msgstr "" "Otro cliente retornó a la sesión X2go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:765 +#: ../pyhoca/wxgui/frontend.py:777 #, python-format msgid "%s - running" msgstr "%s - en ejecución" -#: ../pyhoca/wxgui/frontend.py:765 +#: ../pyhoca/wxgui/frontend.py:777 #, python-format msgid "" "Found already running session\n" @@ -939,12 +944,12 @@ msgstr "" "La sesión ya está en ejecución\n" "%s" -#: ../pyhoca/wxgui/frontend.py:769 +#: ../pyhoca/wxgui/frontend.py:781 #, python-format msgid "%s - suspend" msgstr "%s - suspender" -#: ../pyhoca/wxgui/frontend.py:769 +#: ../pyhoca/wxgui/frontend.py:781 #, python-format msgid "" "X2go Session has been suspended\n" @@ -953,12 +958,12 @@ msgstr "" "Se ha suspendido la Sesión X2go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:785 +#: ../pyhoca/wxgui/frontend.py:797 #, python-format msgid "%s - terminate" msgstr "%s - finalizar" -#: ../pyhoca/wxgui/frontend.py:785 +#: ../pyhoca/wxgui/frontend.py:797 #, python-format msgid "" "X2go Session has terminated\n" diff --git a/po/nl.po b/po/nl.po index 602a03f..d092cce 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-27 11:14+0200\n" -"PO-Revision-Date: 2011-06-27 11:14+0100\n" +"POT-Creation-Date: 2011-07-14 08:07+0200\n" +"PO-Revision-Date: 2011-07-14 08:07+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: nl <dick.kniep(a)lindix.nl>\n" "Language: \n" @@ -55,16 +55,16 @@ msgid "Cancel" msgstr "Afbreken" #: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:310 -#: ../pyhoca/wxgui/frontend.py:350 +#: ../pyhoca/wxgui/frontend.py:355 #, python-format msgid "%s - connect failure" msgstr "%s - verbinden mislukt" -#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:350 +#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:355 msgid "User is not allowed to start X2go sessions!" msgstr "Gebruiker mag geen X2go sessie starten!" -#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:357 +#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:362 #, python-format msgid "%s - connect" msgstr "%s - verbinden" @@ -91,20 +91,20 @@ msgid "Authentication to the SSH proxy server failed!" msgstr "Authenticatie via SSH Proxy Server mislukt!" #: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/logon.py:340 -#: ../pyhoca/wxgui/logon.py:359 ../pyhoca/wxgui/frontend.py:373 -#: ../pyhoca/wxgui/frontend.py:394 ../pyhoca/wxgui/frontend.py:401 -#: ../pyhoca/wxgui/frontend.py:408 +#: ../pyhoca/wxgui/logon.py:363 ../pyhoca/wxgui/frontend.py:378 +#: ../pyhoca/wxgui/frontend.py:399 ../pyhoca/wxgui/frontend.py:406 +#: ../pyhoca/wxgui/frontend.py:413 #, python-format msgid "%s - connect error" msgstr "%s - Verbindingsfout" -#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:380 -#: ../pyhoca/wxgui/frontend.py:387 +#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:385 +#: ../pyhoca/wxgui/frontend.py:392 #, python-format msgid "%s - host key error" msgstr "%s - server sleutel fout" -#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:380 +#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:385 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" @@ -116,7 +116,12 @@ msgstr "" msgid "%s - key error" msgstr "%s - sleutel fout" -#: ../pyhoca/wxgui/logon.py:360 +#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:427 +#, python-format +msgid "%s - auth error" +msgstr "%s - authenticatie fout" + +#: ../pyhoca/wxgui/logon.py:364 msgid "An unknown error occured during authentication!" msgstr "Een onbekende fout is bij de authenticatie opgetreden" @@ -528,8 +533,8 @@ msgstr "Kies een map om te delen" #: ../pyhoca/wxgui/profilemanager.py:1371 #: ../pyhoca/wxgui/profilemanager.py:1374 #: ../pyhoca/wxgui/profilemanager.py:1377 -#: ../pyhoca/wxgui/profilemanager.py:1383 -#: ../pyhoca/wxgui/profilemanager.py:1393 ../pyhoca/wxgui/menus_taskbar.py:87 +#: ../pyhoca/wxgui/profilemanager.py:1382 +#: ../pyhoca/wxgui/profilemanager.py:1392 ../pyhoca/wxgui/menus_taskbar.py:87 msgid "Profile Manager" msgstr "Profiel manager" @@ -543,11 +548,11 @@ msgstr "Profiel naam ontbreekt, kan niet gebruikt worden!!!" msgid "Profile name %s already exists!!!" msgstr "Profiel %s bestaat al" -#: ../pyhoca/wxgui/profilemanager.py:1383 +#: ../pyhoca/wxgui/profilemanager.py:1382 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "SSH Proxy Configuratie is niet volledig! Opnieuw proberen..." -#: ../pyhoca/wxgui/profilemanager.py:1393 +#: ../pyhoca/wxgui/profilemanager.py:1392 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -558,21 +563,21 @@ msgstr "" "SSH proxy.\n" "Verander de SSH proxy instelling om dit probleem te verhelpen." -#: ../pyhoca/wxgui/profilemanager.py:1413 +#: ../pyhoca/wxgui/profilemanager.py:1412 #, python-format msgid "%s - profile added" msgstr "%s - Profiel toegevoegd" -#: ../pyhoca/wxgui/profilemanager.py:1414 +#: ../pyhoca/wxgui/profilemanager.py:1413 msgid "A new session profile has been added." msgstr "Een nieuw Profiel is toegevoegd" -#: ../pyhoca/wxgui/profilemanager.py:1418 +#: ../pyhoca/wxgui/profilemanager.py:1417 #, python-format msgid "%s - modified" msgstr "%s - gewijzigd" -#: ../pyhoca/wxgui/profilemanager.py:1419 +#: ../pyhoca/wxgui/profilemanager.py:1418 msgid "Changes to profile have been saved." msgstr "Wijzigingen in het profiel zijn opgeslagen." @@ -599,7 +604,7 @@ msgstr "Opties" #: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:407 msgid "E&xit" -msgstr "&Beeindigen" +msgstr "&Beëindigen" #: ../pyhoca/wxgui/menus_taskbar.py:159 msgid "Resume Session" @@ -623,7 +628,7 @@ msgstr "Suspend Sessie" #: ../pyhoca/wxgui/menus_taskbar.py:176 msgid "Terminate Session" -msgstr "Sessie beeindigen" +msgstr "Sessie beëindigen" #: ../pyhoca/wxgui/menus_taskbar.py:214 msgid "Start &new Session" @@ -639,7 +644,7 @@ msgstr "Suspended" #: ../pyhoca/wxgui/menus_taskbar.py:244 msgid "&Clean all sessions" -msgstr "Alle Sessies beeindigen" +msgstr "Alle Sessies beëindigen" #: ../pyhoca/wxgui/menus_taskbar.py:246 msgid "Customize &profile" @@ -674,67 +679,67 @@ msgstr "Verbinden met Server" msgid "About %s ..." msgstr "About %s ..." -#: ../pyhoca/wxgui/frontend.py:357 +#: ../pyhoca/wxgui/frontend.py:362 msgid "Public SSH key authentication has been successful." msgstr "Public SSH-key authenticatie is gelukt." -#: ../pyhoca/wxgui/frontend.py:387 +#: ../pyhoca/wxgui/frontend.py:392 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" "De sleutel van de SSH proxy is ongeldig of is niet geaccepteerd door de " "gebruiker" -#: ../pyhoca/wxgui/frontend.py:408 +#: ../pyhoca/wxgui/frontend.py:413 msgid "Authentication protocol communication incomplete! Try again..." msgstr "Authenticatie was niet volledig! Opnieuw proberen..." -#: ../pyhoca/wxgui/frontend.py:415 +#: ../pyhoca/wxgui/frontend.py:420 #, python-format msgid "%s - auth key error" msgstr "%s - Verbindingsfout met auth. key" -#: ../pyhoca/wxgui/frontend.py:422 +#: ../pyhoca/wxgui/frontend.py:434 msgid "An unknown error occurred during authentication!" msgstr "Een onbekende fout is bij de authenticatie opgetreden" -#: ../pyhoca/wxgui/frontend.py:524 +#: ../pyhoca/wxgui/frontend.py:536 msgid "Cleaning X2go sessions..." msgstr "Opschonen X2go sessies..." -#: ../pyhoca/wxgui/frontend.py:543 +#: ../pyhoca/wxgui/frontend.py:555 #, python-format msgid "%s - disconnect" msgstr "%s - verbinding verbreken" -#: ../pyhoca/wxgui/frontend.py:543 +#: ../pyhoca/wxgui/frontend.py:555 msgid "X2go Profile is now disconnected." msgstr "X2go Profiel is nu niet meer verbonden." -#: ../pyhoca/wxgui/frontend.py:559 +#: ../pyhoca/wxgui/frontend.py:571 msgid "New Session Profile" msgstr "Nieuw Profiel" -#: ../pyhoca/wxgui/frontend.py:586 +#: ../pyhoca/wxgui/frontend.py:598 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Verwijder sessie profiel ,,%s''?" -#: ../pyhoca/wxgui/frontend.py:592 +#: ../pyhoca/wxgui/frontend.py:604 #, python-format msgid "%s - profile deleted" msgstr "%s - Profiel is verwijderd!" -#: ../pyhoca/wxgui/frontend.py:592 +#: ../pyhoca/wxgui/frontend.py:604 msgid "The session profile has been deleted." msgstr "Het sessie profiel is verwijderd." -#: ../pyhoca/wxgui/frontend.py:607 +#: ../pyhoca/wxgui/frontend.py:619 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - deel lokale map met dit Profiel" -#: ../pyhoca/wxgui/frontend.py:659 +#: ../pyhoca/wxgui/frontend.py:671 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -747,17 +752,17 @@ msgstr "" "\n" "Weet u zeker dat u de verbinding wilt maken?" -#: ../pyhoca/wxgui/frontend.py:667 +#: ../pyhoca/wxgui/frontend.py:679 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Bevestig dat de Host geautoriseerd is" -#: ../pyhoca/wxgui/frontend.py:686 +#: ../pyhoca/wxgui/frontend.py:698 #, python-format msgid "%s - channel error" msgstr "%s - Verbindingsfout (channel error)" -#: ../pyhoca/wxgui/frontend.py:686 +#: ../pyhoca/wxgui/frontend.py:698 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -766,12 +771,12 @@ msgstr "" "De Verbinding met de server %s werd onverwacht verbroken! Probeer om u " "opnieuw aan te melden..." -#: ../pyhoca/wxgui/frontend.py:696 ../pyhoca/wxgui/frontend.py:708 +#: ../pyhoca/wxgui/frontend.py:708 ../pyhoca/wxgui/frontend.py:720 #, python-format msgid "%s - session failure" msgstr "%s - sessie fout" -#: ../pyhoca/wxgui/frontend.py:696 +#: ../pyhoca/wxgui/frontend.py:708 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" @@ -780,12 +785,12 @@ msgstr "" "Het commando ,,%s'' is niet beschikbaar op de X2go server\n" "%s" -#: ../pyhoca/wxgui/frontend.py:702 +#: ../pyhoca/wxgui/frontend.py:714 #, python-format msgid "%s - session warning" msgstr "%s - sessie waarschuwing" -#: ../pyhoca/wxgui/frontend.py:702 +#: ../pyhoca/wxgui/frontend.py:714 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -794,7 +799,7 @@ msgstr "" "Reverse TCP port forwarding request for session %s to server port %s has " "been denied." -#: ../pyhoca/wxgui/frontend.py:708 +#: ../pyhoca/wxgui/frontend.py:720 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -803,36 +808,36 @@ msgstr "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " "X2go/SSH server. Session startup failed." -#: ../pyhoca/wxgui/frontend.py:720 +#: ../pyhoca/wxgui/frontend.py:732 #, python-format msgid "%s - audio warning" msgstr "%s - audio waarschuwing" -#: ../pyhoca/wxgui/frontend.py:720 +#: ../pyhoca/wxgui/frontend.py:732 msgid "" "The X2go PulseAudio system is not available within Remote Desktop sessions." msgstr "" "Het X2go PulseAudio systeem is niet beschikbaar voor Remote Desktop sessies" -#: ../pyhoca/wxgui/frontend.py:723 ../pyhoca/wxgui/frontend.py:726 +#: ../pyhoca/wxgui/frontend.py:735 ../pyhoca/wxgui/frontend.py:738 #, python-format msgid "%s - audio error" msgstr "%s - audio fout" -#: ../pyhoca/wxgui/frontend.py:723 +#: ../pyhoca/wxgui/frontend.py:735 msgid "The X2go PulseAudio system could not be started." msgstr "Het X2go PulseAudio systeem kon niet gestart worden" -#: ../pyhoca/wxgui/frontend.py:726 +#: ../pyhoca/wxgui/frontend.py:738 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "Het X2go PulseAudio systeem is gecrashed" -#: ../pyhoca/wxgui/frontend.py:729 +#: ../pyhoca/wxgui/frontend.py:741 #, python-format msgid "%s - audio problem" msgstr "%s - audio probleem" -#: ../pyhoca/wxgui/frontend.py:729 +#: ../pyhoca/wxgui/frontend.py:741 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -841,12 +846,12 @@ msgstr "" "De audio verbinding kon niet worden gemaakt voor deze sessie.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:743 ../pyhoca/wxgui/frontend.py:745 +#: ../pyhoca/wxgui/frontend.py:755 ../pyhoca/wxgui/frontend.py:757 #, python-format msgid "%s - print error" msgstr "%s - Printfout" -#: ../pyhoca/wxgui/frontend.py:743 +#: ../pyhoca/wxgui/frontend.py:755 #, python-format msgid "" "%s\n" @@ -857,7 +862,7 @@ msgstr "" "...veroorzaakt door printer %s in sessie\n" "%s" -#: ../pyhoca/wxgui/frontend.py:745 +#: ../pyhoca/wxgui/frontend.py:757 #, python-format msgid "" "%s\n" @@ -868,12 +873,12 @@ msgstr "" "...veroorzaakt door sessie\n" "%s" -#: ../pyhoca/wxgui/frontend.py:749 ../pyhoca/wxgui/frontend.py:753 +#: ../pyhoca/wxgui/frontend.py:761 ../pyhoca/wxgui/frontend.py:765 #, python-format msgid "%s - start" msgstr "%s - Start" -#: ../pyhoca/wxgui/frontend.py:749 +#: ../pyhoca/wxgui/frontend.py:761 #, python-format msgid "" "New X2go session starting up...\n" @@ -882,7 +887,7 @@ msgstr "" "Nieuwe X2go sessie wordt gestart...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:753 +#: ../pyhoca/wxgui/frontend.py:765 #, python-format msgid "" "Another client started X2go session\n" @@ -891,12 +896,12 @@ msgstr "" "Een andere X2go-client heeft deze sessie gestart\n" "%s" -#: ../pyhoca/wxgui/frontend.py:757 ../pyhoca/wxgui/frontend.py:761 +#: ../pyhoca/wxgui/frontend.py:769 ../pyhoca/wxgui/frontend.py:773 #, python-format msgid "%s - resume" msgstr "%s - hervatten" -#: ../pyhoca/wxgui/frontend.py:757 +#: ../pyhoca/wxgui/frontend.py:769 #, python-format msgid "" "Resuming X2go session...\n" @@ -905,7 +910,7 @@ msgstr "" "X2go Sessie wordt hervat...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:761 +#: ../pyhoca/wxgui/frontend.py:773 #, python-format msgid "" "Another client resumed X2go session\n" @@ -914,12 +919,12 @@ msgstr "" "Een andere X2go-client heeft de Sessie hervat\n" "%s" -#: ../pyhoca/wxgui/frontend.py:765 +#: ../pyhoca/wxgui/frontend.py:777 #, python-format msgid "%s - running" msgstr "%s - actief" -#: ../pyhoca/wxgui/frontend.py:765 +#: ../pyhoca/wxgui/frontend.py:777 #, python-format msgid "" "Found already running session\n" @@ -928,12 +933,12 @@ msgstr "" "Reeds actieve sessie gevonden\n" "%s" -#: ../pyhoca/wxgui/frontend.py:769 +#: ../pyhoca/wxgui/frontend.py:781 #, python-format msgid "%s - suspend" msgstr "%s - suspend" -#: ../pyhoca/wxgui/frontend.py:769 +#: ../pyhoca/wxgui/frontend.py:781 #, python-format msgid "" "X2go Session has been suspended\n" @@ -942,18 +947,18 @@ msgstr "" "X2go Sessie is suspended\n" "%s" -#: ../pyhoca/wxgui/frontend.py:785 +#: ../pyhoca/wxgui/frontend.py:797 #, python-format msgid "%s - terminate" -msgstr "%s - beÃ«indigen" +msgstr "%s - beëindigen" -#: ../pyhoca/wxgui/frontend.py:785 +#: ../pyhoca/wxgui/frontend.py:797 #, python-format msgid "" "X2go Session has terminated\n" "%s" msgstr "" -"X2go Sessie wordt beÃ«indigd\n" +"X2go Sessie wordt beëindigd\n" "%s" #: ../pyhoca/wxgui/messages.py:53 diff --git a/po/pyhoca-gui.pot b/po/pyhoca-gui.pot index f385334..3ca1f83 100644 --- a/po/pyhoca-gui.pot +++ b/po/pyhoca-gui.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-27 11:14+0200\n" +"POT-Creation-Date: 2011-07-14 08:07+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -52,16 +52,16 @@ msgid "Cancel" msgstr "" #: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:310 -#: ../pyhoca/wxgui/frontend.py:350 +#: ../pyhoca/wxgui/frontend.py:355 #, python-format msgid "%s - connect failure" msgstr "" -#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:350 +#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:355 msgid "User is not allowed to start X2go sessions!" msgstr "" -#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:357 +#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:362 #, python-format msgid "%s - connect" msgstr "" @@ -88,20 +88,20 @@ msgid "Authentication to the SSH proxy server failed!" msgstr "" #: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/logon.py:340 -#: ../pyhoca/wxgui/logon.py:359 ../pyhoca/wxgui/frontend.py:373 -#: ../pyhoca/wxgui/frontend.py:394 ../pyhoca/wxgui/frontend.py:401 -#: ../pyhoca/wxgui/frontend.py:408 +#: ../pyhoca/wxgui/logon.py:363 ../pyhoca/wxgui/frontend.py:378 +#: ../pyhoca/wxgui/frontend.py:399 ../pyhoca/wxgui/frontend.py:406 +#: ../pyhoca/wxgui/frontend.py:413 #, python-format msgid "%s - connect error" msgstr "" -#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:380 -#: ../pyhoca/wxgui/frontend.py:387 +#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:385 +#: ../pyhoca/wxgui/frontend.py:392 #, python-format msgid "%s - host key error" msgstr "" -#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:380 +#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:385 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" @@ -111,7 +111,12 @@ msgstr "" msgid "%s - key error" msgstr "" -#: ../pyhoca/wxgui/logon.py:360 +#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:427 +#, python-format +msgid "%s - auth error" +msgstr "" + +#: ../pyhoca/wxgui/logon.py:364 msgid "An unknown error occured during authentication!" msgstr "" @@ -517,8 +522,8 @@ msgstr "" #: ../pyhoca/wxgui/profilemanager.py:1371 #: ../pyhoca/wxgui/profilemanager.py:1374 #: ../pyhoca/wxgui/profilemanager.py:1377 -#: ../pyhoca/wxgui/profilemanager.py:1383 -#: ../pyhoca/wxgui/profilemanager.py:1393 ../pyhoca/wxgui/menus_taskbar.py:87 +#: ../pyhoca/wxgui/profilemanager.py:1382 +#: ../pyhoca/wxgui/profilemanager.py:1392 ../pyhoca/wxgui/menus_taskbar.py:87 msgid "Profile Manager" msgstr "" @@ -532,11 +537,11 @@ msgstr "" msgid "Profile name %s already exists!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1383 +#: ../pyhoca/wxgui/profilemanager.py:1382 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1393 +#: ../pyhoca/wxgui/profilemanager.py:1392 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -544,21 +549,21 @@ msgid "" "Please change the SSH proxy settings accordingly." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1413 +#: ../pyhoca/wxgui/profilemanager.py:1412 #, python-format msgid "%s - profile added" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1414 +#: ../pyhoca/wxgui/profilemanager.py:1413 msgid "A new session profile has been added." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1418 +#: ../pyhoca/wxgui/profilemanager.py:1417 #, python-format msgid "%s - modified" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1419 +#: ../pyhoca/wxgui/profilemanager.py:1418 msgid "Changes to profile have been saved." msgstr "" @@ -660,65 +665,65 @@ msgstr "" msgid "About %s ..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:357 +#: ../pyhoca/wxgui/frontend.py:362 msgid "Public SSH key authentication has been successful." msgstr "" -#: ../pyhoca/wxgui/frontend.py:387 +#: ../pyhoca/wxgui/frontend.py:392 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" -#: ../pyhoca/wxgui/frontend.py:408 +#: ../pyhoca/wxgui/frontend.py:413 msgid "Authentication protocol communication incomplete! Try again..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:415 +#: ../pyhoca/wxgui/frontend.py:420 #, python-format msgid "%s - auth key error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:422 +#: ../pyhoca/wxgui/frontend.py:434 msgid "An unknown error occurred during authentication!" msgstr "" -#: ../pyhoca/wxgui/frontend.py:524 +#: ../pyhoca/wxgui/frontend.py:536 msgid "Cleaning X2go sessions..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:543 +#: ../pyhoca/wxgui/frontend.py:555 #, python-format msgid "%s - disconnect" msgstr "" -#: ../pyhoca/wxgui/frontend.py:543 +#: ../pyhoca/wxgui/frontend.py:555 msgid "X2go Profile is now disconnected." msgstr "" -#: ../pyhoca/wxgui/frontend.py:559 +#: ../pyhoca/wxgui/frontend.py:571 msgid "New Session Profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:586 +#: ../pyhoca/wxgui/frontend.py:598 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:592 +#: ../pyhoca/wxgui/frontend.py:604 #, python-format msgid "%s - profile deleted" msgstr "" -#: ../pyhoca/wxgui/frontend.py:592 +#: ../pyhoca/wxgui/frontend.py:604 msgid "The session profile has been deleted." msgstr "" -#: ../pyhoca/wxgui/frontend.py:607 +#: ../pyhoca/wxgui/frontend.py:619 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:659 +#: ../pyhoca/wxgui/frontend.py:671 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -727,95 +732,95 @@ msgid "" "Are you sure you want to continue connecting?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:667 +#: ../pyhoca/wxgui/frontend.py:679 #, python-format msgid "%s: Confirm Host Authorization" msgstr "" -#: ../pyhoca/wxgui/frontend.py:686 +#: ../pyhoca/wxgui/frontend.py:698 #, python-format msgid "%s - channel error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:686 +#: ../pyhoca/wxgui/frontend.py:698 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " "server..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:696 ../pyhoca/wxgui/frontend.py:708 +#: ../pyhoca/wxgui/frontend.py:708 ../pyhoca/wxgui/frontend.py:720 #, python-format msgid "%s - session failure" msgstr "" -#: ../pyhoca/wxgui/frontend.py:696 +#: ../pyhoca/wxgui/frontend.py:708 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" "%s." msgstr "" -#: ../pyhoca/wxgui/frontend.py:702 +#: ../pyhoca/wxgui/frontend.py:714 #, python-format msgid "%s - session warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:702 +#: ../pyhoca/wxgui/frontend.py:714 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " "been denied." msgstr "" -#: ../pyhoca/wxgui/frontend.py:708 +#: ../pyhoca/wxgui/frontend.py:720 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " "X2go/SSH server. Session startup failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:720 +#: ../pyhoca/wxgui/frontend.py:732 #, python-format msgid "%s - audio warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:720 +#: ../pyhoca/wxgui/frontend.py:732 msgid "" "The X2go PulseAudio system is not available within Remote Desktop sessions." msgstr "" -#: ../pyhoca/wxgui/frontend.py:723 ../pyhoca/wxgui/frontend.py:726 +#: ../pyhoca/wxgui/frontend.py:735 ../pyhoca/wxgui/frontend.py:738 #, python-format msgid "%s - audio error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:723 +#: ../pyhoca/wxgui/frontend.py:735 msgid "The X2go PulseAudio system could not be started." msgstr "" -#: ../pyhoca/wxgui/frontend.py:726 +#: ../pyhoca/wxgui/frontend.py:738 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "" -#: ../pyhoca/wxgui/frontend.py:729 +#: ../pyhoca/wxgui/frontend.py:741 #, python-format msgid "%s - audio problem" msgstr "" -#: ../pyhoca/wxgui/frontend.py:729 +#: ../pyhoca/wxgui/frontend.py:741 #, python-format msgid "" "The audio connection could not be set up for this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:743 ../pyhoca/wxgui/frontend.py:745 +#: ../pyhoca/wxgui/frontend.py:755 ../pyhoca/wxgui/frontend.py:757 #, python-format msgid "%s - print error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:743 +#: ../pyhoca/wxgui/frontend.py:755 #, python-format msgid "" "%s\n" @@ -823,7 +828,7 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:745 +#: ../pyhoca/wxgui/frontend.py:757 #, python-format msgid "" "%s\n" @@ -831,74 +836,74 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:749 ../pyhoca/wxgui/frontend.py:753 +#: ../pyhoca/wxgui/frontend.py:761 ../pyhoca/wxgui/frontend.py:765 #, python-format msgid "%s - start" msgstr "" -#: ../pyhoca/wxgui/frontend.py:749 +#: ../pyhoca/wxgui/frontend.py:761 #, python-format msgid "" "New X2go session starting up...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:753 +#: ../pyhoca/wxgui/frontend.py:765 #, python-format msgid "" "Another client started X2go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:757 ../pyhoca/wxgui/frontend.py:761 +#: ../pyhoca/wxgui/frontend.py:769 ../pyhoca/wxgui/frontend.py:773 #, python-format msgid "%s - resume" msgstr "" -#: ../pyhoca/wxgui/frontend.py:757 +#: ../pyhoca/wxgui/frontend.py:769 #, python-format msgid "" "Resuming X2go session...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:761 +#: ../pyhoca/wxgui/frontend.py:773 #, python-format msgid "" "Another client resumed X2go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:765 +#: ../pyhoca/wxgui/frontend.py:777 #, python-format msgid "%s - running" msgstr "" -#: ../pyhoca/wxgui/frontend.py:765 +#: ../pyhoca/wxgui/frontend.py:777 #, python-format msgid "" "Found already running session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:769 +#: ../pyhoca/wxgui/frontend.py:781 #, python-format msgid "%s - suspend" msgstr "" -#: ../pyhoca/wxgui/frontend.py:769 +#: ../pyhoca/wxgui/frontend.py:781 #, python-format msgid "" "X2go Session has been suspended\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:785 +#: ../pyhoca/wxgui/frontend.py:797 #, python-format msgid "%s - terminate" msgstr "" -#: ../pyhoca/wxgui/frontend.py:785 +#: ../pyhoca/wxgui/frontend.py:797 #, python-format msgid "" "X2go Session has terminated\n" 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