From cfcca335b1c8c1abc0f0f74786845a0bc94bda98 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri, 5 Apr 2019 00:08:18 +0100
Subject: [PATCH] Update GtkGrid definitions in GtkBuilder files

Convert packing properties to layout ones.
---
 gtk/ui/gtkaboutdialog.ui         |   1 +
 gtk/ui/gtkappchooserdialog.ui    |   1 +
 gtk/ui/gtkappchooserwidget.ui    |   1 +
 gtk/ui/gtkapplication-quartz.ui  |   1 +
 gtk/ui/gtkassistant.ui           |   1 +
 gtk/ui/gtkcolorchooserdialog.ui  |   1 +
 gtk/ui/gtkcoloreditor.ui         | 117 +++++-----
 gtk/ui/gtkcombobox.ui            |   1 +
 gtk/ui/gtkdialog.ui              |   1 +
 gtk/ui/gtkemojichooser.ui        |  25 +-
 gtk/ui/gtkemojicompletion.ui     |   1 +
 gtk/ui/gtkfilechooserdialog.ui   |   1 +
 gtk/ui/gtkfilechooserwidget.ui   |  95 ++++----
 gtk/ui/gtkfontchooserdialog.ui   |   1 +
 gtk/ui/gtkfontchooserwidget.ui   | 101 ++++----
 gtk/ui/gtkinfobar.ui             |   1 +
 gtk/ui/gtklockbutton.ui          |   1 +
 gtk/ui/gtkmediacontrols.ui       |   1 +
 gtk/ui/gtkmessagedialog.ui       |   1 +
 gtk/ui/gtkpagesetupunixdialog.ui |  87 +++----
 gtk/ui/gtkpathbar.ui             |   1 +
 gtk/ui/gtkplacesview.ui          |  17 +-
 gtk/ui/gtkplacesviewrow.ui       |   1 +
 gtk/ui/gtkprintunixdialog.ui     | 385 ++++++++++++++++---------------
 gtk/ui/gtkscalebutton.ui         |   1 +
 gtk/ui/gtksidebarrow.ui          |   1 +
 gtk/ui/gtkstatusbar.ui           |   1 +
 gtk/ui/gtktooltipwindow.ui       |   1 +
 gtk/ui/gtkvolumebutton.ui        |   1 +
 29 files changed, 442 insertions(+), 407 deletions(-)

diff --git a/gtk/ui/gtkaboutdialog.ui b/gtk/ui/gtkaboutdialog.ui
index 3d4996fa45..e339138a8a 100644
--- a/gtk/ui/gtkaboutdialog.ui
+++ b/gtk/ui/gtkaboutdialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkAboutDialog" parent="GtkDialog">
     <property name="resizable">0</property>
diff --git a/gtk/ui/gtkappchooserdialog.ui b/gtk/ui/gtkappchooserdialog.ui
index e309422f76..c04757ec03 100644
--- a/gtk/ui/gtkappchooserdialog.ui
+++ b/gtk/ui/gtkappchooserdialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkAppChooserDialog" parent="GtkDialog">
     <property name="title" translatable="yes">Select Application</property>
diff --git a/gtk/ui/gtkappchooserwidget.ui b/gtk/ui/gtkappchooserwidget.ui
index d23a402ca8..a87ec7b343 100644
--- a/gtk/ui/gtkappchooserwidget.ui
+++ b/gtk/ui/gtkappchooserwidget.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GtkListStore" id="program_list_store">
     <columns>
diff --git a/gtk/ui/gtkapplication-quartz.ui b/gtk/ui/gtkapplication-quartz.ui
index 42fc3127b2..e41df2d337 100644
--- a/gtk/ui/gtkapplication-quartz.ui
+++ b/gtk/ui/gtkapplication-quartz.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <menu id="app-menu">
     <section>
diff --git a/gtk/ui/gtkassistant.ui b/gtk/ui/gtkassistant.ui
index f39fbf494b..d3f760e2e1 100644
--- a/gtk/ui/gtkassistant.ui
+++ b/gtk/ui/gtkassistant.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkAssistant" parent="GtkWindow">
     <child type="titlebar">
diff --git a/gtk/ui/gtkcolorchooserdialog.ui b/gtk/ui/gtkcolorchooserdialog.ui
index 7eb0d14636..767e3bdb41 100644
--- a/gtk/ui/gtkcolorchooserdialog.ui
+++ b/gtk/ui/gtkcolorchooserdialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkColorChooserDialog" parent="GtkDialog">
     <property name="title" translatable="yes">Select a Color</property>
diff --git a/gtk/ui/gtkcoloreditor.ui b/gtk/ui/gtkcoloreditor.ui
index fb650a34d8..2b24dbfd0e 100644
--- a/gtk/ui/gtkcoloreditor.ui
+++ b/gtk/ui/gtkcoloreditor.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GtkAdjustment" id="a_adj">
     <property name="upper">1</property>
@@ -44,11 +45,11 @@
                 <style>
                   <class name="circular"/>
                 </style>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkColorSwatch" id="swatch">
