2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 42f87f1..d71c191 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-03 svu
+	
+	* libxklavier/xklavier_config.c: more accurate dealing with empty
+	nodeset
+
 2006-04-01 svu
 	
 	* libxklavier/xklavier_props.c: 
diff --git a/libxklavier/xklavier_config.c b/libxklavier/xklavier_config.c
index 301c641..6d84ab5 100644
--- a/libxklavier/xklavier_config.c
+++ b/libxklavier/xklavier_config.c
@@ -213,7 +213,7 @@ static Bool _XklConfigFindObject( const char *format,
     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 )