summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Udaltsov <svu@gnome.org>2006-11-03 22:39:45 +0000
committerSergey Udaltsov <svu@gnome.org>2006-11-03 22:39:45 +0000
commit6f1a6f04430ba4bc398e2880bfc7ebb8338e34db (patch)
tree0c908fc57419bc7c7c11f8a2185b592be9bfed78
parent8929d3d6760e3bc4c9f352180d60acab5a604f0c (diff)
downloadlibxklavier-v.2.x.tar.gz
more accurately checking for empty nodesetv.2.x
-rw-r--r--ChangeLog5
-rw-r--r--libxklavier/xklavier_config.c2
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 )