The branch, master has been updated via 1de00f1102be015f6245ef2bc13c877a4c79fadd (commit) from 163fb7f7d7a35a44cda95fd6fb41a1fc574a9133 (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 1de00f1102be015f6245ef2bc13c877a4c79fadd Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Mar 26 00:23:32 2013 +0100 Make x2goruncommand aware of the Cinnamon desktop shell. (Fixes: #117). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver/bin/x2goruncommand | 5 +++++ 2 files changed, 6 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 59fe699..88b4015 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,6 +37,7 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low * Break execution of x2gosuspend-session / x2goterminate-session if the script is called without session as first argument and $X2GO_SESSION not set. (Fixes: #82). + * Make x2goruncommand aware of the Cinnamon desktop shell. (Fixes: #117). [ Otto Kjell ] * New upstream version (4.1.0.0): diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 112f258..2f3a5a8 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -120,6 +120,11 @@ elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]); then fi # on earlier Ubuntu versions or with non-Ubuntu Distros the ,,UNITY'' command in X2Go will launch the GNOME2 desktop shell +elif [ "$cmd" == "CINNAMON" ]; then + cmd="/usr/bin/gnome-session" + export DESKTOP_SESSION="cinnamon2d" + args=" --session=$DESKTOP_SESSION" + elif [ "$cmd" == "KDE" ]; then cmd="/usr/bin/startkde" elif [ "$cmd" == "XFCE4" ] || [ "$cmd" == "XFCE" ]; 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).