diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-04-03 21:44:05 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-04-03 21:44:05 +0200 |
| commit | 25d38bf360db8f02cb5d6f7c6861dcf9cc5fb206 (patch) | |
| tree | c54c8522db340ff5984483a7530011a7bb23c079 /nx-X11/programs/Xserver/hw/nxagent/Init.c | |
| parent | 147371a28bb23b4dd383ceccff0e279e9dba3bbe (diff) | |
| parent | ee18cd43d873bc814ca40faabd29cc486061969f (diff) | |
| download | nx-libs-25d38bf360db8f02cb5d6f7c6861dcf9cc5fb206.tar.gz nx-libs-25d38bf360db8f02cb5d6f7c6861dcf9cc5fb206.tar.bz2 nx-libs-25d38bf360db8f02cb5d6f7c6861dcf9cc5fb206.zip | |
Merge branch 'uli42-pr/cleanup_keystroke' into 3.6.x
Attributes GH PR #404: https://github.com/ArcticaProject/nx-libs/pull/404
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Init.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Init.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c index f15f2cb0a..014ab17f9 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Init.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c @@ -69,6 +69,7 @@ is" without express or implied warranty. #include "Font.h" #include "Millis.h" #include "Error.h" +#include "Keystroke.h" #include <nx/NX.h> #include "compext/Compext.h" @@ -406,6 +407,8 @@ FIXME: These variables, if not removed at all because have probably */ blackRoot = TRUE; + + nxagentInitKeystrokes(False); } void |