[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-193-gf437ecd
X2Go dev team
git-admin at x2go.org
Tue Jul 23 23:07:08 CEST 2013
The branch, master has been updated
via f437ecd5be93ca4f03285c21ce1c01c229582af0 (commit)
from 65169c9d65b117802e50631be0bbd719163d969e (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 f437ecd5be93ca4f03285c21ce1c01c229582af0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Jul 23 23:05:57 2013 +0200
Make X2Go Server aware of the MATE desktop environment.
Conflicts (resolved by Mike Gabriel):
x2goserver/bin/x2goruncommand
-----------------------------------------------------------------------
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 0c5ede7..2dfb491 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -56,6 +56,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 at das-netzwertkeam.de> Fri, 19 Jul 2013 17:53:11 +0200
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index b86fe1a..3152fb2 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -285,6 +285,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 2bcd8e0..e10a0ac 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
# ===========================================================
@@ -125,6 +125,8 @@ elif ([ "$cmd" == "CINNAMON" ] || [ "$cmd" == "cinnamon" ]); then
export DESKTOP_SESSION="cinnamon2d"
args=" --session=$DESKTOP_SESSION"
+elif [ "$cmd" == "MATE" ]; then
+ cmd=="/usr/bin/mate-session"
elif [ "$cmd" == "KDE" ]; then
cmd="/usr/bin/startkde"
elif [ "$cmd" == "XFCE4" ] || [ "$cmd" == "XFCE" ]; then
@@ -177,6 +179,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 da2ddb9..a77f856 100755
--- a/x2goserver/bin/x2goumount-session
+++ b/x2goserver/bin/x2goumount-session
@@ -81,7 +81,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;
}
@@ -179,6 +179,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).
More information about the x2go-commits
mailing list