x2go-commits February 2012

x2go-commits@lists.x2go.org

1 participants
198 discussions

nx-libs.git - master (branch) updated: redist-server/3.5.0.9-4-g2f8b190
by git-admin＠x2go.org 07 Feb '12

07 Feb '12

The branch, master has been updated via 2f8b190c8c2d3d56b52cb86d9824bba11b9beb99 (commit) from 6ae5c16b8865d14ba034c836a76c7a059d8865c0 (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 2f8b190c8c2d3d56b52cb86d9824bba11b9beb99 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 7 13:09:02 2012 +0100 Reintroduce patch: 008_nxcomp_sa_restorer.full+lite.patch, now in a version found on etersoft.ru, fixes build on ia64 architecture. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 + .../patches/008_nxcomp_sa_restorer.full+lite.patch | 46 ++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 49 insertions(+), 0 deletions(-) create mode 100644 debian/patches/008_nxcomp_sa_restorer.full+lite.patch The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b0e8fc2..59d305c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ nx-libs (2:3.5.0.10) UNRELEASED; urgency=low * Add patch: 006_nxcomp_libpng15.full+lite.patch, fix build against libpng 1.5.x. + * Reintroduce patch: 008_nxcomp_sa_restorer.full+lite.patch, now in a + version found on etersoft.ru, fixes build on ia64 architecture. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 14:48:31 +0100 diff --git a/debian/patches/008_nxcomp_sa_restorer.full+lite.patch b/debian/patches/008_nxcomp_sa_restorer.full+lite.patch new file mode 100644 index 0000000..f1447cc --- /dev/null +++ b/debian/patches/008_nxcomp_sa_restorer.full+lite.patch @@ -0,0 +1,46 @@ +Description: sa_restorer vs. memset + Use memset instead of setting sa_restorer to NULL. +Forwarded: pending +Author: Alexander Morozov +Last-Update: 2012-02-07 +--- a/nxcomp/Loop.cpp ++++ b/nxcomp/Loop.cpp +@@ -5884,20 +5884,9 @@ + + struct sigaction newAction; + +- newAction.sa_handler = HandleSignal; +- +- // +- // This field doesn't exist on most OSes except +- // Linux. We keep setting the field to NULL to +- // avoid side-effects in the case the field is +- // a value return. +- // ++ memset(&newAction, 0, sizeof(newAction)); + +- #if defined(__linux__) +- +- newAction.sa_restorer = NULL; +- +- #endif ++ newAction.sa_handler = HandleSignal; + + sigemptyset(&(newAction.sa_mask)); + +@@ -6509,13 +6498,9 @@ + + struct sigaction action; + +- action.sa_handler = HandleTimer; +- +- #if defined(__linux__) ++ memset(&action, 0, sizeof(action)); + +- action.sa_restorer = NULL; +- +- #endif ++ action.sa_handler = HandleTimer; + + sigemptyset(&action.sa_mask); + diff --git a/debian/patches/series b/debian/patches/series index 9291766..9133bf6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,6 +6,7 @@ 005_nxcomp_gcc43.full+lite.patch 006_nxcomp_libpng15.full+lite.patch 007_nxcompshad_clean-gch-files.full.patch +008_nxcomp_sa_restorer.full+lite.patch 009_nxproxy-add-man-page.full+lite.patch 009_nxagent-add-man-page.full.patch 010_nxauth_fix-binary-name-in-man-page.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

x2goclient.git - master (branch) updated: 3.99.0.6-3-gfd729eb
by git-admin＠x2go.org 07 Feb '12

07 Feb '12

The branch, master has been updated via fd729ebae42d707e7ee10f0456cf88360009d87a (commit) from 3f4eab56698f439deda4cce7629aef9558a5e9ac (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 fd729ebae42d707e7ee10f0456cf88360009d87a Author: Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Date: Tue Feb 7 10:03:51 2012 +0100 Fixed segmentation fault by failed SSH connection to X2Go server ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + onmainwindow.cpp | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b4c9eef..10bb9f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ x2goclient (3.99.1.0-0~x2go1) UNRELEASED; urgency=low [ Oleksandr Shneyder ] * Get new ports from x2goresume-session if reserved ports are busy + * Fixed segmentation fault by failed SSH connection to X2Go server -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 14:07:55 +0100 diff --git a/onmainwindow.cpp b/onmainwindow.cpp index f583283..a543ce1 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -2601,6 +2601,7 @@ void ONMainWindow::slotSshConnectionError ( QString message, QString lastSession { if ( sshConnection ) { + sshConnection->wait(); delete sshConnection; sshConnection=0l; } 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

x2goserver.git - master (branch) updated: 3.0.99.10-3-g414d6c5
by git-admin＠x2go.org 06 Feb '12

06 Feb '12

The branch, master has been updated via 414d6c5d3fc471d5ede367620801d9268bb5c372 (commit) from 63556d25c3a86f187d16b0e44a5beef76a27bc84 (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 414d6c5d3fc471d5ede367620801d9268bb5c372 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Feb 6 22:16:08 2012 +0100 changelog cleanup ----------------------------------------------------------------------- Summary of changes: debian/changelog | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c7e72b0..5084adf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,17 +1,14 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low - [ Mike Gabriel ] - * Continue development... - [ Oleksandr Shneyder ] * New upstream version (3.1.0.0) - remove ports used by X2Go session from database after session was finished - if postgres backend is used. + if postgres backend is used. - before resuming X2Go session check if reserved ports still available - in other case find new free ports, save them in database and send to - x2goclient + in other case find new free ports, save them in database and send to + x2goclient - run netstat -tl --all to find free ports for graphic, sound and sshfs - tunnels in x2gostartagent and x2goresume-session + tunnels in x2gostartagent and x2goresume-session -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 13:45:00 +0100 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 - master (branch) updated: redist-server/3.5.0.9-3-g6ae5c16
by git-admin＠x2go.org 06 Feb '12

06 Feb '12

The branch, master has been updated via 6ae5c16b8865d14ba034c836a76c7a059d8865c0 (commit) from e326dd760e115dcb48f6823462a737039453a63c (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 6ae5c16b8865d14ba034c836a76c7a059d8865c0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Feb 6 12:15:13 2012 +0100 cleanup patch ----------------------------------------------------------------------- Summary of changes: debian/patches/006_nxcomp_libpng15.full+lite.patch | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/patches/006_nxcomp_libpng15.full+lite.patch b/debian/patches/006_nxcomp_libpng15.full+lite.patch index 5ef8478..a75c59b 100644 --- a/debian/patches/006_nxcomp_libpng15.full+lite.patch +++ b/debian/patches/006_nxcomp_libpng15.full+lite.patch @@ -12,7 +12,6 @@ Description: Fix building against libpng 1.5. Forwarded: pending... Author: Fedora packagers of NX Last-Update: 2012-02-06 -diff -ur nxcomp.orig/Pgn.cpp nxcomp/Pgn.cpp --- a/nxcomp/Pgn.cpp 2010-03-01 19:18:59.000000000 +0200 +++ b/nxcomp/Pgn.cpp 2011-09-13 16:35:12.000000000 +0300 @@ -414,7 +414,7 @@ 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.9-2-ge326dd7
by git-admin＠x2go.org 06 Feb '12

06 Feb '12

The branch, master has been updated via e326dd760e115dcb48f6823462a737039453a63c (commit) from dbbbbc5ffaed61f5e04ad68045195df9a7e1f7ed (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 e326dd760e115dcb48f6823462a737039453a63c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Feb 6 12:12:20 2012 +0100 Add patch: 006_nxcomp_libpng15.full+lite.patch, fix build against libpng 1.5.x. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +- debian/patches/006_nxcomp_libpng15.full+lite.patch | 44 ++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 47 insertions(+), 1 deletions(-) create mode 100644 debian/patches/006_nxcomp_libpng15.full+lite.patch The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d79c7f6..b0e8fc2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ nx-libs (2:3.5.0.10) UNRELEASED; urgency=low - * Continue development... + * Add patch: 006_nxcomp_libpng15.full+lite.patch, fix build against + libpng 1.5.x. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 14:48:31 +0100 diff --git a/debian/patches/006_nxcomp_libpng15.full+lite.patch b/debian/patches/006_nxcomp_libpng15.full+lite.patch new file mode 100644 index 0000000..5ef8478 --- /dev/null +++ b/debian/patches/006_nxcomp_libpng15.full+lite.patch @@ -0,0 +1,44 @@ +Description: Fix building against libpng 1.5. + From the libpng homepage... + + The libpng 1.5.x series continues the evolution of the libpng API, + finally hiding the contents of the venerable and hoary png_struct and + png_info data structures inside private (i.e., non-installed) header + files. Instead of direct struct-access, applications should be using + the various png_get_xxx() and png_set_xxx() accessor functions, which + have existed for almost as long as libpng itself. (Apps that compiled + against libpng 1.4 without warnings about deprecated features should + happily compile against 1.5, too. +Forwarded: pending... +Author: Fedora packagers of NX +Last-Update: 2012-02-06 +diff -ur nxcomp.orig/Pgn.cpp nxcomp/Pgn.cpp +--- a/nxcomp/Pgn.cpp 2010-03-01 19:18:59.000000000 +0200 ++++ b/nxcomp/Pgn.cpp 2011-09-13 16:35:12.000000000 +0300 +@@ -414,7 +414,7 @@ + + png_read_info(pngPtr, infoPtr); + +- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_expand(pngPtr); + } +@@ -565,7 +565,7 @@ + + png_read_info( pngPtr, infoPtr ) ; + +- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_expand(pngPtr); + } +@@ -709,7 +709,7 @@ + png_read_info(pngPtr, infoPtr) ; + + +- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_expand(pngPtr); + } diff --git a/debian/patches/series b/debian/patches/series index d22f4b4..9291766 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,6 +4,7 @@ 003_nxcompshad_gcc43.full.patch 004_nx-x11_fix-nxcompshad-build.full.patch 005_nxcomp_gcc43.full+lite.patch +006_nxcomp_libpng15.full+lite.patch 007_nxcompshad_clean-gch-files.full.patch 009_nxproxy-add-man-page.full+lite.patch 009_nxagent-add-man-page.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

pyhoca-gui.git - master (branch) updated: 0.1.0.10-46-gbea3b4a
by git-admin＠x2go.org 04 Feb '12

04 Feb '12

The branch, master has been updated via bea3b4a98da6ae150b4189b284a2cdde7fcfe41c (commit) from 137cafc7d13fe7256b4d024c26c9db8adaa5a63a (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 bea3b4a98da6ae150b4189b284a2cdde7fcfe41c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Feb 4 12:48:22 2012 +0100 rebuild i18n .mo files ----------------------------------------------------------------------- Summary of changes: build/mo/bg/LC_MESSAGES/pyhoca-gui.mo | Bin 541 -> 541 bytes build/mo/de/LC_MESSAGES/pyhoca-gui.mo | Bin 18816 -> 18816 bytes build/mo/en/LC_MESSAGES/pyhoca-gui.mo | Bin 17632 -> 17632 bytes build/mo/es/LC_MESSAGES/pyhoca-gui.mo | Bin 17841 -> 17841 bytes build/mo/nl/LC_MESSAGES/pyhoca-gui.mo | Bin 17138 -> 17138 bytes po/bg.po | 2 +- po/de.po | 2 +- po/en.po | 2 +- po/es.po | 2 +- po/nl.po | 2 +- po/pyhoca-gui.pot | 2 +- 11 files changed, 6 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/build/mo/bg/LC_MESSAGES/pyhoca-gui.mo b/build/mo/bg/LC_MESSAGES/pyhoca-gui.mo index 6a7b882..5d97655 100644 Binary files a/build/mo/bg/LC_MESSAGES/pyhoca-gui.mo and b/build/mo/bg/LC_MESSAGES/pyhoca-gui.mo differ diff --git a/build/mo/de/LC_MESSAGES/pyhoca-gui.mo b/build/mo/de/LC_MESSAGES/pyhoca-gui.mo index e2145d8..e965543 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 0c789ca..61694e3 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 dc1427c..3210220 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 e0704c0..7215105 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/bg.po b/po/bg.po index 8da6cd8..0e8f2d2 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-19 15:35+0100\n" +"POT-Creation-Date: 2012-02-04 12:48+0100\n" "PO-Revision-Date: 2011-09-17 02:17+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: Bulgarian <chepati(a)yahoo.com>\n" diff --git a/po/de.po b/po/de.po index 81d8ad9..703901e 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-19 15:35+0100\n" +"POT-Creation-Date: 2012-02-04 12:48+0100\n" "PO-Revision-Date: 2011-12-19 10:54+0100\n" "Last-Translator: Mike Gabriel <m.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: de <mike.gabriel(a)das-netzwerkteam.de>\n" diff --git a/po/en.po b/po/en.po index c6d5410..76e889b 100644 --- a/po/en.po +++ b/po/en.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-19 15:35+0100\n" +"POT-Creation-Date: 2012-02-04 12:48+0100\n" "PO-Revision-Date: 2011-12-19 10:53+0100\n" "Last-Translator: Mike Gabriel <m.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: en <mike.gabriel(a)das-netzwerkteam.de>\n" diff --git a/po/es.po b/po/es.po index 9917267..3cbb734 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-19 15:35+0100\n" +"POT-Creation-Date: 2012-02-04 12:48+0100\n" "PO-Revision-Date: 2011-11-30 15:59+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: Spanish <x2go-dev(a)lists.berlios.de>\n" diff --git a/po/nl.po b/po/nl.po index 92b6de5..2a65156 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-19 15:35+0100\n" +"POT-Creation-Date: 2012-02-04 12:48+0100\n" "PO-Revision-Date: 2011-12-07 14:38+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: nl <dick.kniep(a)lindix.nl>\n" diff --git a/po/pyhoca-gui.pot b/po/pyhoca-gui.pot index 888e165..a794c8f 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-12-19 15:35+0100\n" +"POT-Creation-Date: 2012-02-04 12:48+0100\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" 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

python-x2go.git - master (branch) updated: 0.1.1.4-100-g37cbc1f
by git-admin＠x2go.org 04 Feb '12

04 Feb '12

The branch, master has been updated via 37cbc1fa5f77877a2a7c28f30947e0fe8027601e (commit) from 986103a27f73a8a133b5b5acd10e2d7675da3e7a (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 37cbc1fa5f77877a2a7c28f30947e0fe8027601e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Feb 4 12:34:19 2012 +0100 Add support for session port re-allocation on session resume (feature of x2goserver >= 3.1.0.0). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/backends/terminal/_stdout.py | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 36703a2..c2752f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Add default value for new session profile parameter xinerama (ignored by Python X2Go for now). - Replace any non-code string ,,X2go'' by ,,X2Go''. + - Add support for session port re-allocation on session resume (feature of + x2goserver >= 3.1.0.0). * Depend on python-xlib. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index b3c6ba9..4ded9bc 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -1104,6 +1104,32 @@ class X2goTerminalSessionSTDOUT(object): (stdin, stdout, stderr) = self.control_session._x2go_exec_command(cmd_line) + # re-allocate (if needed) server-side ports for graphics, sound and sshfs + for stdout_line in stdout.read(): + try: + _new_value = stdout_line.split("=")[1].strip() + if 'gr_port=' in stdout_line and _new_value != str(session_info.graphics_port): + try: + session_info.graphics_port = int(_new_value) + self.logger('re-allocating graphics port for session %s, old server-side port is in use; new graphics port is %s' % (self.session_info, self.session_info.graphics_port), loglevel=log.loglevel_NOTICE) + except TypeError: + # if the re-allocation fails, this is fatal!!! + raise X2goTerminalSessionException('Failed to retrieve new graphics port from server. X2Go Session cannot be resumed.') + elif 'sound_port=' in stdout_line and _new_value != str(session_info.snd_port): + try: + session_info.snd_port = int(_new_value) + self.logger('re-allocating sound port for session %s, old server-side port is in use; new sound port is %s' % (self.session_info, self.session_info.snd_port), loglevel=log.loglevel_NOTICE) + except TypeError: + self.logger('Failed to retrieve new sound port from server for session %s, session will be without sound.' % self.session_info, loglevel=log.loglevel_WARN) + elif 'fs_port=' in stdout_line and _new_value != str(session_info.sshfs_port): + try: + session_info.sshfs_port = int(_new_value) + self.logger('re-allocating sshfs port for session %s, old server-side port is in use; new sshfs port is %s' % (self.session_info, self.session_info.sshfs_port), loglevel=log.loglevel_NOTICE) + except TypeError: + self.logger('Failed to retrieve new sshfs port from server for session %s, session will be without client-side folder sharing. Neither will there be X2Go printing nor X2Go MIME box support.' % self.session_info, loglevel=log.loglevel_WARN) + except IndexError: + continue + self.proxy = self.proxy_backend(session_info=self.session_info, ssh_transport=self.control_session.get_transport(), sessions_rootdir=self.sessions_rootdir, 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

pyhoca-gui.git - master (branch) updated: 0.1.0.10-45-g137cafc
by git-admin＠x2go.org 02 Feb '12

02 Feb '12

The branch, master has been updated via 137cafc7d13fe7256b4d024c26c9db8adaa5a63a (commit) from f1c7968561910d353638708bb8ce4eb93c68cc7c (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 137cafc7d13fe7256b4d024c26c9db8adaa5a63a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Feb 2 23:15:46 2012 +0100 Include dialog-*.png icons for 64x64 pixel size as they are missing in gnome-colors-common package. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/pyhoca-gui.install | 6 ++++++ 2 files changed, 8 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 584c99e..cd6f6be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,8 @@ pyhoca-gui (0.1.0.11-0~x2go1) UNRELEASED; urgency=low * Install X2Go icons with explicit install paths. * Add /debian/source/options file with entry single-debian-patch. Fix control file. * Depend on icons in gnome-colors-common package. + * Include dialog-*.png icons for 64x64 pixel size as they are missing in + gnome-colors-common package. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 09 Nov 2011 03:13:09 +0100 diff --git a/debian/pyhoca-gui.install b/debian/pyhoca-gui.install index 7d78cbd..3b11072 100644 --- a/debian/pyhoca-gui.install +++ b/debian/pyhoca-gui.install @@ -26,3 +26,9 @@ icons/PyHoca/scalable/pyhoca*.svg /usr/share/icons/PyHoca/scalable/ icons/PyHoca/scalable/x2go*.svg /usr/share/icons/PyHoca/scalable/ icons/PyHoca/scalable/question.svg /usr/share/icons/PyHoca/scalable/ icons/PyHoca/scalable/broom-cleanup.svg /usr/share/icons/PyHoca/scalable/ + +# these 64x64 icons are missing in gnome-colors-common +icons/PyHoca/64x64/dialog-apply.png /usr/share/icons/PyHoca/64x64/ +icons/PyHoca/64x64/dialog-error.png /usr/share/icons/PyHoca/64x64/ +icons/PyHoca/64x64/dialog-question.png /usr/share/icons/PyHoca/64x64/ +icons/PyHoca/64x64/dialog-warning.png /usr/share/icons/PyHoca/64x64/ 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

x2goclient.git - master (branch) updated: 3.99.0.6-2-g3f4eab5
by git-admin＠x2go.org 01 Feb '12

01 Feb '12

The branch, master has been updated via 3f4eab56698f439deda4cce7629aef9558a5e9ac (commit) from 817c331b9f53936c2e09c81d30ac07e68a74d208 (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 3f4eab56698f439deda4cce7629aef9558a5e9ac Author: Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Date: Wed Feb 1 14:47:26 2012 +0100 Get new ports from x2goresume-session if reserved ports are busy ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++++ onmainwindow_part2.cpp | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a5cae42..b4c9eef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ x2goclient (3.99.1.0-0~x2go1) UNRELEASED; urgency=low + [ Mike Gabriel ] * Continue development... + [ Oleksandr Shneyder ] + * Get new ports from x2goresume-session if reserved ports are busy + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 14:07:55 +0100 x2goclient (3.99.0.6-0~x2go1) unstable; urgency=low diff --git a/onmainwindow_part2.cpp b/onmainwindow_part2.cpp index 6201f5b..d228cb9 100644 --- a/onmainwindow_part2.cpp +++ b/onmainwindow_part2.cpp @@ -1553,7 +1553,28 @@ void ONMainWindow::slotRetResumeSess ( bool result, } } else + { host=resumingSession.server; + QStringList outputLines=output.split("\n",QString::SkipEmptyParts); + foreach(QString line,outputLines) + { + if (line.indexOf("gr_port=")!=-1) + { + resumingSession.grPort=line.replace("gr_port=",""); + x2goDebug<<"new gr_port: "<<resumingSession.grPort<<endl; + } + if (line.indexOf("sound_port=")!=-1) + { + resumingSession.sndPort=line.replace("sound_port=",""); + x2goDebug<<"new sound_port: "<<resumingSession.sndPort<<endl; + } + if (line.indexOf("fs_port=")!=-1) + { + resumingSession.fsPort=line.replace("fs_port=",""); + x2goDebug<<"new fs_port: "<<resumingSession.fsPort<<endl; + } + } + } if ( !useLdap ) { if ( !embedMode ) 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

nx-libs.git - master (branch) updated: redist-server/3.5.0.9-1-gdbbbbc5
by git-admin＠x2go.org 01 Feb '12

01 Feb '12

The branch, master has been updated via dbbbbc5ffaed61f5e04ad68045195df9a7e1f7ed (commit) from 220c985d366883f4021cc9d84550cc630022f016 (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 dbbbbc5ffaed61f5e04ad68045195df9a7e1f7ed Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Feb 1 14:48:55 2012 +0100 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 cf1715c..d79c7f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +nx-libs (2:3.5.0.10) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 01 Feb 2012 14:48:31 +0100 + nx-libs (2:3.5.0.9-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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits February 2012