@@ -57,11 +58,11 @@
                 <property name="rgba">rgb(255,255,255)</property>
                 <property name="selectable">False</property>
                 <property name="has-menu">False</property>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkEntry" id="entry">
@@ -74,11 +75,11 @@
                 <signal name="activate" handler="entry_apply" swapped="no"/>
                 <signal name="notify::has-focus" handler="entry_focus_changed" swapped="no"/>
                 <signal name="notify::text" handler="entry_text_changed" swapped="no"/>
+                <layout>
+                  <property name="left-attach">2</property>
+                  <property name="top-attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkColorScale" id="h_slider">
@@ -88,11 +89,11 @@
                 <property name="draw-value">False</property>
                 <property name="has-origin">False</property>
                 <signal name="popup-menu" handler="popup_edit" swapped="no"/>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkColorScale" id="a_slider">
@@ -105,12 +106,12 @@
                   <class name="marks-before"/>
                 </style>
                 <signal name="popup-menu" handler="popup_edit" swapped="no"/>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">2</property>
+                  <property name="column-span">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">2</property>
-                <property name="width">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkColorPlane" id="sv_plane">
@@ -121,12 +122,12 @@
                 <property name="s-adjustment">s_adj</property>
                 <property name="v-adjustment">v_adj</property>
                 <signal name="popup-menu" handler="popup_edit" swapped="no"/>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">1</property>
+                  <property name="column-span">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">1</property>
-                <property name="width">2</property>
-              </packing>
             </child>
           </object>
         </child>
@@ -149,11 +150,11 @@
         <child>
           <object class="GtkLabel" id="label4">
             <property name="label" translatable="yes" context="Color channel">A</property>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSpinButton" id="a_entry">
@@ -166,11 +167,11 @@
                 <property name="AtkObject::accessible-name" translatable="yes">Alpha</property>
               </object>
             </child>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
       </object>
     </child>
@@ -191,11 +192,11 @@
         <child>
           <object class="GtkLabel" id="label3">
             <property name="label" translatable="yes" context="Color channel">H</property>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSpinButton" id="h_entry">
@@ -208,11 +209,11 @@
                 <property name="AtkObject::accessible-name" translatable="yes">Hue</property>
               </object>
             </child>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
       </object>
     </child>
@@ -234,20 +235,20 @@
         <child>
           <object class="GtkLabel" id="label1">
             <property name="label" translatable="yes" context="Color Channel">S</property>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
             <property name="label" translatable="yes" context="Color Channel">V</property>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSpinButton" id="s_entry">
@@ -260,11 +261,11 @@
                 <property name="AtkObject::accessible-name" translatable="yes">Saturation</property>
               </object>
             </child>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSpinButton" id="v_entry">
@@ -277,11 +278,11 @@
                 <property name="AtkObject::accessible-name" translatable="yes">Value</property>
               </object>
             </child>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/gtk/ui/gtkcombobox.ui b/gtk/ui/gtkcombobox.ui
index 9cd3b3d735..41b5754b75 100644
--- a/gtk/ui/gtkcombobox.ui
+++ b/gtk/ui/gtkcombobox.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkComboBox" parent="GtkBin">
     <child>
diff --git a/gtk/ui/gtkdialog.ui b/gtk/ui/gtkdialog.ui
index 33d768e86a..9c83c84207 100644
--- a/gtk/ui/gtkdialog.ui
+++ b/gtk/ui/gtkdialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkDialog" parent="GtkWindow">
     <property name="window-position">center-on-parent</property>
diff --git a/gtk/ui/gtkemojichooser.ui b/gtk/ui/gtkemojichooser.ui
index dfa5357f49..1f7a2e9485 100644
--- a/gtk/ui/gtkemojichooser.ui
+++ b/gtk/ui/gtkemojichooser.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkEmojiChooser" parent="GtkPopover">
     <style>
@@ -309,11 +310,11 @@
                         <style>
                           <class name="dim-label"/>
                         </style>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">0</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel">
@@ -322,11 +323,11 @@
                           <attribute name="weight" value="bold"></attribute>
                           <attribute name="scale" value="1.44"></attribute>
                         </attributes>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">1</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">1</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel">
@@ -334,11 +335,11 @@
                         <style>
                           <class name="dim-label"/>
                         </style>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">2</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">2</property>
-                      </packing>
                     </child>
                   </object>
                 </property>
diff --git a/gtk/ui/gtkemojicompletion.ui b/gtk/ui/gtkemojicompletion.ui
index 964b4bf26c..0abdb7742a 100644
--- a/gtk/ui/gtkemojicompletion.ui
+++ b/gtk/ui/gtkemojicompletion.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkEmojiCompletion" parent="GtkPopover">
     <property name="modal">0</property>
