The branch, master has been updated via ad4034e189a7659add5a748f9c64a91c1c4584cf (commit) from 48be2fab98b7a31da4061ddb92c34d98507e9a0c (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 ad4034e189a7659add5a748f9c64a91c1c4584cf Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Mar 21 13:27:30 2012 +0100 Do not let wx.EndBusyCursor crash the application on Windows. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pyhoca/wxgui/frontend.py | 3 ++- pyhoca/wxgui/logon.py | 6 ++++-- pyhoca/wxgui/messages.py | 6 ++---- pyhoca/wxgui/printingprefs.py | 9 ++++++--- pyhoca/wxgui/profilemanager.py | 6 ++++-- 6 files changed, 19 insertions(+), 12 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 67b0701..6290070 100644 --- a/debian/changelog +++ b/debian/changelog @@ -78,6 +78,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low parameters. - Auto-resuming and auto-starting of sessions, as well as auto-connecting to session profiles has been moved into Python X2Go. + - Do not let wx.EndBusyCursor crash the application on Windows. * 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/frontend.py b/pyhoca/wxgui/frontend.py index df7a5cb..4774f89 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -173,7 +173,8 @@ class PyHocaGUI(wx.App, x2go.X2goClient): self.SetVendorName(self.vendorname) self.startGUI() - wx.EndBusyCursor() + try: wx.EndBusyCursor() + except: pass return True def OnIdle(self, evt): diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py index 6b66930..ec8000f 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -286,7 +286,8 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog): except x2go.AuthenticationException: if self.sshproxy_auth and (not self.sshproxy_started): - wx.EndBusyCursor() + try: wx.EndBusyCursor() + except: pass self.sshproxy_started = True self.headerLbl.Enable(True) self.userLbl.Enable(True) @@ -313,7 +314,8 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog): connect_failed = True except x2go.X2goSSHProxyAuthenticationException: - wx.EndBusyCursor() + try: wx.EndBusyCursor() + except: pass self._PyHocaGUI.notifier.send(title=_(u'%s - ssh proxy') % self.current_profile_name, text=_(u'Authentication to the SSH proxy server failed!'), icon='auth_failed') diff --git a/pyhoca/wxgui/messages.py b/pyhoca/wxgui/messages.py index 5086963..18b3bac 100644 --- a/pyhoca/wxgui/messages.py +++ b/pyhoca/wxgui/messages.py @@ -44,10 +44,8 @@ class PyHoca_MessageWindow(wx.Dialog): self._PyHocaGUI = _PyHocaGUI - try: - wx.EndBusyCursor() - except: - pass + try: wx.EndBusyCursor() + except: pass self._pyhoca_messages = { 'REALLY_DELETE_PROFILE': _(u'Are you really sure you want to\ndelete the session profile ,,%s\'\'?') % profile_name, diff --git a/pyhoca/wxgui/printingprefs.py b/pyhoca/wxgui/printingprefs.py index 1c8de98..b84cae3 100644 --- a/pyhoca/wxgui/printingprefs.py +++ b/pyhoca/wxgui/printingprefs.py @@ -385,16 +385,19 @@ class PyHocaGUI_PrintingPreferences(wx.Dialog): def OnOKButton(self, evt): wx.BeginBusyCursor() if self._apply_changes(): - wx.EndBusyCursor() + try: wx.EndBusyCursor() + except: pass self.Close() self.Destroy() else: - wx.EndBusyCursor() + try: wx.EndBusyCursor() + except: pass def OnApplyButton(self, evt): wx.BeginBusyCursor() self._apply_changes() - wx.EndBusyCursor() + try: wx.EndBusyCursor() + except: pass def OnCancel(self, evt): self.client_printing.load() diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 3b9789b..4ed854e 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -1641,11 +1641,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog): text=_(u'Changes to profile have been saved.'), icon='profile_save', ) - wx.EndBusyCursor() + try: wx.EndBusyCursor() + except: pass self.Close() self.Destroy() else: - wx.EndBusyCursor() + try: wx.EndBusyCursor() + except: pass def OnCancel(self, event): self.Close() 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)).