[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 4dfbdb8a54aad666747e2b5d3d33376da187a9ca
X2Go dev team
git-admin at x2go.org
Tue Aug 27 13:20:41 CEST 2013
The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
via 4dfbdb8a54aad666747e2b5d3d33376da187a9ca (commit)
from 971504207b394d7ea064427b89072f01b6bd4ffd (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:
pyhoca/wxgui/frontend.py | 6 ++++++
pyhoca/wxgui/logon.py | 1 +
2 files changed, 7 insertions(+)
The diff of changes is:
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index f952018..25012a3 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -262,6 +262,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
self._X2goClient__disconnect(session_uuid)
else:
self.notifier.send('%s - connect' % self.current_profile_name, 'Public SSH key authentication has been successful.', icon='auth_success', timeout=4000)
+ _dummy = self._X2goClient__list_sessions(session_uuid, refresh_cache=True)
self._post_authenticate(evt, session_uuid)
except x2go.AuthenticationException:
self._pyhoca_logger('public SSH key authentication to server failed, trying next auth-mechanism', loglevel=x2go.log.loglevel_INFO, )
@@ -276,6 +277,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
except:
self.notifier.send('%s - connect error' % self.current_profile_name, 'An unknown error occurred!', icon='auth_error', timeout=4000)
+
def OnSessionStart(self, evt):
"""\
STILL UNDOCUMENTED
@@ -287,6 +289,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
if self._X2goClient__server_is_alive(session_uuid):
gevent.spawn(self._X2goClient__start_session, session_uuid)
self.notifier.send(self.current_profile_name, 'New X2go session starting up...', icon='session_start', timeout=10000)
+ _dummy = self._X2goClient__list_sessions(session_uuid, refresh_cache=True)
else:
self.notifier.send(self.current_profile_name, 'Paramiko/SSH session has died! Try to re-connect to the server.', icon='session_error', timeout=10000)
@@ -303,6 +306,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
if self._X2goClient__server_is_alive(session_uuid):
gevent.spawn(self._X2goClient__resume_session, session_uuid, session_name=session_name)
self.notifier.send(self.current_profile_name, 'Resuming X2go session...\nSession: %s' % session_name, icon='session_resume', timeout=10000)
+ _dummy = self._X2goClient__list_sessions(session_uuid, refresh_cache=True)
else:
self.notifier.send(self.current_profile_name, 'Paramiko/SSH session has died! Try to re-connect to the server.', icon='session_error', timeout=10000)
self._eventid_sessionnames_map = {}
@@ -322,6 +326,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
if self._X2goClient__server_is_alive(session_uuid):
if self._X2goClient__is_session_suspended(session_uuid, session_name):
self.notifier.send(self.current_profile_name, 'X2go session has been suspended.\nSession: %s' % session_name, icon='session_suspend', timeout=8000)
+ _dummy = self._X2goClient__list_sessions(session_uuid, refresh_cache=True)
else:
self.notifier.send(self.current_profile_name, 'Paramiko/SSH transport session has died!', icon='session_error', timeout=10000)
self._eventid_sessionnames_map = {}
@@ -340,6 +345,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
if self._X2goClient__server_is_alive(session_uuid):
if self._X2goClient__has_session_terminated(session_uuid, session_name):
self.notifier.send(self.current_profile_name, 'X2go session has terminated.\nSession: %s' % session_name, icon='session_terminate', timeout=8000)
+ _dummy = self._X2goClient__list_sessions(session_uuid, refresh_cache=True)
else:
self.notifier.send(self.current_profile_name, 'Paramiko/SSH session has died! Try to re-connect to the server.', icon='session_error', timeout=10000)
diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py
index 28b5b0a..a076849 100644
--- a/pyhoca/wxgui/logon.py
+++ b/pyhoca/wxgui/logon.py
@@ -207,6 +207,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
self._PyHocaGUI.notifier.send(self.current_profile_name, context='AUTH_%s' % self.current_profile_name, timeout=4000)
if self._PyHocaGUI._X2goClient__is_session_connected(session_uuid):
+ _dummy = self._PyHocaGUI.list_sessions(session_uuid, refresh_cache=True)
self._PyHocaGUI._post_authenticate(evt, session_uuid)
self.Destroy()
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)).
More information about the x2go-commits
mailing list