diff options
| author | Sergey Udaltsov <svu@gnome.org> | 2006-11-03 22:27:42 +0000 |
|---|---|---|
| committer | Sergey Udaltsov <svu@gnome.org> | 2006-11-03 22:27:42 +0000 |
| commit | cdebb038b50be0267b8ab8d7e2b536633df85a92 (patch) | |
| tree | f431f15317d710824a572531920675c1b7c19ec7 | |
| parent | 3c3dc976f1c02a780cf3bf5937b7074748d9581c (diff) | |
| download | libxklavier-cdebb038b50be0267b8ab8d7e2b536633df85a92.tar.gz | |
more accurately checking for empty nodeset, b.g.o#370038
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | libxklavier/xklavier_config.c | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2006-11-03 svu + + * libxklavier/xklavier_config.c: more accurate dealing with empty + nodeset, hopefully fixing + http://bugzilla.gnome.org/show_bug.cgi?id=370038 + 2006-10-16 svu * configure.in, NEWS: preparing release 3.1 diff --git a/libxklavier/xklavier_config.c b/libxklavier/xklavier_config.c index 5f82f21..847f69a 100644 --- a/libxklavier/xklavier_config.c +++ b/libxklavier/xklavier_config.c @@ -280,8 +280,8 @@ xkl_config_registry_find_object(XklConfigRegistry * config, return FALSE; nodes = xpath_obj->nodesetval; - if (nodes != NULL && nodes->nodeTab != NULL) { - rv = xkl_read_config_item(config, *nodes->nodeTab, pitem); + if (nodes != NULL && nodes->nodeTab != NULL && nodes->nodeNr > 0) { + rv = xkl_read_config_item(config, nodes->nodeTab[0], pitem); if (pnode != NULL) { *pnode = *nodes->nodeTab; } |