[PATCH] Set nIndicators in XkbGetIndicatorMap

Peter Hutterer peter.hutterer at who-t.net
Wed Feb 20 15:40:48 PST 2013


On Tue, Feb 19, 2013 at 04:08:52PM -0500, Peter Harris wrote:
> Xlib doesn't use this value (it computes it from the reply length
> instead) which is why nobody has noticed yet. But the spec
> http://www.x.org/releases/X11R7.7/doc/kbproto/xkbproto.html
> says that it should be set.
> 
> Signed-off-by: Peter Harris <pharris at opentext.com>
> ---
>  xkb/xkb.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/xkb/xkb.c b/xkb/xkb.c
> index 7e51e40..2ad6574 100644
> --- a/xkb/xkb.c
> +++ b/xkb/xkb.c
> @@ -3073,6 +3073,7 @@ XkbComputeGetIndicatorMapReplySize(XkbIndicatorPtr indicators,
>              nIndicators++;
>      }
>      rep->length = (nIndicators * SIZEOF(xkbIndicatorMapWireDesc)) / 4;
> +    rep->nIndicators = nIndicators;
>      return Success;
>  }
>  
> -- 
> 1.7.2.5
 
merged into -next, thanks.

Cheers,
   Peter


More information about the xorg-devel mailing list