Attachment 22875 Details for Bug 20081 – 0001-xkb-Fix-wrong-colour-reference-in-XKB-geometry-copy.patch

[patch] 0001-xkb-Fix-wrong-colour-reference-in-XKB-geometry-copy.patch

0001-xkb-Fix-wrong-colour-reference-in-XKB-geometry-copy.patch (text/plain), 1.24 KB, created by Peter Hutterer on 2009-02-12 16:21:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Hutterer

Created: 2009-02-12 16:21:08 UTC

Size: 1.24 KB

patch

obsolete

>From 743a4caad7cf6afa5a54d8279a868e93d2fa1372 Mon Sep 17 00:00:00 2001
>From: Peter Hutterer <peter.hutterer@who-t.net>
>Date: Fri, 13 Feb 2009 09:56:22 +1000
>Subject: [PATCH] xkb: Fix wrong colour reference in XKB geometry copying. #20081
>
>base_color and label_color need to reference the color in the destination, not
>in the source.
>
>X.Org Bug 20081 <http://bugs.freedesktop.org/show_bug.cgi?id=20081>
>
>Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
>---
> xkb/xkbUtils.c |    4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
>index 98f9fc5..4afdf91 100644
>--- a/xkb/xkbUtils.c
>+++ b/xkb/xkbUtils.c
>@@ -1955,9 +1955,9 @@ _XkbCopyGeom(XkbDescPtr src, XkbDescPtr dst)
> 
>             strcpy(dst->geom->label_font, src->geom->label_font);
>             i = XkbGeomColorIndex(src->geom, src->geom->label_color);
>-            dst->geom->label_color = &(src->geom->colors[i]);
>+            dst->geom->label_color = &(dst->geom->colors[i]);
>             i = XkbGeomColorIndex(src->geom, src->geom->base_color);
>-            dst->geom->base_color = &(src->geom->colors[i]);
>+            dst->geom->base_color = &(dst->geom->colors[i]);
>         }
>         else {
>             if (dst->geom->label_font) {
>-- 
>1.6.0.6
>

Actions: View | Splinter Review

Attachments on bug 20081: 22875 | 23890 | 23906

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.