[dconf-editor] Rework conflicting schemas.

[Arnaud Bonatti <arnaudb src gnome org>]

commit f9ee177a41ce001ae508ae8467ebc0fce533919a
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Wed Jan 24 09:17:48 2018 +0100

    Rework conflicting schemas.

 editor/ca.desrt.dconf-editor.gschema.xml |   60 +++++++++++++++---------------
 1 files changed, 30 insertions(+), 30 deletions(-)
---
diff --git a/editor/ca.desrt.dconf-editor.gschema.xml b/editor/ca.desrt.dconf-editor.gschema.xml
index 86fb1d7..d4f6f22 100644
--- a/editor/ca.desrt.dconf-editor.gschema.xml
+++ b/editor/ca.desrt.dconf-editor.gschema.xml
@@ -361,47 +361,47 @@ If you are not interacting with D-Bus, then there is no reason to make use of th
     </key>
   </schema>
   <schema id="ca.desrt.dconf-editor.Demo.Conflict1" path="/ca/desrt/dconf-editor/Demo/Conflict/">
-    <key name="hard-conflicting-key" type="i">
-      <default>0</default>
-      <summary>An integer conflicting key that should give a error</summary>
-      <description>This key is a test for multiple schemas in the same path with hard-conflicting keys. 
Hard-conflicting keys should not be editable, since that could confuse the backend.</description>
-    </key>
-    <key name="conflicting-key" type="s">
-      <default>''</default>
-      <summary>First conflicting key that should give a warning</summary>
-      <description>This key is a test for multiple schemas in the same path with conflicting keys. It can be 
edited, since the types are compatible, but it is still an issue.</description>
-    </key>
-    <key name="conflicting-key-2" type="s">
-      <default>'bla1'</default>
-      <summary>First conflicting key that should give a warning</summary>
-      <description>This key is a test for multiple schemas in the same path with conflicting keys. It can be 
edited, since the types are compatible, but it is still an issue.</description>
-    </key>
     <key name="a-non-conflicting-key" type="i">
       <default>0</default>
-      <summary>A normal non-conflicting key</summary>
+      <summary>A normal non-conflicting key from Conflict1</summary>
       <description>This key is a test for multiple schemas in the same path with conflicting keys. 
Non-conflicting keys should have no issues.</description>
     </key>
-  </schema>
-  <schema id="ca.desrt.dconf-editor.Demo.Conflict2" path="/ca/desrt/dconf-editor/Demo/Conflict/">
-    <key name="hard-conflicting-key" type="b">
-      <default>false</default>
-      <summary>A boolean conflicting key that should give an error</summary>
-      <description>This key is a test for multiple schemas in the same path with hard-conflicting keys. 
Hard-conflicting keys should not be editable, since that could confuse the backend.</description>
+    <key name="default-value-conflict" type="i">
+      <default>1</default>
+      <summary>Conflicting key defaulting to “1” that should give an error</summary>
+      <description>This key is a test for multiple schemas in the same path with conflicting keys. It 
shouldn’t be editable as a key mapped to the same path has a different default value.</description>
     </key>
-    <key name="conflicting-key" type="s">
-      <default>''</default>
-      <summary>Second conflicting key that should give a warning</summary>
-      <description>This key is a test for multiple schemas in the same path with conflicting keys. It can be 
edited, since the types are compatible, but it is still an issue.</description>
+    <key name="type-conflict" type="s">
+      <default>'test'</default>
+      <summary>A (simple) string conflicting key that should give a error</summary>
+      <description>This key is a test for multiple schemas in the same path with conflicting keys. It 
shouldn’t be editable as a key mapped to the same path has a different type.</description>
     </key>
-    <key name="conflicting-key-2" type="s">
-      <default>'bla2'</default>
-      <summary>Second conflicting key that should give a warning</summary>
+    <key name="warning-similar" type="s">
+      <default>''</default>
+      <summary>Conflicting key from Conflict1 that should give a warning</summary>
       <description>This key is a test for multiple schemas in the same path with conflicting keys. It can be 
edited, since the types are compatible, but it is still an issue.</description>
     </key>
+  </schema>
+  <schema id="ca.desrt.dconf-editor.Demo.Conflict2" path="/ca/desrt/dconf-editor/Demo/Conflict/">
     <key name="another-non-conflicting-key" type="i">
       <default>0</default>
-      <summary>A normal non-conflicting key</summary>
+      <summary>A normal non-conflicting key from Conflict2</summary>
       <description>This key is a test for multiple schemas in the same path with conflicting keys. 
Non-conflicting keys should have no issues.</description>
     </key>
+    <key name="default-value-conflict" type="i">
+      <default>2</default>
+      <summary>Conflicting key defaulting to “2” that should give an error</summary>
+      <description>This key is a test for multiple schemas in the same path with conflicting keys. It 
shouldn’t be editable as a key mapped to the same path has a different default value.</description>
+    </key>
+    <key name="type-conflict" type="ms">
+      <default>'test'</default>
+      <summary>A nullable-string conflicting key that should give an error</summary>
+      <description>This key is a test for multiple schemas in the same path with conflicting keys. It 
shouldn’t be editable as a key mapped to the same path has a different type.</description>
+    </key>
+    <key name="warning-similar" type="s">
+      <default>''</default>
+      <summary>Conflicting key from Conflict2 that should give a warning</summary>
+      <description>This key is a test for multiple schemas in the same path with conflicting keys. It can be 
edited, since the types are compatible, but it is still an issue.</description>
+    </key>
   </schema>
 </schemalist>