x2go-commits April 2012

x2go-commits@lists.x2go.org

1 participants
194 discussions

python-x2go.git - master (branch) updated: 0.1.1.4-208-g393c129
by git-admin＠x2go.org 18 Apr '12

18 Apr '12

The branch, master has been updated via 393c1297895e723167977505e45df18e4f903b5a (commit) via 4982c1319f128dd81cd5da71ecbcf7d73312e3e6 (commit) from 29315a21584c684382d2d5eecbe10e6e263f29e3 (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 393c1297895e723167977505e45df18e4f903b5a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Apr 18 10:09:23 2012 +0200 Make transitions of master sessions more robust. Only allow local folder sharing for running sessions. commit 4982c1319f128dd81cd5da71ecbcf7d73312e3e6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Apr 18 10:08:46 2012 +0200 If configured X-server display port is already in use, try to detect the next available display number. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++++ x2go/session.py | 8 ++++---- x2go/xserver.py | 16 ++++++++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a8f88d6..1042ea1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -102,6 +102,10 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low startup has not yet been completed fully. - Use nxproxy-3.5.0.12 when testing Python X2Go applications. - Use VcXsrv-1.12.0.1 when testing Python X2Go applications. + - If configured X-server display port is already in use, try to detect + the next available display number. + - Make transitions of master sessions more robust. Only allow local folder sharing for + running sessions. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/session.py b/x2go/session.py index 0201d1a..d3d7d9e 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -488,8 +488,7 @@ class X2goSession(object): """ self.logger('Using session %s as master session for profile %s.' % (self.get_session_name(), self.get_profile_name()), loglevel=log.loglevel_NOTICE) self.master_session = True - if self.has_terminal_session(): - self.share_all_local_folders() + self.share_all_local_folders() def unset_master_session(self): """\ @@ -1494,7 +1493,6 @@ class X2goSession(object): self.HOOK_mimebox_not_available() self._SUPPORTED_MIMEBOX = False - self.share_all_local_folders() self.virgin = False self.suspended = False @@ -1502,6 +1500,8 @@ class X2goSession(object): self.terminated = False self.faulty = False + self.share_all_local_folders() + self.has_terminal_session() and self.terminal_session.session_info_unprotect() return True @@ -1890,7 +1890,7 @@ class X2goSession(object): """ _retval = False - if self.has_terminal_session() and self.share_local_folders and not self.faulty: + if self.has_terminal_session() and self.share_local_folders and not self.faulty and self.is_running(): if self._SUPPORTED_FOLDERSHARING and self.is_folder_sharing_available(): if self.control_session.get_transport().reverse_tunnels[self.terminal_session.get_session_name()]['sshfs'][1] is not None: _retval = True diff --git a/x2go/xserver.py b/x2go/xserver.py index d4a6b95..0ed3476 100644 --- a/x2go/xserver.py +++ b/x2go/xserver.py @@ -224,7 +224,23 @@ class X2goXServer(threading.Thread): self.xserver_name = xserver_name self.xserver_config = xserver_config self.hProcess = None + if self.xserver_config.has_key('display'): + + try: + _configured_display_no = int(self.xserver_config['display'].split(":")[1].split(".")[0]) + _xserver_port = _configured_display_no + 6000 + while utils.detect_unused_port(preferred_port=_xserver_port) != _xserver_port: + _xserver_port += 1 + _display_no = _xserver_port - 6000 + + if _configured_display_no != _display_no: + self.xserver_config['display'] = self.xserver_config['display'].replace(_configured_display_no, _display_no) + self.xserver_config['parameters'] = self.xserver_config['parameters'].replace(_configured_display_no, _display_no) + + except TypeError: + pass + self.logger('setting DISPLAY environment variable to %s' % self.xserver_config['display'], loglevel=log.loglevel_NOTICE) os.environ.update({'DISPLAY': str(self.xserver_config['display'])}) threading.Thread.__init__(self) 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

x2go-keyring.git - build-main (branch) updated: 2011.12.07-1-g126a7d8
by git-admin＠x2go.org 18 Apr '12

18 Apr '12

The branch, build-main has been updated via 126a7d8cba49831cec221fc1b4e136c2d3c47379 (commit) from 55842a9f0fac67352550c5ffd9481371dd47acdc (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: README | 2 +- debian/changelog | 7 +++++++ debian/control | 2 +- debian/rules | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/README b/README index d395809..1ade027 100644 --- a/README +++ b/README @@ -10,4 +10,4 @@ For further information on keyrings refer to the Debian package ,,debian-keyring''. Best regards, -Mike Gabriel, DAS-NETZWERKTEAM, 2010-07-18 +Mike Gabriel, DAS-NETZWERKTEAM, 2012-04-18 diff --git a/debian/changelog b/debian/changelog index 30ffd53..919f191 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +x2go-keyring (2012.04.18) UNRELEASED; urgency=low + + * Bump standards version to 3.9.3. + * Happy new year in copyright. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 18 Apr 2012 06:22:31 +0200 + x2go-keyring (2011.12.07) unstable; urgency=low * minor script, copyright, text output, comment updates diff --git a/debian/control b/debian/control index 632e032..c1a1966 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Uploaders: X2go Git Administrator <git-admin(a)x2go.org> -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://code.x2go.org/releases/source/x2go-keyring Vcs-Git: git://code.x2go.org/x2go-keyring.git Vcs-Browser: http://code.x2go.org/gitweb?p=x2go-keyring.git;a=summary diff --git a/debian/rules b/debian/rules index 24e2d41..365e680 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ # Based on sample debian/rules file - for GNU Hello (1.3). # Copyright 1994,1995 by Ian Jackson. # Copyright 1998-2003 James Troup -# Copyright 2010 Mike Gabriel +# Copyright 2010-2012 Mike Gabriel # I hereby give you perpetual unlimited permission to copy, # modify and relicense this file, provided that you do not remove # my name from the file itself. (I assert my moral right of hooks/post-receive -- x2go-keyring.git (Archive and Maintainer Keys for X2Go) 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 "x2go-keyring.git" (Archive and Maintainer Keys for X2Go).

1 0

x2go-keyring.git - master (branch) updated: 2011.12.07-1-g126a7d8
by git-admin＠x2go.org 18 Apr '12

18 Apr '12

The branch, master has been updated via 126a7d8cba49831cec221fc1b4e136c2d3c47379 (commit) from 55842a9f0fac67352550c5ffd9481371dd47acdc (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 126a7d8cba49831cec221fc1b4e136c2d3c47379 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Apr 18 06:23:12 2012 +0200 Bump standards version to 3.9.3. Happy new year in copyright. ----------------------------------------------------------------------- Summary of changes: README | 2 +- debian/changelog | 7 +++++++ debian/control | 2 +- debian/rules | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/README b/README index d395809..1ade027 100644 --- a/README +++ b/README @@ -10,4 +10,4 @@ For further information on keyrings refer to the Debian package ,,debian-keyring''. Best regards, -Mike Gabriel, DAS-NETZWERKTEAM, 2010-07-18 +Mike Gabriel, DAS-NETZWERKTEAM, 2012-04-18 diff --git a/debian/changelog b/debian/changelog index 30ffd53..919f191 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +x2go-keyring (2012.04.18) UNRELEASED; urgency=low + + * Bump standards version to 3.9.3. + * Happy new year in copyright. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 18 Apr 2012 06:22:31 +0200 + x2go-keyring (2011.12.07) unstable; urgency=low * minor script, copyright, text output, comment updates diff --git a/debian/control b/debian/control index 632e032..c1a1966 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Uploaders: X2go Git Administrator <git-admin(a)x2go.org> -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://code.x2go.org/releases/source/x2go-keyring Vcs-Git: git://code.x2go.org/x2go-keyring.git Vcs-Browser: http://code.x2go.org/gitweb?p=x2go-keyring.git;a=summary diff --git a/debian/rules b/debian/rules index 24e2d41..365e680 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ # Based on sample debian/rules file - for GNU Hello (1.3). # Copyright 1994,1995 by Ian Jackson. # Copyright 1998-2003 James Troup -# Copyright 2010 Mike Gabriel +# Copyright 2010-2012 Mike Gabriel # I hereby give you perpetual unlimited permission to copy, # modify and relicense this file, provided that you do not remove # my name from the file itself. (I assert my moral right of hooks/post-receive -- x2go-keyring.git (Archive and Maintainer Keys for X2Go) 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 "x2go-keyring.git" (Archive and Maintainer Keys for X2Go).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-212-gf37c235
by git-admin＠x2go.org 17 Apr '12

17 Apr '12

The branch, master has been updated via f37c235acd7491deb742e38f469c2461f9ec8b52 (commit) from e34ee331758845c3c09e251e96c78bd8451f3a71 (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 f37c235acd7491deb742e38f469c2461f9ec8b52 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Apr 17 15:33:59 2012 +0200 Make sure the log file on Windows does not grow limitlessly. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pyhoca-gui | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1ff9341..0e297b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -110,6 +110,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - When packaging Windows binary with py2exe, use nxproxy-3.5.0.12. - When packaging Windows binary with py2exe, use VcXsrv-1.12.0.1. - Fix missing declaration of notificationmessage_NotifierPopup.timeout. + - Make sure the log file on Windows does not grow limitlessly. * 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 c62464c..901fe24 100755 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -35,6 +35,8 @@ if hasattr(sys, 'frozen') and sys.frozen in ("windows_exe", "console_exe"): def __init__(self, filemode='a'): self._filemode = filemode + if os.path.isfile(self._fname) and self._filemode == "w+": + os.remove(self._fname) def write(self, text, **kwargs): if self._file is 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-211-ge34ee33
by git-admin＠x2go.org 17 Apr '12

17 Apr '12

The branch, master has been updated via e34ee331758845c3c09e251e96c78bd8451f3a71 (commit) from 4897263aded384247aff2172bd913cad6c496d4e (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 e34ee331758845c3c09e251e96c78bd8451f3a71 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Apr 17 15:10:09 2012 +0200 Fix missing declaration of notificationmessage_NotifierPopup.timeout. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pyhoca/wxgui/notify.py | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index bfa6c51..1ff9341 100644 --- a/debian/changelog +++ b/debian/changelog @@ -109,6 +109,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Fix/improve --non-interactive command line option. - When packaging Windows binary with py2exe, use nxproxy-3.5.0.12. - When packaging Windows binary with py2exe, use VcXsrv-1.12.0.1. + - Fix missing declaration of notificationmessage_NotifierPopup.timeout. * Depend on Python X2Go 0.1.2.0. * Install GNOME icons via dh_links. * Install X2Go icons with explicit install paths. diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py index d909d6f..c7eb0c1 100644 --- a/pyhoca/wxgui/notify.py +++ b/pyhoca/wxgui/notify.py @@ -104,6 +104,7 @@ class notificationmessage_NotifierPopup(object): title = {} text = {} icon = {} + timeout = {} def __init__(self, _about): self._PyHocaGUI = _about._PyHocaGUI @@ -136,6 +137,14 @@ class notificationmessage_NotifierPopup(object): del self.icon[context] except KeyError: pass + try: + timeout = self.timeout[context] + del self.timeout[context] + except KeyError: + pass + + # libnotify timeouts are given in millisecs, on Windows we use seconds... + timeout = timeout / 1000 _icon_map_wx = { 'audio_error': wx.ICON_ERROR, @@ -170,7 +179,7 @@ class notificationmessage_NotifierPopup(object): _notification_msg.SetMessage(text) _notification_msg.SetParent(self._PyHocaGUI.about) _notification_msg.SetFlags(icon) - _notification_msg.Show(timeout=1) + _notification_msg.Show(timeout=timeout) except: # if we are running wxPython 2.8, we ignore missing # wx.NotificationMessage class 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.2.0-9-g8c41c07
by git-admin＠x2go.org 17 Apr '12

17 Apr '12

The branch, master has been updated via 8c41c073e281b7a7d6a876381096b45458748ec1 (commit) from 74d212292d0e8d085032aeb59c469b8f5155e74a (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 8c41c073e281b7a7d6a876381096b45458748ec1 Author: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Date: Tue Apr 17 11:56:43 2012 +0200 removing %USERPROFILE%\.x2go\pulse\.pulse\%COMPUTERNAME%-runtime\pid if exists under windows ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ onmainwindow.cpp | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8819d32..a54b5c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ x2goclient (3.99.2.1-0~x2go1) UNRELEASED; urgency=low - Not starting smart card daemon before users are loaded in LDAP mode. - Merging onmainwindow_part*.cpp into onmainwindow.cpp - Support recent pulseuadio on windows + - removing %USERPROFILE%\.x2go\pulse\.pulse\%COMPUTERNAME%-runtime\pid + if exists under windows [ Daniel Lindgren ] * New upstream version (3.99.2.1): diff --git a/onmainwindow.cpp b/onmainwindow.cpp index d520df4..6879c39 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -8586,6 +8586,8 @@ void ONMainWindow::startPulsed() QDir drr(homeDir+"/.x2go/pulse/.pulse/"+QHostInfo::localHostName ()+"-runtime"); if (!drr.exists()) drr.mkpath(drr.path()); + if (QFile::exists(homeDir+"/.x2go/pulse/.pulse/"+QHostInfo::localHostName ()+"-runtime/pid")) + QFile::remove(homeDir+"/.x2go/pulse/.pulse/"+QHostInfo::localHostName ()+"-runtime/pid"); pulseDir.replace("/","\\"); args<<"--exit-idle-time=-1"<<"-n"<<"-F"<<pulseDir+"\\config.pa"; #else hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-210-g4897263
by git-admin＠x2go.org 16 Apr '12

16 Apr '12

The branch, master has been updated via 4897263aded384247aff2172bd913cad6c496d4e (commit) from c68dd2db147558a46570234f3f0eb1c0eca23951 (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 4897263aded384247aff2172bd913cad6c496d4e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Apr 17 00:30:36 2012 +0200 When packaging Windows binary with py2exe, use VcXsrv-1.12.0.1. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + setup.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4bf997a..bfa6c51 100644 --- a/debian/changelog +++ b/debian/changelog @@ -108,6 +108,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low applications mode. - Fix/improve --non-interactive command line option. - When packaging Windows binary with py2exe, use nxproxy-3.5.0.12. + - When packaging Windows binary with py2exe, use VcXsrv-1.12.0.1. * Depend on Python X2Go 0.1.2.0. * Install GNOME icons via dh_links. * Install X2Go icons with explicit install paths. diff --git a/setup.py b/setup.py index dc2a126..b246bef 100755 --- a/setup.py +++ b/setup.py @@ -137,7 +137,7 @@ if platform.system() == 'Windows': dll_data_files = [("Microsoft.VC90.CRT", glob(r'..\\pyhoca-contrib\\mswin\\ms-vc-runtime\\*.*'))] nxproxy_files = [("nxproxy", glob(r'..\\pyhoca-contrib\\mswin\\nxproxy-mswin\\nxproxy-3.5.0.12\\*.*'))] pulseaudio_files = [("pulseaudio", glob(r'..\\pyhoca-contrib\\mswin\\pulseaudio-mswin\\pulseaudio-1.1\\*.*'))] - xserver_files = datafilelist('vcxsrv', r'..\\pyhoca-contrib\\mswin\\vcxsrv-mswin\\vcxsrv-1.11.4.0') + xserver_files = datafilelist('vcxsrv', r'..\\pyhoca-contrib\\mswin\\vcxsrv-mswin\\vcxsrv-1.12.0.1') icon_files = datafilelist('icons\\PyHoca', r'icons\\PyHoca') img_files = [("img", glob(r'img\\*.*'))] 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-206-g29315a2
by git-admin＠x2go.org 16 Apr '12

16 Apr '12

The branch, master has been updated via 29315a21584c684382d2d5eecbe10e6e263f29e3 (commit) from 2b79c7ec5b87a4927686b7e5039cde74e1831953 (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 29315a21584c684382d2d5eecbe10e6e263f29e3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Apr 17 00:29:53 2012 +0200 Use VcXsrv-1.12.0.1 when testing Python X2Go applications. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/defaults.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 46b6cb2..a8f88d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -101,6 +101,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Silence warnings that occur during session info queries in case a session startup has not yet been completed fully. - Use nxproxy-3.5.0.12 when testing Python X2Go applications. + - Use VcXsrv-1.12.0.1 when testing Python X2Go applications. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/defaults.py b/x2go/defaults.py index cb11513..095a162 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -265,8 +265,8 @@ if X2GOCLIENT_OS == 'Windows': 'VcXsrv_development': { 'display': 'localhost:40', 'process_name': 'vcxsrv.exe', - 'test_installed': os.path.join(os.getcwd(), '..', 'pyhoca-contrib', 'mswin', 'vcxsrv-mswin', 'VcXsrv-1.11.4.0', 'vcxsrv.exe'), - 'run_command': os.path.join(os.getcwd(), '..', 'pyhoca-contrib', 'mswin', 'vcxsrv-mswin', 'VcXsrv-1.11.4.0', 'vcxsrv.exe'), + 'test_installed': os.path.join(os.getcwd(), '..', 'pyhoca-contrib', 'mswin', 'vcxsrv-mswin', 'VcXsrv-1.12.0.1', 'vcxsrv.exe'), + 'run_command': os.path.join(os.getcwd(), '..', 'pyhoca-contrib', 'mswin', 'vcxsrv-mswin', 'VcXsrv-1.12.0.1', 'vcxsrv.exe'), 'parameters': [':40', '-clipboard', '-multiwindow', '-notrayicon', '-nowinkill', '-nounixkill', '-swcursor', ], }, 'Xming': { 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-contrib.git - master (branch) updated: 5c91573a7a308e3edb35cf390f79838c82646525
by git-admin＠x2go.org 16 Apr '12

16 Apr '12

The branch, master has been updated via 5c91573a7a308e3edb35cf390f79838c82646525 (commit) from b6e09689a7b9f82ddd0f488fe9eef0cbbec4cc24 (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 5c91573a7a308e3edb35cf390f79838c82646525 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Apr 16 23:56:04 2012 +0200 add nxproxy 3.5.0.12 ----------------------------------------------------------------------- Summary of changes: mswin/nxproxy-mswin/nxproxy-3.5.0.12/cygXcomp.dll | Bin 0 -> 1605613 bytes .../nxproxy-3.5.0.12/cygcrypto-0.9.8.dll | Bin 0 -> 1083904 bytes .../cygjpeg-62.dll | Bin 126976 -> 126976 bytes mswin/nxproxy-mswin/nxproxy-3.5.0.12/cygpng12.dll | Bin 0 -> 248320 bytes mswin/nxproxy-mswin/nxproxy-3.5.0.12/cygwin1.dll | Bin 0 -> 1872884 bytes .../{nxproxy-3.0.4-2 => nxproxy-3.5.0.12}/cygz.dll | Bin 66048 -> 66048 bytes .../nxproxy.exe | Bin 10446 -> 10410 bytes 7 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 mswin/nxproxy-mswin/nxproxy-3.5.0.12/cygXcomp.dll create mode 100644 mswin/nxproxy-mswin/nxproxy-3.5.0.12/cygcrypto-0.9.8.dll copy mswin/nxproxy-mswin/{nxproxy-3.0.4-2 => nxproxy-3.5.0.12}/cygjpeg-62.dll (100%) create mode 100644 mswin/nxproxy-mswin/nxproxy-3.5.0.12/cygpng12.dll create mode 100644 mswin/nxproxy-mswin/nxproxy-3.5.0.12/cygwin1.dll copy mswin/nxproxy-mswin/{nxproxy-3.0.4-2 => nxproxy-3.5.0.12}/cygz.dll (100%) copy mswin/nxproxy-mswin/{nxproxy-3.0.4-2 => nxproxy-3.5.0.12}/nxproxy.exe (55%) The diff of changes is: diff --git a/mswin/nxproxy-mswin/nxproxy-3.5.0.12/cygXcomp.dll b/mswin/nxproxy-mswin/nxproxy-3.5.0.12/cygXcomp.dll new file mode 100644 index 0000000..4cb5bce Binary files /dev/null and b/mswin/nxproxy-mswin/nxproxy-3.5.0.12/cygXcomp.dll differ diff --git a/mswin/nxproxy-mswin/nxproxy-3.5.0.12/cygcrypto-0.9.8.dll b/mswin/nxproxy-mswin/nxproxy-3.5.0.12/cygcrypto-0.9.8.dll new file mode 100644 index 0000000..8c270ad Binary files /dev/null and b/mswin/nxproxy-mswin/nxproxy-3.5.0.12/cygcrypto-0.9.8.dll differ diff --git a/mswin/nxproxy-mswin/nxproxy-3.5.0.12/cygpng12.dll b/mswin/nxproxy-mswin/nxproxy-3.5.0.12/cygpng12.dll new file mode 100644 index 0000000..f45dff9 Binary files /dev/null and b/mswin/nxproxy-mswin/nxproxy-3.5.0.12/cygpng12.dll differ diff --git a/mswin/nxproxy-mswin/nxproxy-3.5.0.12/cygwin1.dll b/mswin/nxproxy-mswin/nxproxy-3.5.0.12/cygwin1.dll new file mode 100644 index 0000000..0296b95 Binary files /dev/null and b/mswin/nxproxy-mswin/nxproxy-3.5.0.12/cygwin1.dll differ diff --git a/mswin/nxproxy-mswin/nxproxy-3.0.4-2/nxproxy.exe b/mswin/nxproxy-mswin/nxproxy-3.5.0.12/nxproxy.exe similarity index 55% copy from mswin/nxproxy-mswin/nxproxy-3.0.4-2/nxproxy.exe copy to mswin/nxproxy-mswin/nxproxy-3.5.0.12/nxproxy.exe index a117aa6..49ace24 100644 Binary files a/mswin/nxproxy-mswin/nxproxy-3.0.4-2/nxproxy.exe and b/mswin/nxproxy-mswin/nxproxy-3.5.0.12/nxproxy.exe differ hooks/post-receive -- pyhoca-contrib.git (Contrib software for packaging PyHoca) 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-contrib.git" (Contrib software for packaging PyHoca).

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-205-g2b79c7e
by git-admin＠x2go.org 16 Apr '12

16 Apr '12

The branch, master has been updated via 2b79c7ec5b87a4927686b7e5039cde74e1831953 (commit) from e80e656114ad6d58d557e07a029908aa2b18b6aa (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 2b79c7ec5b87a4927686b7e5039cde74e1831953 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Apr 17 00:00:24 2012 +0200 Use nxproxy-3.5.0.12 when testing Python X2Go applications. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/backends/proxy/_nx3.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1409c09..46b6cb2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -100,6 +100,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low to start the first time if the user is new to X2Go. - Silence warnings that occur during session info queries in case a session startup has not yet been completed fully. + - Use nxproxy-3.5.0.12 when testing Python X2Go applications. * 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/proxy/_nx3.py b/x2go/backends/proxy/_nx3.py index cfc8457..e5ada98 100644 --- a/x2go/backends/proxy/_nx3.py +++ b/x2go/backends/proxy/_nx3.py @@ -54,7 +54,7 @@ class X2goProxyNX3(base.X2goProxyBASE): os.path.join(os.environ["ProgramFiles"], os.path.normpath("PyHoca-GUI/nxproxy/nxproxy.exe")), os.path.join(os.environ["ProgramFiles"], os.path.normpath("x2goclient/nxproxy.exe")), os.path.join(os.environ["ProgramFiles"], os.path.normpath("NX Client for Windows/bin/nxproxy.exe")), - os.path.normpath("../pyhoca-contrib/mswin/nxproxy-mswin/nxproxy-3.0.4-2/nxproxy.exe"), + os.path.normpath("../pyhoca-contrib/mswin/nxproxy-mswin/nxproxy-3.5.0.12/nxproxy.exe"), ] if os.environ.has_key('NXPROXY_BINARY'): _nxproxy_paths.insert(0, os.environ['NXPROXY_BINARY']) 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

← Newer
1
2
3
4
5
6
7
8
9
...
20
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits April 2012