From de1c1c49f6f84afe5f0b0c1d8d445fbd8e89997a Mon Sep 17 00:00:00 2001
From: Thomas White <taw@bitwiz.me.uk>
Date: Mon, 15 Apr 2019 23:23:42 +0200
Subject: Make it compile

---
 data/stylesheeteditor.ui | 42 +++++++++++++++++++++---------------------
 src/narrative_window.c   |  2 +-
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/data/stylesheeteditor.ui b/data/stylesheeteditor.ui
index dba28b5..1e0c0b8 100644
--- a/data/stylesheeteditor.ui
+++ b/data/stylesheeteditor.ui
@@ -129,7 +129,7 @@
             <property name="orientation">vertical</property>
             <property name="spacing">8</property>
             <child>
-              <object class="GtkComboBox" id="element_selector">
+              <object class="GtkComboBox" id="selector">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="model">element_tree</property>
@@ -217,7 +217,7 @@
                             <property name="can_focus">True</property>
                             <property name="text" translatable="yes">0</property>
                             <property name="adjustment">adjustment19</property>
-                            <signal name="value-changed" handler="furniture_dims_sig" swapped="no"/>
+                            <signal name="value-changed" handler="dims_sig" swapped="no"/>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -230,7 +230,7 @@
                             <property name="can_focus">True</property>
                             <property name="text" translatable="yes">0</property>
                             <property name="adjustment">adjustment20</property>
-                            <signal name="value-changed" handler="furniture_dims_sig" swapped="no"/>
+                            <signal name="value-changed" handler="dims_sig" swapped="no"/>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -243,7 +243,7 @@
                             <property name="can_focus">True</property>
                             <property name="text" translatable="yes">0</property>
                             <property name="adjustment">adjustment21</property>
-                            <signal name="value-changed" handler="furniture_dims_sig" swapped="no"/>
+                            <signal name="value-changed" handler="dims_sig" swapped="no"/>
                           </object>
                           <packing>
                             <property name="left_attach">4</property>
@@ -256,7 +256,7 @@
                             <property name="can_focus">True</property>
                             <property name="text" translatable="yes">0</property>
                             <property name="adjustment">adjustment22</property>
-                            <signal name="value-changed" handler="furniture_dims_sig" swapped="no"/>
+                            <signal name="value-changed" handler="dims_sig" swapped="no"/>
                           </object>
                           <packing>
                             <property name="left_attach">4</property>
@@ -272,7 +272,7 @@
                               <item id="percent" translatable="yes">% slide</item>
                               <item id="units" translatable="yes">units</item>
                             </items>
-                            <signal name="changed" handler="furniture_dims_sig" swapped="no"/>
+                            <signal name="changed" handler="dims_sig" swapped="no"/>
                           </object>
                           <packing>
                             <property name="left_attach">5</property>
@@ -288,7 +288,7 @@
                               <item id="percent" translatable="yes">% slide</item>
                               <item id="units" translatable="yes">units</item>
                             </items>
-                            <signal name="changed" handler="furniture_dims_sig" swapped="no"/>
+                            <signal name="changed" handler="dims_sig" swapped="no"/>
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
@@ -344,7 +344,7 @@
                     <property name="receives_default">True</property>
                     <property name="font">Sans 12</property>
                     <property name="preview_text">Preview text</property>
-                    <signal name="font-set" handler="furniture_font_sig" swapped="no"/>
+                    <signal name="font-set" handler="font_sig" swapped="no"/>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -359,7 +359,7 @@
                     <property name="receives_default">True</property>
                     <property name="use_alpha">True</property>
                     <property name="title" translatable="yes">Foreground colour</property>
-                    <signal name="color-set" handler="furniture_fgcol_sig" swapped="no"/>
+                    <signal name="color-set" handler="fgcol_sig" swapped="no"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -401,7 +401,7 @@
                       <item id="horiz" translatable="yes">Horizontal gradient</item>
                       <item id="vert" translatable="yes">Vertical gradient</item>
                     </items>
-                    <signal name="changed" handler="furniture_bg_sig" swapped="no"/>
+                    <signal name="changed" handler="bg_sig" swapped="no"/>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -416,7 +416,7 @@
                     <property name="receives_default">True</property>
                     <property name="use_alpha">True</property>
                     <property name="title" translatable="yes">Background first colour</property>
-                    <signal name="color-set" handler="furniture_bg_sig" swapped="no"/>
+                    <signal name="color-set" handler="bg_sig" swapped="no"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -431,7 +431,7 @@
                     <property name="receives_default">True</property>
                     <property name="use_alpha">True</property>
                     <property name="title" translatable="yes">Background second colour</property>