diff --git a/gtk/ui/gtkfilechooserdialog.ui b/gtk/ui/gtkfilechooserdialog.ui
index f8b454e90d..4434b186de 100644
--- a/gtk/ui/gtkfilechooserdialog.ui
+++ b/gtk/ui/gtkfilechooserdialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkFileChooserDialog" parent="GtkDialog">
     <property name="type-hint">dialog</property>
diff --git a/gtk/ui/gtkfilechooserwidget.ui b/gtk/ui/gtkfilechooserwidget.ui
index 84ea0e9f98..9ea493cec9 100644
--- a/gtk/ui/gtkfilechooserwidget.ui
+++ b/gtk/ui/gtkfilechooserwidget.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkFileChooserWidget" parent="GtkWidget">
     <child>
@@ -284,11 +285,11 @@
                                         <style>
                                           <class name="dim-label"/>
                                         </style>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">0</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">0</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel">
@@ -297,11 +298,11 @@
                                           <attribute name="weight" value="bold"></attribute>
                                           <attribute name="scale" value="1.44"></attribute>
                                         </attributes>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">1</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">1</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel">
@@ -309,11 +310,11 @@
                                         <style>
                                           <class name="dim-label"/>
                                         </style>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">2</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">2</property>
-                                      </packing>
                                     </child>
                                   </object>
                                 </property>
@@ -389,10 +390,10 @@
             <attributes>
               <attribute name="weight" value="bold"></attribute>
             </attributes>
+            <layout>
+              <property name="column-span">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="width">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkEntry" id="new_folder_name_entry">
@@ -400,11 +401,11 @@
             <property name="activates-default">1</property>
             <property name="hexpand">1</property>
             <signal name="changed" handler="new_folder_name_changed"/>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="new_folder_create_button">
@@ -416,19 +417,20 @@
             <style>
               <class name="suggested-action"/>
             </style>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
-          </packing>
         </child>
         <child>
-          <object class="GtkFileChooserErrorStack" id="new_folder_error_stack"/>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">2</property>
-            <property name="width">2</property>
-          </packing>
+          <object class="GtkFileChooserErrorStack" id="new_folder_error_stack">
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">2</property>
+              <property name="column-span">2</property>
+            </layout>
+          </object>
         </child>
       </object>
     </child>
@@ -449,20 +451,20 @@
             <attributes>
               <attribute name="weight" value="bold"></attribute>
             </attributes>
+            <layout>
+              <property name="column-span">2</property>
+            </layout>
           </object>
-          <packing>
-            <property name="width">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkEntry" id="rename_file_name_entry">
             <property name="activates-default">1</property>
             <signal name="changed" handler="rename_file_name_changed"/>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="rename_file_rename_button">
@@ -474,19 +476,20 @@
             <style>
               <class name="suggested-action"/>
             </style>
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
-          </packing>
         </child>
         <child>
-          <object class="GtkFileChooserErrorStack" id="rename_file_error_stack"/>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">2</property>
-            <property name="width">2</property>
-          </packing>
+          <object class="GtkFileChooserErrorStack" id="rename_file_error_stack">
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">2</property>
+              <property name="column-span">2</property>
+            </layout>
+          </object>
         </child>
       </object>
     </child>
diff --git a/gtk/ui/gtkfontchooserdialog.ui b/gtk/ui/gtkfontchooserdialog.ui
index be72f3908c..72c314a14f 100644
--- a/gtk/ui/gtkfontchooserdialog.ui
+++ b/gtk/ui/gtkfontchooserdialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkFontChooserDialog" parent="GtkDialog">
     <property name="title" translatable="yes">Select Font</property>
diff --git a/gtk/ui/gtkfontchooserwidget.ui b/gtk/ui/gtkfontchooserwidget.ui
index 0ffb9fe434..1a4ea543ae 100644
--- a/gtk/ui/gtkfontchooserwidget.ui
+++ b/gtk/ui/gtkfontchooserwidget.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GtkListStore" id="model">
     <columns>
@@ -41,11 +42,11 @@
                     <property name="placeholder-text" translatable="yes">Search font name</property>
                     <signal name="search-changed" handler="text_changed_cb" swapped="no"/>
                     <signal name="stop-search" handler="stop_search_cb" swapped="no"/>
+                    <layout>
+                      <property name="left-attach">0</property>
+                      <property name="top-attach">0</property>
+                    </layout>
                   </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">0</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkStack" id="list_stack">
@@ -94,12 +95,12 @@
                                     </child>
                                   </object>
                                 </child>
+                                <layout>
+                                  <property name="left-attach">0</property>
+                                  <property name="top-attach">1</property>
+                                  <property name="column-span">3</property>
+                                </layout>
                               </object>
-                              <packing>
-                                <property name="left-attach">0</property>
-                                <property name="top-attach">1</property>
-                                <property name="width">3</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkEntry" id="preview">
@@ -111,23 +112,23 @@
                                     <signal name="scroll" handler="resize_by_scroll_cb"/>
                                   </object>
                                 </child>
+                                <layout>
+                                  <property name="left-attach">0</property>
+                                  <property name="top-attach">2</property>
+                                  <property name="column-span">3</property>
+                                </layout>
                               </object>
