This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 79a2b7b241e61dae4c2ae7a3896f98243e41ff3b Author: Ulrich Sibiller <uli42@gmx.de> Date: Wed May 8 21:49:50 2019 +0200 Remove useless "ignore" keystroke for Ctrl-Alt-Backspace nxagent does not react on that anyway (see xkb/xkbDflts.h) --- etc/keystrokes.cfg | 1 - nx-X11/programs/Xserver/hw/nxagent/Keystroke.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/etc/keystrokes.cfg b/etc/keystrokes.cfg index c57d2efbb..856369839 100644 --- a/etc/keystrokes.cfg +++ b/etc/keystrokes.cfg @@ -5,7 +5,6 @@ <keystroke action="fullscreen" Control="1" Shift="1" AltMeta="1" key="f" /> <keystroke action="minimize" Control="1" AltMeta="1" key="m" /> <keystroke action="defer" Control="1" AltMeta="1" key="e" /> -<keystroke action="ignore" Control="1" AltMeta="1" key="BackSpace" /> <keystroke action="force_synchronization" Control="1" AltMeta="1" key="j" /> <keystroke action="resize" Control="1" AltMeta="1" key="r" /> <keystroke action="viewport_move_left" Control="1" Shift="1" AltMeta="1" key="Left" /> diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c index 6def29ae4..3e02d318d 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c @@ -113,8 +113,6 @@ struct nxagentSpecialKeystrokeMap default_map[] = { {KEYSTROKE_FULLSCREEN, ControlMask | ShiftMask, True, XK_f}, {KEYSTROKE_MINIMIZE, ControlMask, True, XK_m}, {KEYSTROKE_DEFER, ControlMask, True, XK_e}, - {KEYSTROKE_IGNORE, ControlMask, True, XK_BackSpace}, - {KEYSTROKE_IGNORE, 0, False, XK_Terminate_Server}, {KEYSTROKE_FORCE_SYNCHRONIZATION, ControlMask, True, XK_j}, #ifdef DUMP {KEYSTROKE_REGIONS_ON_SCREEN, ControlMask, True, XK_a}, -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git