From 45f9353164c3aaad5dc826c5f0bee6d0e9f6916d Mon Sep 17 00:00:00 2001
From: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
Date: Fri, 2 Aug 2019 14:05:21 +0000
Subject: [PATCH] geometry: Use default outline by default

---
 data/keyboards/geometry/compact.xml | 58 ++++++++++++++---------------
 eek/eek-xml-layout.c                |  6 +--
 2 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/data/keyboards/geometry/compact.xml b/data/keyboards/geometry/compact.xml
index 8d76c4a2..a1f8f58a 100644
--- a/data/keyboards/geometry/compact.xml
+++ b/data/keyboards/geometry/compact.xml
@@ -2,48 +2,48 @@
 <geometry version="0.90">
   <bounds x="10" y="10" width="410.0000" height="229"/>
   <section angle="0">
-      <key name="AD01" oref="outline2" />
-      <key name="AD02" oref="outline2" />
-      <key name="AD03" oref="outline2" />
-      <key name="AD04" oref="outline2" />
-      <key name="AD05" oref="outline2" />
-      <key name="AD06" oref="outline2" />
-      <key name="AD07" oref="outline2" />
-      <key name="AD08" oref="outline2" />
-      <key name="AD09" oref="outline2" />
-      <key name="AD10" oref="outline2" />
+      <key name="AD01" />
+      <key name="AD02" />
+      <key name="AD03" />
+      <key name="AD04" />
+      <key name="AD05" />
+      <key name="AD06" />
+      <key name="AD07" />
+      <key name="AD08" />
+      <key name="AD09" />
+      <key name="AD10" />
   </section>
   <section angle="0">
-      <key name="AC01" oref="outline2" />
-      <key name="AC02" oref="outline2" />
-      <key name="AC03" oref="outline2" />
-      <key name="AC04" oref="outline2" />
-      <key name="AC05" oref="outline2" />
-      <key name="AC06" oref="outline2" />
-      <key name="AC07" oref="outline2" />
-      <key name="AC08" oref="outline2" />
-      <key name="AC09" oref="outline2" />
-      <key name="AC10" oref="outline2" />
+      <key name="AC01" />
+      <key name="AC02" />
+      <key name="AC03" />
+      <key name="AC04" />
+      <key name="AC05" />
+      <key name="AC06" />
+      <key name="AC07" />
+      <key name="AC08" />
+      <key name="AC09" />
+      <key name="AC10" />
   </section>
   <section angle="0">
       <key name="LFSH" oref="altline" />
-      <key name="AB01" oref="outline2" />
-      <key name="AB02" oref="outline2" />
-      <key name="AB03" oref="outline2" />
-      <key name="AB04" oref="outline2" />
-      <key name="AB05" oref="outline2" />
-      <key name="AB06" oref="outline2" />
-      <key name="AB07" oref="outline2" />
+      <key name="AB01" />
+      <key name="AB02" />
+      <key name="AB03" />
+      <key name="AB04" />
+      <key name="AB05" />
+      <key name="AB06" />
+      <key name="AB07" />
       <key name="BKSP" oref="altline" />
   </section>
   <section angle="0">
       <key keycode="0" name="ABC123" oref="altline" />
       <key name="I149" oref="altline" />
       <key name="SPCE" oref="spaceline" />
-      <key name="AB08" oref="outline2" />
+      <key name="AB08" />
       <key name="RTRN" oref="outline7" />
   </section>
-  <outline id="outline2" corner-radius="1.000000">
+  <outline id="default" corner-radius="1.000000">
     <point x="0.000000" y="0.000000"/>
     <point x="37.46341" y="0.000000"/>
     <point x="37.46341" y="52"/>
diff --git a/eek/eek-xml-layout.c b/eek/eek-xml-layout.c
index 69339e28..25f0dabc 100644
--- a/eek/eek-xml-layout.c
+++ b/eek/eek-xml-layout.c
@@ -417,11 +417,7 @@ geometry_start_element_callback (GMarkupParseContext *pcontext,
         attribute = get_attribute (attribute_names, attribute_values,
                                    "oref");
         if (attribute == NULL) {
-            g_set_error (error,
-                         G_MARKUP_ERROR,
-                         G_MARKUP_ERROR_MISSING_ATTRIBUTE,
-                         "no \"oref\" attribute for \"key\"");
-            return;
+            attribute = g_strdup("default");
         }
         g_hash_table_insert (data->key_oref_hash,
                              data->key,