Re: xklavier test program and output

[Sam Morris <sam@robots.org.uk>]

Denis Barbier wrote:
> I checked differences between /etc/X11/xkb-data/rules/xorg.xml
> and /etc/X11/xkb/rules/xorg.xml, and found that these problems
> are caused by comments in the latter file.  I am reassigning
> this bugreport to libxklavier10, IMO it should not be confused
> by comments in xorg.xml.  If this cannot be fixed easily, please
> let us know, we may remove these comments from xorg.xml, but
> fixing libxklavier10 is a much better solution for the long term.

Many thanks for doing the hard work! I have altered libxklavier so that 
it doesn't bug out if there is a comment under any of the 
/xkbConfigRegistry/optionList/group elements of the XML file.

Comments anywhere else in the file may still cause similar failures, but 
I think that's a job for upstream.

If the attached patch is acceptable, you will probably have to NMU 
libxklavier; the last upload by the maintainer was in August 2004.

> Denis

--
Sam Morris
http://robots.org.uk/

PGP key id 5EA01078
3412 EA18 1277 354B 991B  C869 B219 7FDB 5EA0 1078

--- libxklavier-2.0/libxklavier/xklavier_config.c	2006-01-21 00:03:46.000000000 +0000
+++ libxklavier-2.0+sam/libxklavier/xklavier_config.c	2006-01-21 00:02:17.000000000 +0000
@@ -60,9 +60,11 @@
           break;
         return False;
       case XML_TEXT_NODE:
+      case XML_COMMENT_NODE:
         ptr = ptr->next;
         continue;
       default:
+		XklDebug (115, "Unknown node type [%d]\n", ptr->type);
         return False;
     }
     break;
@@ -464,6 +466,8 @@
 
         func( &ci, allowMC, userData );
       }
+      else
+        XklDebug (110, "Unable to parse 'group' element\n");
 
       theNodePtr++;
     }