diff options
author | Reinhard Tartler <siretart@tauware.de> | 2011-10-10 17:58:55 +0200 |
---|---|---|
committer | Reinhard Tartler <siretart@tauware.de> | 2011-10-10 17:58:55 +0200 |
commit | 97fe7650e309c529085abef6e6418796b36f421c (patch) | |
tree | 92ecf43dc6f73cfb77eef93ac1b4fab1ba547b56 /nx-X11/programs/Xserver/hw | |
parent | c4e7705d299fcfc058baaa0867e1a1e29d626c6f (diff) | |
download | nx-libs-97fe7650e309c529085abef6e6418796b36f421c.tar.gz nx-libs-97fe7650e309c529085abef6e6418796b36f421c.tar.bz2 nx-libs-97fe7650e309c529085abef6e6418796b36f421c.zip |
Imported nxagent-3.2.0-8.tar.gznxagent/3.2.0-8
Summary: Imported nxagent-3.2.0-8.tar.gz
Keywords:
Imported nxagent-3.2.0-8.tar.gz
into Git repository
Diffstat (limited to 'nx-X11/programs/Xserver/hw')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/CHANGELOG | 5 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/CHANGELOG b/nx-X11/programs/Xserver/hw/nxagent/CHANGELOG index 7cf04acc0..c45c97bbb 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/CHANGELOG +++ b/nx-X11/programs/Xserver/hw/nxagent/CHANGELOG @@ -1,5 +1,10 @@ ChangeLog: +nxagent-3.2.0-8 + +- Fixed TR07F02082. The agent server could be unable to init core + keyboard on 64 bit systems. + nxagent-3.2.0-7 - Imported patch fixing issues from X.Org security advisory, June diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c index 1cc6898d7..88e99a1a0 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c @@ -444,7 +444,7 @@ N/A max_keycode - min_keycode + 1, &mapWidth); - if (keymap == NULL) + if (keymap64 == NULL) { XFreeModifiermap(modifier_keymap); |