summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark McLoughlin <mark@skynet.ie>2004-04-05 19:14:33 +0000
committerMark McLoughlin <markmc@src.gnome.org>2004-04-05 19:14:33 +0000
commit02b3061dbb1363f541f9d3f04fb9ad9db76c545e (patch)
tree59a7cd73c9b8a74656a7e63b279d382b8c635844
parent5b0be05edb20a7f9c16de22f0b25d10343947a4b (diff)
downloadgconf-02b3061dbb1363f541f9d3f04fb9ad9db76c545e.tar.gz
Revert the --dump behaviour change (not dumping schema defaults). The
2004-04-05 Mark McLoughlin <mark@skynet.ie> Revert the --dump behaviour change (not dumping schema defaults). The --ignore-schema-defaults argument on HEAD must be used to get that effect now. * gconf/gconftool.c: (dump_entries_in_dir): always dump the value even if it is the schema default.
-rw-r--r--ChangeLog9
-rw-r--r--gconf/gconftool.c3
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4a3c4c70..4265f6e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-04-05 Mark McLoughlin <mark@skynet.ie>
+
+ Revert the --dump behaviour change (not dumping schema defaults).
+ The --ignore-schema-defaults argument on HEAD must be used to
+ get that effect now.
+
+ * gconf/gconftool.c: (dump_entries_in_dir): always dump the value
+ even if it is the schema default.
+
2004-04-02 Mark McLoughlin <mark@skynet.ie>
* gconf/gconftool.c: (set_values), (process_entry): handle
diff --git a/gconf/gconftool.c b/gconf/gconftool.c
index 9e13e83c..11787a44 100644
--- a/gconf/gconftool.c
+++ b/gconf/gconftool.c
@@ -1497,8 +1497,7 @@ dump_entries_in_dir(GConfEngine* conf, const gchar* dir, const gchar* base_dir)
g_print (" <schema_key>%s</schema_key>\n",
get_key_relative(gconf_entry_get_schema_name(entry), base_dir));
- /* don't print the value if its just the schema default */
- if (entry->value && !gconf_entry_get_is_default(entry))
+ if (entry->value)
print_value_in_xml(entry->value, 6);
g_print (" </entry>\n");