[PATCH] Xext: panoramiXprocs: fix typo

Linus Arver linusarver at gmail.com
Sun Oct 17 12:26:01 PDT 2010


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

--0016e64655161bf95e0492d5564c
Content-Type: text/x-patch; charset=US-ASCII; 
	name="0001-Xext-panoramiXprocs-fix-typo.patch"
Content-Disposition: attachment; 
	filename="0001-Xext-panoramiXprocs-fix-typo.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_gfebtz1m0

RnJvbSA4YzczNmE3OTljMzI3NTdkZmQwNTJhZDcwN2FjOTFiYTBjNzdjNzYxIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBMaW51cyBBcnZlciA8bGludXNhcnZlckBnbWFpbC5jb20+CkRh
dGU6IFN1biwgMTcgT2N0IDIwMTAgMTI6MjY6MDEgLTA3MDAKU3ViamVjdDogW1BBVENIXSBYZXh0
OiBwYW5vcmFtaVhwcm9jczogZml4IHR5cG8KClRoaXMgZml4ZXMgYSB0eXBvIGludHJvZHVjZWQg
aW4gY29tbWl0CjgwYjVkM2EzMjY0ZDJjNTE2N2U1YWM4NWEzYjA0YWYwZjg5Y2VjZTEuIFRoZSBw
b2ludGVyIHBEc3Qgd2FzIGNoYW5nZWQKdW5pbnRlbnRpb25hbGx5IHRvIHBXaW4gZnJvbSBhIGNv
cHkvcGFzdGUgZXJyb3IuIFRoaXMgcmVzdWx0ZWQgaW4gYWxsClFULWJhc2VkIGFwcHMgYW5kIHNv
bWUgdGNsL3RrIG9uZXMgKGxpa2UgZm9udGZvcmdlKSB0byBjcmFzaCBYIDEuOSBvbgpzdGFydGlu
ZyB1cCwgd2hlbiBYaW5lcmFtYSB3YXMgZW5hYmxlZC4KCkJ1ZyByZXBvcnQ6IGh0dHBzOi8vYmJz
LmFyY2hsaW51eC5vcmcvdmlld3RvcGljLnBocD9pZD0xMDYxMjUKClNpZ25lZC1vZmYtYnk6IEVs
aWUgQmxldG9uIDxkcm96b2ZpbEBnbWFpbC5jb20+ClRlc3RlZC1ieTogTGludXMgQXJ2ZXIgPGxp
bnVzYXJ2ZXJAZ21haWwuY29tPgotLS0KIFhleHQvcGFub3JhbWlYcHJvY3MuYyB8ICAgIDIgKy0K
IDEgZmlsZXMgY2hhbmdlZCwgMSBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9ucygtKQoKZGlmZiAt
LWdpdCBhL1hleHQvcGFub3JhbWlYcHJvY3MuYyBiL1hleHQvcGFub3JhbWlYcHJvY3MuYwppbmRl
eCA2N2I0MDMwLi5kODQzMTY4IDEwMDY0NAotLS0gYS9YZXh0L3Bhbm9yYW1pWHByb2NzLmMKKysr
IGIvWGV4dC9wYW5vcmFtaVhwcm9jcy5jCkBAIC02MzQsNyArNjM0LDcgQEAgaW50IFBhbm9yYW1p
WFRyYW5zbGF0ZUNvb3JkcyhDbGllbnRQdHIgY2xpZW50KQogICAgIHJlcC5kc3RYID0geCAtIHBE
c3QtPmRyYXdhYmxlLng7CiAgICAgcmVwLmRzdFkgPSB5IC0gcERzdC0+ZHJhd2FibGUueTsKICAg
ICBpZigocERzdCA9PSBzY3JlZW5JbmZvLnNjcmVlbnNbMF0tPnJvb3QpIHx8Ci0gICAgICAgKHBX
aW4tPmRyYXdhYmxlLmlkID09IHNjcmVlbkluZm8uc2NyZWVuc1swXS0+c2NyZWVuc2F2ZXIud2lk
KSkKKyAgICAgICAocERzdC0+ZHJhd2FibGUuaWQgPT0gc2NyZWVuSW5mby5zY3JlZW5zWzBdLT5z
Y3JlZW5zYXZlci53aWQpKQogICAgIHsKIAlyZXAuZHN0WCArPSBzY3JlZW5JbmZvLnNjcmVlbnNb
MF0tPng7CiAJcmVwLmRzdFkgKz0gc2NyZWVuSW5mby5zY3JlZW5zWzBdLT55OwotLSAKMS43LjMu
MQoK
--0016e64655161bf95e0492d5564c--


More information about the xorg-devel mailing list