[PATCH v2] xkb: Fix a check for MASTER_KEYBOARD

[Daniel Stone]

On Mon, Feb 21, 2011 at 04:00:23PM +1000, Peter Hutterer wrote:
> And copy into the master keyboard, not just the directly attached device.
> 
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> ---
> On Fri, Feb 18, 2011 at 10:48:10AM +0100, Benjamin Tissoires wrote:
> > >@@ -5883,9 +5884,8 @@ ProcXkbGetKbdByName(ClientPtr client)
> > >         nkn.changed|= XkbNKN_GeometryMask;
> > >     XkbSendNewKeyboardNotify(dev,&nkn);
> > >
> > >-    if (!IsMaster(dev)&&  !IsFloating(dev))
> > >+    if (!IsMaster(dev)&&  (master = GetMaster(dev, MASTER_KEYBOARD)))
> > 
> > I had a quick watch on the series, and this line worries me: I all
> > the time consider putting an affectation in a test as a bug (or
> > source of bug) as it's ambiguous. I know that it's valid in this
> > case, but I don't like it.
> > 
> > Sorry for the noise if you consider this as valid. ;)
> 
> who am I to argue with that :)
> 
> another change: the previous patch would still copy the keymap into the
> attached master, not the master keyboard. fix this.

Reviewed-by: Daniel Stone <daniel at fooishbar.org>

Cheers,
Daniel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.x.org/archives/xorg-devel/attachments/20110221/9d7b9da8/attachment.pgp>