X2Go dev team | 17 Nov 09:44 2013

pyhoca-gui.git - master (branch) updated: 0.4.0.8-28-gb6d80b0

The branch, master has been updated
       via  b6d80b00cbfda470ad264608f271b5390809b1ef (commit)
      from  6dc9be87a26882d6b0a444a8db0f3784e955d02f (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 b6d80b00cbfda470ad264608f271b5390809b1ef
Author: Mike Gabriel <mike.gabriel@...>
Date:   Sun Nov 17 09:44:11 2013 +0100

    Fix termination of published application sessions.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog         |    1 +
 pyhoca/wxgui/frontend.py |    6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 8936bc8..0331fc5 100644
--- a/debian/changelog
+++ b/debian/changelog
 <at>  <at>  -24,6 +24,7  <at>  <at>  pyhoca-gui (0.4.0.9-0~x2go1) UNRELEASED; urgency=low
     - Resolve tilde char in file path of the splash image.
     - Resolve tilde char in base directories for the PyHoca-GUI application.
     - Resolve tilde char in session icon names.
+    - Fix termination of published application sessions.
   * /debian/copyright:
     + Update file. Add entry for file icon2exe.py.
   * /debian/control:
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index e9d6b63..9155aa5 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
 <at>  <at>  -547,8 +547,10  <at>  <at>  class PyHocaGUI(wx.App, x2go.X2GoClient):
                     elif session_list[session_name].is_published_applications_provider() and pubapp_session_resumed:

                         # if there are more then one published applications mode sessions (in suspended state), terminate them now...
-
-                        connected_session.terminate(session_name=session_name)
+                        try:
+                            connected_session.terminate()
+                        except x2go.X2GoSessionException:
+                            pass

             if not pubapp_session_resumed:

hooks/post-receive

Gmane