xserver: commit 80b5d3a3264d2c5167e5ac85a3b04af0f89cece1 seems to have a copy/paste error

[Linus Arver]

On Sun, Oct 17, 2010 at 12:47 PM, Linus Arver <linusarver at gmail.com> wrote:
> On Sat, Oct 16, 2010 at 5:56 AM, jamey at minilop.net <jamey at minilop.net> wrote:
>> I haven't checked carefully, but off-hand it sure looks like I
>> introduced a copy-paste bug there, yes--especially if the code doesn't
>> work as written and does work when patched.
>>
>> Please post the patch to xorg-devel at lists.x.org with its author's
>> Signed-off-by and any Tested-by annotations you can get, and we can
>> get it reviewed and applied to master and 1.9.
>>
>> Jamey
>>
>
> So this is the patch to fix the typo from commit
> 80b5d3a3264d2c5167e5ac85a3b04af0f89cece1. I've attached it as a
> separate file just in case.
>
> ------------------------------------------------------------------
>
> From 8c736a799c32757dfd052ad707ac91ba0c77c761 Mon Sep 17 00:00:00 2001
> From: Linus Arver <linusarver at gmail.com>
> Date: Sun, 17 Oct 2010 12:26:01 -0700
> Subject: [PATCH] Xext: panoramiXprocs: fix typo
>
> This fixes a typo introduced in commit
> 80b5d3a3264d2c5167e5ac85a3b04af0f89cece1. The pointer pDst was changed
> unintentionally to pWin from a copy/paste error. This resulted in all
> QT-based apps and some tcl/tk ones (like fontforge) to crash X 1.9 on
> starting up, when Xinerama was enabled.
>
> Bug report: https://bbs.archlinux.org/viewtopic.php?id=106125
>
> Signed-off-by: Elie Bleton <drozofil at gmail.com>
> Tested-by: Linus Arver <linusarver at gmail.com>
> ---
>  Xext/panoramiXprocs.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c
> index 67b4030..d843168 100644
> --- a/Xext/panoramiXprocs.c
> +++ b/Xext/panoramiXprocs.c
> @@ -634,7 +634,7 @@ int PanoramiXTranslateCoords(ClientPtr client)
>     rep.dstX = x - pDst->drawable.x;
>     rep.dstY = y - pDst->drawable.y;
>     if((pDst == screenInfo.screens[0]->root) ||
> -       (pWin->drawable.id == screenInfo.screens[0]->screensaver.wid))
> +       (pDst->drawable.id == screenInfo.screens[0]->screensaver.wid))
>     {
>        rep.dstX += screenInfo.screens[0]->x;
>        rep.dstY += screenInfo.screens[0]->y;
> --
> 1.7.3.1
>

I just want to add that this patch fixes the bug reported at various
places online.

https://bugs.freedesktop.org/show_bug.cgi?id=30943
https://bbs.archlinux.org/viewtopic.php?id=106125
https://bugs.launchpad.net/ubuntu/+source/qt4-x11/+bug/650539
http://bugs.gentoo.org/show_bug.cgi?id=339135

-Linus