x2go-commits

x2go-commits@lists.x2go.org

37910 discussions

x2goserver.git - master (branch) updated: 3.1.1.0-15-g147d22c
by git-admin＠x2go.org 14 May '12

14 May '12

The branch, master has been updated via 147d22c44167b9b2d4afbdaf17262555a7af713b (commit) from ea355064c9a388987117c8765501be55061e47c9 (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 147d22c44167b9b2d4afbdaf17262555a7af713b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon May 14 12:56:29 2012 +0200 Use ,,-nolisten tcp'' option when evoking x2goagent from within x2gostartagent. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/bin/x2gostartagent | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f07404d..967131b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ x2goserver (3.1.1.1-0~x2go1) UNRELEASED; urgency=low translated into an executable command by x2goruncommand. - Detect desktop session mode to use for Ubuntu precise and later. - Complete UNITY/GNOME support for Ubuntu/Debian. + - Use ,,-nolisten tcp'' option when evoking x2goagent from within + x2gostartagent. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 04 Apr 2012 11:44:14 +0200 diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 739a0c2..29d0302 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -246,9 +246,9 @@ x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSI SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}" if [ "$X2GO_STYPE" == "S" ]; then - x2goagent $X2GODPIOPTION_ -$SESSION_TYPE -auth "$XAUTHORITY" -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_DIR}/session.log" & + x2goagent -nolisten tcp $X2GODPIOPTION_ -$SESSION_TYPE -auth "$XAUTHORITY" -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_DIR}/session.log" & else - x2goagent $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_DIR}/session.log" & + x2goagent -nolisten tcp $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE $NOEXITPARAM -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_DIR}/session.log" & fi 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

nx-libs.git - null-source-drawable (branch) created: redist-server/3.5.0.13-2-ge604911
by git-admin＠x2go.org 14 May '12

14 May '12

The branch, null-source-drawable has been created at e6049116e11268aa958f95f232ae8d3bf1f5a3b6 (commit) - Log ----------------------------------------------------------------- commit e6049116e11268aa958f95f232ae8d3bf1f5a3b6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon May 14 09:56:11 2012 +0200 trying to fix null source drawable patch ----------------------------------------------------------------------- hooks/post-receive -- nx-libs.git (NX (redistributed)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX (redistributed)).

1 0

nx-libs.git - master (branch) updated: redist-server/3.5.0.13-1-gfe72988
by git-admin＠x2go.org 11 May '12

11 May '12

