diff options
| author | Mark McLoughlin <mark@skynet.ie> | 2004-07-02 07:57:47 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@src.gnome.org> | 2004-07-02 07:57:47 +0000 |
| commit | 0ebf4ef73101ab45a4333ca45236f792b548c6ee (patch) | |
| tree | 3ad48a18017077e6fff99613427df47776fee566 | |
| parent | 84b60a63169b2e30d825f1894b67e7b615665df4 (diff) | |
| download | gconf-0ebf4ef73101ab45a4333ca45236f792b548c6ee.tar.gz | |
Fix for bug #145141.
2004-07-02 Mark McLoughlin <mark@skynet.ie>
Fix for bug #145141.
* backends/markup-tree.c: (load_subdirs): recognise
subdirs which don't contain a %gconf.xml file but do
contain a %gconf-tree.xml file.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | backends/markup-tree.c | 8 |
2 files changed, 14 insertions, 2 deletions
@@ -1,3 +1,11 @@ +2004-07-02 Mark McLoughlin <mark@skynet.ie> + + Fix for bug #145141. + + * backends/markup-tree.c: (load_subdirs): recognise + subdirs which don't contain a %gconf.xml file but do + contain a %gconf-tree.xml file. + 2004-06-21 Mark McLoughlin <mark@skynet.ie> Patch from Leonardo Quijano Vincenzi <lquijano@hotpop.com> diff --git a/backends/markup-tree.c b/backends/markup-tree.c index 7527f00c..4e2088ca 100644 --- a/backends/markup-tree.c +++ b/backends/markup-tree.c @@ -522,8 +522,12 @@ load_subdirs (MarkupDir *dir) if (stat (fullpath, &statbuf) < 0) { - /* This is some kind of cruft, not an XML directory */ - continue; + strncpy (fullpath_end+len, "/%gconf-tree.xml", subdir_len - len); + if (stat (fullpath, &statbuf) < 0) + { + /* This is some kind of cruft, not an XML directory */ + continue; + } } markup_dir_new (dir->tree, dir, dent->d_name); |