-                    <signal name="color-set" handler="furniture_bg_sig" swapped="no"/>
+                    <signal name="color-set" handler="bg_sig" swapped="no"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -475,7 +475,7 @@
                       <item id="center" translatable="yes">Center</item>
                       <item id="right" translatable="yes">Right</item>
                     </items>
-                    <signal name="changed" handler="furniture_alignment_sig" swapped="no"/>
+                    <signal name="changed" handler="alignment_sig" swapped="no"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -568,7 +568,7 @@
                             <property name="can_focus">True</property>
                             <property name="text" translatable="yes">0</property>
                             <property name="adjustment">adjustment23</property>
-                            <signal name="value-changed" handler="furniture_padding_sig" swapped="no"/>
+                            <signal name="value-changed" handler="padding_sig" swapped="no"/>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -581,7 +581,7 @@
                             <property name="can_focus">True</property>
                             <property name="text" translatable="yes">0</property>
                             <property name="adjustment">adjustment24</property>
-                            <signal name="value-changed" handler="furniture_padding_sig" swapped="no"/>
+                            <signal name="value-changed" handler="padding_sig" swapped="no"/>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -594,7 +594,7 @@
                             <property name="can_focus">True</property>
                             <property name="text" translatable="yes">0</property>
                             <property name="adjustment">adjustment25</property>
-                            <signal name="value-changed" handler="furniture_padding_sig" swapped="no"/>
+                            <signal name="value-changed" handler="padding_sig" swapped="no"/>
                           </object>
                           <packing>
                             <property name="left_attach">3</property>
@@ -607,7 +607,7 @@
                             <property name="can_focus">True</property>
                             <property name="text" translatable="yes">0</property>
                             <property name="adjustment">adjustment26</property>
-                            <signal name="value-changed" handler="furniture_padding_sig" swapped="no"/>
+                            <signal name="value-changed" handler="padding_sig" swapped="no"/>
                           </object>
                           <packing>
                             <property name="left_attach">3</property>
@@ -704,7 +704,7 @@
                         <property name="can_focus">True</property>
                         <property name="text" translatable="yes">0</property>
                         <property name="adjustment">adjustment27</property>
-                        <signal name="value-changed" handler="furniture_paraspace_sig" swapped="no"/>
+                        <signal name="value-changed" handler="paraspace_sig" swapped="no"/>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -717,7 +717,7 @@
                         <property name="can_focus">True</property>
                         <property name="text" translatable="yes">0</property>
                         <property name="adjustment">adjustment28</property>
-                        <signal name="value-changed" handler="furniture_paraspace_sig" swapped="no"/>
+                        <signal name="value-changed" handler="paraspace_sig" swapped="no"/>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -730,7 +730,7 @@
                         <property name="can_focus">True</property>
                         <property name="text" translatable="yes">0</property>
                         <property name="adjustment">adjustment29</property>
-                        <signal name="value-changed" handler="furniture_paraspace_sig" swapped="no"/>
+                        <signal name="value-changed" handler="paraspace_sig" swapped="no"/>
                       </object>
                       <packing>
                         <property name="left_attach">3</property>
@@ -743,7 +743,7 @@
                         <property name="can_focus">True</property>
                         <property name="text" translatable="yes">0</property>
                         <property name="adjustment">adjustment30</property>
-                        <signal name="value-changed" handler="furniture_paraspace_sig" swapped="no"/>
+                        <signal name="value-changed" handler="paraspace_sig" swapped="no"/>
                       </object>
                       <packing>
                         <property name="left_attach">3</property>
diff --git a/src/narrative_window.c b/src/narrative_window.c
index f8d9127..6bf6acf 100644
--- a/src/narrative_window.c
+++ b/src/narrative_window.c
@@ -274,7 +274,7 @@ static void edit_ss_sig(GSimpleAction *action, GVariant *parameter,
 	NarrativeWindow *nw = vp;
 	StylesheetEditor *se;
 
-	se = stylesheet_editor_new(nw->n);
+	se = stylesheet_editor_new(narrative_get_stylesheet(nw->n));
 	gtk_window_set_transient_for(GTK_WINDOW(se), GTK_WINDOW(nw->window));
 	g_signal_connect(G_OBJECT(se), "changed",
 	                 G_CALLBACK(stylesheet_changed_sig), nw);
-- 
cgit v1.2.3