diff options
| author | Havoc Pennington <hp@redhat.com> | 2000-09-13 16:37:36 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2000-09-13 16:37:36 +0000 |
| commit | d1e883b56f142baa06145265b3ad7de4cf2d943d (patch) | |
| tree | eb83832699f837381198b1030489c5ad59ac41c7 /wrappers | |
| parent | 34b0d193836cdab76e47934174585a4a5b1b8a6e (diff) | |
| download | gconf-d1e883b56f142baa06145265b3ad7de4cf2d943d.tar.gz | |
Put full key in GConfEntry (but we only get the relative key over the
2000-09-13 Havoc Pennington <hp@redhat.com>
* gconf/gconf.c (gconf_engine_all_entries): Put full key in
GConfEntry (but we only get the relative key over the
CORBA wire)
* wrappers/gtk/gconf-client.c (cache_pairs_in_dir): Change to
reflect fact that GConfEntry now contains full key
* gconf/gconftool.c (list_pairs_in_dir): Change to reflect full
key in GConfEntry
* doc/gconf/tmpl/gconf-value.sgml: updated GConfEntry docs on this
matter.
Diffstat (limited to 'wrappers')
| -rw-r--r-- | wrappers/gtk/gconf-client.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/wrappers/gtk/gconf-client.c b/wrappers/gtk/gconf-client.c index 1fe17d2a..4a690bf7 100644 --- a/wrappers/gtk/gconf-client.c +++ b/wrappers/gtk/gconf-client.c @@ -822,17 +822,12 @@ cache_pairs_in_dir(GConfClient* client, const gchar* dir) while (tmp != NULL) { GConfEntry* pair = tmp->data; - gchar* full_key; - - full_key = gconf_concat_key_and_dir(dir, gconf_entry_key(pair)); gconf_client_cache(client, - full_key, + gconf_entry_key (pair), gconf_entry_is_default(pair), gconf_entry_steal_value(pair)); - g_free(full_key); - gconf_entry_free(pair); tmp = g_slist_next(tmp); @@ -1024,7 +1019,7 @@ get(GConfClient* client, const gchar* key, /* Check the GConfEngine */ val = gconf_engine_get_full(client->engine, key, gconf_current_locale(), - use_default, &is_default, error); + use_default, &is_default, error); if (is_default_retloc) *is_default_retloc = is_default; |