[X2go-Commits] python-x2go.git - master (branch) updated: 0.1.1.4-77-gc1e20ef

X2go dev team git-admin at x2go.org
Wed Dec 7 10:01:33 CET 2011


The branch, master has been updated
       via  c1e20ef02f7c157d20ef997b2bedc12587036128 (commit)
       via  6bdd1a0fc23e939ca7dbd05fa4e516c9328ba7f2 (commit)
      from  05d0d3836a8c1a8ea67c14feffcc08c0e375e354 (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 c1e20ef02f7c157d20ef997b2bedc12587036128
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Dec 7 10:01:24 2011 +0100

    Make terminal backend ,,applications'' aware.

commit 6bdd1a0fc23e939ca7dbd05fa4e516c9328ba7f2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Dec 7 10:00:38 2011 +0100

    Fix for list processing in  INI files.

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

Summary of changes:
 debian/changelog |    2 ++
 x2go/inifiles.py |   14 ++++++++------
 x2go/session.py  |    2 +-
 x2go/utils.py    |    1 -
 4 files changed, 11 insertions(+), 8 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index c02355c..2c4b02f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ python-x2go (0.1.1.9-0-x2go1) UNRELEASED; urgency=low
     - Add ,,autostart'' parameter to default session profile parameters.
     - Add support for session window title renaming from client-side.
     - Introduce additional session profile parameter: setsessiontitle.
+    - Fix for list processing in  INI files.
+    - Make terminal backend ,,applications'' aware.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 12 Oct 2011 10:54:23 +0200
 
diff --git a/x2go/inifiles.py b/x2go/inifiles.py
index c95b2b2..f789de1 100644
--- a/x2go/inifiles.py
+++ b/x2go/inifiles.py
@@ -247,13 +247,15 @@ class X2goIniFile(object):
             elif key_type is types.IntType:
                 return self.iniConfig.getint(section, key)
             elif key_type is types.ListType:
-                val = self.iniConfig.get(section, key)
-                if val.startswith('[') and val.endswith(']'):
-                    return eval(val)
-                elif ',' in val:
-                    val = [ v.strip() for v in val.split(',') ]
+                _val = self.iniConfig.get(section, key)
+                _val = _val.strip()
+                if _val.startswith('[') and _val.endswith(']'):
+                    return eval(_val)
+                elif ',' in _val:
+                    _val = [ v.strip() for v in _val.split(',') ]
                 else:
-                    val = [ val ]
+                    _val = [ _val ]
+                return _val
             else:
                 _val = self.iniConfig.get(section, key)
                 return _val.decode(utils.get_encoding())
diff --git a/x2go/session.py b/x2go/session.py
index 22fcafd..fbd4cbd 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -63,7 +63,7 @@ _X2GO_SESSION_PARAMS = ('geometry', 'depth', 'link', 'pack',
                         'cache_type', 'kblayout', 'kbtype',
                         'session_type', 'snd_system', 'snd_port',
                         'cmd', 'set_session_title', 'session_title',
-                        'rdp_server', 'rdp_options',
+                        'rdp_server', 'rdp_options', 'applications',
                         'xdmcp_server',
                         'rootdir', 'loglevel', 'profile_name', 'profile_id',
                         'print_action', 'print_action_args',
diff --git a/x2go/utils.py b/x2go/utils.py
index d8109b5..ab23c19 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -256,7 +256,6 @@ def _convert_SessionProfileOptions_2_SessionParams(_options):
             'soundtunnel',
             'defsndport',
             'icon',
-            'applications',
             'autostart',
     ]
     for i in _ignored_options:


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