[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 0.1.0.10-129-g20652a1
X2Go dev team
git-admin at x2go.org
Tue Aug 27 13:22:09 CEST 2013
The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
via 20652a1dcd988190b59e7cc9378c1409453c7c88 (commit)
from fc925cb37581beb10ab990cf9fd08dfb1453c21e (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:
debian/changelog | 1 +
pyhoca-gui | 2 ++
pyhoca/wxgui/frontend.py | 3 +--
3 files changed, 4 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 443408f..afe7ea6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -80,6 +80,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
to session profiles has been moved into Python X2Go.
- Do not let wx.EndBusyCursor crash the application on Windows.
- Add connect and exit menu items if in single-session-profile mode.
+ - Properly catch CTRL-C and SIGTERM signals.
* 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 3a2c3e8..b053624 100755
--- a/pyhoca-gui
+++ b/pyhoca-gui
@@ -330,8 +330,10 @@ def main():
thisPyHocaGUI = PyHocaGUI(args, logger, liblogger, version=VERSION)
thisPyHocaGUI.MainLoop()
except KeyboardInterrupt:
+ thisPyHocaGUI.WakeUpIdle()
thisPyHocaGUI.ExitMainLoop()
except SystemExit:
+ thisPyHocaGUI.WakeUpIdle()
thisPyHocaGUI.ExitMainLoop()
if __name__ == '__main__':
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index d8c7d31..74a2a88 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -155,7 +155,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
x2go.X2goClient.__init__(self, **_x2goclient_kwargs)
- wx.App.__init__(self)
+ wx.App.__init__(self, clearSigInt=False)
if not self.args.disable_splash:
splash.PyHocaGUI_SplashScreen()
@@ -297,7 +297,6 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
STILL UNDOCUMENTED
"""
-
# close open password dialogs (or other remaining windows)
for _win in self._sub_windows:
_win.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)).
More information about the x2go-commits
mailing list