The branch, master has been updated via fe72988fb668ad97fc4fcb2ee3862613324d9516 (commit) from 789c758510fc661b9d1a297ff5284962c5e944f0 (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 fe72988fb668ad97fc4fcb2ee3862613324d9516 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri May 11 23:57:35 2012 +0200 Continue development... ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a5c0844..45bd035 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +nx-libs (2:3.5.0.14-0) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 11 May 2012 23:57:18 +0200 + nx-libs (2:3.5.0.13-0) unstable; urgency=low [ Mike Gabriel ] hooks/post-receive -- nx-libs.git (NX (redistributed)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX (redistributed)).

1 0

nx-libs.git - build-main (branch) updated: redist-server/3.5.0.13
by git-admin＠x2go.org 11 May '12

11 May '12

The branch, build-main has been updated via 789c758510fc661b9d1a297ff5284962c5e944f0 (commit) via 3511e8791bd03a3e54384bdfd19e145efb4a136b (commit) via 45311f783acad296d37a248fb2c702c578ac3059 (commit) via 4372dfa53207a3247b8c317392f2672191b54fdf (commit) via fc87c4fbb2a2ce73c56be8fe59bcad05df359d4e (commit) via ab04ba2175ce37efb83d914792d2755b57cba2d5 (commit) via 30110dd4a80fb38e670296ad4fcbd43c2a4f184e (commit) from 1b1a26ae66725db1d8e8a3b3b5b3f755457f5068 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 11 + debian/control | 1 + ...agent_libcairo-null-source-drawables.full.patch | 193 ++++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 206 insertions(+), 0 deletions(-) create mode 100644 debian/patches/120_nxagent_libcairo-null-source-drawables.full.patch The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d1c14d8..a5c0844 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +nx-libs (2:3.5.0.13-0) unstable; urgency=low + + [ Mike Gabriel ] + * Let nxagent Debian package depend on xfonts-base. + + [ Jim Burnes ] + * Add patch: 120_nxagent_libcairo-null-source-drawables.full.patch, solves + crashes of GTK applications based on libcairo 1.12.1+. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 11 May 2012 23:51:35 +0200 + nx-libs (2:3.5.0.12-0) unstable; urgency=low [ Mike Gabriel ] diff --git a/debian/control b/debian/control index b23ecc2..16f25d7 100644 --- a/debian/control +++ b/debian/control @@ -74,6 +74,7 @@ Package: nxagent Architecture: any Depends: libnx-x11 (>= ${source:Version}), libnx-x11 (<< ${source:Version}.1~), + xfonts-base, ${shlibs:Depends}, ${misc:Depends} Description: NX agent diff --git a/debian/patches/120_nxagent_libcairo-null-source-drawables.full.patch b/debian/patches/120_nxagent_libcairo-null-source-drawables.full.patch new file mode 100644 index 0000000..319f6ed --- /dev/null +++ b/debian/patches/120_nxagent_libcairo-null-source-drawables.full.patch @@ -0,0 +1,193 @@ +Description: Fix nxagent/x2goagent With New LibCairo (>1.12.1) + Quoting two postings of Jim Burnes <jvburnes(a)gmail.com> on x2go-dev ML: + + I don't know what the current patch status is for fixing nxagent with the + new libcairo (1.12.1+ I believe), but eventually I got tired of waiting and + created my own patches for nxagent/x2goagent. + + Most of the fixes were required because the render extension now allows + (and libcairo uses) null source drawables (for gradients etc), null masks + and null mask drawables. + + This change creates a bit of a logic mess in the code. Previous patches + to the code tried to account for all of the possibilities, but fell a + little short. + + Consider this an alpha-quality patch. I've only tested it in KDE while + running GTK applications. All my favorite GTK apps like Firefox, Emacs, + rox-filer and all my other GTK apps that were broken are now working just + fine. (Though I'm getting only the standard GTK look and feel - don't know + if that's caused by anything I've done.) + + Could someone test this under Gnome? + + Also, since I'm not primarily an X software engineer I'd like a specialist + to take a look at it. The fix is a little crude. I just attached to the + x2goagent process and fixed the lines that caused segfaults. (About 10 of + them). + + I also rewrote one of the macros in Pixels.h into a local subroutine in + Render.c. It had a bug in it and complex macro bugs are a PITA to debug in + gdb (or anything else really). The macro is only used in one place and + although the code in the macro is called pretty often, it's very likely + that the compiler would inline it anyway. The rewrite increases + readability by a large factor. + + A better patch could be created by someone that understands nxagent and X + much better. The render extension code receives render ops from X client + programs. The render ops can contain any combination of picture source, + picture destination and picture mask. It's apparently legal to send render + ops with combinations of null picture source drawables, picture masks and + picture mask drawables. A better way to patch this would be to simply + perform a return on all the illegal combinations of null parameters for the + render ops. That way you wouldn't have to keep re-checking the parameter + values. + + So anyway, here it is. I appreciate it if someone out there would test it + and let me know. Also if anyone knows of the X docs which discuss null + picture sources and masks in the render extension I'd be glad to create a + cleaner patch that conforms to the stands. + + + You can reproduce the issue by running any recent copy of x2go/nxagent and + start any program that uses very recent versions of libCairo. Things + started breaking for both ArchLinux and Debian SID users about 3 weeks ago. + + The issues started with versions of libCairo >= libcairo2_1.12.0-2_amd64 + (debian packages of course). These versions of Cairo seem to use null + parameters in render ops a lot. Users of recent GTK environments would + have the startup process just crash. KDE sessions start and run fine until + you start a gtk app. +Forwarded: pending +Author: Jim Burnes <jvburnes(a)gmail.com> +Last-Update: 2012-05-11 +--- a/nx-X11/programs/Xserver/hw/nxagent/Render.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c +@@ -995,6 +995,36 @@ + #endif + } + ++ ++int nxagentShouldDeferComposite(PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst) ++{ ++ ++int drawableDst; ++int linkDeferred; ++int unSyncedSrcMask; ++ ++ drawableDst = ( nxagentRenderVersionMajor == 0 && ++ nxagentRenderVersionMinor == 8 && ++ (pDst) -> pDrawable -> type == DRAWABLE_PIXMAP ++ ); ++ ++ linkDeferred = ( nxagentOption(DeferLevel) >= 2 && ++ nxagentOption(LinkType) < LINK_TYPE_ADSL ++ ); ++ ++ unSyncedSrcMask = ( nxagentOption(DeferLevel) == 1 && ++ (pDst) -> pDrawable -> type == DRAWABLE_PIXMAP && ++ ( ++ (pSrc -> pDrawable && (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized)) || ++ ((pMask) && pMask -> pDrawable && (nxagentDrawableStatus((pMask) -> pDrawable) == NotSynchronized)) ++ ) ++ ); ++ ++ ++ return drawableDst || linkDeferred || unSyncedSrcMask; ++} ++ ++ + void nxagentComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, + INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask, INT16 xDst, + INT16 yDst, CARD16 width, CARD16 height) +@@ -1036,8 +1066,8 @@ + } + + #endif +- +- if (NXAGENT_SHOULD_DEFER_COMPOSITE(pSrc, pMask, pDst)) ++ /* if (NXAGENT_SHOULD_DEFER_COMPOSITE(pSrc, pMask, pDst)) */ ++ if (nxagentShouldDeferComposite(pSrc, pMask, pDst)) + { + pDstRegion = nxagentCreateRegion(pDst -> pDrawable, NULL, xDst, yDst, width, height); + +@@ -1095,7 +1125,8 @@ + } + } + +- if (pMask != NULL && pMask -> pDrawable != pSrc -> pDrawable && ++ if ((pMask) && (pMask->pDrawable) && ++ pMask -> pDrawable != pSrc -> pDrawable && + pMask -> pDrawable != pDst -> pDrawable) + { + nxagentSynchronizeShmPixmap(pMask -> pDrawable, xMask, yMask, width, height); +@@ -1259,7 +1290,7 @@ + * on the real X server. + */ + +- if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) ++ if (pSrc -> pDrawable && (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized)) + { + #ifdef TEST + fprintf(stderr, "nxagentGlyphs: Synchronizing source [%s] at [%p].\n", +@@ -1302,14 +1333,15 @@ + nxagentSynchronizeBox(pSrc -> pDrawable, &glyphBox, NEVER_BREAK); + } + +- if (pSrc -> pDrawable -> type == DRAWABLE_PIXMAP) ++ if (pSrc -> pDrawable && (pSrc -> pDrawable -> type == DRAWABLE_PIXMAP)) + { + nxagentIncreasePixmapUsageCounter((PixmapPtr) pSrc -> pDrawable); + } + } + +- if (pSrc -> pDrawable != pDst -> pDrawable && +- nxagentDrawableStatus(pDst -> pDrawable) == NotSynchronized) ++ ++ if (pSrc -> pDrawable && (pSrc -> pDrawable != pDst -> pDrawable && ++ nxagentDrawableStatus(pDst -> pDrawable) == NotSynchronized)) + { + #ifdef TEST + fprintf(stderr, "nxagentGlyphs: Synchronizing destination [%s] at [%p].\n", +@@ -1749,7 +1781,9 @@ + return; + } + +- if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) ++ /* the following blocks need fixing to ignore null values of pDrawable */ ++ ++ if (pSrc -> pDrawable && (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized)) + { + #ifdef TEST + fprintf(stderr, "nxagentTrapezoids: Going to synchronize the source drawable at [%p].\n", +@@ -1843,7 +1877,9 @@ + * operation like nxagentTrapezoids() does. + */ + +- if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) ++ ++ ++ if (pSrc -> pDrawable && (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized)) + { + #ifdef TEST + fprintf(stderr, "nxagentTriangles: Going to synchronize the source drawable at [%p].\n", +@@ -1920,7 +1956,8 @@ + * operation like nxagentTrapezoids() does. + */ + +- if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) ++ ++ if (pSrc -> pDrawable && (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized)) + { + #ifdef TEST + fprintf(stderr, "nxagentTriStrip: Going to synchronize the source drawable at [%p].\n", +@@ -1997,7 +2034,8 @@ + * operation like nxagentTrapezoids() does. + */ + +- if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) ++ ++ if (pSrc -> pDrawable && (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized)) + { + #ifdef TEST + fprintf(stderr, "nxagentTriFan: Going to synchronize the source drawable at [%p].\n", diff --git a/debian/patches/series b/debian/patches/series index dc42d85..0e7726a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -35,6 +35,7 @@ 108_nxagent_wine-close-delay.full.patch 109_nxagent_locale-utf8-compound-text.full.patch 110_nxagent_createpixmap-bounds-check.full.patch +120_nxagent_libcairo-null-source-drawables.full.patch 200_nxagent_check-binary-x2go-flavour.full.patch 201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch 202_nx-x11_enable-xinerama.full.patch hooks/post-receive -- nx-libs.git (NX (redistributed)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX (redistributed)).

1 0

nx-libs.git - master (branch) updated: redist-client/3.5.0.12-7-g789c758
by git-admin＠x2go.org 11 May '12

11 May '12

The branch, master has been updated via 789c758510fc661b9d1a297ff5284962c5e944f0 (commit) from 3511e8791bd03a3e54384bdfd19e145efb4a136b (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 789c758510fc661b9d1a297ff5284962c5e944f0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri May 11 23:52:39 2012 +0200 release 3.5.0.13 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 143717e..a5c0844 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -nx-libs (2:3.5.0.13-0) UNRELEASED; urgency=low +nx-libs (2:3.5.0.13-0) unstable; urgency=low [ Mike Gabriel ] * Let nxagent Debian package depend on xfonts-base. @@ -7,7 +7,7 @@ nx-libs (2:3.5.0.13-0) UNRELEASED; urgency=low * Add patch: 120_nxagent_libcairo-null-source-drawables.full.patch, solves crashes of GTK applications based on libcairo 1.12.1+. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Mar 2012 21:01:21 +0100 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 11 May 2012 23:51:35 +0200 nx-libs (2:3.5.0.12-0) unstable; urgency=low hooks/post-receive -- nx-libs.git (NX (redistributed)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX (redistributed)).

1 0

nx-libs.git - master (branch) updated: redist-client/3.5.0.12-6-g3511e87
by git-admin＠x2go.org 11 May '12

11 May '12

The branch, master has been updated via 3511e8791bd03a3e54384bdfd19e145efb4a136b (commit) from 45311f783acad296d37a248fb2c702c578ac3059 (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 3511e8791bd03a3e54384bdfd19e145efb4a136b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri May 11 23:51:09 2012 +0200 add patch header for 120_nxagent_libcairo-null-source-drawables.full.patch ----------------------------------------------------------------------- Summary of changes: ...agent_libcairo-null-source-drawables.full.patch | 63 ++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/patches/120_nxagent_libcairo-null-source-drawables.full.patch b/debian/patches/120_nxagent_libcairo-null-source-drawables.full.patch index 66af325..319f6ed 100644 --- a/debian/patches/120_nxagent_libcairo-null-source-drawables.full.patch +++ b/debian/patches/120_nxagent_libcairo-null-source-drawables.full.patch @@ -1,3 +1,66 @@ +Description: Fix nxagent/x2goagent With New LibCairo (>1.12.1) + Quoting two postings of Jim Burnes <jvburnes(a)gmail.com> on x2go-dev ML: + + I don't know what the current patch status is for fixing nxagent with the + new libcairo (1.12.1+ I believe), but eventually I got tired of waiting and + created my own patches for nxagent/x2goagent. + + Most of the fixes were required because the render extension now allows + (and libcairo uses) null source drawables (for gradients etc), null masks + and null mask drawables. + + This change creates a bit of a logic mess in the code. Previous patches + to the code tried to account for all of the possibilities, but fell a + little short. + + Consider this an alpha-quality patch. I've only tested it in KDE while + running GTK applications. All my favorite GTK apps like Firefox, Emacs, + rox-filer and all my other GTK apps that were broken are now working just + fine. (Though I'm getting only the standard GTK look and feel - don't know + if that's caused by anything I've done.) + + Could someone test this under Gnome? + + Also, since I'm not primarily an X software engineer I'd like a specialist + to take a look at it. The fix is a little crude. I just attached to the + x2goagent process and fixed the lines that caused segfaults. (About 10 of + them). + + I also rewrote one of the macros in Pixels.h into a local subroutine in + Render.c. It had a bug in it and complex macro bugs are a PITA to debug in + gdb (or anything else really). The macro is only used in one place and + although the code in the macro is called pretty often, it's very likely + that the compiler would inline it anyway. The rewrite increases + readability by a large factor. + + A better patch could be created by someone that understands nxagent and X + much better. The render extension code receives render ops from X client + programs. The render ops can contain any combination of picture source, + picture destination and picture mask. It's apparently legal to send render + ops with combinations of null picture source drawables, picture masks and + picture mask drawables. A better way to patch this would be to simply + perform a return on all the illegal combinations of null parameters for the + render ops. That way you wouldn't have to keep re-checking the parameter + values. + + So anyway, here it is. I appreciate it if someone out there would test it + and let me know. Also if anyone knows of the X docs which discuss null + picture sources and masks in the render extension I'd be glad to create a + cleaner patch that conforms to the stands. + + + You can reproduce the issue by running any recent copy of x2go/nxagent and + start any program that uses very recent versions of libCairo. Things + started breaking for both ArchLinux and Debian SID users about 3 weeks ago. + + The issues started with versions of libCairo >= libcairo2_1.12.0-2_amd64 + (debian packages of course). These versions of Cairo seem to use null + parameters in render ops a lot. Users of recent GTK environments would + have the startup process just crash. KDE sessions start and run fine until + you start a gtk app. +Forwarded: pending +Author: Jim Burnes <jvburnes(a)gmail.com> +Last-Update: 2012-05-11 --- a/nx-X11/programs/Xserver/hw/nxagent/Render.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c @@ -995,6 +995,36 @@ hooks/post-receive -- nx-libs.git (NX (redistributed)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX (redistributed)).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-238-g03afe04
by git-admin＠x2go.org 11 May '12

11 May '12

The branch, master has been updated via 03afe04286a88a0e24a540cdc39feab3a9705124 (commit) from 9264eee6b541eea834b8f46aa975d465cc350f47 (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 03afe04286a88a0e24a540cdc39feab3a9705124 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri May 11 15:09:53 2012 +0200 drop pyhoca-gui.pot in favour of PyHoca-GUI.pot ----------------------------------------------------------------------- Summary of changes: po/pyhoca-gui.pot | 1342 ----------------------------------------------------- 1 files changed, 0 insertions(+), 1342 deletions(-) delete mode 100644 po/pyhoca-gui.pot The diff of changes is: diff --git a/po/pyhoca-gui.pot b/po/pyhoca-gui.pot deleted file mode 100644 index 7fddec5..0000000 --- a/po/pyhoca-gui.pot +++ /dev/null @@ -1,1342 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-13 14:12+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" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../pyhoca/wxgui/logon.py:80 -#, python-format -msgid "%s (via %s)" -msgstr "" - -#: ../pyhoca/wxgui/logon.py:84 ../pyhoca/wxgui/logon.py:96 -msgid "Username" -msgstr "" - -#: ../pyhoca/wxgui/logon.py:86 ../pyhoca/wxgui/logon.py:98 -msgid "Password" -msgstr "" - -#: ../pyhoca/wxgui/logon.py:89 -msgid "Authenticate" -msgstr "" - -#: ../pyhoca/wxgui/logon.py:101 -msgid " Start SSH tunnel " -msgstr "" - -#: ../pyhoca/wxgui/logon.py:109 -msgid "Session login" -msgstr "" - -#: ../pyhoca/wxgui/logon.py:110 -msgid "SSH proxy server login" -msgstr "" - -#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:310 -#: ../pyhoca/wxgui/messages.py:109 ../pyhoca/wxgui/printingprefs.py:138 -#: ../pyhoca/wxgui/sessiontitle.py:75 -msgid "Cancel" -msgstr "" - -#: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:319 -#: ../pyhoca/wxgui/frontend.py:469 -#, python-format -msgid "%s - connect failure" -msgstr "" - -#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:469 -msgid "User is not allowed to start X2Go sessions!" -msgstr "" - -#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:476 -#, python-format -msgid "%s - connect" -msgstr "" - -#: ../pyhoca/wxgui/logon.py:284 -msgid "Authentication has been successful." -msgstr "" - -#: ../pyhoca/wxgui/logon.py:315 -msgid "SSH tunnel started" -msgstr "" - -#: ../pyhoca/wxgui/logon.py:320 -msgid "Authentication failed!" -msgstr "" - -#: ../pyhoca/wxgui/logon.py:327 -#, python-format -msgid "%s - SSH proxy" -msgstr "" - -#: ../pyhoca/wxgui/logon.py:328 -msgid "Authentication to the SSH proxy server failed!" -msgstr "" - -#: ../pyhoca/wxgui/logon.py:343 ../pyhoca/wxgui/frontend.py:517 -#, python-format -msgid "%s - DNS error" -msgstr "" - -#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:524 -#, python-format -msgid "%s - socket error" -msgstr "" - -#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:503 -#: ../pyhoca/wxgui/frontend.py:510 -#, python-format -msgid "%s - host key error" -msgstr "" - -#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:503 -msgid "" -"The remote server's host key is invalid or has not been accepted by the user" -msgstr "" - -#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:545 -#, python-format -msgid "%s - missing home directory" -msgstr "" - -#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:545 -msgid "The remote user's home directory does not exist." -msgstr "" - -#: ../pyhoca/wxgui/logon.py:373 -#, python-format -msgid "%s - key error" -msgstr "" - -#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:552 -#, python-format -msgid "%s - auth error" -msgstr "" - -#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:496 -#, python-format -msgid "%s - SSH error" -msgstr "" - -#: ../pyhoca/wxgui/logon.py:397 -#, python-format -msgid "%s - unknown error" -msgstr "" - -#: ../pyhoca/wxgui/logon.py:398 -msgid "An unknown error occured during authentication!" -msgstr "" - -#: ../pyhoca/wxgui/taskbar.py:79 -#, python-format -msgid "" -"PyHoca-GUI\n" -"Connecting you to ,,%s''" -msgstr "" - -#: ../pyhoca/wxgui/taskbar.py:82 -#, python-format -msgid "" -"PyHoca-GUI (Python X2goClient)\n" -"Currently connecting you to remote X2Go server ,,%s''" -msgstr "" - -#: ../pyhoca/wxgui/taskbar.py:87 -msgid "" -"PyHoca-GUI\n" -"Connecting you to X2Go..." -msgstr "" - -#: ../pyhoca/wxgui/taskbar.py:90 -msgid "" -"PyHoca-GUI (Python X2goClient)\n" -"Client for connecting you to a remote X2Go server" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:73 -msgid "GNOME Desktop (GNOME)" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:74 -msgid "K Desktop Environment (KDE)" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:75 -msgid "Lightweight X Desktop (LXDE)" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:76 -msgid "Trinity X Desktop (KDE3-like)" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:77 -msgid "Unity X Desktop Shell (UNITY)" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:78 -msgid "XFCE4 Desktop (XFCE4)" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:79 -msgid "Published Applications" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:80 -msgid "Single Application" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:81 -msgid "XDMCP Query" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:82 -msgid "Windows Terminal Server (RDP-proxy)" -msgstr "" - -#. 'DirectRDP': 'Windows Terminal Server (RDP-direct)', -#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:200 -msgid "Custom command" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:87 ../pyhoca/wxgui/menus_taskbar.py:337 -msgid "Internet Browser" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:88 ../pyhoca/wxgui/menus_taskbar.py:338 -msgid "Email Client" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:89 ../pyhoca/wxgui/menus_taskbar.py:339 -msgid "Office" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/menus_taskbar.py:340 -msgid "Terminal" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:104 -msgid "Open file with system's default application" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:105 -msgid "Open application chooser dialog" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:106 -msgid "Save incoming file as ..." -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:134 -msgid "settings derived from " -msgstr "" - -#. allow localization of the default keyboard settings -#: ../pyhoca/wxgui/profilemanager.py:138 -msgid "us" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:139 -msgid "pc105/us" -msgstr "" - -#. boxes for all tabs -#: ../pyhoca/wxgui/profilemanager.py:153 -msgid "Session Title" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:154 -msgid "Session Window" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:155 -msgid "Session Startup" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:156 -msgid "Server" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:157 -msgid "Connection Link Speed" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:158 -msgid "Compression" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:159 -msgid "Display" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:160 -msgid "Keyboard" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:161 -msgid "Sound" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:162 -msgid "Printing" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:163 -msgid "Folder Exports" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:164 -msgid "File Import" -msgstr "" - -#. ## -#. ## widgets for the PROFILE tab -#. ## -#: ../pyhoca/wxgui/profilemanager.py:169 -msgid "Name" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:176 -msgid "Set session window title" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:177 -msgid "Use a default session window title" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:178 -msgid "Custom session window title" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:188 -msgid "Window Icon" -msgstr "" - -#. ## -#. ## widgets for the SESSION tab -#. ## -#: ../pyhoca/wxgui/profilemanager.py:194 -msgid "Start session automatically after login" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:195 -#, python-format -msgid "Login automatically after %s has started" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:196 -msgid "Type" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:198 -msgid "Application" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:202 -msgid "XDMCP server" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:204 -msgid "RDP server" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:206 -msgid "RDP options" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:208 -msgid "Menu of published applications" -msgstr "" - -#. ## -#. ## widgets for the CONNECTION tab -#. ## -#: ../pyhoca/wxgui/profilemanager.py:215 ../pyhoca/wxgui/profilemanager.py:225 -msgid "User" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:217 -msgid "Host" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:219 -msgid "Port" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:221 -msgid "RSA/DSA private key" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:224 -msgid "Server behind SSH proxy" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:227 -msgid "Key file" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:230 -msgid "Host[:Port]" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:232 -msgid "SSH Proxy Tunnel" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:240 -msgid "Modem" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:241 -msgid "ISDN" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:242 -msgid "ADSL" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:243 -msgid "WAN" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:244 -msgid "LAN" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:246 -msgid "Method" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:248 -msgid "Image quality" -msgstr "" - -#. ## -#. ## wigdets for the SETTINGS tab -#. ## -#: ../pyhoca/wxgui/profilemanager.py:254 -msgid "Fullscreen" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:255 -msgid "Custom Size" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:260 -msgid "Set display DPI" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:262 -msgid "Keep current keyboard settings" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:263 -msgid "Keyboard layout" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:265 -msgid "Keyboard model" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:267 -msgid "Enable sound support" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:268 -msgid "Pulse Audio" -msgstr "" - -#. Arts daemon is not supported by PyHoca-GUI / Python X2Go as it is outdated. -#. However, config files can contain an Arts configuration, so we will honour this -#: ../pyhoca/wxgui/profilemanager.py:272 -msgid "Arts (not supported)" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:275 -msgid "esd" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:276 -msgid "Use default sound port" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:277 -msgid "Custom sound port" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:279 -msgid "Client Side printing" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:281 -msgid "Use local folder sharing" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:282 -msgid "Path" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:285 ../pyhoca/wxgui/profilemanager.py:304 -msgid "Add" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:287 -msgid "Local Path" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:288 -msgid "Connect Method" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:289 -msgid "Delete" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:291 -msgid "Convert between client and server encodings" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:292 -msgid "Client encoding" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:294 -msgid "Server encoding" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:297 -msgid "Use file MIME box for local file import" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:298 -msgid "Extensions" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:300 -msgid "Action" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:305 -msgid "Defaults" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:307 -msgid "Save" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:308 -msgid "Reset" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:351 -#: ../pyhoca/wxgui/profilemanager.py:1016 -#: ../pyhoca/wxgui/profilemanager.py:1554 -msgid "automatically" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:353 -#: ../pyhoca/wxgui/profilemanager.py:1018 -msgid "manually" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:358 -msgid "PyHoca-GUI Profile Manager - new profile" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:360 -#, python-format -msgid "PyHoca-GUI Profile Manager - %s (connected)" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:362 -#, python-format -msgid "PyHoca-GUI Profile Manager - %s" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:721 -msgid "Profile" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:722 -msgid "Session" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:723 -msgid "Connection" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:724 -msgid "Settings" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:725 -msgid "Sharing" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:1203 -msgid "Icon Files (*.png)|*.png|All files (*.*)|*" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:1206 -msgid "Choose an icon for this session profile" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:1365 -msgid "All files (*.*)|*" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:1367 -#: ../pyhoca/wxgui/profilemanager.py:1382 -msgid "Choose a public SSH key" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:1534 -msgid "Choose a folder to share within a session" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:1598 -#: ../pyhoca/wxgui/profilemanager.py:1601 -#: ../pyhoca/wxgui/profilemanager.py:1604 -#: ../pyhoca/wxgui/profilemanager.py:1609 -#: ../pyhoca/wxgui/profilemanager.py:1619 ../pyhoca/wxgui/menus_taskbar.py:106 -msgid "Profile Manager" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:1598 -msgid "Profile name is missing, profile unusable!!!" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:1601 -#: ../pyhoca/wxgui/profilemanager.py:1604 -#, python-format -msgid "Profile name %s already exists!!!" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:1609 -msgid "The SSH proxy configuration is incomplete. Try again." -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:1619 -#, python-format -msgid "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH " -"proxy to.\n" -"Please change the SSH proxy settings accordingly." -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:1639 -#, python-format -msgid "%s - profile added" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:1640 -msgid "A new session profile has been added." -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:1644 -#, python-format -msgid "%s - modified" -msgstr "" - -#: ../pyhoca/wxgui/profilemanager.py:1645 -msgid "Changes to profile have been saved." -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:68 -msgid "Edit Profile" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:71 -msgid "Use as Template for New Profile" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:72 -msgid "Delete Profile" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:95 -#, python-format -msgid "About %s (%s)..." -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:121 -msgid "Manage Session Profile" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:130 -msgid "Printing Preferences" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:136 -msgid "Client Options" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:144 ../pyhoca/wxgui/menus_taskbar.py:686 -#: ../pyhoca/wxgui/menus_taskbar.py:850 -msgid "E&xit" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:200 -msgid "Window title" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:206 ../pyhoca/wxgui/menus_taskbar.py:522 -msgid "Resume Session" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:208 -msgid "Resume Session (not possible)" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:219 -msgid "Transfer Session" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:221 -msgid "Transfer Session (not possible)" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:224 ../pyhoca/wxgui/menus_taskbar.py:518 -msgid "Suspend Session" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:229 ../pyhoca/wxgui/menus_taskbar.py:525 -msgid "Terminate Session" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:238 -msgid "Rename Session Window" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:239 -msgid "Show Session Window" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:271 -msgid "&Share custom local folder" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:294 -msgid "Share:" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:305 -msgid "Unshare:" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:315 -msgid "Unshare &all local folders" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:369 -msgid "Multimedia" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:370 -msgid "Development" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:371 -msgid "Education" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:372 -msgid "Games" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:373 -msgid "Graphics" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:374 -msgid "Internet" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:375 -msgid "Office Applications" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:376 -msgid "System" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:377 -msgid "Utilities" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:378 -msgid "Other Applications" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:415 -msgid "still loading" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:415 -msgid "" -"On slow connections, the loading of the application menu can take a couple " -"of seconds." -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:417 ../pyhoca/wxgui/menus_taskbar.py:473 -#: ../pyhoca/wxgui/menus_taskbar.py:594 -msgid "Retrieving Application Menu..." -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:449 ../pyhoca/wxgui/menus_taskbar.py:461 -#, python-format -msgid "Connect %s" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:455 -msgid "Currently connecting..." -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:469 -msgid "Start &new Desktop Session" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:477 ../pyhoca/wxgui/menus_taskbar.py:597 -msgid "Retrieve Application Menu" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:480 -msgid "Start &new Session" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:543 -msgid "Launch Single Application" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:581 -msgid "Manage Application Menu" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:624 -msgid "Running" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:626 -msgid "Suspended" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:645 -msgid "&Clean all sessions" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:655 -msgid "Customize &profile" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:664 -msgid "Shared &folders" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:677 -msgid "&Disconnect from Server" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:682 -msgid "Suspend Sessions and E&xit" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:684 -msgid "Disconnect and E&xit" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:713 -msgid "Add Profile" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:789 -msgid "No session profiles defined" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:820 -msgid "Start/Resume Session" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:820 -msgid "Connect Server" -msgstr "" - -#: ../pyhoca/wxgui/about.py:55 ../pyhoca/wxgui/about.py:57 -#, python-format -msgid "About %s ..." -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:361 -msgid "Suspending sessions and exiting application..." -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:364 -#, python-format -msgid "Disconnecting %s and exiting application ..." -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:366 -msgid "Exiting application..." -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:443 -#, python-format -msgid "%s - server warning" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:443 -msgid "The X2Go Server does not publish an application menu." -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:476 -msgid "Public SSH key authentication has been successful." -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:510 -msgid "" -"The SSH proxy's host key is invalid or has not been accepted by the user" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:531 -#, python-format -msgid "%s - EOF error" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:531 -msgid "Authentication protocol communication incomplete! Try again..." -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:538 -#, python-format -msgid "%s - auth key error" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:559 -msgid "An unknown error occurred during authentication!" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:587 -msgid "Unknown session profile, configure before using it..." -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:707 -msgid "Cleaning X2Go sessions..." -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:741 -#, python-format -msgid "%s - disconnect" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:741 -msgid "X2Go Profile is now disconnected." -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:754 -msgid "New Session Profile" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:794 -#, python-format -msgid "Really Delete Session Profile ,,%s''?" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:800 -#, python-format -msgid "%s - profile deleted" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:800 -msgid "The session profile has been deleted." -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:815 -#, python-format -msgid "%s - share local folder with sessions of this profile" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:904 -#, python-format -msgid "" -"The authenticity of host [%s]:%s can't be established.\n" -"%s key fingerprint is ,,%s''.\n" -"\n" -"Are you sure you want to continue connecting?" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:912 -#, python-format -msgid "%s: Confirm Host Authorization" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:931 -#, python-format -msgid "%s - channel error" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:931 -#, python-format -msgid "" -"Lost connection to server %s unexpectedly! Try to re-authenticate to the " -"server..." -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:941 ../pyhoca/wxgui/frontend.py:948 -#: ../pyhoca/wxgui/frontend.py:950 ../pyhoca/wxgui/frontend.py:962 -#, python-format -msgid "%s - session failure" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:941 -msgid "The session startup failed." -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:948 -#, python-format -msgid "The command ,,%s'' is not available on X2Go server." -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:950 -#, python-format -msgid "" -"The command ,,%s'' is not available on X2Go server\n" -"%s." -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:956 -#, python-format -msgid "%s - session warning" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:956 -#, python-format -msgid "" -"Reverse TCP port forwarding request for session %s to server port %s has " -"been denied." -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:962 -#, 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:974 -#, python-format -msgid "%s - audio warning" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:974 -msgid "" -"The X2Go PulseAudio system is not available within Remote Desktop sessions." -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:977 ../pyhoca/wxgui/frontend.py:980 -#, python-format -msgid "%s - audio error" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:977 -msgid "The X2Go PulseAudio system could not be started." -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:980 -msgid "The X2Go PulseAudio system has died unexpectedly." -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:983 -#, python-format -msgid "%s - audio problem" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:983 -#, python-format -msgid "" -"The audio connection could not be set up for this session.\n" -"%s" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:986 -#, python-format -msgid "%s - client-side printing not available" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:986 -#, python-format -msgid "" -"The server denies client-side printing from within this session.\n" -"%s" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:989 -#, python-format -msgid "%s - MIME box not available" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:989 -#, python-format -msgid "" -"The server does not support the X2Go MIME box.\n" -"%s" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:992 -#, python-format -msgid "%s - client-side folders not sharable" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:992 -#, python-format -msgid "" -"The server denies client-side folder sharing with this session.\n" -"%s" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:995 -#, python-format -msgid "%s - client resources not sharable" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:995 -#, python-format -msgid "" -"Client-side folders and printers cannot be shared with this session.\n" -"%s" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:1009 ../pyhoca/wxgui/frontend.py:1011 -#, python-format -msgid "%s - print error" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:1009 -#, python-format -msgid "" -"%s\n" -"...caused on printer %s by session\n" -"%s" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:1011 -#, python-format -msgid "" -"%s\n" -"...caused by session\n" -"%s" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:1015 ../pyhoca/wxgui/frontend.py:1019 -#, python-format -msgid "%s - start" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:1015 -#, python-format -msgid "" -"New X2Go session starting up...\n" -"%s" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:1019 -#, python-format -msgid "" -"Another client started X2Go session\n" -"%s" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:1023 ../pyhoca/wxgui/frontend.py:1027 -#, python-format -msgid "%s - resume" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:1023 -#, python-format -msgid "" -"Resuming X2Go session...\n" -"%s" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:1027 -#, python-format -msgid "" -"Another client resumed X2Go session\n" -"%s" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:1031 -#, python-format -msgid "%s - running" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:1031 -#, python-format -msgid "" -"Found already running session\n" -"%s" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:1039 -#, python-format -msgid "%s - suspend" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:1039 -#, python-format -msgid "" -"X2Go Session has been suspended\n" -"%s" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:1055 -#, python-format -msgid "%s - terminate" -msgstr "" - -#: ../pyhoca/wxgui/frontend.py:1055 -#, python-format -msgid "" -"X2Go Session has terminated\n" -"%s" -msgstr "" - -#: ../pyhoca/wxgui/messages.py:51 -#, python-format -msgid "" -"Are you really sure you want to\n" -"delete the session profile ,,%s''?" -msgstr "" - -#: ../pyhoca/wxgui/messages.py:52 -#, python-format -msgid "" -"PyHoca-GUI is already running for user ,,%s''!\n" -"\n" -"Only one instance of PyHoca-GUI can be started per\n" -"user. The PyHoca-GUI icon can be found in your desktops's\n" -"notification area/systray." -msgstr "" - -#: ../pyhoca/wxgui/messages.py:85 -msgid "Yes" -msgstr "" - -#: ../pyhoca/wxgui/messages.py:86 -msgid "No" -msgstr "" - -#: ../pyhoca/wxgui/messages.py:103 ../pyhoca/wxgui/printingprefs.py:133 -msgid "Ok" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:57 -#, python-format -msgid "%s - Printing Preferences" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:59 -#, python-format -msgid "%s - Incoming Print Job from %s (%s)" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:64 -msgid "Open this dialog window" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:65 -msgid "Open with PDF viewer" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:66 -msgid "Save to a local folder" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:67 -msgid "Print to a local printer" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:68 -msgid "Run custom print command" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:71 -msgid "<Select a print action here>" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:105 -msgid "Print action" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:107 -msgid "Default action for incoming print jobs" -msgstr "" - -#. widgets for print action PDFVIEW -#: ../pyhoca/wxgui/printingprefs.py:111 -msgid "PDF viewer command" -msgstr "" - -#. widgets for print action PDFSAVE -#: ../pyhoca/wxgui/printingprefs.py:118 -msgid "Save PDFs to folder" -msgstr "" - -#. widgets for print action PRINT -#: ../pyhoca/wxgui/printingprefs.py:125 -msgid "Use this printer" -msgstr "" - -#. widgets for print action PRINTCMD -#: ../pyhoca/wxgui/printingprefs.py:129 -msgid "Custom print command" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:134 -msgid "Apply" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:136 -msgid "Print" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:231 -msgid "- no printers installed -" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:236 -msgid "- print system is not available -" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:343 -msgid "Choose PDF viewer application" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:359 -msgid "Choose PDF saving location" -msgstr "" - -#: ../pyhoca/wxgui/sessiontitle.py:69 -#, python-format -msgid "Session Title - %s" -msgstr "" - -#: ../pyhoca/wxgui/sessiontitle.py:71 -msgid "Change session title to" -msgstr "" - -#: ../pyhoca/wxgui/sessiontitle.py:73 -msgid "OK" -msgstr "" 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

pyhoca-gui.git - master (branch) updated: 0.1.0.10-237-g9264eee
by git-admin＠x2go.org 11 May '12

11 May '12

The branch, master has been updated via 9264eee6b541eea834b8f46aa975d465cc350f47 (commit) from e3d22dd947f9424598314f589c03ad4284fe3a6d (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 9264eee6b541eea834b8f46aa975d465cc350f47 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri May 11 14:46:33 2012 +0200 Add option --splash-image that allows to name a custom splash image that gets shown during application startup. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ pyhoca-gui | 1 + pyhoca/wxgui/frontend.py | 2 +- pyhoca/wxgui/splash.py | 16 +++++++++++++--- 4 files changed, 17 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f737d38..1c7abfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -126,6 +126,8 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Python gevent will drop gevent.dns in v1.0. Not using it anymore. - Add options --tray-icon and --tray-icon-connecting to customize the system tray icon (e.g. for branding). + - Add option --splash-image that allows to name a custom splash image + that gets shown during application startup. * Depend on Python X2Go 0.1.2.0. * Install GNOME icons via dh_links. * Install X2Go icons with explicit install paths. diff --git a/pyhoca-gui b/pyhoca-gui index ae66833..f3c6b31 100755 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -213,6 +213,7 @@ x2go_gui_options = [ {'args':['--resume-all-on-connect'], 'default': False, 'action': 'store_true', 'help': 'auto-resume all suspended sessions on connect', }, {'args':['--disconnect-on-suspend'], 'default': False, 'action': 'store_true', 'help': 'disconnect a server if a session has been suspended', }, {'args':['--disconnect-on-terminate'], 'default': False, 'action': 'store_true', 'help': 'disconnect a server if a session has been terminated', }, + {'args':['--splash-image'], 'default': None, 'metavar': '<your-splash-image>', 'help': 'define an alternative splash image that gets shown on application startup (PNG files only, full path or filename as found in <share>/img)', }, {'args':['--disable-splash'], 'default': False, 'action': 'store_true', 'help': 'disable the applications splash screen', }, {'args':['--disable-options'], 'default': False, 'action': 'store_true', 'help': 'disable the client options configuration window', }, {'args':['--disable-printingprefs'], 'default': False, 'action': 'store_true', 'help': 'disable the client\'s printing preferences window', }, diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 972c03f..43518e2 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -181,7 +181,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): #SetExitHandler(self._exit_handler) if not self.args.disable_splash: - splash.PyHocaGUI_SplashScreen() + splash.PyHocaGUI_SplashScreen(splash_image=self.args.splash_image) self.Bind(wx.EVT_IDLE, self.OnIdle) diff --git a/pyhoca/wxgui/splash.py b/pyhoca/wxgui/splash.py index e18547c..dda5aaa 100644 --- a/pyhoca/wxgui/splash.py +++ b/pyhoca/wxgui/splash.py @@ -35,10 +35,20 @@ import os import basepath class PyHocaGUI_SplashScreen(wx.SplashScreen): - def __init__(self): - splash_bitmap = wx.Bitmap(os.path.join(basepath.images_basepath, 'pyhoca-splash.png'), wx.BITMAP_TYPE_PNG) + def __init__(self, splash_image=None): + + if splash_image is None: + splash_image = 'pyhoca-splash.png' + + if os.path.basename(splash_image) == splash_image: + splash_image = os.path.join(basepath.images_basepath, splash_image) + + splash_wximage = wx.Image(splash_image, wx.BITMAP_TYPE_PNG, ) + splash_wximage.Rescale(400, int(float(400)/splash_wximage.Width*splash_wximage.Height)) + + splash_wxbitmap = splash_wximage.ConvertToBitmap() wx.SplashScreen.__init__(self, - splash_bitmap, + splash_wxbitmap, splashStyle=wx.SPLASH_CENTRE_ON_SCREEN|wx.SPLASH_TIMEOUT, milliseconds=5000, parent=None, 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

pyhoca-gui.git - master (branch) updated: 0.1.0.10-236-ge3d22dd
by git-admin＠x2go.org 11 May '12

11 May '12

The branch, master has been updated via e3d22dd947f9424598314f589c03ad4284fe3a6d (commit) from d3be56fe6794a891488320343db3cd34b8236b7e (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 e3d22dd947f9424598314f589c03ad4284fe3a6d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri May 11 14:19:10 2012 +0200 Add options --tray-icon and --tray-icon-connecting to customize the system tray icon (e.g. for branding). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ pyhoca-gui | 2 ++ pyhoca/wxgui/frontend.py | 2 ++ pyhoca/wxgui/taskbar.py | 12 ++++++++---- 4 files changed, 14 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index fa0216b..f737d38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -124,6 +124,8 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Windows packaging: remove dist directory before calling py2exe. - For empty menu maps create a dummy menu. - Python gevent will drop gevent.dns in v1.0. Not using it anymore. + - Add options --tray-icon and --tray-icon-connecting to customize the + system tray icon (e.g. for branding). * Depend on Python X2Go 0.1.2.0. * Install GNOME icons via dh_links. * Install X2Go icons with explicit install paths. diff --git a/pyhoca-gui b/pyhoca-gui index 901fe24..ae66833 100755 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -203,6 +203,8 @@ x2go_gui_options = [ {'args':['--auto-connect'], 'default': False, 'action': 'store_true', 'help': 'connect sessions via SSH pubkey authentication if possible', }, {'args':['--show-profile-metatypes'], 'default': False, 'action': 'store_true', 'help': 'show descriptive meta information on session profiles in menus (NOTE: this makes menus appear a bit more sluggish, use it mostly for debugging)', }, {'args':['--single-session-profile'], 'default': False, 'action': 'store_true', 'help': 'disable support of handling multiple session profiles', }, + {'args':['--tray-icon'], 'default': None, 'metavar': '<your-logo>', 'help': 'define an alternative system tray icon file (PNG files only, leave out file extension here, size 22x22 on Linux, 16x16 on Windows)', }, + {'args':['--tray-icon-connecting'], 'default': None, 'metavar': '<your-logo-while-connecting>', 'help': 'define an alternative system tray icon file while connecting to a server (PNG files only, leave out file extension here, size 22x22 on Linux, 16x16 on Windows)', }, {'args':['--restricted-trayicon'], 'default': False, 'action': 'store_true', 'help': 'restricts session manager\'s main icon functionality to information window and application exit', }, {'args':['--start-on-connect'], 'default': False, 'action': 'store_true', 'help': 'start a session directly after authentication if no session is currently running/suspended', }, {'args':['--exit-on-disconnect'], 'default': False, 'action': 'store_true', 'help': 'exit the session manager after a server connection has died', }, diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index bff85d4..972c03f 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -234,6 +234,8 @@ class PyHocaGUI(wx.App, x2go.X2goClient): self.disconnect_on_terminate = self.args.disconnect_on_terminate self.show_profile_metatypes = self.args.show_profile_metatypes self.restricted_trayicon = self.args.restricted_trayicon + self.tray_icon = self.args.tray_icon + self.tray_icon_connecting = self.args.tray_icon_connecting self.disable_notifications = self.args.disable_notifications self.remember_username = self.args.remember_username diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py index 089b84d..5aa0a4f 100644 --- a/pyhoca/wxgui/taskbar.py +++ b/pyhoca/wxgui/taskbar.py @@ -75,18 +75,22 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon): def SetIconConnecting(self, profile_name): self.icon = self.MakeIcon(icon_name='pyhoca-trayicon') if x2go.X2GOCLIENT_OS == 'Windows': - self.icon = self.MakeIcon(icon_name='x2go-logo-ubuntu') + icon_name = self._PyHocaGUI.tray_icon_connecting or self._PyHocaGUI.tray_icon or 'x2go-logo-ubuntu' + self.icon = self.MakeIcon(icon_name=icon_name) self.SetIcon(self.icon, _(u"PyHoca-GUI\nConnecting you to ,,%s\'\'") % profile_name) else: - self.icon = self.MakeIcon(icon_name='pyhoca-trayicon') + icon_name = self._PyHocaGUI.tray_icon_connecting or self._PyHocaGUI.tray_icon or 'pyhoca-trayicon' + self.icon = self.MakeIcon(icon_name=icon_name) self.SetIcon(self.icon, _(u"PyHoca-GUI (Python X2goClient)\nCurrently connecting you to remote X2Go server ,,%s\'\'") % profile_name) def SetIconIdle(self): if x2go.X2GOCLIENT_OS == 'Windows': - self.icon = self.MakeIcon(icon_name='x2go-logo-ubuntu') + icon_name = self._PyHocaGUI.tray_icon or 'x2go-logo-ubuntu' + self.icon = self.MakeIcon(icon_name=icon_name) self.SetIcon(self.icon, _(u"PyHoca-GUI\nConnecting you to X2Go...")) else: - self.icon = self.MakeIcon(icon_name='pyhoca-trayicon') + icon_name = self._PyHocaGUI.tray_icon or 'pyhoca-trayicon' + self.icon = self.MakeIcon(icon_name=icon_name) self.SetIcon(self.icon, _(u"PyHoca-GUI (Python X2goClient)\nClient for connecting you to a remote X2Go server")) def CreateSessionManagerPopupMenu(self, evt): 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

nx-libs.git - master (branch) updated: redist-client/3.5.0.12-5-g45311f7
by git-admin＠x2go.org 11 May '12

11 May '12

The branch, master has been updated via 45311f783acad296d37a248fb2c702c578ac3059 (commit) from 4372dfa53207a3247b8c317392f2672191b54fdf (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 45311f783acad296d37a248fb2c702c578ac3059 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri May 11 12:48:36 2012 +0200 Add patch: 120_nxagent_libcairo-null-source-drawables.full.patch, solves crashes of GTK applications based on libcairo 1.12.1+. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 + ...agent_libcairo-null-source-drawables.full.patch | 130 ++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 136 insertions(+), 0 deletions(-) create mode 100644 debian/patches/120_nxagent_libcairo-null-source-drawables.full.patch The diff of changes is: diff --git a/debian/changelog b/debian/changelog index da4999c..143717e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,12 @@ nx-libs (2:3.5.0.13-0) UNRELEASED; urgency=low + [ Mike Gabriel ] * Let nxagent Debian package depend on xfonts-base. + [ Jim Burnes ] + * Add patch: 120_nxagent_libcairo-null-source-drawables.full.patch, solves + crashes of GTK applications based on libcairo 1.12.1+. + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Mar 2012 21:01:21 +0100 nx-libs (2:3.5.0.12-0) unstable; urgency=low diff --git a/debian/patches/120_nxagent_libcairo-null-source-drawables.full.patch b/debian/patches/120_nxagent_libcairo-null-source-drawables.full.patch new file mode 100644 index 0000000..66af325 --- /dev/null +++ b/debian/patches/120_nxagent_libcairo-null-source-drawables.full.patch @@ -0,0 +1,130 @@ +--- a/nx-X11/programs/Xserver/hw/nxagent/Render.c ++++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c +@@ -995,6 +995,36 @@ + #endif + } + ++ ++int nxagentShouldDeferComposite(PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst) ++{ ++ ++int drawableDst; ++int linkDeferred; ++int unSyncedSrcMask; ++ ++ drawableDst = ( nxagentRenderVersionMajor == 0 && ++ nxagentRenderVersionMinor == 8 && ++ (pDst) -> pDrawable -> type == DRAWABLE_PIXMAP ++ ); ++ ++ linkDeferred = ( nxagentOption(DeferLevel) >= 2 && ++ nxagentOption(LinkType) < LINK_TYPE_ADSL ++ ); ++ ++ unSyncedSrcMask = ( nxagentOption(DeferLevel) == 1 && ++ (pDst) -> pDrawable -> type == DRAWABLE_PIXMAP && ++ ( ++ (pSrc -> pDrawable && (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized)) || ++ ((pMask) && pMask -> pDrawable && (nxagentDrawableStatus((pMask) -> pDrawable) == NotSynchronized)) ++ ) ++ ); ++ ++ ++ return drawableDst || linkDeferred || unSyncedSrcMask; ++} ++ ++ + void nxagentComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, + INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask, INT16 xDst, + INT16 yDst, CARD16 width, CARD16 height) +@@ -1036,8 +1066,8 @@ + } + + #endif +- +- if (NXAGENT_SHOULD_DEFER_COMPOSITE(pSrc, pMask, pDst)) ++ /* if (NXAGENT_SHOULD_DEFER_COMPOSITE(pSrc, pMask, pDst)) */ ++ if (nxagentShouldDeferComposite(pSrc, pMask, pDst)) + { + pDstRegion = nxagentCreateRegion(pDst -> pDrawable, NULL, xDst, yDst, width, height); + +@@ -1095,7 +1125,8 @@ + } + } + +- if (pMask != NULL && pMask -> pDrawable != pSrc -> pDrawable && ++ if ((pMask) && (pMask->pDrawable) && ++ pMask -> pDrawable != pSrc -> pDrawable && + pMask -> pDrawable != pDst -> pDrawable) + { + nxagentSynchronizeShmPixmap(pMask -> pDrawable, xMask, yMask, width, height); +@@ -1259,7 +1290,7 @@ + * on the real X server. + */ + +- if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) ++ if (pSrc -> pDrawable && (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized)) + { + #ifdef TEST + fprintf(stderr, "nxagentGlyphs: Synchronizing source [%s] at [%p].\n", +@@ -1302,14 +1333,15 @@ + nxagentSynchronizeBox(pSrc -> pDrawable, &glyphBox, NEVER_BREAK); + } + +- if (pSrc -> pDrawable -> type == DRAWABLE_PIXMAP) ++ if (pSrc -> pDrawable && (pSrc -> pDrawable -> type == DRAWABLE_PIXMAP)) + { + nxagentIncreasePixmapUsageCounter((PixmapPtr) pSrc -> pDrawable); + } + } + +- if (pSrc -> pDrawable != pDst -> pDrawable && +- nxagentDrawableStatus(pDst -> pDrawable) == NotSynchronized) ++ ++ if (pSrc -> pDrawable && (pSrc -> pDrawable != pDst -> pDrawable && ++ nxagentDrawableStatus(pDst -> pDrawable) == NotSynchronized)) + { + #ifdef TEST + fprintf(stderr, "nxagentGlyphs: Synchronizing destination [%s] at [%p].\n", +@@ -1749,7 +1781,9 @@ + return; + } + +- if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) ++ /* the following blocks need fixing to ignore null values of pDrawable */ ++ ++ if (pSrc -> pDrawable && (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized)) + { + #ifdef TEST + fprintf(stderr, "nxagentTrapezoids: Going to synchronize the source drawable at [%p].\n", +@@ -1843,7 +1877,9 @@ + * operation like nxagentTrapezoids() does. + */ + +- if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) ++ ++ ++ if (pSrc -> pDrawable && (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized)) + { + #ifdef TEST + fprintf(stderr, "nxagentTriangles: Going to synchronize the source drawable at [%p].\n", +@@ -1920,7 +1956,8 @@ + * operation like nxagentTrapezoids() does. + */ + +- if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) ++ ++ if (pSrc -> pDrawable && (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized)) + { + #ifdef TEST + fprintf(stderr, "nxagentTriStrip: Going to synchronize the source drawable at [%p].\n", +@@ -1997,7 +2034,8 @@ + * operation like nxagentTrapezoids() does. + */ + +- if (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized) ++ ++ if (pSrc -> pDrawable && (nxagentDrawableStatus(pSrc -> pDrawable) == NotSynchronized)) + { + #ifdef TEST + fprintf(stderr, "nxagentTriFan: Going to synchronize the source drawable at [%p].\n", diff --git a/debian/patches/series b/debian/patches/series index dc42d85..0e7726a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -35,6 +35,7 @@ 108_nxagent_wine-close-delay.full.patch 109_nxagent_locale-utf8-compound-text.full.patch 110_nxagent_createpixmap-bounds-check.full.patch +120_nxagent_libcairo-null-source-drawables.full.patch 200_nxagent_check-binary-x2go-flavour.full.patch 201_nxagent_set-x2go-icon-if-x2goagent-flavour.full.patch 202_nx-x11_enable-xinerama.full.patch hooks/post-receive -- nx-libs.git (NX (redistributed)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX (redistributed)).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits