The branch, build-main has been updated via e2c021f21a17475cfc917c4e7bcab02011a0bb68 (commit) from 15860d2e1e69ae9e5b58e4957aa3efa925410d00 (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 + x2goserver/bin/x2gomountdirs | 4 ++++ x2goserver/bin/x2goruncommand | 6 +++++- x2goserver/bin/x2goumount-session | 6 +++++- 4 files changed, 15 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 08d3a39..2952864 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ x2goserver (4.0.1.4-0~x2go1) UNRELEASED; urgency=low * New upstream versino (4.0.1.4): - Multiply query USED_DISPLAYS and USED_PORTS in x2gostartagent to minimize race conditions in cases where many clients launch session simultaneously. + - Make X2Go Server aware of the MATE desktop environment. -- Mike Gabriel <mike.gabriel@das-netzwertkeam.de> Fri, 19 Jul 2013 17:53:11 +0200 diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs index 4c6d6b4..10c40e2 100755 --- a/x2goserver/bin/x2gomountdirs +++ b/x2goserver/bin/x2gomountdirs @@ -306,6 +306,10 @@ for (my $i=0;$i<@dirs;$i++) { $current_desktop="-gnome"; } + elsif (($session =~ m/_stDMATE_dp/) && system("x2gofeature X2GO_MATEBINDINGS >/dev/null") == 0) + { + $current_desktop="-mate"; + } elsif (($session =~ m/_stDLXDE_dp/) && system("x2gofeature X2GO_LXDEBINDINGS >/dev/null") == 0) { $current_desktop="-lxde"; diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 2f95341..60b898f 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -71,7 +71,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) +# let x2goruncommand choose what command to use for a given desktop shell name (GNOME, UNITY, KDE, XFCE4, LXDE, TRINITY, MATE) # NOTES on GNOME startup behaviour in different distributions # =========================================================== @@ -120,6 +120,8 @@ 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" == "MATE" ]; then + cmd=="/usr/bin/mate-session" elif [ "$cmd" == "KDE" ]; then cmd="/usr/bin/startkde" elif [ "$cmd" == "XFCE4" ]; then @@ -172,6 +174,8 @@ if [ "$cmd" == "TERMINAL" ]; then cmd="/usr/bin/konsole" # KDE4 konsole behaves differently from other terminals IMEXIT="false" + elif [ -e "/usr/bin/mate-terminal" ]; then + cmd="/usr/bin/mate-terminal" elif [ -e "/usr/bin/gnome-terminal" ]; then cmd="/usr/bin/gnome-terminal" elif [ -e "/usr/bin/lxterminal" ]; then diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session index a502090..3c3dc20 100755 --- a/x2goserver/bin/x2goumount-session +++ b/x2goserver/bin/x2goumount-session @@ -105,7 +105,7 @@ close(F); my $use_zenity=0; -if ($ENV{'GNOME_DESKTOP_SESSION_ID'} ne "") +if (($ENV{'GNOME_DESKTOP_SESSION_ID'} ne "") || ($ENV{'MATE_DESKTOP_SESSION_ID'} ne "")) { $use_zenity=1; } @@ -203,6 +203,10 @@ break: { $current_desktop="-gnome"; } + elsif (($session =~ m/_stDMATE_dp/) && system("x2gofeature X2GO_MATEBINDINGS >/dev/null") == 0) + { + $current_desktop="-mate"; + } elsif (($session =~ m/_stDLXDE_dp/) && system("x2gofeature X2GO_LXDEBINDINGS >/dev/null") == 0) { $current_desktop="-lxde"; 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).