Author: mmazur Date: Thu Apr 2 21:06:33 2009 GMT Module: SOURCES Tag: HEAD ---- Log message: - Fixes fullscreen ooffice + usb keyboard x crash.
---- Files affected: SOURCES: xorg-xserver-server-xkb-color-geometry-fix.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/xorg-xserver-server-xkb-color-geometry-fix.patch diff -u /dev/null SOURCES/xorg-xserver-server-xkb-color-geometry-fix.patch:1.1 --- /dev/null Thu Apr 2 23:06:34 2009 +++ SOURCES/xorg-xserver-server-xkb-color-geometry-fix.patch Thu Apr 2 23:06:28 2009 @@ -0,0 +1,34 @@ +From 743a4caad7cf6afa5a54d8279a868e93d2fa1372 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <[email protected]> +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 <[email protected]> +--- + 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 + ================================================================ _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