-                              <packing>
-                                <property name="left-attach">0</property>
-                                <property name="top-attach">2</property>
-                                <property name="width">3</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkLabel" id="size_label">
                                 <property name="label" translatable="yes">Size</property>
                                 <property name="xalign">0</property>
                                 <property name="valign">baseline</property>
+                                <layout>
+                                  <property name="left-attach">0</property>
+                                  <property name="top-attach">3</property>
+                                </layout>
                               </object>
-                              <packing>
-                                <property name="left-attach">0</property>
-                                <property name="top-attach">3</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkScale" id="size_slider">
@@ -142,11 +143,11 @@
                                     <signal name="scroll" handler="resize_by_scroll_cb"/>
                                   </object>
                                 </child>
+                                <layout>
+                                  <property name="left-attach">1</property>
+                                  <property name="top-attach">3</property>
+                                </layout>
                               </object>
-                              <packing>
-                                <property name="left-attach">1</property>
-                                <property name="top-attach">3</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkSpinButton" id="size_spin">
@@ -154,11 +155,11 @@
                                 <property name="adjustment">spin_adjustment</property>
                                 <property name="valign">center</property>
                                 <signal name="output" handler="output_cb"/>
+                                <layout>
+                                  <property name="left-attach">2</property>
+                                  <property name="top-attach">3</property>
+                                </layout>
                               </object>
-                              <packing>
-                                <property name="left-attach">2</property>
-                                <property name="top-attach">3</property>
-                              </packing>
                             </child>
                           </object>
                         </property>
@@ -181,11 +182,11 @@
                               <object class="GtkImage">
                                 <property name="gicon">fonticon</property>
                                 <property name="pixel-size">64</property>
+                                <layout>
+                                  <property name="left-attach">0</property>
+                                  <property name="top-attach">0</property>
+                                </layout>
                               </object>
-                              <packing>
-                                <property name="left-attach">0</property>
-                                <property name="top-attach">0</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkLabel">
@@ -194,21 +195,21 @@
                                   <attribute name="weight" value="bold"></attribute>
                                   <attribute name="scale" value="1.2"></attribute>
                                 </attributes>
+                                <layout>
+                                  <property name="left-attach">0</property>
+                                  <property name="top-attach">1</property>
+                                </layout>
                               </object>
-                              <packing>
-                                <property name="left-attach">0</property>
-                                <property name="top-attach">1</property>
-                              </packing>
                             </child>
                           </object>
                         </property>
                       </object>
                     </child>
+                    <layout>
+                      <property name="left-attach">0</property>
+                      <property name="top-attach">1</property>
+                    </layout>
                   </object>
-                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">1</property>
-                  </packing>
                 </child>
               </object>
             </property>
@@ -261,11 +262,11 @@
                                 <property name="label" translatable="yes">Size</property>
                                 <property name="xalign">0</property>
                                 <property name="valign">baseline</property>
+                                <layout>
+                                  <property name="left-attach">0</property>
+                                  <property name="top-attach">0</property>
+                                </layout>
                               </object>
-                              <packing>
-                                <property name="left-attach">0</property>
-                                <property name="top-attach">0</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkScale" id="size_slider2">
@@ -274,11 +275,11 @@
                                 <property name="adjustment">slider_adjustment</property>
                                 <property name="draw-value">0</property>
                                 <property name="round-digits">0</property>
+                                <layout>
+                                  <property name="left-attach">1</property>
+                                  <property name="top-attach">0</property>
+                                </layout>
                               </object>
-                              <packing>
-                                <property name="left-attach">1</property>
-                                <property name="top-attach">0</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkSpinButton" id="size_spin2">
@@ -286,11 +287,11 @@
                                 <property name="adjustment">spin_adjustment</property>
                                 <property name="valign">center</property>
                                 <signal name="output" handler="output_cb"/>
+                                <layout>
+                                  <property name="left-attach">2</property>
+                                  <property name="top-attach">0</property>
+                                </layout>
                               </object>
-                              <packing>
-                                <property name="left-attach">2</property>
-                                <property name="top-attach">0</property>
-                              </packing>
                             </child>
                           </object>
                         </child>
diff --git a/gtk/ui/gtkinfobar.ui b/gtk/ui/gtkinfobar.ui
index 2dcc1a6aab..66e4e3d78a 100644
--- a/gtk/ui/gtkinfobar.ui
+++ b/gtk/ui/gtkinfobar.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkInfoBar" parent="GtkBox">
     <child>
diff --git a/gtk/ui/gtklockbutton.ui b/gtk/ui/gtklockbutton.ui
index 328c02ff07..820ba63692 100644
--- a/gtk/ui/gtklockbutton.ui
+++ b/gtk/ui/gtklockbutton.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkLockButton" parent="GtkButton">
     <property name="can-focus">1</property>
