summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Untz <vuntz@gnome.org>2010-07-07 23:02:26 +0200
committerVincent Untz <vuntz@gnome.org>2010-07-07 23:02:26 +0200
commit7dd9d7e1e05b16be5284781423501dddf2182073 (patch)
tree44a5395fcae2474c8251081f3f35747e80c17203
parent082d26d93c473a96cbf314b4a7259c625c5778f4 (diff)
downloadgconf-7dd9d7e1e05b16be5284781423501dddf2182073.tar.gz
[gsettings] Convert to xml schema format by default
-rwxr-xr-xgsettings/gsettings-schema-convert2
-rw-r--r--gsettings/gsettings-schema-convert.xml9
2 files changed, 5 insertions, 6 deletions
diff --git a/gsettings/gsettings-schema-convert b/gsettings/gsettings-schema-convert
index 30df1b97..a60dc35f 100755
--- a/gsettings/gsettings-schema-convert
+++ b/gsettings/gsettings-schema-convert
@@ -1091,7 +1091,7 @@ def main(args):
if options.gconf:
if not options.simple and not options.xml:
- options.simple = True
+ options.xml = True
try:
parser = GConfSchemaParser(argfile, options.gettext_domain, options.schema_id, options.keep_underscores)
diff --git a/gsettings/gsettings-schema-convert.xml b/gsettings/gsettings-schema-convert.xml
index 77ac55c4..0283b5b5 100644
--- a/gsettings/gsettings-schema-convert.xml
+++ b/gsettings/gsettings-schema-convert.xml
@@ -65,8 +65,9 @@ The input file is a GConf schema.
<varlistentry>
<term><option>-s</option>, <option>--simple</option></term>
<listitem><para>
-The input file is a simple GSettings schema. If the input
-format is not explicitly specified, this is the default.
+Produce a GSettings schema in simple format. The simple format
+is easier to edit and can be converted into the XML format with
+<command>gsettings-schema-convert</command> later on.
</para></listitem>
</varlistentry>
@@ -74,9 +75,7 @@ format is not explicitly specified, this is the default.
<term><option>-x</option>, <option>--xml</option></term>
<listitem><para>
Produce a GSettings schema in XML format. If the output format
-is not explicitly specified, a GConf schema will be converted
-into a simple Gsettings schema, and a simple GSettings schema
-will be converted into XML.
+is not explicitly specified, this is the default.
</para></listitem>
</varlistentry>