libxrandr: Changes to 'upstream-unstable'

[Julien Cristau <jcristau@alioth.debian.org>]

 configure.ac |    2 +-
 src/Xrandr.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 029491243b43c2e03a62c143ac21941449f335aa
Author: Eric Anholt <eric@anholt.net>
Date:   Wed Sep 5 10:01:06 2007 -0700

    Bump version to 1.2.2.

diff --git a/configure.ac b/configure.ac
index 16e5a14..f1e3d39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ dnl try to keep these the same.  Note that the library has an extra
 dnl digit in the version number to track changes which don't affect the
 dnl protocol, so Xrandr version l.n.m corresponds to protocol version l.n
 dnl
-AC_INIT(libXrandr, 1.2.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXrandr)
+AC_INIT(libXrandr, 1.2.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXrandr)
 AC_CONFIG_AUX_DIR(.)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE

commit 126143add5349fc34488b23d54d1bdcc7e8847b9
Author: Keith Packard <keithp@neko.keithp.com>
Date:   Tue Jul 3 09:58:09 2007 -0700

    CrtcChange event format conversion was using 'height' for 'width'.
    
    CrtcChange events were getting the source 'height' value stored in the
    'width' target in both conversion directions.

diff --git a/src/Xrandr.c b/src/Xrandr.c
index f8bdf02..fdaa80d 100644
--- a/src/Xrandr.c
+++ b/src/Xrandr.c
@@ -116,7 +116,7 @@ static Bool XRRWireToEvent(Display *dpy, XEvent *event, xEvent *wire)
 	    aevent->rotation = awire->rotation;
 	    aevent->x = awire->x;
 	    aevent->y = awire->y;
-	    aevent->width = awire->height;
+	    aevent->width = awire->width;
 	    aevent->height = awire->height;
 	    return True;
 	}
@@ -191,7 +191,7 @@ static Status XRREventToWire(Display *dpy, XEvent *event, xEvent *wire)
 	    awire->rotation = aevent->rotation;
 	    awire->x = aevent->x;
 	    awire->y = aevent->y;
-	    awire->width = aevent->height;
+	    awire->width = aevent->width;
 	    awire->height = aevent->height;
 	    return True;
 	}