[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 0.1.0.10-227-ga9a9f37
X2Go dev team
git-admin at x2go.org
Tue Aug 27 13:22:21 CEST 2013
The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
via a9a9f371037d5eb78ef41f0f6394afbe64da38e7 (commit)
from 4994d76bbd1b84ea4c75e61254b5337211b7502b (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 | 2 ++
pyhoca/wxgui/frontend.py | 13 +++++++------
2 files changed, 9 insertions(+), 6 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 097cbd3..dc8ed36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -119,6 +119,8 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
- Do not suspend session if profile is disconnected.
- Non-interactive application runs only disconnect/exit for associated
sessions.
+ - Only auto-resume if session profile is not configured for published
+ applications.
* 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 8d9798d..4ef68a4 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -318,12 +318,13 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def session_auto_start_or_resume(self, session_uuid, newest=True, oldest=False, all_suspended=False):
- if self.resume_newest_on_connect:
- self._X2goClient__session_auto_start_or_resume(session_uuid, newest=True, start=self.start_on_connect)
- elif self.resume_oldest_on_connect:
- self._X2goClient__session_auto_start_or_resume(session_uuid, newest=False, oldest=True, start=self.start_on_connect)
- elif self.resume_all_on_connect:
- self._X2goClient__session_auto_start_or_resume(session_uuid, newest=False, all_suspended=True, start=self.start_on_connect)
+ if not self.get_session(session_uuid).published_applications:
+ if self.resume_newest_on_connect:
+ self._X2goClient__session_auto_start_or_resume(session_uuid, newest=True, start=self.start_on_connect)
+ elif self.resume_oldest_on_connect:
+ self._X2goClient__session_auto_start_or_resume(session_uuid, newest=False, oldest=True, start=self.start_on_connect)
+ elif self.resume_all_on_connect:
+ self._X2goClient__session_auto_start_or_resume(session_uuid, newest=False, all_suspended=True, start=self.start_on_connect)
def _exit_handler(self, *args):
self.WakeUpIdle()
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