[dia/zbrown/test-build: 1/6] ui: fixup ui files

[Zander Brown <zbrown src gnome org>]

commit fcfe84e944eafa01a9b78ce877f46937a4f9967f
Author: Zander Brown <zbrown gnome org>
Date:   Thu Sep 23 20:34:57 2021 +0100

    ui: fixup ui files
    
    We missed a couple colour selectors
    
    `has-separator` is gone in gtk3, probably didn't want it anyway

 data/ui/preferences-dialog.ui   | 8 ++++----
 data/ui/properties-dialog.ui    | 8 ++++----
 data/ui/sheets-edit-dialog.ui   | 1 -
 data/ui/sheets-new-dialog.ui    | 1 -
 data/ui/sheets-remove-dialog.ui | 1 -
 5 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/data/ui/preferences-dialog.ui b/data/ui/preferences-dialog.ui
index d9825035c..f892ef9e0 100644
--- a/data/ui/preferences-dialog.ui
+++ b/data/ui/preferences-dialog.ui
@@ -588,7 +588,7 @@
               </packing>
             </child>
             <child>
-              <object class="DiaColorSelector" id="dd_background">
+              <object class="DiaColourSelector" id="dd_background">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <signal name="value-changed" handler="dd_background_changed" swapped="no"/>
@@ -885,7 +885,7 @@
               </packing>
             </child>
             <child>
-              <object class="DiaColorSelector" id="vd_guide_colour">
+              <object class="DiaColourSelector" id="vd_guide_colour">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <signal name="value-changed" handler="vd_guide_colour_changed" swapped="no"/>
@@ -900,7 +900,7 @@
               </packing>
             </child>
             <child>
-              <object class="DiaColorSelector" id="vd_pb_colour">
+              <object class="DiaColourSelector" id="vd_pb_colour">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <signal name="value-changed" handler="vd_pb_colour_changed" swapped="no"/>
@@ -1532,7 +1532,7 @@
               </packing>
             </child>
             <child>
-              <object class="DiaColorSelector" id="gl_color">
+              <object class="DiaColourSelector" id="gl_color">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <signal name="value-changed" handler="gl_color_changed" swapped="no"/>
diff --git a/data/ui/properties-dialog.ui b/data/ui/properties-dialog.ui
index 96fe24d05..fd873ddcd 100644
--- a/data/ui/properties-dialog.ui
+++ b/data/ui/properties-dialog.ui
@@ -378,7 +378,7 @@
           </packing>
         </child>
         <child>
-          <object class="DiaColorSelector" id="background">
+          <object class="DiaColourSelector" id="background">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -390,7 +390,7 @@
           </packing>
         </child>
         <child>
-          <object class="DiaColorSelector" id="grid_lines">
+          <object class="DiaColourSelector" id="grid_lines">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -404,7 +404,7 @@
           </packing>
         </child>
         <child>
-          <object class="DiaColorSelector" id="page_lines">
+          <object class="DiaColourSelector" id="page_lines">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -418,7 +418,7 @@
           </packing>
         </child>
         <child>
-          <object class="DiaColorSelector" id="guide_lines">
+          <object class="DiaColourSelector" id="guide_lines">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
diff --git a/data/ui/sheets-edit-dialog.ui b/data/ui/sheets-edit-dialog.ui
index 11b1e17a1..d70431439 100644
--- a/data/ui/sheets-edit-dialog.ui
+++ b/data/ui/sheets-edit-dialog.ui
@@ -15,7 +15,6 @@
     <property name="skip_pager_hint">False</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-    <property name="has_separator">True</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog_vbox3">
         <property name="visible">True</property>
diff --git a/data/ui/sheets-new-dialog.ui b/data/ui/sheets-new-dialog.ui
index 587d98efa..d3cc7bc6f 100644
--- a/data/ui/sheets-new-dialog.ui
+++ b/data/ui/sheets-new-dialog.ui
@@ -14,7 +14,6 @@
     <property name="skip_pager_hint">False</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-    <property name="has_separator">True</property>
     <child internal-child="vbox">
     <object class="GtkVBox" id="dialog_vbox2">
       <property name="visible">True</property>
diff --git a/data/ui/sheets-remove-dialog.ui b/data/ui/sheets-remove-dialog.ui
index bddd3d79e..35756e57c 100644
--- a/data/ui/sheets-remove-dialog.ui
+++ b/data/ui/sheets-remove-dialog.ui
@@ -14,7 +14,6 @@
     <property name="skip_pager_hint">False</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-    <property name="has_separator">True</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog_vbox4">
         <property name="visible">True</property>