diff --git a/gtk/ui/gtkmediacontrols.ui b/gtk/ui/gtkmediacontrols.ui
index 19eee4f4e2..011d3f9ca2 100644
--- a/gtk/ui/gtkmediacontrols.ui
+++ b/gtk/ui/gtkmediacontrols.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GtkAdjustment" id="time_adjustment">
     <property name="upper">10</property>
diff --git a/gtk/ui/gtkmessagedialog.ui b/gtk/ui/gtkmessagedialog.ui
index 61f1b3d095..c2ec33b197 100644
--- a/gtk/ui/gtkmessagedialog.ui
+++ b/gtk/ui/gtkmessagedialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkMessageDialog" parent="GtkDialog">
     <property name="title"></property>
diff --git a/gtk/ui/gtkpagesetupunixdialog.ui b/gtk/ui/gtkpagesetupunixdialog.ui
index 85ffaf0c9a..78e2c2b6e3 100644
--- a/gtk/ui/gtkpagesetupunixdialog.ui
+++ b/gtk/ui/gtkpagesetupunixdialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GtkListStore" id="custom_paper_list">
     <columns>
@@ -38,11 +39,11 @@
                 <property name="label" translatable="yes">_Format for:</property>
                 <property name="use-underline">1</property>
                 <property name="mnemonic-widget">printer_combo</property>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkComboBox" id="printer_combo">
@@ -55,12 +56,12 @@
                     <attribute name="markup">0</attribute>
                   </attributes>
                 </child>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">0</property>
+                  <property name="column-span">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">0</property>
-                <property name="width">3</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="paper_size_combo_label">
@@ -69,11 +70,11 @@
                 <property name="label" translatable="yes">_Paper size:</property>
                 <property name="use-underline">1</property>
                 <property name="mnemonic-widget">paper_size_combo</property>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkComboBox" id="paper_size_combo">
@@ -83,23 +84,23 @@
                 <child>
                   <object class="GtkCellRendererText" id="paper_size_cell"/>
                 </child>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">1</property>
+                  <property name="column-span">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">1</property>
-                <property name="width">3</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="paper_size_label">
                 <property name="halign">start</property>
                 <property name="valign">center</property>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">2</property>
+                  <property name="column-span">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">2</property>
-                <property name="width">3</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="orientation_label">
@@ -108,11 +109,11 @@
                 <property name="label" translatable="yes">_Orientation:</property>
                 <property name="use-underline">1</property>
                 <property name="mnemonic-widget">portrait_radio</property>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">3</property>
-              </packing>
             </child>
             <child>
               <object class="GtkRadioButton" id="portrait_radio">
@@ -134,11 +135,11 @@
                     </child>
                   </object>
                 </child>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">3</property>
-              </packing>
             </child>
             <child>
               <object class="GtkRadioButton" id="reverse_portrait_radio">
@@ -161,11 +162,11 @@
                     </child>
                   </object>
                 </child>
+                <layout>
+                  <property name="left-attach">2</property>
+                  <property name="top-attach">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">3</property>
-              </packing>
             </child>
             <child>
               <object class="GtkRadioButton" id="landscape_radio">
@@ -188,11 +189,11 @@
                     </child>
                   </object>
                 </child>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">4</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">4</property>
-              </packing>
             </child>
             <child>
               <object class="GtkRadioButton" id="reverse_landscape_radio">
@@ -214,11 +215,11 @@
                     </child>
                   </object>
                 </child>
+                <layout>
+                  <property name="left-attach">2</property>
+                  <property name="top-attach">4</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">2</property>
-                <property name="top-attach">4</property>
-              </packing>
             </child>
           </object>
         </child>
diff --git a/gtk/ui/gtkpathbar.ui b/gtk/ui/gtkpathbar.ui
index be2fe80905..29fe44c3bd 100644
--- a/gtk/ui/gtkpathbar.ui
+++ b/gtk/ui/gtkpathbar.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GtkButton" id="down_slider_button">
     <property name="can-focus">1</property>
diff --git a/gtk/ui/gtkplacesview.ui b/gtk/ui/gtkplacesview.ui
index 39022efdb9..010612b90f 100644
--- a/gtk/ui/gtkplacesview.ui
+++ b/gtk/ui/gtkplacesview.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <requires lib="gtk+" version="3.16"/>
   <object class="GtkListStore" id="completion_store">
@@ -65,11 +66,11 @@
                 <attributes>
                   <attribute name="weight" value="bold"></attribute>
                 </attributes>
+                <layout>
+                  <property name="left-attach">0</property>
+                  <property name="top-attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel">
@@ -78,11 +79,11 @@
                 <attributes>
                   <attribute name="weight" value="bold"></attribute>
                 </attributes>
+                <layout>
+                  <property name="left-attach">1</property>
+                  <property name="top-attach">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
           </object>
         </child>
diff --git a/gtk/ui/gtkplacesviewrow.ui b/gtk/ui/gtkplacesviewrow.ui
index 6225d3b9ec..e9f9e8908a 100644
--- a/gtk/ui/gtkplacesviewrow.ui
+++ b/gtk/ui/gtkplacesviewrow.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <requires lib="gtk+" version="3.16"/>
   <template class="GtkPlacesViewRow" parent="GtkListBoxRow">
