The branch, master has been updated via 476c6f3d70767ca3d4fe3fe98064427d47e46d92 (commit) via 9dc305a53a2f9c7101ef8f3be64ace4ec41bd8ba (commit) from 05f98034c7110a93838c20559fe885477d71b037 (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 476c6f3d70767ca3d4fe3fe98064427d47e46d92 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun May 27 15:44:18 2012 +0200 wait 2 seconds before invoking share_all_local_folders script commit 9dc305a53a2f9c7101ef8f3be64ace4ec41bd8ba Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun May 27 15:43:54 2012 +0200 recognize session parameter type during import ----------------------------------------------------------------------- Summary of changes: x2go/registry.py | 4 ++-- x2go/utils.py | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/x2go/registry.py b/x2go/registry.py index 7b174a1..87026a4 100644 --- a/x2go/registry.py +++ b/x2go/registry.py @@ -350,10 +350,10 @@ class X2goSessionRegistry(object): _pubapp_associated_sessions = self.pubapp_sessions_of_profile_name(_profile_name, return_objects=True) if _pubapp_associated_sessions: self.master_sessions[_profile_name] = _pubapp_associated_sessions[0] - _pubapp_associated_sessions[0].set_master_session(wait=1) + _pubapp_associated_sessions[0].set_master_session(wait=2) else: self.master_sessions[_profile_name] = _running_associated_sessions[0] - _running_associated_sessions[0].set_master_session(wait=1) + _running_associated_sessions[0].set_master_session(wait=2) return True diff --git a/x2go/utils.py b/x2go/utils.py index 652799d..0333afe 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -186,7 +186,11 @@ def _convert_SessionProfileOptions_2_SessionParams(_options): if opt in _rename_dict.keys(): del _params[opt] opt = _rename_dict[opt] - _params[opt] = val + if opt in _known_options: + _type = _type(_known_options[opt]) + _params[opt] = _type(val) + else: + _params[opt] = val # translate integer values for connection speed to readable strings if opt == 'link': 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).