diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-04 15:38:04 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-04 15:38:04 +0000 |
| commit | 3592ad31cfc72ffff3c9024eecea7d3b987c7954 (patch) | |
| tree | 0e3b50cb6bcd0839b591d318a41d04b7cbd8e6e2 /xorg-server/xkb/xkb.c | |
| parent | 79409465b0b8d5d38e6b94deb1943316f40c66eb (diff) | |
| parent | 0a5888393c68f6f7db86206d1f277232db18240b (diff) | |
| download | vcxsrv-3592ad31cfc72ffff3c9024eecea7d3b987c7954.tar.gz vcxsrv-3592ad31cfc72ffff3c9024eecea7d3b987c7954.tar.bz2 vcxsrv-3592ad31cfc72ffff3c9024eecea7d3b987c7954.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkb/xkb.c')
| -rw-r--r-- | xorg-server/xkb/xkb.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/xorg-server/xkb/xkb.c b/xorg-server/xkb/xkb.c index 3ce7e690c..9d6c4d4f6 100644 --- a/xorg-server/xkb/xkb.c +++ b/xorg-server/xkb/xkb.c @@ -5621,17 +5621,17 @@ ProcXkbGetKbdByName(ClientPtr client) else fwant= stuff->want|stuff->need;
if ((!names.compat)&&
(fwant&(XkbGBN_CompatMapMask|XkbGBN_IndicatorMapMask))) {
- names.compat= _XkbDupString("%");
+ names.compat= Xstrdup("%");
}
if ((!names.types)&&(fwant&(XkbGBN_TypesMask))) {
- names.types= _XkbDupString("%");
+ names.types= Xstrdup("%");
}
if ((!names.symbols)&&(fwant&XkbGBN_SymbolsMask)) {
- names.symbols= _XkbDupString("%");
+ names.symbols= Xstrdup("%");
}
geom_changed= ((names.geometry!=NULL)&&(strcmp(names.geometry,"%")!=0));
if ((!names.geometry)&&(fwant&XkbGBN_GeometryMask)) {
- names.geometry= _XkbDupString("%");
+ names.geometry= Xstrdup("%");
geom_changed= FALSE;
}
@@ -5885,12 +5885,10 @@ ProcXkbGetKbdByName(ClientPtr client) nkn.changed|= XkbNKN_GeometryMask;
XkbSendNewKeyboardNotify(dev,&nkn);
- if (!IsMaster(dev) && dev->u.master)
- {
- DeviceIntPtr master = dev->u.master;
- if (master->u.lastSlave == dev)
- {
- XkbCopyDeviceKeymap(dev->u.master, dev);
+ if (!IsMaster(dev)) {
+ DeviceIntPtr master = GetMaster(dev, MASTER_KEYBOARD);
+ if (master && master->lastSlave == dev) {
+ XkbCopyDeviceKeymap(master, dev);
XkbSendNewKeyboardNotify(dev,&nkn);
}
}
|