← Back to branch summary

~chasedouglas/ubuntu/maverick/xorg-server/670016

« back to all changes in this revision

Viewing changes to debian/patches/207_Xext_panoramiXprocs_fix_typo.patch

  • Committer: Bazaar Package Importer
  • Author(s): Alberto Milone
  • Date: 2010-11-22 18:55:50 UTC
  • Revision ID: james.westby@ubuntu.com-20101122185550-8f0v6hqhltn3b4ns
https://launchpad.net/bugs/650539
* debian/patches/207_Xext_panoramiXprocs_fix_typo.patch:
  - This prevents Qt applications from crashing when using
    Xinerama multi-head with drivers such as nvidia (LP: #650539).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/207_Xext_panoramiXprocs_fix_typo.patch
 
1
From 78f94f19aab66a1e5331df0ce29f36e310b4195d Mon Sep 17 00:00:00 2001
 
2
From: Linus Arver <linusarver@gmail.com>
 
3
Date: Sun, 17 Oct 2010 19:26:01 +0000
 
4
Subject: Xext: panoramiXprocs: fix typo
 
5
 
 
6
This fixes a typo introduced in commit
 
7
80b5d3a3264d2c5167e5ac85a3b04af0f89cece1. The pointer pDst was changed
 
8
unintentionally to pWin from a copy/paste error. This resulted in all
 
9
QT-based apps and some tcl/tk ones (like fontforge) to crash X 1.9 on
 
10
starting up, when Xinerama was enabled.
 
11
 
 
12
Bug report: https://bbs.archlinux.org/viewtopic.php?id=106125
 
13
 
 
14
Signed-off-by: Elie Bleton <drozofil@gmail.com>
 
15
Reviewed-by: Adam Jackson <ajax@redhat.com>
 
16
Reviewed-by: Matt Turner <mattst88@gmail.com>
 
17
Tested-by: Linus Arver <linusarver@gmail.com>
 
18
---
 
19
diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c
 
20
index 67b4030..d843168 100644
 
21
--- a/Xext/panoramiXprocs.c
 
22
+++ b/Xext/panoramiXprocs.c
 
23
@@ -634,7 +634,7 @@ int PanoramiXTranslateCoords(ClientPtr client)
 
24
     rep.dstX = x - pDst->drawable.x;
 
25
     rep.dstY = y - pDst->drawable.y;
 
26
     if((pDst == screenInfo.screens[0]->root) ||
 
27
-       (pWin->drawable.id == screenInfo.screens[0]->screensaver.wid))
 
28
+       (pDst->drawable.id == screenInfo.screens[0]->screensaver.wid))
 
29
     {
 
30
        rep.dstX += screenInfo.screens[0]->x;
 
31
        rep.dstY += screenInfo.screens[0]->y;
 
32
--
 
33
cgit v0.8.3-6-g21f6