Merge lp:~w-shackleton/ubuntu/natty/x2vnc/x2vnc-fix-726783 into lp:ubuntu/natty/x2vnc

[Will Shackleton]

Fixes lp:#726783

[Luke Yelavich (themuso)]

Thanks for your work. As commented in the bug, this has been sent upstream and to Debian. Hopefully the Debian maintainer will release a new package revision with your patch included, we can then sync the package from Debian.

Thanks again.

review: Abstain

[Stefan Lesicnik (stefanlsd)]

Not needed here anymore. Work adopted in Debian - thanks for the patch!

review: Disapprove

[Martin Pitt (pitti)]

Package got synced from Debian, closing proposal. Thanks!

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-05 10:34:21 +0000
+++ debian/changelog	2011-02-28 22:40:48 +0000
@@ -1,3 +1,9 @@
+x2vnc (1.7.2-2ubuntu1) maverick; urgency=low
+
+  * x.c: Fixed xinerama support for certain multiple screen setups. (LP: #726783)
+
+ -- William Shackleton <[e-mail]>  Mon, 28 Feb 2011 21:09:32 +0000
+
 x2vnc (1.7.2-2) unstable; urgency=low
 
   * New maintainer (Closes: #586422).
 
=== modified file 'x.c'
--- x.c	2008-03-25 10:45:34 +0000
+++ x.c	2011-02-28 22:40:48 +0000
@@ -848,9 +848,9 @@
 {
   int n,ret=a.x;
   if(a.y < ret) ret=a.y;
-  n=displayHeight - a.y;
+  n=y_offset + displayHeight - a.y;
   if(n < ret) ret=n;
-  n=displayWidth - a.x;
+  n=x_offset + displayWidth - a.x;
   if(n < ret) ret=n;
   return ret;
 }