[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 290a45ae301a86fcb0345ff0300dee7a82e8c64f
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:29:39 CET 2014
The branch, build-baikal has been updated
via 290a45ae301a86fcb0345ff0300dee7a82e8c64f (commit)
from 58ece9e00def0c33b67b591eb075b025f59f79d7 (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:
x2go/backends/terminal/_stdout.py | 4 ++++
x2go/defaults.py | 4 +++-
x2go/inifiles.py | 8 ++++----
3 files changed, 11 insertions(+), 5 deletions(-)
The diff of changes is:
diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py
index 2384f40..e130adb 100644
--- a/x2go/backends/terminal/_stdout.py
+++ b/x2go/backends/terminal/_stdout.py
@@ -54,6 +54,7 @@ from x2go.defaults import LOCAL_HOME as _LOCAL_HOME
from x2go.defaults import CURRENT_LOCAL_USER as _CURRENT_LOCAL_USER
from x2go.defaults import X2GO_CLIENT_ROOTDIR as _X2GO_CLIENT_ROOTDIR
from x2go.defaults import X2GO_SESSIONS_ROOTDIR as _X2GO_SESSIONS_ROOTDIR
+from x2go.defaults import X2GO_GENERIC_APPLICATIONS as _X2GO_GENERIC_APPLICATIONS
from x2go.backends.info import X2goServerSessionInfo as _X2goServerSessionInfo
from x2go.backends.info import X2goServerSessionList as _X2goServerSessionList
@@ -645,6 +646,9 @@ class X2goTerminalSessionSTDOUT(object):
if cmd.find('RDP') != -1:
cmd = 'rdesktop'
+ if cmd.strip('"').strip('"') in _X2GO_GENERIC_APPLICATIONS:
+ return True
+
if cmd:
test_cmd = 'which %s && echo OK' % os.path.basename(cmd.split()[0])
(stdin, stdout, stderr) = self.control_session._x2go_exec_command([test_cmd])
diff --git a/x2go/defaults.py b/x2go/defaults.py
index e58701c..2ec07ba 100644
--- a/x2go/defaults.py
+++ b/x2go/defaults.py
@@ -234,6 +234,8 @@ else:
# make the variable available when building API documentation with epydoc
X2GO_CLIENTXCONFIG_DEFAULTS = {}
+X2GO_GENERIC_APPLICATIONS = [ 'WWWBROWSER', 'MAILCLIENT', 'OFFICE', 'TERMINAL', ]
+
X2GO_SESSIONPROFILE_DEFAULTS = {
'speed': 2, 'pack': '16m-jpeg', 'quality': 9,
'iconvto': 'UTF-8', 'iconvfrom': 'UTF-8', 'useiconv': False,
@@ -246,7 +248,7 @@ X2GO_SESSIONPROFILE_DEFAULTS = {
'sound':False, 'soundsystem': 'pulse', 'startsoundsystem': False, 'soundtunnel':True, 'defsndport':True, 'sndport':4713,
'name': '', 'icon': ':icons/128x128/x2gosession.png',
'host': '', 'user': CURRENT_LOCAL_USER, 'key': '', 'sshport': 22,
- 'rootless': True, 'applications': 'WWWBROWSER, MAILCLIENT, OFFICE, TERMINAL', 'command':'TERMINAL',
+ 'rootless': True, 'applications': str(X2GO_GENERIC_APPLICATIONS), 'command':'TERMINAL',
'rdpoptions': '-u X2GO_USER -p X2GO_PASSWORD', 'rdpserver': '',
'print': False,
'xdmcpserver': 'localhost',
diff --git a/x2go/inifiles.py b/x2go/inifiles.py
index b20b9fc..4f993b8 100644
--- a/x2go/inifiles.py
+++ b/x2go/inifiles.py
@@ -131,12 +131,12 @@ class X2goIniFile(object):
@param key: the ini file key in the given section
@type key: C{str}
@param value: the value for the given section and key
- @type value: C{str}, C{list}, C{bool}, ...
+ @type value: C{str}, C{list}, C{booAl}, ...
"""
if type(value) == type(u''):
value = value.encode(utils.get_encoding())
-
+
if type(value) is types.BooleanType:
self.iniConfig.set(section, key, str(int(value)))
else:
@@ -156,7 +156,7 @@ class X2goIniFile(object):
if not self.iniConfig.has_section(section):
self.iniConfig.add_section(section)
self._storeValue(section, key, value)
-
+
def update_value(self, section, key, value):
"""\
Change a value for a given section and key. This method
@@ -174,7 +174,7 @@ class X2goIniFile(object):
self.iniConfig.add_section(section)
self._storeValue(section, key, value)
self.write_config = True
-
+
def write(self):
"""\
Write the ini file modifications (SafeConfigParser object) from RAM to disk.
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