[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.1.1.4-148-g7067c12
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:28:58 CET 2014
The branch, build-baikal has been updated
via 7067c12cf3a2f575872cbd8b3490efd8a6d978bd (commit)
from c7e4817344e2d930efdab307ed15e6845533f2ca (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 | 3 +++
x2go/backends/control/_stdout.py | 2 +-
x2go/defaults.py | 1 +
x2go/session.py | 8 +++++---
4 files changed, 10 insertions(+), 4 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index c567e73..2fc90f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -55,6 +55,9 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
- Support auto-resuming and auto-starting of session with Python X2Go.
- Include development location of nxproxy in possible file locations.
- Add X2goClient method is_profile_connected.
+ - Fix auto_start_or_resume method when using SSH proxy with interactive
+ authentication. Provide default value for PUBAPP_MAX_NO_SUBMENUS in
+ defaults.py.
* Depend on python-xlib.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index 58c6922..1a54f15 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -599,7 +599,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
return True
return False
- def get_published_applications(self, lang=None, refresh=False, raw=False, very_raw=False, max_no_submenus=0):
+ def get_published_applications(self, lang=None, refresh=False, raw=False, very_raw=False, max_no_submenus=defaults.PUBAPP_MAX_NO_SUBMENUS):
"""\
Retrieve the menu tree of published applications from X2Go server.
diff --git a/x2go/defaults.py b/x2go/defaults.py
index ce9190f..0230435 100644
--- a/x2go/defaults.py
+++ b/x2go/defaults.py
@@ -407,3 +407,4 @@ X2GO_MIMEBOX_EXTENSIONS_BLACKLIST = [
X2GO_SHARE_VIEWONLY=0
X2GO_SHARE_FULLACCESS=1
+PUBAPP_MAX_NO_SUBMENUS=10
\ No newline at end of file
diff --git a/x2go/session.py b/x2go/session.py
index ea0170d..1bbea20 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -37,11 +37,13 @@ import gevent
import re
# Python X2Go modules
+import defaults
import log
import utils
import session
import x2go_exceptions
+
from x2go.backends.control import X2goControlSession as _X2goControlSession
from x2go.backends.terminal import X2goTerminalSession as _X2goTerminalSession
from x2go.backends.info import X2goServerSessionInfo as _X2goServerSessionInfo
@@ -960,8 +962,6 @@ class X2goSession(object):
self.control_params['password'] = ''
if self.sshproxy_params and self.sshproxy_params.has_key('sshproxy_password'):
del self.sshproxy_params['sshproxy_password']
- if self.auto_start_or_resume:
- self.do_auto_start_or_resume()
if not self.connected:
# then tidy up...
@@ -972,6 +972,8 @@ class X2goSession(object):
if self.connected:
self.update_status()
self.retrieve_server_features()
+ if self.auto_start_or_resume:
+ gevent.spawn(self.do_auto_start_or_resume)
return self.connected
__connect = connect
@@ -1257,7 +1259,7 @@ class X2goSession(object):
return self.terminal_session.is_desktop_session()
return False
- def get_published_applications(self, lang=None, refresh=False, raw=False, very_raw=False, max_no_submenus=0):
+ def get_published_applications(self, lang=None, refresh=False, raw=False, very_raw=False, max_no_submenus=defaults.PUBAPP_MAX_NO_SUBMENUS):
"""\
Return a list of published menu items from the X2Go server
for session type published applications.
hooks/post-receive
--
python-x2go.git (Python X2Go Client API)
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 "python-x2go.git" (Python X2Go Client API).
More information about the x2go-commits
mailing list