This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch release/4.0.1.x in repository x2goserver. from 513206b Clean user SSHD process if connection between server and client lost. This should fix error "Global request tcpip-forward failed". new 4d6fb03 Fix support for Cinnamon 1.4. (Fixes: #569) Update the logic for launching Cinnamon 1.6 and 1.8. Fix the logic for launching Cinnamon 2.0 and 2.2. (Fixes: #572) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 8 ++++++++ x2goserver/bin/x2goruncommand | 21 ++++++++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit 4d6fb035825f8e36db0771da6a6daab16f42c234 Author: Mike DePaulo <mikedep333@gmail.com> Date: Sat Aug 16 13:47:05 2014 -0400 Fix support for Cinnamon 1.4. (Fixes: #569) Update the logic for launching Cinnamon 1.6 and 1.8. Fix the logic for launching Cinnamon 2.0 and 2.2. (Fixes: #572) --- debian/changelog | 8 ++++++++ x2goserver/bin/x2goruncommand | 21 ++++++++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index b58bcad..fc51359 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,14 @@ x2goserver (4.0.1.16-0x2go1) UNRELEASED; urgency=low It also currently requires that the gnome-session binary not require hardware 3D acceleration for said session.) (Thanks Eugene San (eugenesan@gmail.com)) + - Fix support for Cinnamon 1.4 (Linux Mint 13) (Fixes: #569) + - Fix the logic for launching Cinnamon 2.0 and 2.2 (Linux Mint 17). + (Fixes: #572) + NOTE: Fixing this bug in x2goserver is not sufficient to make Cinnamon 2.0 + & 2.2 to work properly with X2Go. Bug #150 in nx-libs is still a problem. + Fixing this bug enables Cinnamon 2.0 and 2.2 to launch to their + "fallback mode", which has many bugs and missing features when compared to + "software rendering" mode (cinnamon2d), but is still better than nothing. * debian/rules: + Improve dh_auto_clean override. diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 3d867b8..b9b0c16 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -156,9 +156,24 @@ elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]); then # on earlier Ubuntu versions or with non-Ubuntu Distros the ,,UNITY'' command in X2Go will launch the GNOME2 desktop shell elif ([ "$cmd" == "CINNAMON" ] || [ "$cmd" == "cinnamon" ]); then - cmd="/usr/bin/gnome-session" - export DESKTOP_SESSION="cinnamon2d" - args=" --session=$DESKTOP_SESSION" + # Cinnamon 2.0 and newer + # The cmd is a script that calls the "cinnamon-session" binary. + if [ -e /usr/bin/cinnamon-session-cinnamon2d ]; then + cmd="/usr/bin/cinnamon-session-cinnamon2d" + # Cinnamon 1.6 & 1.8 + # The cmd is a script that calls the "gnome-session" binary. + elif [ -e /usr/bin/gnome-session-cinnamon2d ]; then + cmd="/usr/bin/gnome-session-cinnamon2d" + # Cinnamon 1.4 + # The cmd is a script that calls the "gnome-session" binary. + elif [ -e /usr/bin/gnome-session-cinnamon ]; then + cmd="/usr/bin/gnome-session-cinnamon" + # Fallback to the old behavior. + else + cmd="/usr/bin/gnome-session" + export DESKTOP_SESSION="cinnamon2d" + args=" --session=$DESKTOP_SESSION" + fi elif [ "$cmd" == "MATE" ]; then cmd="/usr/bin/mate-session" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org