diff --git a/gtk/ui/gtkprintunixdialog.ui b/gtk/ui/gtkprintunixdialog.ui
index 826811aa6a..bacfd31e07 100644
--- a/gtk/ui/gtkprintunixdialog.ui
+++ b/gtk/ui/gtkprintunixdialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GtkAdjustment" id="copies_spin_adjustment">
     <property name="lower">1</property>
@@ -169,12 +170,12 @@
                                         <property name="can-focus">1</property>
                                         <property name="use-underline">1</property>
                                         <property name="active">1</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">0</property>
+                                          <property name="column-span">2</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">0</property>
-                                        <property name="width">2</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkRadioButton" id="current_page_radio">
@@ -184,12 +185,12 @@
                                         <property name="use-underline">1</property>
                                         <property name="active">1</property>
                                         <property name="group">all_pages_radio</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">1</property>
+                                          <property name="column-span">2</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">1</property>
-                                        <property name="width">2</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkRadioButton" id="selection_radio">
@@ -199,12 +200,12 @@
                                         <property name="use-underline">1</property>
                                         <property name="active">1</property>
                                         <property name="group">all_pages_radio</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">2</property>
+                                          <property name="column-span">2</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">2</property>
-                                        <property name="width">2</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkRadioButton" id="page_range_radio">
@@ -216,11 +217,11 @@
                                         <property name="active">1</property>
                                         <property name="group">all_pages_radio</property>
                                         <signal name="toggled" handler="update_page_range_entry_sensitivity" swapped="no"/>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">3</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">3</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkEntry" id="page_range_entry">
@@ -236,11 +237,11 @@
  e.g. 1–3, 7, 11</property>
                                           </object>
                                         </child>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">3</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">3</property>
-                                      </packing>
                                     </child>
                                     <accessibility>
                                       <relation type="labelled-by" target="label_widget1"/>
@@ -279,11 +280,11 @@
                                         <property name="label" translatable="yes">Copie_s:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">copies_spin</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">0</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">0</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkSpinButton" id="copies_spin">
@@ -292,11 +293,11 @@
                                         <property name="adjustment">copies_spin_adjustment</property>
                                         <signal name="changed" handler="update_dialog_from_capabilities" object="GtkPrintUnixDialog" swapped="yes"/>
                                         <signal name="value-changed" handler="update_dialog_from_capabilities" object="GtkPrintUnixDialog" swapped="yes"/>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">0</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">0</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkCheckButton" id="collate_check">
@@ -304,11 +305,11 @@
                                         <property name="can-focus">1</property>
                                         <property name="use-underline">1</property>
                                         <signal name="toggled" handler="update_collate_icon" swapped="no"/>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">1</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">1</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkCheckButton" id="reverse_check">
@@ -316,22 +317,22 @@
                                         <property name="can-focus">1</property>
                                         <property name="use-underline">1</property>
                                         <signal name="toggled" handler="update_collate_icon" swapped="no"/>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">2</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">2</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkDrawingArea" id="collate_image">
                                         <property name="content-width">70</property>
                                         <property name="content-height">90</property>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">1</property>
+                                          <property name="row-span">2</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">1</property>
-                                        <property name="height">2</property>
-                                      </packing>
                                     </child>
                                     <accessibility>
                                       <relation type="labelled-by" target="label_widget2"/>
@@ -391,20 +392,20 @@
                                         <property name="label" translatable="yes">T_wo-sided:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">duplex</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">0</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">0</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkPrinterOptionWidget" id="duplex">
                                         <property name="valign">baseline</property>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">0</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">0</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label6">
@@ -413,22 +414,22 @@
                                         <property name="label" translatable="yes">Pages per _side:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">pages_per_sheet</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">1</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">1</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkPrinterOptionWidget" id="pages_per_sheet">
                                         <property name="valign">baseline</property>
                                         <signal name="changed" handler="redraw_page_layout_preview" object="GtkPrintUnixDialog" swapped="yes"/>
                                         <signal name="changed" handler="update_number_up_layout" object="GtkPrintUnixDialog" swapped="yes"/>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">1</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">1</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label7">
@@ -437,21 +438,21 @@
                                         <property name="label" translatable="yes">Page or_dering:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">number_up_layout</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">2</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">2</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkPrinterOptionWidget" id="number_up_layout">
                                         <property name="valign">baseline</property>
                                         <signal name="changed" handler="redraw_page_layout_preview" object="GtkPrintUnixDialog" swapped="yes"/>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">2</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">2</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label8">
@@ -460,11 +461,11 @@
                                         <property name="label" translatable="yes">_Only print:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">page_set_combo</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">3</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">3</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkComboBoxText" id="page_set_combo">
@@ -477,11 +478,11 @@
                                           <item translatable="yes">Even sheets</item>
                                           <item translatable="yes">Odd sheets</item>
                                         </items>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">3</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">3</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label9">
