[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-74-g40589aa

[X2Go dev team]

The branch, master has been updated
       via  40589aa3d6f8b042c665e89472e6f5c471e0a98d (commit)
      from  41b4b81145b39e2c9fd4c2e821a1dedf71035e85 (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 40589aa3d6f8b042c665e89472e6f5c471e0a98d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Oct 21 16:25:38 2012 +0200

    Make session type label XFCE a valid session that starts xfce4-session.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog              |    1 +
 x2goserver/bin/x2goruncommand |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index cf6811e..83fefdb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low
       Makefile installation.
     - Fix new SQLite3 wrapper for db_getmounts Perl call.
     - Fix list output in new SQLite3 wrapper.
+    - Make session type label XFCE a valid session that starts xfce4-session.
   * /debian/control:
     + Package X2Go::Log in separate package: libx2go-log-perl.
     + Package X2Go::Server::DB in separate package: libx2go-server-db-perl.
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index d26fa82..01552a5 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -119,7 +119,7 @@ elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]); then
 
 elif [ "$cmd" == "KDE" ]; then
 	cmd="/usr/bin/startkde"
-elif [ "$cmd" == "XFCE4" ]; then
+elif [ "$cmd" == "XFCE4" ] || [ "$cmd" == "XFCE" ]; then
 	cmd="/usr/bin/xfce4-session"
 elif [ "$cmd" == "LXDE" ]; then
 	cmd="/usr/bin/startlxde"


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).