diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-02-13 09:56:22 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-02-17 08:04:16 +1000 |
| commit | f5bf1fdaf36163d5c2f1b9b51df96326ebbb0e9c (patch) | |
| tree | 1b732272906194feaf4fabab11e0e5528e79faa6 /xkb/xkbUtils.c | |
| parent | a9d7d659a05e4b6b25e6acd2ce59926911aac0f7 (diff) | |
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>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'xkb/xkbUtils.c')
| -rw-r--r-- | xkb/xkbUtils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c index aa63b35ab..9a1edc901 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) { |