@@ -490,11 +491,11 @@
                                         <property name="label" translatable="yes">Sc_ale:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">scale_spin</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">4</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">4</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkBox" id="box5">
@@ -514,11 +515,11 @@
                                             <property name="label">%</property>
                                           </object>
                                         </child>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">4</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">4</property>
-                                      </packing>
                                     </child>
                                     <accessibility>
                                       <relation type="labelled-by" target="label_widget3"/>
@@ -557,20 +558,20 @@
                                         <property name="label" translatable="yes">Paper _type:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">paper_type</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">0</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">0</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkPrinterOptionWidget" id="paper_type">
                                         <property name="valign">baseline</property>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">0</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">0</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label12">
@@ -579,20 +580,20 @@
                                         <property name="label" translatable="yes">Paper _source:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">paper_source</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">1</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">1</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkPrinterOptionWidget" id="paper_source">
                                         <property name="valign">baseline</property>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">1</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">1</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label13">
@@ -601,20 +602,20 @@
                                         <property name="label" translatable="yes">Output t_ray:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">output_tray</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">2</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">2</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkPrinterOptionWidget" id="output_tray">
                                         <property name="valign">baseline</property>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">2</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">2</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="paper_size_combo_label">
@@ -623,11 +624,11 @@
                                         <property name="label" translatable="yes">_Paper size:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">paper_size_combo</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">3</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">3</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkComboBox" id="paper_size_combo">
@@ -637,11 +638,11 @@
                                         <child>
                                           <object class="GtkCellRendererText" id="paper_size_renderer"/>
                                         </child>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">3</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">3</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="orientation_combo_label">
@@ -650,11 +651,11 @@
                                         <property name="label" translatable="yes">Or_ientation:</property>
                                         <property name="use-underline">1</property>
                                         <property name="mnemonic-widget">orientation_combo</property>
+                                        <layout>
+                                          <property name="left-attach">0</property>
+                                          <property name="top-attach">4</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">0</property>
-                                        <property name="top-attach">4</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkComboBoxText" id="orientation_combo">
@@ -669,11 +670,11 @@
                                           <item translatable="yes">Reverse portrait</item>
                                           <item translatable="yes">Reverse landscape</item>
                                         </items>
+                                        <layout>
+                                          <property name="left-attach">1</property>
+                                          <property name="top-attach">4</property>
+                                        </layout>
                                       </object>
-                                      <packing>
-                                        <property name="left-attach">1</property>
-                                        <property name="top-attach">4</property>
-                                      </packing>
                                     </child>
                                     <accessibility>
                                       <relation type="labelled-by" target="label_widget4"/>
@@ -740,18 +741,19 @@
                                     <property name="label" translatable="yes">Pri_ority:</property>
                                     <property name="use-underline">1</property>
                                     <property name="mnemonic-widget">job_prio</property>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">0</property>
+                                    </layout>
                                   </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">0</property>
-                                  </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkPrinterOptionWidget" id="job_prio"/>
-                                  <packing>
-                                    <property name="left-attach">1</property>
-                                    <property name="top-attach">0</property>
-                                  </packing>
+                                  <object class="GtkPrinterOptionWidget" id="job_prio">
+                                    <layout>
+                                      <property name="left-attach">1</property>
+                                      <property name="top-attach">0</property>
+                                    </layout>
+                                  </object>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label17">
@@ -760,29 +762,30 @@
                                     <property name="label" translatable="yes">_Billing info:</property>
                                     <property name="use-underline">1</property>
                                     <property name="mnemonic-widget">billing_info</property>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">1</property>
+                                    </layout>
                                   </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">1</property>
-                                  </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkPrinterOptionWidget" id="billing_info"/>
-                                  <packing>
-                                    <property name="left-attach">1</property>
-                                    <property name="top-attach">1</property>
-                                  </packing>
+                                  <object class="GtkPrinterOptionWidget" id="billing_info">
+                                    <layout>
+                                      <property name="left-attach">1</property>
+                                      <property name="top-attach">1</property>
+                                    </layout>
+                                  </object>
                                 </child>
                                 <accessibility>
                                   <relation type="labelled-by" target="label_widget5"/>
                                 </accessibility>
                               </object>
                             </child>
+                            <layout>
+                              <property name="left-attach">0</property>
+                              <property name="top-attach">0</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left-attach">0</property>
-                            <property name="top-attach">0</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkBox" id="frame_template6">
@@ -813,12 +816,12 @@
                                     <property name="use-underline">1</property>
                                     <property name="active">1</property>
                                     <signal name="toggled" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">0</property>
+                                      <property name="column-span">2</property>
+                                    </layout>
                                   </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">0</property>
-                                    <property name="width">2</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="print_at_radio">
@@ -833,11 +836,11 @@
                                     <property name="group">print_now_radio</property>
                                     <signal name="toggled" handler="update_print_at_entry_sensitivity" swapped="no"/>
                                     <signal name="toggled" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">1</property>
+                                    </layout>
                                   </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">1</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkEntry" id="print_at_entry">
