[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-65-g55d23d3

[X2Go dev team]

The branch, master has been updated
       via  55d23d3c52f83f81bf9826e4e816a12e8083affe (commit)
      from  f562fff98f9856719d7b0f432c00bf2ac5aad003 (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 55d23d3c52f83f81bf9826e4e816a12e8083affe
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Oct 2 18:11:27 2012 +0200

    Fix ,,Only extend LD_LIBRARY_PATH by Xrandr extension for KDE. Breaks GNOME.'' from last release.

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

Summary of changes:
 debian/changelog              |    2 ++
 x2goserver/bin/x2goruncommand |   12 ++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index c1f7589..ce793ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,8 @@ x2goserver (3.1.1.5-0~x2go1) UNRELEASED; urgency=low
     - Fix x2gogetapps when rendering multi-section .desktop files. Closes
       upstream issue #43.
     - Remove redundant setting of loglevel in x2gogetapps.
+    - Fix ,,Only extend LD_LIBRARY_PATH by Xrandr extension for KDE. Breaks
+      GNOME.'' from last release.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 25 Sep 2012 15:03:32 +0200
 
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index d783a3a..d26fa82 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -119,10 +119,6 @@ elif ([ "$cmd" == "UNITY" ] || [ "$cmd" == "unity" ]); then
 
 elif [ "$cmd" == "KDE" ]; then
 	cmd="/usr/bin/startkde"
-	NX_XRANDR_LIBS=/usr/lib/nx/X11/Xrandr
-	LD_LIBRARY_PATH="$NX_XRANDR_LIBS:$LD_LIBRARY_PATH"
-	$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "extending LD_LIBRARY_PATH=$LD_LIBRARY_PATH by Xrandr extension"
-	export LD_LIBRARY_PATH
 elif [ "$cmd" == "XFCE4" ]; then
 	cmd="/usr/bin/xfce4-session"
 elif [ "$cmd" == "LXDE" ]; then
@@ -207,6 +203,14 @@ then
 	X2GO_SESS_TYPE="R"
 fi
 
+if [ "$cmd" == "startkde" ]; then
+	NX_XRANDR_LIBS=/usr/lib/nx/X11/Xrandr
+	LD_LIBRARY_PATH="$NX_XRANDR_LIBS:$LD_LIBRARY_PATH"
+	$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "extending LD_LIBRARY_PATH=$LD_LIBRARY_PATH by Xrandr extension"
+	export LD_LIBRARY_PATH
+fi
+
+
 # run x2goserver-extensions for pre-runcommand
 x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$X2GO_SESSION" pre-runcommand || true
 


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