diff options
| author | Havoc Pennington <hp@pobox.com> | 2002-03-10 23:11:24 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2002-03-10 23:11:24 +0000 |
| commit | 981d688aa10ec978ce8951432e31c33441a4395b (patch) | |
| tree | 7e3c6b14479c622bbce2b058645ee264737a877e | |
| parent | 0824c60dd64f7f1f84289dcf6405c477e8d3ad6c (diff) | |
| download | gconf-981d688aa10ec978ce8951432e31c33441a4395b.tar.gz | |
fix from HEAD, replace a "mi" with "this_mi"
2002-03-10 Havoc Pennington <hp@pobox.com>
* gconf/gconf-sources.c (gconf_sources_query_metainfo): fix from
HEAD, replace a "mi" with "this_mi"
* backends/xml-backend.c (query_metainfo): fix from HEAD, use
relative key to look up metainfo
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | backends/xml-backend.c | 8 | ||||
| -rw-r--r-- | gconf/gconf-sources.c | 2 |
3 files changed, 16 insertions, 2 deletions
@@ -1,3 +1,11 @@ +2002-03-10 Havoc Pennington <hp@pobox.com> + + * gconf/gconf-sources.c (gconf_sources_query_metainfo): fix from + HEAD, replace a "mi" with "this_mi" + + * backends/xml-backend.c (query_metainfo): fix from HEAD, use + relative key to look up metainfo + 2002-02-05 Abel Cheung <maddog@linux.org.hk> * configure.in (ALL_LINGUAS): zh_CN.GB2312 -> zh_CN diff --git a/backends/xml-backend.c b/backends/xml-backend.c index 98409393..34020250 100644 --- a/backends/xml-backend.c +++ b/backends/xml-backend.c @@ -505,7 +505,13 @@ query_metainfo (GConfSource* source, const gchar* key, parent = NULL; if (dir != NULL) - return dir_get_metainfo(dir, key, err); + { + const gchar* relative_key; + + relative_key = gconf_key_key (key); + + return dir_get_metainfo (dir, relative_key, err); + } } /* No metainfo found */ diff --git a/gconf/gconf-sources.c b/gconf/gconf-sources.c index 728a964b..0f499bd9 100644 --- a/gconf/gconf-sources.c +++ b/gconf/gconf-sources.c @@ -1212,7 +1212,7 @@ gconf_sources_query_metainfo (GConfSources* sources, gconf_meta_info_get_schema(this_mi) != NULL) { gconf_meta_info_set_schema(mi, - gconf_meta_info_get_schema(mi)); + gconf_meta_info_get_schema(this_mi)); } if (gconf_meta_info_get_mod_user(mi) == NULL && |