This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository pyhoca-gui. from 579c3f1 Revert "Rename hook method HOOK_no_known_xserver_found to HOOK_no_installed_xservers_found. Call this new hook if no installed X-Servers could be found on the system." new ce8b4e1 add new icon symlinks (fix for commit 83bbf02) new 4387ad8 Make check_running() test terminal server / multi-session safe. (Fixes: #19). The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 1 + .../32x32/{audio_error.png => connect_error.png} | Bin 1674 -> 1674 bytes .../64x64/{audio_error.png => connect_error.png} | Bin 3973 -> 3973 bytes .../scalable/{auth_error.svg => connect_error.svg} | 0 .../32x32/{audio_error.png => connect_error.png} | 0 .../audio_error.png => 64x64/connect_error.png} | 0 .../PyHoca/scalable/connect_error.svg | 0 pyhoca/wxgui/launcher.py | 7 ++++--- pyhoca/wxgui/profilemanager.py | 5 ++++- 9 files changed, 9 insertions(+), 4 deletions(-) copy icons/PyHoca/32x32/{audio_error.png => connect_error.png} (100%) copy icons/PyHoca/64x64/{audio_error.png => connect_error.png} (100%) copy icons/PyHoca/scalable/{auth_error.svg => connect_error.svg} (100%) copy icons_symlinked/PyHoca/32x32/{audio_error.png => connect_error.png} (100%) copy icons_symlinked/PyHoca/{32x32/audio_error.png => 64x64/connect_error.png} (100%) copy icons/PyHoca/scalable/auth_error.svg => icons_symlinked/PyHoca/scalable/connect_error.svg (100%) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-gui. commit 4387ad81205fdc9b67d7498d7b6aa7ea77829264 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Apr 15 21:02:15 2014 +0200 Make check_running() test terminal server / multi-session safe. (Fixes: #19). --- debian/changelog | 1 + pyhoca/wxgui/launcher.py | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0719443..67836c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,6 +40,7 @@ pyhoca-gui (0.5.0.0-0x2go1) UNRELEASED; urgency=low provided: username, if no URL provided: broker-URL field). - Fix check_running() method in PyHocaGUI_Launcher on MS Windows. - Make broker support available for the MS Windows build of PyHoca-GUI. + - Make check_running() test terminal server / multi-session safe. (Fixes: #19). - Update English / German translation. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 08 Jan 2014 21:28:37 +0100 diff --git a/pyhoca/wxgui/launcher.py b/pyhoca/wxgui/launcher.py index b09bd11..a207728 100644 --- a/pyhoca/wxgui/launcher.py +++ b/pyhoca/wxgui/launcher.py @@ -155,10 +155,11 @@ VERSION: %s elif X2GOCLIENT_OS == 'Windows': import wmi w = wmi.WMI() - _p_names = [] + _p = {} for process in w.Win32_Process(): - _p_names.append(process.Name) - return len([ _p_name for _p_name in _p_names if _p_name == _executable]) > 1 + if process.Name == _executable: + _p[process.ProcessId] = process.SessionId + return len([ _p_id for _p_id in _p.keys() if _p[PROG_PID] == _p[_p_id]) > 1 def version(self): -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-gui. commit ce8b4e1e070d3c01298d5d1e2410529606567a78 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Apr 15 21:07:55 2014 +0200 add new icon symlinks (fix for commit 83bbf02) --- icons/PyHoca/32x32/connect_error.png | Bin 0 -> 1674 bytes icons/PyHoca/64x64/connect_error.png | Bin 0 -> 3973 bytes icons/PyHoca/scalable/connect_error.svg | 1 + icons_symlinked/PyHoca/32x32/connect_error.png | 1 + icons_symlinked/PyHoca/64x64/connect_error.png | 1 + icons_symlinked/PyHoca/scalable/connect_error.svg | 1 + pyhoca/wxgui/profilemanager.py | 5 ++++- 7 files changed, 8 insertions(+), 1 deletion(-) diff --git a/icons/PyHoca/32x32/connect_error.png b/icons/PyHoca/32x32/connect_error.png new file mode 100644 index 0000000..030d8c5 Binary files /dev/null and b/icons/PyHoca/32x32/connect_error.png differ diff --git a/icons/PyHoca/64x64/connect_error.png b/icons/PyHoca/64x64/connect_error.png new file mode 100644 index 0000000..6811d8e Binary files /dev/null and b/icons/PyHoca/64x64/connect_error.png differ diff --git a/icons/PyHoca/scalable/connect_error.svg b/icons/PyHoca/scalable/connect_error.svg new file mode 120000 index 0000000..3b41d91 --- /dev/null +++ b/icons/PyHoca/scalable/connect_error.svg @@ -0,0 +1 @@ +dialog-error.svg \ No newline at end of file diff --git a/icons_symlinked/PyHoca/32x32/connect_error.png b/icons_symlinked/PyHoca/32x32/connect_error.png new file mode 120000 index 0000000..ab8db5e --- /dev/null +++ b/icons_symlinked/PyHoca/32x32/connect_error.png @@ -0,0 +1 @@ +dialog-error.png \ No newline at end of file diff --git a/icons_symlinked/PyHoca/64x64/connect_error.png b/icons_symlinked/PyHoca/64x64/connect_error.png new file mode 120000 index 0000000..ab8db5e --- /dev/null +++ b/icons_symlinked/PyHoca/64x64/connect_error.png @@ -0,0 +1 @@ +dialog-error.png \ No newline at end of file diff --git a/icons_symlinked/PyHoca/scalable/connect_error.svg b/icons_symlinked/PyHoca/scalable/connect_error.svg new file mode 120000 index 0000000..3b41d91 --- /dev/null +++ b/icons_symlinked/PyHoca/scalable/connect_error.svg @@ -0,0 +1 @@ +dialog-error.svg \ No newline at end of file diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 36b43a0..8d75e01 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -876,6 +876,9 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.ProfileName.SetValue(self.profile_config['name']) self.SetSessionWindowTitle.SetValue(self.profile_config['setsessiontitle']) self.CustomSessionWindowTitle.SetValue(self.profile_config['sessiontitle']) + + print self.profile_config['host'], type(self.profile_config['host']) + if type(self.profile_config['host']) is types.ListType: self.Host.SetValue(",".join(self.profile_config['host'])) else: @@ -1998,7 +2001,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): """ if self.UseSSHProxy.GetValue(): - self.profile_config_bak['host'] = self.Host.GetValue() + self.profile_config_bak['host'] = self.Host.GetValue().split(',') self.profile_config_bak['sshport'] = self.SSHPort.GetValue() self._toggle_SSHProxy() -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
-
git-admin＠x2go.org