@@ -856,11 +859,11 @@
                                       </object>
                                     </child>
                                     <signal name="changed" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
+                                    <layout>
+                                      <property name="left-attach">1</property>
+                                      <property name="top-attach">1</property>
+                                    </layout>
                                   </object>
-                                  <packing>
-                                    <property name="left-attach">1</property>
-                                    <property name="top-attach">1</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkRadioButton" id="print_hold_radio">
@@ -872,23 +875,23 @@
                                     <property name="use-underline">1</property>
                                     <property name="group">print_now_radio</property>
                                     <signal name="toggled" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">2</property>
+                                      <property name="column-span">2</property>
+                                    </layout>
                                   </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">2</property>
-                                    <property name="width">2</property>
-                                  </packing>
                                 </child>
                                 <accessibility>
                                   <relation type="labelled-by" target="label_widget6"/>
                                 </accessibility>
                               </object>
                             </child>
+                            <layout>
+                              <property name="left-attach">0</property>
+                              <property name="top-attach">1</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left-attach">0</property>
-                            <property name="top-attach">1</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkBox" id="frame_template7">
@@ -919,18 +922,19 @@
                                     <property name="label" translatable="yes" comments="this is the label used for the option in the print dialog that controls the front cover page.">Be_fore:</property>
                                     <property name="use-underline">1</property>
                                     <property name="mnemonic-widget">cover_before</property>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">0</property>
+                                    </layout>
                                   </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">0</property>
-                                  </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkPrinterOptionWidget" id="cover_before"/>
-                                  <packing>
-                                    <property name="left-attach">1</property>
-                                    <property name="top-attach">0</property>
-                                  </packing>
+                                  <object class="GtkPrinterOptionWidget" id="cover_before">
+                                    <layout>
+                                      <property name="left-attach">1</property>
+                                      <property name="top-attach">0</property>
+                                    </layout>
+                                  </object>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="label19">
@@ -939,29 +943,30 @@
                                     <property name="label" translatable="yes" comments="this is the label used for the option in the print dialog that controls the back cover page.">_After:</property>
                                     <property name="use-underline">1</property>
                                     <property name="mnemonic-widget">cover_after</property>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">1</property>
+                                    </layout>
                                   </object>
-                                  <packing>
-                                    <property name="left-attach">0</property>
-                                    <property name="top-attach">1</property>
-                                  </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkPrinterOptionWidget" id="cover_after"/>
-                                  <packing>
-                                    <property name="left-attach">1</property>
-                                    <property name="top-attach">1</property>
-                                  </packing>
+                                  <object class="GtkPrinterOptionWidget" id="cover_after">
+                                    <layout>
+                                      <property name="left-attach">1</property>
+                                      <property name="top-attach">1</property>
+                                    </layout>
+                                  </object>
                                 </child>
                                 <accessibility>
                                   <relation type="labelled-by" target="label_widget7"/>
                                 </accessibility>
                               </object>
                             </child>
+                            <layout>
+                              <property name="left-attach">1</property>
+                              <property name="top-attach">0</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left-attach">1</property>
-                            <property name="top-attach">0</property>
-                          </packing>
                         </child>
                       </object>
                     </property>
diff --git a/gtk/ui/gtkscalebutton.ui b/gtk/ui/gtkscalebutton.ui
index 560ec39def..4dcdb71620 100644
--- a/gtk/ui/gtkscalebutton.ui
+++ b/gtk/ui/gtkscalebutton.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkScaleButton" parent="GtkButton">
     <property name="can-focus">1</property>
diff --git a/gtk/ui/gtksidebarrow.ui b/gtk/ui/gtksidebarrow.ui
index b31078fe5b..5b71724e29 100644
--- a/gtk/ui/gtksidebarrow.ui
+++ b/gtk/ui/gtksidebarrow.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkSidebarRow" parent="GtkListBoxRow">
     <property name="margin-top">1</property>
diff --git a/gtk/ui/gtkstatusbar.ui b/gtk/ui/gtkstatusbar.ui
index eb0a23d53a..bbd871594d 100644
--- a/gtk/ui/gtkstatusbar.ui
+++ b/gtk/ui/gtkstatusbar.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkStatusbar" parent="GtkWidget">
     <child>
diff --git a/gtk/ui/gtktooltipwindow.ui b/gtk/ui/gtktooltipwindow.ui
index 848d4cedc4..bb4329f18b 100644
--- a/gtk/ui/gtktooltipwindow.ui
+++ b/gtk/ui/gtktooltipwindow.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkTooltipWindow" parent="GtkWindow">
     <property name="resizable">0</property>
diff --git a/gtk/ui/gtkvolumebutton.ui b/gtk/ui/gtkvolumebutton.ui
index cd5f3224d1..67e881f015 100644
--- a/gtk/ui/gtkvolumebutton.ui
+++ b/gtk/ui/gtkvolumebutton.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GtkAdjustment" id="adjustment">
     <property name="upper">1</property>