[X2go-Commits] x2gothinclient.git - master (branch) updated: 1.0.1.8-52-gd1e11d3

[X2Go dev team]

The branch, master has been updated
       via  d1e11d3bf7f7656e74615da0b97507b1cd3eb82b (commit)
      from  b9d34cae9f3029e43b5c0dcc170a308c149e61b8 (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 d1e11d3bf7f7656e74615da0b97507b1cd3eb82b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Oct 16 15:08:20 2012 +0200

    Fix multi-head detection failures where xrandr write output to stderr (closes upstream issue #48).

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

Summary of changes:
 debian/changelog                    |    2 ++
 x2gothinclient/sbin/x2gothinclientd |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 8733e1d..f97555e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,8 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low
     - Provide a README.hostname file in doc folder of x2gothinclientmanagement.
     - For TCE stations with multiple heads, align heads next to each other
       in order of appearance in xrandr.
+    - Fix multi-head detection failures where xrandr write output to stderr
+      (closes upstream issue #48).
   * /debian/control:
     + Maintainer change in package: X2Go Developers <x2go-dev at lists.berlios.de>.
     + Priority: optional.
diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd
index cc92713..5fa9d27 100755
--- a/x2gothinclient/sbin/x2gothinclientd
+++ b/x2gothinclient/sbin/x2gothinclientd
@@ -110,7 +110,7 @@ elsif ($pid == 0 )
 			# align displays next to each other in order of appearance in xrandr
 			my $this_display;
 			my $next_display;
-			foreach (`DISPLAY=:0 LANG=C xrandr | grep ' connected ' | cut -d ' ' -f1`)
+			foreach (`DISPLAY=:0 LANG=C xrandr 2>/dev/null | grep ' connected ' | cut -d ' ' -f1`)
 			{
 				$next_display = $_;
 				$next_display =~ s/\n//;


hooks/post-receive
-- 
x2gothinclient.git (X2Go Thin Client Environment)

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 "x2gothinclient.git" (X2Go Thin Client Environment).