[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.0.99-2-188-g5ca4d96

[X2Go dev team]

The branch, build-baikal has been updated
       via  5ca4d96cb3f5788dc631a7b4d512fa5cd40bcb82 (commit)
      from  1baf675e4dd77d98c598df7f4a9c80fa47a620db (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              |    2 ++
 x2goserver/bin/x2goruncommand |    2 ++
 2 files changed, 4 insertions(+)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 05870f1..db55b6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
   * Add chromium-browser as possible WWWBROWSER to x2goruncommand.
   * Add lxterminal as possible TERMINAL to x2goruncommand.
   * Add LibreOffice.org as possible OFFICE application to x2goruncommand.
+  * Fix for TERMINAL command execution if konsole (KDE4) is installed on the
+    server (closes upstream issue #87)
 
   [Martin Oehler]
   * Removes old debug code fragment, fixes x2golistsessions parsing.
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 42156b9..391294f 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -85,6 +85,8 @@ if [ "$cmd" == "TERMINAL" ]; then
 	IMEXIT="true"
 	if [ -e "/usr/bin/konsole" ]; then
 		cmd="/usr/bin/konsole"
+		# KDE4 konsole behaves differently from other terminals
+		IMEXIT="false"
 	elif  [ -e "/usr/bin/gnome-terminal" ]; then
 		cmd="/usr/bin/gnome-terminal"
 	elif  [ -e "/usr/bin/lxterminal" ]; then


hooks/post-receive
-- 
x2goserver.git (X2Go Server)

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 "x2goserver.git" (X2Go Server).