From 97fe7650e309c529085abef6e6418796b36f421c Mon Sep 17 00:00:00 2001 From: Reinhard Tartler Date: Mon, 10 Oct 2011 17:58:55 +0200 Subject: Imported nxagent-3.2.0-8.tar.gz Summary: Imported nxagent-3.2.0-8.tar.gz Keywords: Imported nxagent-3.2.0-8.tar.gz into Git repository --- nx-X11/programs/Xserver/hw/nxagent/CHANGELOG | 5 +++++ nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'nx-X11/programs') 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); -- cgit v1.2.3