Home
Reading
Searching
Subscribe
Sponsors
Statistics
Posting
Contact
Spam
Lists
Links
About
Hosting
Filtering
Features Download
Marketing
Archives
FAQ
Blog
 
Gmane
From: X2Go dev team <git-admin-P0WSJaAXTow <at> public.gmane.org>
Subject: x2goserver.git - release/3.1.1.x (branch) updated: 3.1.1.4-7-gc7d7bc7
Newsgroups: gmane.linux.terminal-server.x2go.scm
Date: Tuesday 2nd October 2012 16:11:59 UTC (over 4 years ago)
The branch, release/3.1.1.x has been updated
       via  c7d7bc79b50bd7c5691793218f11ec7375f2dcc8 (commit)
      from  3a9f412b1710c1b20a9e9b233c92532611dda001 (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 c7d7bc79b50bd7c5691793218f11ec7375f2dcc8
Author: Mike Gabriel

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 3a74d77..512a2f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,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
  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
 
CD: 3ms