Configurable keystrokes: Don't ignore first XML element in keystrokes.cfg anymore. (Fixes: #488).

debian/changelog

@@ -7,6 +7,8 @@ nx-libs (2:3.5.0.24-0x2go1) UNRELEASED; urgency=low
     + Fix: nx-libs source: not-binnmuable-all-depends-any x2goagent -> nxagent.
   * Update 320_nxagent_configurable-keystrokes.full.patch: The keystrokes config
     file's default name now is keystrokes.cfg (plural).
+  * Configurable keystrokes: Don't ignore first XML element in keystrokes.cfg
+    anymore. (Fixes: #488).
 
  -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Tue, 06 May 2014 18:34:36 +0200
 

debian/patches/320_nxagent_configurable-keystrokes.full.patch

@@ -83,7 +83,7 @@ Description: Make nxagent-specific keyboard bindings configurable
  
  #ifdef NX_DEBUG_INPUT
  int nxagentDebugInputDevices = 0;
-@@ -47,297 +54,527 @@
+@@ -47,297 +54,528 @@
  #undef  DEBUG
  #undef  DUMP
  
@@ -649,10 +649,11 @@ Description: Make nxagent-specific keyboard bindings configurable
 -        {
 -          *result = doViewportMoveUp;
 -        }
-+  while ((cur++)->stroke != KEYSTROKE_END_MARKER) {
++  while (cur->stroke != KEYSTROKE_END_MARKER) {
 +    if (cur->keysym == keysym && modifier_matches(cur->modifierMask, cur->modifierAltMeta, X->state)) {
 +      return cur->stroke;
 +    }
++    cur++;
 +  }
  
 -        break;