[dconf-editor] Add conflicting schemas.

[Arnaud Bonatti <arnaudb src gnome org>]

commit 8e4289d07cf0ccf252b95017f069c25351a5ba32
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Mon Jan 22 04:18:28 2018 +0100

    Add conflicting schemas.
    
    Extracted (with typos corrected) from Davi’s patchset.
    https://bugzilla.gnome.org/show_bug.cgi?id=791782#c5

 editor/ca.desrt.dconf-editor.gschema.xml |   46 ++++++++++++++++++++++++++++++
 1 files changed, 46 insertions(+), 0 deletions(-)
---
diff --git a/editor/ca.desrt.dconf-editor.gschema.xml b/editor/ca.desrt.dconf-editor.gschema.xml
index 657f3af..88f755e 100644
--- a/editor/ca.desrt.dconf-editor.gschema.xml
+++ b/editor/ca.desrt.dconf-editor.gschema.xml
@@ -202,6 +202,8 @@
     <value value="0" nick="only-choice"/>
   </enum>
   <schema id="ca.desrt.dconf-editor.Demo" path="/ca/desrt/dconf-editor/Demo/">
+    <child schema="ca.desrt.dconf-editor.Demo.Conflict1" name="conflict1"/>
+    <child schema="ca.desrt.dconf-editor.Demo.Conflict2" name="conflict2"/>
     <key name="boolean" type="b">
       <default>true</default>
       <summary>A boolean, type ‘b’</summary>
@@ -356,4 +358,48 @@ If you are not interacting with D-Bus, then there is no reason to make use of th
       <description>Flags could be set by the “enum” attribute.</description>
     </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>
+      <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>
+    <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>
+    <key name="conflicting-key-2" type="s">
+      <default>'bla2'</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>
+    <key name="another-non-conflicting-key" type="i">
+      <default>0</default>
+      <summary>A normal non-conflicting key</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>
 </schemalist>