Bug#396492: GSwitchit applet fails to load after upgrading libxml2 from 2.6.26 to 2.6.27

[Loïc Minier]

reassign 396492 libxklavier
tags 396492 + patch pending confirmed fixed-upstream upstream
stop

        Hi,

On Fri, Nov 03, 2006, Raphaël Quinet wrote:
> I got hit by the same problem today after upgrading some of my machines
> running Debian testing.  Although the problem seems to be specific to
> Debian, there are already several duplicates reported upstream:
>   http://bugzilla.gnome.org/show_bug.cgi?id=367195

 Thanks, I've extracted a proposed NMU patch.

   Bye,
-- 
Loïc Minier <lool at dooz.org>
-------------- next part --------------
diff -u libxklavier-2.2/debian/changelog libxklavier-2.2/debian/changelog
--- libxklavier-2.2/debian/changelog
+++ libxklavier-2.2/debian/changelog
@@ -1,3 +1,11 @@
+libxklavier (2.2-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * New patch, 02_xklconfigfindobject-crashes-when-no-nodes-are-found, from
+    the discussion in GNOME #367195; closes: #396492.
+
+ -- Loic Minier <lool at dooz.org>  Fri,  3 Nov 2006 23:42:51 +0100
+
 libxklavier (2.2-3) unstable; urgency=medium
 
   * debian/patches/01_xorg_xkb_path.patch: add fix by Marcelo Magallon
only in patch2:
unchanged:
--- libxklavier-2.2.orig/debian/patches/02_xklconfigfindobject-crashes-when-no-nodes-are-found.patch
+++ libxklavier-2.2/debian/patches/02_xklconfigfindobject-crashes-when-no-nodes-are-found.patch
@@ -0,0 +1,12 @@
+diff -Nur libxklavier-2.2/libxklavier/xklavier_config.c libxklavier-2.2.new/libxklavier/xklavier_config.c
+--- libxklavier-2.2/libxklavier/xklavier_config.c	2006-02-14 02:06:19.000000000 +0100
++++ libxklavier-2.2.new/libxklavier/xklavier_config.c	2006-11-03 23:42:26.000000000 +0100
+@@ -213,7 +213,7 @@
+     return False;
+ 
+   nodes = xpathObj->nodesetval;
+-  if( nodes != NULL && nodes->nodeTab != NULL )
++  if( nodes != NULL && nodes->nodeTab != NULL && nodes->nodeNr > 0 )
+   {
+     rv = _XklReadConfigItem( *nodes->nodeTab, ptr );
+     if( nodePtr != NULL )