xserver: Branch 'master'

[Daniel Stone]

Hi,
Thanks for actually taking on XKB ...

On Mon, Mar 10, 2008 at 09:29:27PM -0700, Keith Packard wrote:
> @@ -1796,6 +1796,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
>                    dsection = dst->geom->sections;
>                   i < src->geom->num_sections;
>                   i++, ssection++, dsection++) {
> +		*dsection = *ssection;

Please don't introduce tab breakage into an otherwise consistent file.

> @@ -1830,6 +1831,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
>                      dsection->doodads = NULL;
>                  }
>  
> +                dsection->sz_doodads = ssection->num_doodads;

If sz_doodads is set, you should be setting num_doodads for consistency,
unless this is already covered by *dsection = *ssection.

> @@ -1850,8 +1852,9 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
>                      }
>                      ddoodad->any.type = sdoodad->any.type;
>                  }
> -                dsection->num_doodads = ssection->num_doodads;
> -                dsection->sz_doodads = ssection->num_doodads;
> +		dsection->overlays = NULL;
> +		dsection->sz_overlays = 0;
> +		dsection->num_overlays = 0;

Again, indentation failure.

Cheers,
Daniel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.x.org/archives/xorg/attachments/20080311/5d3f0e3b/attachment.pgp>