[X2Go-Commits] [x2goserver] 01/01: Make X2Go Server aware of the Openbox and IceWM desktop environments (Fixes: #605, #606)

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit 85f939dcbcda89a60944f41f57c284cf335d2326
Author: Mike DePaulo <mikedep333 at gmail.com>
Date:   Sun Sep 14 10:28:34 2014 -0400

    Make X2Go Server aware of the Openbox and IceWM desktop environments (Fixes: #605,#606)
---
 debian/changelog              |    4 ++++
 x2goserver/bin/x2goruncommand |    6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9c927f3..6677690 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -128,6 +128,10 @@ x2goserver (4.0.1.16-0x2go1) UNRELEASED; urgency=low
 
   [ Mike DePaulo ]
   * New upstream release (4.0.1.16):
+    - Make X2Go Server aware of the Openbox desktop environment
+      (Command: OPENBOX) (Fixes: #605)
+    - Make X2Go Server aware of the IceWM desktop environment
+      (Command: ICEWM) (Fixes: #606)
     - Support GNOME Flashback session (GNOME 3.8+) on distro releases such as
       Ubuntu 13.10+ and debian Jessie
       (NOTE: For most users, GNOME Flashback currently will not work.
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index f4352b0..55d7f38 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -72,7 +72,7 @@ if [ -e "/etc/lsb-release" ]; then
 	source /etc/lsb-release
 fi
 
-# let x2goruncommand choose what command to use for a given desktop shell name (GNOME, UNITY, KDE, XFCE4, LXDE, TRINITY, MATE)
+# let x2goruncommand choose what command to use for a given desktop shell name (GNOME, UNITY, KDE, XFCE4, LXDE, TRINITY, MATE, OPENBOX, ICEWM)
 
 # NOTES on GNOME startup behaviour in different distributions
 # ===========================================================
@@ -180,6 +180,10 @@ elif [ "$cmd" == "LXDE" ]; then
 	cmd="/usr/bin/startlxde"
 elif [ "$cmd" == "TRINITY" ]; then
 	cmd="/usr/bin/starttrinity"
+elif [ "$cmd" == "OPENBOX" ]; then
+	cmd="/usr/bin/openbox-session"
+elif [ "$cmd" == "ICEWM" ]; then
+	cmd="/usr/bin/icewm-session"
 fi
 
 if [ "$cmd" == "WWWBROWSER" ]; then

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git