The branch, twofactorauth has been updated via 6d336a746e1706cb521b4aa26fa626f1d3c219de (commit) from 28dfe666762b7d77d03b99e6226773e577426de7 (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 | 1 + x2go/backends/control/_stdout.py | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9e46c7c..9fcf3be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -95,6 +95,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Provide X2goClient.get_published_applications() method. - Fill session profile configurations with missing default values and then detect the profile meta type. + - Support published applications that have to be run in a terminal window. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel@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 fa6d78b..d939787 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -709,6 +709,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): _menu_entry_fallback_comment = '' _menu_entry_exec = '' _menu_entry_cat = '' + _menu_entry_shell = False lang_regio = lang lang_only = lang_regio.split('_')[0] @@ -716,14 +717,20 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): for line in item['desktop'].split('\n'): if re.match('^Name\[%s\]=.*' % lang_regio, line) or re.match('Name\[%s\]=.*' % lang_only, line): _menu_entry_name = line.split("=")[1].strip() - elif re.match('^Comment\[%s\]=.*' % lang_regio, line) or re.match('Comment\[%s\]=.*' % lang_only, line): - _menu_entry_comment = line.split("=")[1].strip() + elif re.match('^GenericName\[%s\]=.*' % lang_regio, line) or re.match('GenericName\[%s\]=.*' % lang_only, line): + _menu_entry_name = line.split("=")[1].strip() elif re.match('^Name=.*', line): _menu_entry_fallback_name = line.split("=")[1].strip() + elif re.match('^GenericName=.*', line): + _menu_entry_fallback_name = line.split("=")[1].strip() + elif re.match('^Comment\[%s\]=.*' % lang_regio, line) or re.match('Comment\[%s\]=.*' % lang_only, line): + _menu_entry_comment = line.split("=")[1].strip() elif re.match('^Comment=.*', line): _menu_entry_fallback_comment = line.split("=")[1].strip() elif re.match('^Exec=.*', line): _menu_entry_exec = line.split("=")[1].strip() + elif re.match('^Terminal=.*(t|T)(r|R)(u|U)(e|E).*', line): + _menu_entry_shell = True elif re.match('^Categories=.*', line): if 'X2Go-Top' in line: _menu_entry_cat = 'TOP' @@ -755,6 +762,8 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): else: # FIXME: strip off any noted options (%f, %F, %u, %U, ...), this can be more intelligent _menu_entry_exec = _menu_entry_exec.replace('%f', '').replace('%F','').replace('%u','').replace('%U','') + if _menu_entry_shell: + _menu_entry_exec = "x-terminal-emulator -e '%s'" % _menu_entry_exec if not _menu_entry_cat: _menu_entry_cat = 'Other 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).