GNOME.org
 

[gtk/kill-popup-windows: 6/13] testsuite: Remove popup from reftests too

commit a95b10c1412d734a9ec9d7eafeb790f22d8f8bde
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Dec 30 15:55:11 2019 -0500

    testsuite: Remove popup from reftests too
    
    This breaks some of the reftests, but many still work.

 testsuite/reftests/721800-0px-dotted-border.ref.ui               | 1 -
 testsuite/reftests/721800-0px-dotted-border.ui                   | 1 -
 testsuite/reftests/actionbar.ref.ui                              | 1 -
 testsuite/reftests/actionbar.ui                                  | 1 -
 testsuite/reftests/animation-direction.ref.ui                    | 1 -
 testsuite/reftests/animation-direction.ui                        | 1 -
 testsuite/reftests/background-area.ref.ui                        | 1 -
 testsuite/reftests/background-area.ui                            | 1 -
 testsuite/reftests/background-blend-mode-clip-interaction.ref.ui | 1 -
 testsuite/reftests/background-blend-mode-clip-interaction.ui     | 1 -
 testsuite/reftests/background-image-multiple.ref.ui              | 1 -
 testsuite/reftests/background-image-multiple.ui                  | 1 -
 testsuite/reftests/background-origin.ref.ui                      | 1 -
 testsuite/reftests/background-origin.ui                          | 1 -
 testsuite/reftests/background-position-repeat.ref.ui             | 1 -
 testsuite/reftests/background-position-repeat.ui                 | 1 -
 testsuite/reftests/background-position-simple.ref.ui             | 1 -
 testsuite/reftests/background-position-simple.ui                 | 1 -
 testsuite/reftests/background-position.ref.ui                    | 1 -
 testsuite/reftests/background-position.ui                        | 1 -
 testsuite/reftests/background-positioning-area-empty.ref.ui      | 1 -
 testsuite/reftests/background-positioning-area-empty.ui          | 1 -
 testsuite/reftests/background-repeat.ref.ui                      | 1 -
 testsuite/reftests/background-repeat.ui                          | 1 -
 testsuite/reftests/background-size-keywords.ref.ui               | 1 -
 testsuite/reftests/background-size-keywords.ui                   | 1 -
 testsuite/reftests/background-size-zero.ref.ui                   | 1 -
 testsuite/reftests/background-size-zero.ui                       | 1 -
 testsuite/reftests/background-size.ref.ui                        | 1 -
 testsuite/reftests/background-size.ui                            | 1 -
 testsuite/reftests/background-window-transparent.ref.ui          | 1 -
 testsuite/reftests/background-window-transparent.ui              | 1 -
 testsuite/reftests/bad-color-names.ref.ui                        | 1 -
 testsuite/reftests/bad-color-names.ui                            | 1 -
 testsuite/reftests/border-color-default.ref.ui                   | 1 -
 testsuite/reftests/border-color-default.ui                       | 1 -
 testsuite/reftests/border-corner-zero-width-rendering.ref.ui     | 1 -
 testsuite/reftests/border-corner-zero-width-rendering.ui         | 1 -
 testsuite/reftests/border-half-pixel.ref.ui                      | 1 -
 testsuite/reftests/border-half-pixel.ui                          | 1 -
 testsuite/reftests/border-image-excess-size.ref.ui               | 1 -
 testsuite/reftests/border-image-excess-size.ui                   | 1 -
 testsuite/reftests/border-image-url-scaled.ref.ui                | 1 -
 testsuite/reftests/border-image-url-scaled.ui                    | 1 -
 testsuite/reftests/border-image-url.ref.ui                       | 1 -
 testsuite/reftests/border-image-url.ui                           | 1 -
 testsuite/reftests/border-radius-clamp.ref.ui                    | 1 -
 testsuite/reftests/border-radius-clamp.ui                        | 1 -
 testsuite/reftests/border-style-none.ref.ui                      | 1 -
 testsuite/reftests/border-style-none.ui                          | 1 -
 testsuite/reftests/border-style.ref.ui                           | 1 -
 testsuite/reftests/border-style.ui                               | 1 -
 testsuite/reftests/box-order.ref.ui                              | 1 -
 testsuite/reftests/box-order.ui                                  | 1 -
 testsuite/reftests/box-pseudo-classes.ref.ui                     | 1 -
 testsuite/reftests/box-pseudo-classes.ui                         | 1 -
 testsuite/reftests/box-shadow-changes-modify-clip.ref.ui         | 1 -
 testsuite/reftests/box-shadow-changes-modify-clip.ui             | 1 -
 testsuite/reftests/box-shadow-spec-inset.ref.ui                  | 1 -
 testsuite/reftests/box-shadow-spec-inset.ui                      | 1 -
 testsuite/reftests/box-shadow-spread.ref.ui                      | 1 -
 testsuite/reftests/box-shadow-spread.ui                          | 1 -
 testsuite/reftests/box-shadow-with-blend-mode.ref.ui             | 1 -
 testsuite/reftests/box-shadow-with-blend-mode.ui                 | 1 -
 testsuite/reftests/button-wrapping.ref.ui                        | 1 -
 testsuite/reftests/button-wrapping.ui                            | 1 -
 testsuite/reftests/color-transition.ref.ui                       | 1 -
 testsuite/reftests/color-transition.ui                           | 1 -
 testsuite/reftests/cross-fade-syntax.ref.ui                      | 1 -
 testsuite/reftests/cross-fade-syntax.ui                          | 1 -
 testsuite/reftests/css-currentcolor-alpha.ref.ui                 | 1 -
 testsuite/reftests/css-currentcolor-alpha.ui                     | 1 -
 testsuite/reftests/css-em-label-size.ref.ui                      | 1 -
 testsuite/reftests/css-em-label-size.ui                          | 1 -
 testsuite/reftests/css-image-aspect-ratio.ref.ui                 | 1 -
 testsuite/reftests/css-image-aspect-ratio.ui                     | 1 -
 testsuite/reftests/css-image-color-aspect-ratio.ref.ui           | 1 -
 testsuite/reftests/css-image-color-aspect-ratio.ui               | 1 -
 testsuite/reftests/css-match-class.ref.ui                        | 1 -
 testsuite/reftests/css-match-class.ui                            | 1 -
 testsuite/reftests/css-match-descendant-later.ref.ui             | 1 -
 testsuite/reftests/css-match-descendant-later.ui                 | 1 -
 testsuite/reftests/css-match-exact.ref.ui                        | 1 -
 testsuite/reftests/css-match-exact.ui                            | 1 -
 testsuite/reftests/css-match-import.ref.ui                       | 1 -
 testsuite/reftests/css-match-import.ui                           | 1 -
 testsuite/reftests/css-match-inherit-different-state.ref.ui      | 1 -
 testsuite/reftests/css-match-inherit-different-state.ui          | 1 -
 testsuite/reftests/css-match-inherit.ref.ui                      | 1 -
 testsuite/reftests/css-match-inherit.ui                          | 1 -
 testsuite/reftests/css-match-name.ref.ui                         | 1 -
 testsuite/reftests/css-match-name.ui                             | 1 -
 testsuite/reftests/css-match-siblings.ref.ui                     | 1 -
 testsuite/reftests/css-match-siblings.ui                         | 1 -
 testsuite/reftests/css-match-type.ref.ui                         | 1 -
 testsuite/reftests/css-match-type.ui                             | 1 -
 testsuite/reftests/css-multi-state.ref.ui                        | 1 -
 testsuite/reftests/css-multi-state.ui                            | 1 -
 testsuite/reftests/css-rem-label-size.ref.ui                     | 1 -
 testsuite/reftests/css-rem-label-size.ui                         | 1 -
 testsuite/reftests/data-url.ref.ui                               | 1 -
 testsuite/reftests/data-url.ui                                   | 1 -
 testsuite/reftests/expander.ref.ui                               | 1 -
 testsuite/reftests/expander.ui                                   | 1 -
 testsuite/reftests/fixed-widget-stacking.ref.ui                  | 1 -
 testsuite/reftests/fixed-widget-stacking.ui                      | 1 -
 testsuite/reftests/flipping-icons.ref.ui                         | 1 -
 testsuite/reftests/flipping-icons.ui                             | 1 -
 testsuite/reftests/font-sizes-names.ref.ui                       | 1 -
 testsuite/reftests/font-sizes-names.ui                           | 1 -
 testsuite/reftests/grid-empty-with-spacing.ref.ui                | 1 -
 testsuite/reftests/grid-empty-with-spacing.ui                    | 1 -
 testsuite/reftests/grid-expand.ref.ui                            | 1 -
 testsuite/reftests/grid-expand.ui                                | 1 -
 testsuite/reftests/grid-homogeneous.ref.ui                       | 1 -
 testsuite/reftests/grid-homogeneous.ui                           | 1 -
 testsuite/reftests/grid-spacing1.ref.ui                          | 1 -
 testsuite/reftests/grid-spacing1.ui                              | 1 -
 testsuite/reftests/grid-spacing2.ref.ui                          | 1 -
 testsuite/reftests/grid-spacing2.ui                              | 1 -
 testsuite/reftests/grid-spacing3.ref.ui                          | 1 -
 testsuite/reftests/grid-spacing3.ui                              | 1 -
 testsuite/reftests/grid-wfh.ref.ui                               | 1 -
 testsuite/reftests/grid-wfh.ui                                   | 1 -
 testsuite/reftests/gtk-icontheme-sizing.ref.ui                   | 1 -
 testsuite/reftests/gtk-icontheme-sizing.ui                       | 1 -
 testsuite/reftests/gtk-image-effect-inherit.ref.ui               | 1 -
 testsuite/reftests/gtk-image-effect-inherit.ui                   | 1 -
 testsuite/reftests/icon-effect-missing.ref.ui                    | 1 -
 testsuite/reftests/icon-effect-missing.ui                        | 1 -
 testsuite/reftests/icon-shadow-no-transform.ref.ui               | 1 -
 testsuite/reftests/icon-shadow-no-transform.ui                   | 1 -
 testsuite/reftests/icon-style-basics.ref.ui                      | 1 -
 testsuite/reftests/icon-style-basics.ui                          | 1 -
 testsuite/reftests/iconview-empty.ref.ui                         | 1 -
 testsuite/reftests/iconview-empty.ui                             | 1 -
 testsuite/reftests/image-icon-name-use-fallback.ref.ui           | 1 -
 testsuite/reftests/image-icon-name-use-fallback.ui               | 1 -
 testsuite/reftests/image-icon-shadow-clipping.ref.ui             | 1 -
 testsuite/reftests/image-icon-shadow-clipping.ui                 | 1 -
 testsuite/reftests/image-load-from-file.ref.ui                   | 1 -
 testsuite/reftests/image-load-from-file.ui                       | 1 -
 testsuite/reftests/label-attribute-preference.ref.ui             | 1 -
 testsuite/reftests/label-attribute-preference.ui                 | 1 -
 testsuite/reftests/label-background.ref.ui                       | 1 -
 testsuite/reftests/label-background.ui                           | 1 -
 testsuite/reftests/label-box-shadow-clip.ref.ui                  | 1 -
 testsuite/reftests/label-box-shadow-clip.ui                      | 1 -
 testsuite/reftests/label-clipping.ref.ui                         | 1 -
 testsuite/reftests/label-clipping.ui                             | 1 -
 testsuite/reftests/label-ellipsize-small.ref.ui                  | 1 -
 testsuite/reftests/label-ellipsize-small.ui                      | 1 -
 testsuite/reftests/label-ellipsize-with-big.ref.ui               | 1 -
 testsuite/reftests/label-ellipsize-with-big.ui                   | 1 -
 testsuite/reftests/label-fonts.ref.ui                            | 1 -
 testsuite/reftests/label-fonts.ui                                | 1 -
 testsuite/reftests/label-shadows.ref.ui                          | 1 -
 testsuite/reftests/label-shadows.ui                              | 1 -
 testsuite/reftests/label-sizing.ref.ui                           | 1 -
 testsuite/reftests/label-sizing.ui                               | 1 -
 testsuite/reftests/label-small-ellipsized.ref.ui                 | 1 -
 testsuite/reftests/label-small-ellipsized.ui                     | 1 -
 testsuite/reftests/label-text-shadow-changes-modify-clip.ref.ui  | 1 -
 testsuite/reftests/label-text-shadow-changes-modify-clip.ui      | 1 -
 testsuite/reftests/label-text-shadow-clipping.ref.ui             | 1 -
 testsuite/reftests/label-text-shadow-clipping.ui                 | 1 -
 testsuite/reftests/label-width-chars-dont-shrink.ref.ui          | 1 -
 testsuite/reftests/label-width-chars-dont-shrink.ui              | 1 -
 testsuite/reftests/label-wrap-justify.ref.ui                     | 1 -
 testsuite/reftests/label-wrap-justify.ui                         | 1 -
 testsuite/reftests/letter-spacing.ref.ui                         | 1 -
 testsuite/reftests/letter-spacing.ui                             | 1 -
 testsuite/reftests/linear-gradient-transition-to-other.ref.ui    | 1 -
 testsuite/reftests/linear-gradient-transition-to-other.ui        | 1 -
 testsuite/reftests/linear-gradient.ref.ui                        | 1 -
 testsuite/reftests/linear-gradient.ui                            | 1 -
 testsuite/reftests/link-coloring.ref.ui                          | 1 -
 testsuite/reftests/link-coloring.ui                              | 1 -
 testsuite/reftests/messagedialog-secondarytext.ref.ui            | 1 -
 testsuite/reftests/messagedialog-secondarytext.ui                | 1 -
 testsuite/reftests/named-colors.ref.ui                           | 1 -
 testsuite/reftests/named-colors.ui                               | 1 -
 testsuite/reftests/no-colors.ref.ui                              | 1 -
 testsuite/reftests/no-colors.ui                                  | 1 -
 testsuite/reftests/nonresizable-size.ref.ui                      | 1 -
 testsuite/reftests/nonresizable-size.ui                          | 1 -
 testsuite/reftests/notebook-tab-position.ref.ui                  | 1 -
 testsuite/reftests/notebook-tab-position.ui                      | 1 -
 testsuite/reftests/nth-child.ref.ui                              | 1 -
 testsuite/reftests/nth-child.ui                                  | 1 -
 testsuite/reftests/opacity-initial.ref.ui                        | 1 -
 testsuite/reftests/opacity-initial.ui                            | 1 -
 testsuite/reftests/opacity.ref.ui                                | 1 -
 testsuite/reftests/opacity.ui                                    | 1 -
 testsuite/reftests/paned-undersized.ref.ui                       | 1 -
 testsuite/reftests/paned-undersized.ui                           | 1 -
 testsuite/reftests/partial-rounded-border.ref.ui                 | 1 -
 testsuite/reftests/partial-rounded-border.ui                     | 1 -
 testsuite/reftests/picture-load-invalid-file.ref.ui              | 1 -
 testsuite/reftests/picture-load-invalid-file.ui                  | 1 -
 testsuite/reftests/pseudoclass-on-box.ref.ui                     | 1 -
 testsuite/reftests/pseudoclass-on-box.ui                         | 1 -
 testsuite/reftests/pseudoclass-on-parent.ref.ui                  | 1 -
 testsuite/reftests/pseudoclass-on-parent.ui                      | 1 -
 testsuite/reftests/quit-mnemonic.ref.ui                          | 1 -
 testsuite/reftests/quit-mnemonic.ui                              | 1 -
 testsuite/reftests/repeating-radial-gradient-at-beginning.ref.ui | 1 -
 testsuite/reftests/repeating-radial-gradient-at-beginning.ui     | 1 -
 testsuite/reftests/revealer-extra-size.ref.ui                    | 1 -
 testsuite/reftests/revealer-extra-size.ui                        | 1 -
 testsuite/reftests/revealer-wrappable-contents.ref.ui            | 1 -
 testsuite/reftests/revealer-wrappable-contents.ui                | 1 -
 testsuite/reftests/rotated-layout.ref.ui                         | 1 -
 testsuite/reftests/rotated-layout.ui                             | 1 -
 testsuite/reftests/separator-size.ref.ui                         | 1 -
 testsuite/reftests/separator-size.ui                             | 1 -
 testsuite/reftests/set-default-direction.ref.ui                  | 1 -
 testsuite/reftests/set-default-direction.ui                      | 1 -
 testsuite/reftests/shadow-clip-rounding.ref.ui                   | 1 -
 testsuite/reftests/shadow-clip-rounding.ui                       | 1 -
 testsuite/reftests/shorthand-entry-border.ref.ui                 | 1 -
 testsuite/reftests/shorthand-entry-border.ui                     | 1 -
 testsuite/reftests/simple.ref.ui                                 | 1 -
 testsuite/reftests/simple.ui                                     | 1 -
 testsuite/reftests/sizegroups-basics.ref.ui                      | 1 -
 testsuite/reftests/sizegroups-basics.ui                          | 1 -
 testsuite/reftests/sizegroups-evolution-identity-page.ref.ui     | 1 -
 testsuite/reftests/sizegroups-evolution-identity-page.ui         | 1 -
 testsuite/reftests/sizegroups-get-preferred-null.ref.ui          | 1 -
 testsuite/reftests/sizegroups-get-preferred-null.ui              | 1 -
 testsuite/reftests/statusbar-remove-all.ref.ui                   | 1 -
 testsuite/reftests/statusbar-remove-all.ui                       | 1 -
 testsuite/reftests/style-context-save-inheritance.ref.ui         | 1 -
 testsuite/reftests/style-context-save-inheritance.ui             | 1 -
 testsuite/reftests/style-properties-only-child.ref.ui            | 1 -
 testsuite/reftests/style-properties-only-child.ui                | 1 -
 testsuite/reftests/symbolic-icon-translucent-color.ref.ui        | 1 -
 testsuite/reftests/symbolic-icon-translucent-color.ui            | 1 -
 testsuite/reftests/textview-border-windows.ref.ui                | 1 -
 testsuite/reftests/textview-border-windows.ui                    | 1 -
 testsuite/reftests/textview-margins.ref.ui                       | 1 -
 testsuite/reftests/textview-margins.ui                           | 1 -
 testsuite/reftests/toplevel-vs-popup.ref.ui                      | 1 -
 testsuite/reftests/treeview-fixed-height.ref.ui                  | 1 -
 testsuite/reftests/treeview-fixed-height.ui                      | 1 -
 testsuite/reftests/treeview-headers-hidden.ref.ui                | 1 -
 testsuite/reftests/treeview-headers-hidden.ui                    | 1 -
 testsuite/reftests/unresolvable.ref.ui                           | 1 -
 testsuite/reftests/unresolvable.ui                               | 1 -
 testsuite/reftests/window-border-width.ref.ui                    | 1 -
 testsuite/reftests/window-border-width.ui                        | 1 -
 testsuite/reftests/window-default-size.ref.ui                    | 1 -
 testsuite/reftests/window-default-size.ui                        | 1 -
 testsuite/reftests/window-show-contents-on-map.ref.ui            | 1 -
 testsuite/reftests/window-show-contents-on-map.ui                | 1 -
 255 files changed, 255 deletions(-)
---
diff --git a/testsuite/reftests/721800-0px-dotted-border.ref.ui 
b/testsuite/reftests/721800-0px-dotted-border.ref.ui
index 56115658fe..fdd99a68c9 100644
--- a/testsuite/reftests/721800-0px-dotted-border.ref.ui
+++ b/testsuite/reftests/721800-0px-dotted-border.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">Hello World</property>
diff --git a/testsuite/reftests/721800-0px-dotted-border.ui b/testsuite/reftests/721800-0px-dotted-border.ui
index 0da0e9de66..c8b569da8a 100644
--- a/testsuite/reftests/721800-0px-dotted-border.ui
+++ b/testsuite/reftests/721800-0px-dotted-border.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">Hello World</property>
diff --git a/testsuite/reftests/actionbar.ref.ui b/testsuite/reftests/actionbar.ref.ui
index f92771d949..80aed87eee 100644
--- a/testsuite/reftests/actionbar.ref.ui
+++ b/testsuite/reftests/actionbar.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox">
         <child>
diff --git a/testsuite/reftests/actionbar.ui b/testsuite/reftests/actionbar.ui
index 064d90e143..6921618272 100644
--- a/testsuite/reftests/actionbar.ui
+++ b/testsuite/reftests/actionbar.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkActionBar">
         <child type="start">
diff --git a/testsuite/reftests/animation-direction.ref.ui b/testsuite/reftests/animation-direction.ref.ui
index abcd7d641e..c5f9520ae1 100644
--- a/testsuite/reftests/animation-direction.ref.ui
+++ b/testsuite/reftests/animation-direction.ref.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="column_spacing">2</property>
diff --git a/testsuite/reftests/animation-direction.ui b/testsuite/reftests/animation-direction.ui
index 3cc6672287..34a3f5e5d3 100644
--- a/testsuite/reftests/animation-direction.ui
+++ b/testsuite/reftests/animation-direction.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="column_spacing">2</property>
diff --git a/testsuite/reftests/background-area.ref.ui b/testsuite/reftests/background-area.ref.ui
index 33789a1040..9defba0af2 100644
--- a/testsuite/reftests/background-area.ref.ui
+++ b/testsuite/reftests/background-area.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/background-area.ui b/testsuite/reftests/background-area.ui
index f4b96de1d4..0095adb83f 100644
--- a/testsuite/reftests/background-area.ui
+++ b/testsuite/reftests/background-area.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/background-blend-mode-clip-interaction.ref.ui 
b/testsuite/reftests/background-blend-mode-clip-interaction.ref.ui
index d8e47d84e3..95b599b95c 100644
--- a/testsuite/reftests/background-blend-mode-clip-interaction.ref.ui
+++ b/testsuite/reftests/background-blend-mode-clip-interaction.ref.ui
@@ -3,7 +3,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">50</property>
     <property name="height_request">50</property>
-    <property name="type">popup</property>
     <property name="name">reference</property>
     <child>
       <object class="GtkBox"/>
diff --git a/testsuite/reftests/background-blend-mode-clip-interaction.ui 
b/testsuite/reftests/background-blend-mode-clip-interaction.ui
index 8b5af4d54e..65cbc2ae6d 100644
--- a/testsuite/reftests/background-blend-mode-clip-interaction.ui
+++ b/testsuite/reftests/background-blend-mode-clip-interaction.ui
@@ -3,7 +3,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">50</property>
     <property name="height_request">50</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox"/>
     </child>
diff --git a/testsuite/reftests/background-image-multiple.ref.ui 
b/testsuite/reftests/background-image-multiple.ref.ui
index 079929abf1..d829576bec 100644
--- a/testsuite/reftests/background-image-multiple.ref.ui
+++ b/testsuite/reftests/background-image-multiple.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/background-image-multiple.ui b/testsuite/reftests/background-image-multiple.ui
index b30e02f939..2275bbded4 100644
--- a/testsuite/reftests/background-image-multiple.ui
+++ b/testsuite/reftests/background-image-multiple.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/background-origin.ref.ui b/testsuite/reftests/background-origin.ref.ui
index bb9080172a..62e49eaae1 100644
--- a/testsuite/reftests/background-origin.ref.ui
+++ b/testsuite/reftests/background-origin.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <property name="width_request">154</property>
     <property name="height_request">680</property>
     <child>
diff --git a/testsuite/reftests/background-origin.ui b/testsuite/reftests/background-origin.ui
index 061c285cb1..6239aa6a6c 100644
--- a/testsuite/reftests/background-origin.ui
+++ b/testsuite/reftests/background-origin.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/background-position-repeat.ref.ui 
b/testsuite/reftests/background-position-repeat.ref.ui
index 399e9b34a4..2254cc2cd7 100644
--- a/testsuite/reftests/background-position-repeat.ref.ui
+++ b/testsuite/reftests/background-position-repeat.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1_ref">
         <property name="name">button1_ref</property>
diff --git a/testsuite/reftests/background-position-repeat.ui 
b/testsuite/reftests/background-position-repeat.ui
index 28c855bcba..a89df257f8 100644
--- a/testsuite/reftests/background-position-repeat.ui
+++ b/testsuite/reftests/background-position-repeat.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">button1</property>
diff --git a/testsuite/reftests/background-position-simple.ref.ui 
b/testsuite/reftests/background-position-simple.ref.ui
index 73a6a91297..de0a31e5cd 100644
--- a/testsuite/reftests/background-position-simple.ref.ui
+++ b/testsuite/reftests/background-position-simple.ref.ui
@@ -4,7 +4,6 @@
     <property name="name">reference</property>
     <property name="width_request">40</property>
     <property name="height_request">40</property>
-    <property name="type">popup</property>
     <child>
       <placeholder/>
     </child>
diff --git a/testsuite/reftests/background-position-simple.ui 
b/testsuite/reftests/background-position-simple.ui
index a15b766c8b..65aa4c044d 100644
--- a/testsuite/reftests/background-position-simple.ui
+++ b/testsuite/reftests/background-position-simple.ui
@@ -3,7 +3,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">40</property>
     <property name="height_request">40</property>
-    <property name="type">popup</property>
     <child>
       <placeholder/>
     </child>
diff --git a/testsuite/reftests/background-position.ref.ui b/testsuite/reftests/background-position.ref.ui
index d7d6a5c6b7..d2bd312fc8 100644
--- a/testsuite/reftests/background-position.ref.ui
+++ b/testsuite/reftests/background-position.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <property name="name">ref</property>
     <child>
       <object class="GtkFixed" id="fixed1">
diff --git a/testsuite/reftests/background-position.ui b/testsuite/reftests/background-position.ui
index cfa5cb1c59..6975bb4098 100644
--- a/testsuite/reftests/background-position.ui
+++ b/testsuite/reftests/background-position.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/background-positioning-area-empty.ref.ui 
b/testsuite/reftests/background-positioning-area-empty.ref.ui
index 2367e407d9..cffbc8a05d 100644
--- a/testsuite/reftests/background-positioning-area-empty.ref.ui
+++ b/testsuite/reftests/background-positioning-area-empty.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="receives_default">1</property>
diff --git a/testsuite/reftests/background-positioning-area-empty.ui 
b/testsuite/reftests/background-positioning-area-empty.ui
index 2367e407d9..cffbc8a05d 100644
--- a/testsuite/reftests/background-positioning-area-empty.ui
+++ b/testsuite/reftests/background-positioning-area-empty.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="receives_default">1</property>
diff --git a/testsuite/reftests/background-repeat.ref.ui b/testsuite/reftests/background-repeat.ref.ui
index e0bedecf05..f3115cc472 100644
--- a/testsuite/reftests/background-repeat.ref.ui
+++ b/testsuite/reftests/background-repeat.ref.ui
@@ -3,7 +3,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">50</property>
     <property name="height_request">60</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/background-repeat.ui b/testsuite/reftests/background-repeat.ui
index dffc4645bd..623bbd3c77 100644
--- a/testsuite/reftests/background-repeat.ui
+++ b/testsuite/reftests/background-repeat.ui
@@ -3,7 +3,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">50</property>
     <property name="height_request">60</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/background-size-keywords.ref.ui 
b/testsuite/reftests/background-size-keywords.ref.ui
index 397398434e..80393b323a 100644
--- a/testsuite/reftests/background-size-keywords.ref.ui
+++ b/testsuite/reftests/background-size-keywords.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/background-size-keywords.ui b/testsuite/reftests/background-size-keywords.ui
index d6acd4e05e..19a33fac47 100644
--- a/testsuite/reftests/background-size-keywords.ui
+++ b/testsuite/reftests/background-size-keywords.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/background-size-zero.ref.ui b/testsuite/reftests/background-size-zero.ref.ui
index 5cb0e82ca6..abf1e160a8 100644
--- a/testsuite/reftests/background-size-zero.ref.ui
+++ b/testsuite/reftests/background-size-zero.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <property name="name">reference</property>
     <child>
       <placeholder/>
diff --git a/testsuite/reftests/background-size-zero.ui b/testsuite/reftests/background-size-zero.ui
index ec70764dc3..26f8e051c5 100644
--- a/testsuite/reftests/background-size-zero.ui
+++ b/testsuite/reftests/background-size-zero.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <placeholder/>
     </child>
diff --git a/testsuite/reftests/background-size.ref.ui b/testsuite/reftests/background-size.ref.ui
index 3fe2e2f29e..19f751c39f 100644
--- a/testsuite/reftests/background-size.ref.ui
+++ b/testsuite/reftests/background-size.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/background-size.ui b/testsuite/reftests/background-size.ui
index 5fd91c028c..c4a0bf823a 100644
--- a/testsuite/reftests/background-size.ui
+++ b/testsuite/reftests/background-size.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/background-window-transparent.ref.ui 
b/testsuite/reftests/background-window-transparent.ref.ui
index 62011eb05c..2232869731 100644
--- a/testsuite/reftests/background-window-transparent.ref.ui
+++ b/testsuite/reftests/background-window-transparent.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <property name="name">reference</property>
     <child>
       <object class="GtkViewport" id="viewport1">
diff --git a/testsuite/reftests/background-window-transparent.ui 
b/testsuite/reftests/background-window-transparent.ui
index 9b4f1d07ed..0366aa9a26 100644
--- a/testsuite/reftests/background-window-transparent.ui
+++ b/testsuite/reftests/background-window-transparent.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkViewport" id="viewport1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/bad-color-names.ref.ui b/testsuite/reftests/bad-color-names.ref.ui
index 297844bb36..f117aa2a30 100644
--- a/testsuite/reftests/bad-color-names.ref.ui
+++ b/testsuite/reftests/bad-color-names.ref.ui
@@ -3,6 +3,5 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">10</property>
     <property name="height_request">10</property>
-    <property name="type">popup</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/bad-color-names.ui b/testsuite/reftests/bad-color-names.ui
index 297844bb36..f117aa2a30 100644
--- a/testsuite/reftests/bad-color-names.ui
+++ b/testsuite/reftests/bad-color-names.ui
@@ -3,6 +3,5 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">10</property>
     <property name="height_request">10</property>
-    <property name="type">popup</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/border-color-default.ref.ui b/testsuite/reftests/border-color-default.ref.ui
index c4e75901a2..f137ae5548 100644
--- a/testsuite/reftests/border-color-default.ref.ui
+++ b/testsuite/reftests/border-color-default.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/border-color-default.ui b/testsuite/reftests/border-color-default.ui
index 5171539c74..a66c6c58a2 100644
--- a/testsuite/reftests/border-color-default.ui
+++ b/testsuite/reftests/border-color-default.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/border-corner-zero-width-rendering.ref.ui 
b/testsuite/reftests/border-corner-zero-width-rendering.ref.ui
index df0ac760ae..0968f3083e 100644
--- a/testsuite/reftests/border-corner-zero-width-rendering.ref.ui
+++ b/testsuite/reftests/border-corner-zero-width-rendering.ref.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/border-corner-zero-width-rendering.ui 
b/testsuite/reftests/border-corner-zero-width-rendering.ui
index 51f3df159a..6553efea00 100644
--- a/testsuite/reftests/border-corner-zero-width-rendering.ui
+++ b/testsuite/reftests/border-corner-zero-width-rendering.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/border-half-pixel.ref.ui b/testsuite/reftests/border-half-pixel.ref.ui
index c4e75901a2..f137ae5548 100644
--- a/testsuite/reftests/border-half-pixel.ref.ui
+++ b/testsuite/reftests/border-half-pixel.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/border-half-pixel.ui b/testsuite/reftests/border-half-pixel.ui
index 5171539c74..a66c6c58a2 100644
--- a/testsuite/reftests/border-half-pixel.ui
+++ b/testsuite/reftests/border-half-pixel.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/border-image-excess-size.ref.ui 
b/testsuite/reftests/border-image-excess-size.ref.ui
index 9da0c1204d..0892b694a2 100644
--- a/testsuite/reftests/border-image-excess-size.ref.ui
+++ b/testsuite/reftests/border-image-excess-size.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="row_spacing">8</property>
diff --git a/testsuite/reftests/border-image-excess-size.ui b/testsuite/reftests/border-image-excess-size.ui
index f4a5021f48..e3cb23de04 100644
--- a/testsuite/reftests/border-image-excess-size.ui
+++ b/testsuite/reftests/border-image-excess-size.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkToolbar" id="toolbar1">
         <property name="width_request">10</property>
diff --git a/testsuite/reftests/border-image-url-scaled.ref.ui 
b/testsuite/reftests/border-image-url-scaled.ref.ui
index 3509cbc830..9b84c9bc6d 100644
--- a/testsuite/reftests/border-image-url-scaled.ref.ui
+++ b/testsuite/reftests/border-image-url-scaled.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/border-image-url-scaled.ui b/testsuite/reftests/border-image-url-scaled.ui
index 4542d594c8..4c086fee53 100644
--- a/testsuite/reftests/border-image-url-scaled.ui
+++ b/testsuite/reftests/border-image-url-scaled.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/border-image-url.ref.ui b/testsuite/reftests/border-image-url.ref.ui
index b1464c4ac7..f5b2902ed2 100644
--- a/testsuite/reftests/border-image-url.ref.ui
+++ b/testsuite/reftests/border-image-url.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/border-image-url.ui b/testsuite/reftests/border-image-url.ui
index 4542d594c8..4c086fee53 100644
--- a/testsuite/reftests/border-image-url.ui
+++ b/testsuite/reftests/border-image-url.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/border-radius-clamp.ref.ui b/testsuite/reftests/border-radius-clamp.ref.ui
index 1f3fbc4282..54eac88c70 100644
--- a/testsuite/reftests/border-radius-clamp.ref.ui
+++ b/testsuite/reftests/border-radius-clamp.ref.ui
@@ -2,7 +2,6 @@
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="name">reference</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkProgressBar" id="progressbar1">
         <property name="width_request">150</property>
diff --git a/testsuite/reftests/border-radius-clamp.ui b/testsuite/reftests/border-radius-clamp.ui
index 481c5508c2..9f039e7d23 100644
--- a/testsuite/reftests/border-radius-clamp.ui
+++ b/testsuite/reftests/border-radius-clamp.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkProgressBar" id="progressbar1">
         <property name="width_request">150</property>
diff --git a/testsuite/reftests/border-style-none.ref.ui b/testsuite/reftests/border-style-none.ref.ui
index ca4bfdeabd..1f45071e26 100644
--- a/testsuite/reftests/border-style-none.ref.ui
+++ b/testsuite/reftests/border-style-none.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/border-style-none.ui b/testsuite/reftests/border-style-none.ui
index fc9d598981..0b7556c7e0 100644
--- a/testsuite/reftests/border-style-none.ui
+++ b/testsuite/reftests/border-style-none.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/border-style.ref.ui b/testsuite/reftests/border-style.ref.ui
index 88556a8377..2aae146bde 100644
--- a/testsuite/reftests/border-style.ref.ui
+++ b/testsuite/reftests/border-style.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/border-style.ui b/testsuite/reftests/border-style.ui
index e3c08e17a9..d26cb85562 100644
--- a/testsuite/reftests/border-style.ui
+++ b/testsuite/reftests/border-style.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/box-order.ref.ui b/testsuite/reftests/box-order.ref.ui
index 7b539bfb85..ca9e472308 100644
--- a/testsuite/reftests/box-order.ref.ui
+++ b/testsuite/reftests/box-order.ref.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/box-order.ui b/testsuite/reftests/box-order.ui
index 8bf2687da7..bae3f5eb4d 100644
--- a/testsuite/reftests/box-order.ui
+++ b/testsuite/reftests/box-order.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/box-pseudo-classes.ref.ui b/testsuite/reftests/box-pseudo-classes.ref.ui
index acb21faa98..505c9ee606 100644
--- a/testsuite/reftests/box-pseudo-classes.ref.ui
+++ b/testsuite/reftests/box-pseudo-classes.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
diff --git a/testsuite/reftests/box-pseudo-classes.ui b/testsuite/reftests/box-pseudo-classes.ui
index f458da2795..ecf2aa6f12 100644
--- a/testsuite/reftests/box-pseudo-classes.ui
+++ b/testsuite/reftests/box-pseudo-classes.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
diff --git a/testsuite/reftests/box-shadow-changes-modify-clip.ref.ui 
b/testsuite/reftests/box-shadow-changes-modify-clip.ref.ui
index c18d74d7e6..0d4fb46322 100644
--- a/testsuite/reftests/box-shadow-changes-modify-clip.ref.ui
+++ b/testsuite/reftests/box-shadow-changes-modify-clip.ref.ui
@@ -4,7 +4,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="halign">center</property>
diff --git a/testsuite/reftests/box-shadow-changes-modify-clip.ui 
b/testsuite/reftests/box-shadow-changes-modify-clip.ui
index f69a690560..4c44d0300e 100644
--- a/testsuite/reftests/box-shadow-changes-modify-clip.ui
+++ b/testsuite/reftests/box-shadow-changes-modify-clip.ui
@@ -4,7 +4,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
     <signal name="map" handler="reftest:inhibit_for_3_frames" swapped="no"/>
     <child>
       <object class="GtkBox" id="box2">
diff --git a/testsuite/reftests/box-shadow-spec-inset.ref.ui b/testsuite/reftests/box-shadow-spec-inset.ref.ui
index 14646a3a4a..cf8b714746 100644
--- a/testsuite/reftests/box-shadow-spec-inset.ref.ui
+++ b/testsuite/reftests/box-shadow-spec-inset.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="row_spacing">20</property>
diff --git a/testsuite/reftests/box-shadow-spec-inset.ui b/testsuite/reftests/box-shadow-spec-inset.ui
index 3d38e4d42d..6331f4dc91 100644
--- a/testsuite/reftests/box-shadow-spec-inset.ui
+++ b/testsuite/reftests/box-shadow-spec-inset.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="row_spacing">20</property>
diff --git a/testsuite/reftests/box-shadow-spread.ref.ui b/testsuite/reftests/box-shadow-spread.ref.ui
index 826a0dde37..23bf3b0678 100644
--- a/testsuite/reftests/box-shadow-spread.ref.ui
+++ b/testsuite/reftests/box-shadow-spread.ref.ui
@@ -4,7 +4,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="label" translatable="yes">Hi</property>
diff --git a/testsuite/reftests/box-shadow-spread.ui b/testsuite/reftests/box-shadow-spread.ui
index 9a7384a6a1..a4da8d70b9 100644
--- a/testsuite/reftests/box-shadow-spread.ui
+++ b/testsuite/reftests/box-shadow-spread.ui
@@ -4,7 +4,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="label" translatable="yes">Hi</property>
diff --git a/testsuite/reftests/box-shadow-with-blend-mode.ref.ui 
b/testsuite/reftests/box-shadow-with-blend-mode.ref.ui
index 6e81666205..338834daa4 100644
--- a/testsuite/reftests/box-shadow-with-blend-mode.ref.ui
+++ b/testsuite/reftests/box-shadow-with-blend-mode.ref.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.16"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="b">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/box-shadow-with-blend-mode.ui 
b/testsuite/reftests/box-shadow-with-blend-mode.ui
index 0926699a8c..6bf206bf74 100644
--- a/testsuite/reftests/box-shadow-with-blend-mode.ui
+++ b/testsuite/reftests/box-shadow-with-blend-mode.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.16"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="b">
         <property name="label" translatable="yes">Hello World!</property>
diff --git a/testsuite/reftests/button-wrapping.ref.ui b/testsuite/reftests/button-wrapping.ref.ui
index 44dc22f0cb..05489b8291 100644
--- a/testsuite/reftests/button-wrapping.ref.ui
+++ b/testsuite/reftests/button-wrapping.ref.ui
@@ -3,7 +3,6 @@
   <object class="GtkWindow" id="window1">
     <property name="height_request">500</property>
     <property name="width_request">500</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/button-wrapping.ui b/testsuite/reftests/button-wrapping.ui
index 9e66104984..c1f1d1b4d3 100644
--- a/testsuite/reftests/button-wrapping.ui
+++ b/testsuite/reftests/button-wrapping.ui
@@ -3,7 +3,6 @@
   <object class="GtkWindow" id="window1">
     <property name="height_request">500</property>
     <property name="width_request">500</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/color-transition.ref.ui b/testsuite/reftests/color-transition.ref.ui
index 331350ef6d..f004bf6676 100644
--- a/testsuite/reftests/color-transition.ref.ui
+++ b/testsuite/reftests/color-transition.ref.ui
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/color-transition.ui b/testsuite/reftests/color-transition.ui
index 715d42c771..4dfc76a522 100644
--- a/testsuite/reftests/color-transition.ui
+++ b/testsuite/reftests/color-transition.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
diff --git a/testsuite/reftests/cross-fade-syntax.ref.ui b/testsuite/reftests/cross-fade-syntax.ref.ui
index dfbd9d7c59..ecc5ead405 100644
--- a/testsuite/reftests/cross-fade-syntax.ref.ui
+++ b/testsuite/reftests/cross-fade-syntax.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="row-spacing">1</property>
diff --git a/testsuite/reftests/cross-fade-syntax.ui b/testsuite/reftests/cross-fade-syntax.ui
index d7fd2805e6..664122e642 100644
--- a/testsuite/reftests/cross-fade-syntax.ui
+++ b/testsuite/reftests/cross-fade-syntax.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="row-spacing">1</property>
diff --git a/testsuite/reftests/css-currentcolor-alpha.ref.ui 
b/testsuite/reftests/css-currentcolor-alpha.ref.ui
index 5cb0e82ca6..abf1e160a8 100644
--- a/testsuite/reftests/css-currentcolor-alpha.ref.ui
+++ b/testsuite/reftests/css-currentcolor-alpha.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <property name="name">reference</property>
     <child>
       <placeholder/>
diff --git a/testsuite/reftests/css-currentcolor-alpha.ui b/testsuite/reftests/css-currentcolor-alpha.ui
index ec70764dc3..26f8e051c5 100644
--- a/testsuite/reftests/css-currentcolor-alpha.ui
+++ b/testsuite/reftests/css-currentcolor-alpha.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <placeholder/>
     </child>
diff --git a/testsuite/reftests/css-em-label-size.ref.ui b/testsuite/reftests/css-em-label-size.ref.ui
index 8dbfeb4d76..05f7974ba2 100644
--- a/testsuite/reftests/css-em-label-size.ref.ui
+++ b/testsuite/reftests/css-em-label-size.ref.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkWindow">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid">
         <property name="row_homogeneous">1</property>
diff --git a/testsuite/reftests/css-em-label-size.ui b/testsuite/reftests/css-em-label-size.ui
index 66190f6c1b..44e02740f8 100644
--- a/testsuite/reftests/css-em-label-size.ui
+++ b/testsuite/reftests/css-em-label-size.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkWindow">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid">
         <property name="row_homogeneous">1</property>
diff --git a/testsuite/reftests/css-image-aspect-ratio.ref.ui 
b/testsuite/reftests/css-image-aspect-ratio.ref.ui
index 8198b04612..7d07287d5f 100644
--- a/testsuite/reftests/css-image-aspect-ratio.ref.ui
+++ b/testsuite/reftests/css-image-aspect-ratio.ref.ui
@@ -3,7 +3,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">48</property>
     <property name="height_request">24</property>
-    <property name="type">popup</property>
     <property name="name">reference</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/css-image-aspect-ratio.ui b/testsuite/reftests/css-image-aspect-ratio.ui
index f9a37b7a61..f270fcf5ce 100644
--- a/testsuite/reftests/css-image-aspect-ratio.ui
+++ b/testsuite/reftests/css-image-aspect-ratio.ui
@@ -3,6 +3,5 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">48</property>
     <property name="height_request">24</property>
-    <property name="type">popup</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/css-image-color-aspect-ratio.ref.ui 
b/testsuite/reftests/css-image-color-aspect-ratio.ref.ui
index 5e2a51192a..e18c11cde0 100644
--- a/testsuite/reftests/css-image-color-aspect-ratio.ref.ui
+++ b/testsuite/reftests/css-image-color-aspect-ratio.ref.ui
@@ -3,7 +3,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">20</property>
     <property name="height_request">10</property>
-    <property name="type">popup</property>
     <property name="name">reference</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/css-image-color-aspect-ratio.ui 
b/testsuite/reftests/css-image-color-aspect-ratio.ui
index 63e8f04846..3c2addfee7 100644
--- a/testsuite/reftests/css-image-color-aspect-ratio.ui
+++ b/testsuite/reftests/css-image-color-aspect-ratio.ui
@@ -3,6 +3,5 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">20</property>
     <property name="height_request">10</property>
-    <property name="type">popup</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/css-match-class.ref.ui b/testsuite/reftests/css-match-class.ref.ui
index e85bbec582..5b683c02c6 100644
--- a/testsuite/reftests/css-match-class.ref.ui
+++ b/testsuite/reftests/css-match-class.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
-    <property name="type">popup</property>
     <child>
       <object class="GtkPicture">
         <property name="paintable">green-20x20.png</property>
diff --git a/testsuite/reftests/css-match-class.ui b/testsuite/reftests/css-match-class.ui
index ab783b3219..8e4e4f6bac 100644
--- a/testsuite/reftests/css-match-class.ui
+++ b/testsuite/reftests/css-match-class.ui
@@ -3,7 +3,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">20</property>
     <property name="height_request">20</property>
-    <property name="type">popup</property>
     <property name="name">window</property>
     <style>
       <class name="window"/>
diff --git a/testsuite/reftests/css-match-descendant-later.ref.ui 
b/testsuite/reftests/css-match-descendant-later.ref.ui
index 0c8a4b46e0..a13a140a0e 100644
--- a/testsuite/reftests/css-match-descendant-later.ref.ui
+++ b/testsuite/reftests/css-match-descendant-later.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="width_request">10</property>
diff --git a/testsuite/reftests/css-match-descendant-later.ui 
b/testsuite/reftests/css-match-descendant-later.ui
index 90e3d7a3de..18e5af4977 100644
--- a/testsuite/reftests/css-match-descendant-later.ui
+++ b/testsuite/reftests/css-match-descendant-later.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/css-match-exact.ref.ui b/testsuite/reftests/css-match-exact.ref.ui
index 74b65db8a1..4be3571725 100644
--- a/testsuite/reftests/css-match-exact.ref.ui
+++ b/testsuite/reftests/css-match-exact.ref.ui
@@ -3,7 +3,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">10</property>
     <property name="height_request">10</property>
-    <property name="type">popup</property>
     <child>
       <placeholder/>
     </child>
diff --git a/testsuite/reftests/css-match-exact.ui b/testsuite/reftests/css-match-exact.ui
index 7a9389c2d5..b61dcc65bc 100644
--- a/testsuite/reftests/css-match-exact.ui
+++ b/testsuite/reftests/css-match-exact.ui
@@ -3,7 +3,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">10</property>
     <property name="height_request">10</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/css-match-import.ref.ui b/testsuite/reftests/css-match-import.ref.ui
index a2f55c86fd..2a01304c39 100644
--- a/testsuite/reftests/css-match-import.ref.ui
+++ b/testsuite/reftests/css-match-import.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="name">purple</property>
diff --git a/testsuite/reftests/css-match-import.ui b/testsuite/reftests/css-match-import.ui
index 8ea0858c14..7afe31d620 100644
--- a/testsuite/reftests/css-match-import.ui
+++ b/testsuite/reftests/css-match-import.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">Purple</property>
diff --git a/testsuite/reftests/css-match-inherit-different-state.ref.ui 
b/testsuite/reftests/css-match-inherit-different-state.ref.ui
index 84596a0208..e65d79cdfd 100644
--- a/testsuite/reftests/css-match-inherit-different-state.ref.ui
+++ b/testsuite/reftests/css-match-inherit-different-state.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/css-match-inherit-different-state.ui 
b/testsuite/reftests/css-match-inherit-different-state.ui
index 15f803784c..1aebeeeb54 100644
--- a/testsuite/reftests/css-match-inherit-different-state.ui
+++ b/testsuite/reftests/css-match-inherit-different-state.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/css-match-inherit.ref.ui b/testsuite/reftests/css-match-inherit.ref.ui
index d3b58f7432..132e57a9b0 100644
--- a/testsuite/reftests/css-match-inherit.ref.ui
+++ b/testsuite/reftests/css-match-inherit.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/css-match-inherit.ui b/testsuite/reftests/css-match-inherit.ui
index 8395c51add..557ae0993c 100644
--- a/testsuite/reftests/css-match-inherit.ui
+++ b/testsuite/reftests/css-match-inherit.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/css-match-name.ref.ui b/testsuite/reftests/css-match-name.ref.ui
index 5fc9c823dc..150587165b 100644
--- a/testsuite/reftests/css-match-name.ref.ui
+++ b/testsuite/reftests/css-match-name.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkPicture">
         <property name="paintable">green-20x20.png</property>
diff --git a/testsuite/reftests/css-match-name.ui b/testsuite/reftests/css-match-name.ui
index ab783b3219..8e4e4f6bac 100644
--- a/testsuite/reftests/css-match-name.ui
+++ b/testsuite/reftests/css-match-name.ui
@@ -3,7 +3,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">20</property>
     <property name="height_request">20</property>
-    <property name="type">popup</property>
     <property name="name">window</property>
     <style>
       <class name="window"/>
diff --git a/testsuite/reftests/css-match-siblings.ref.ui b/testsuite/reftests/css-match-siblings.ref.ui
index cdd1d6730b..6249af299e 100644
--- a/testsuite/reftests/css-match-siblings.ref.ui
+++ b/testsuite/reftests/css-match-siblings.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/css-match-siblings.ui b/testsuite/reftests/css-match-siblings.ui
index 5e8dfcae6c..7a36de01d9 100644
--- a/testsuite/reftests/css-match-siblings.ui
+++ b/testsuite/reftests/css-match-siblings.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/css-match-type.ref.ui b/testsuite/reftests/css-match-type.ref.ui
index 5fc9c823dc..150587165b 100644
--- a/testsuite/reftests/css-match-type.ref.ui
+++ b/testsuite/reftests/css-match-type.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkPicture">
         <property name="paintable">green-20x20.png</property>
diff --git a/testsuite/reftests/css-match-type.ui b/testsuite/reftests/css-match-type.ui
index ab783b3219..8e4e4f6bac 100644
--- a/testsuite/reftests/css-match-type.ui
+++ b/testsuite/reftests/css-match-type.ui
@@ -3,7 +3,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">20</property>
     <property name="height_request">20</property>
-    <property name="type">popup</property>
     <property name="name">window</property>
     <style>
       <class name="window"/>
diff --git a/testsuite/reftests/css-multi-state.ref.ui b/testsuite/reftests/css-multi-state.ref.ui
index b99269be6b..ec402d6438 100644
--- a/testsuite/reftests/css-multi-state.ref.ui
+++ b/testsuite/reftests/css-multi-state.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkToggleButton" id="togglebutton1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/css-multi-state.ui b/testsuite/reftests/css-multi-state.ui
index 9f7979e29a..c7d108e4dd 100644
--- a/testsuite/reftests/css-multi-state.ui
+++ b/testsuite/reftests/css-multi-state.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkToggleButton" id="togglebutton1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/css-rem-label-size.ref.ui b/testsuite/reftests/css-rem-label-size.ref.ui
index aa903fb77d..58c5093899 100644
--- a/testsuite/reftests/css-rem-label-size.ref.ui
+++ b/testsuite/reftests/css-rem-label-size.ref.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkWindow">
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel">
         <property name="label" translatable="yes">███</property>
diff --git a/testsuite/reftests/css-rem-label-size.ui b/testsuite/reftests/css-rem-label-size.ui
index f70bf80600..8eb87dc54e 100644
--- a/testsuite/reftests/css-rem-label-size.ui
+++ b/testsuite/reftests/css-rem-label-size.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkWindow">
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel">
         <property name="label" translatable="yes">███</property>
diff --git a/testsuite/reftests/data-url.ref.ui b/testsuite/reftests/data-url.ref.ui
index 7a09474075..d2b18bf7b2 100644
--- a/testsuite/reftests/data-url.ref.ui
+++ b/testsuite/reftests/data-url.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
-    <property name="type">popup</property>
     <child>
       <object class="GtkPicture">
         <property name="can-shrink">0</property>
diff --git a/testsuite/reftests/data-url.ui b/testsuite/reftests/data-url.ui
index 6fa417228a..c569311f58 100644
--- a/testsuite/reftests/data-url.ui
+++ b/testsuite/reftests/data-url.ui
@@ -3,6 +3,5 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">20</property>
     <property name="height_request">20</property>
-    <property name="type">popup</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/expander.ref.ui b/testsuite/reftests/expander.ref.ui
index cf55a788dc..d6a78e426f 100644
--- a/testsuite/reftests/expander.ref.ui
+++ b/testsuite/reftests/expander.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkExpander" id="expander1">
         <property name="expanded">1</property>
diff --git a/testsuite/reftests/expander.ui b/testsuite/reftests/expander.ui
index 628d0c60c9..a432a53f7b 100644
--- a/testsuite/reftests/expander.ui
+++ b/testsuite/reftests/expander.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkExpander" id="expander1">
         <property name="label">Hello</property>
diff --git a/testsuite/reftests/fixed-widget-stacking.ref.ui b/testsuite/reftests/fixed-widget-stacking.ref.ui
index acfe9c984c..fe9b307afa 100644
--- a/testsuite/reftests/fixed-widget-stacking.ref.ui
+++ b/testsuite/reftests/fixed-widget-stacking.ref.ui
@@ -5,7 +5,6 @@
 TEST123</property>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkFixed" id="fixed1">
         <child>
diff --git a/testsuite/reftests/fixed-widget-stacking.ui b/testsuite/reftests/fixed-widget-stacking.ui
index dc2e9f73a7..0ff24d55d0 100644
--- a/testsuite/reftests/fixed-widget-stacking.ui
+++ b/testsuite/reftests/fixed-widget-stacking.ui
@@ -5,7 +5,6 @@
 TEST123</property>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkFixed" id="fixed1">
         <child>
diff --git a/testsuite/reftests/flipping-icons.ref.ui b/testsuite/reftests/flipping-icons.ref.ui
index a669882851..13bea132d5 100644
--- a/testsuite/reftests/flipping-icons.ref.ui
+++ b/testsuite/reftests/flipping-icons.ref.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/flipping-icons.ui b/testsuite/reftests/flipping-icons.ui
index 3a508cf48e..1fceb2dcfd 100644
--- a/testsuite/reftests/flipping-icons.ui
+++ b/testsuite/reftests/flipping-icons.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <signal name="map" handler="reftest:switch_default_direction" swapped="no"/>
     <signal name="destroy" handler="reftest:switch_default_direction" swapped="no"/>
     <child>
diff --git a/testsuite/reftests/font-sizes-names.ref.ui b/testsuite/reftests/font-sizes-names.ref.ui
index da94ffd4ba..e3aeaa6b08 100644
--- a/testsuite/reftests/font-sizes-names.ref.ui
+++ b/testsuite/reftests/font-sizes-names.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <property name="name">reference</property>
     <child>
       <object class="GtkBox" id="box1">
diff --git a/testsuite/reftests/font-sizes-names.ui b/testsuite/reftests/font-sizes-names.ui
index 6c396675cf..a3fffa586d 100644
--- a/testsuite/reftests/font-sizes-names.ui
+++ b/testsuite/reftests/font-sizes-names.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/grid-empty-with-spacing.ref.ui 
b/testsuite/reftests/grid-empty-with-spacing.ref.ui
index aa2b506bf9..e5f08bc06e 100644
--- a/testsuite/reftests/grid-empty-with-spacing.ref.ui
+++ b/testsuite/reftests/grid-empty-with-spacing.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="row_spacing">5</property>
diff --git a/testsuite/reftests/grid-empty-with-spacing.ui b/testsuite/reftests/grid-empty-with-spacing.ui
index 5b9e81e76b..da375d1f14 100644
--- a/testsuite/reftests/grid-empty-with-spacing.ui
+++ b/testsuite/reftests/grid-empty-with-spacing.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="row_spacing">5</property>
diff --git a/testsuite/reftests/grid-expand.ref.ui b/testsuite/reftests/grid-expand.ref.ui
index 431a73c05f..aac93e5c3c 100644
--- a/testsuite/reftests/grid-expand.ref.ui
+++ b/testsuite/reftests/grid-expand.ref.ui
@@ -3,7 +3,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/grid-expand.ui b/testsuite/reftests/grid-expand.ui
index c0b33be95f..e8f17d55bb 100644
--- a/testsuite/reftests/grid-expand.ui
+++ b/testsuite/reftests/grid-expand.ui
@@ -3,7 +3,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid0">
         <child>
diff --git a/testsuite/reftests/grid-homogeneous.ref.ui b/testsuite/reftests/grid-homogeneous.ref.ui
index d40f0d620d..cbe331e910 100644
--- a/testsuite/reftests/grid-homogeneous.ref.ui
+++ b/testsuite/reftests/grid-homogeneous.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/grid-homogeneous.ui b/testsuite/reftests/grid-homogeneous.ui
index 43116e11d5..940e9709f5 100644
--- a/testsuite/reftests/grid-homogeneous.ui
+++ b/testsuite/reftests/grid-homogeneous.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/grid-spacing1.ref.ui b/testsuite/reftests/grid-spacing1.ref.ui
index 2faa9a0117..7ee9246ce4 100644
--- a/testsuite/reftests/grid-spacing1.ref.ui
+++ b/testsuite/reftests/grid-spacing1.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/grid-spacing1.ui b/testsuite/reftests/grid-spacing1.ui
index 004c62ed9d..61e91f607d 100644
--- a/testsuite/reftests/grid-spacing1.ui
+++ b/testsuite/reftests/grid-spacing1.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid">
         <child>
diff --git a/testsuite/reftests/grid-spacing2.ref.ui b/testsuite/reftests/grid-spacing2.ref.ui
index c37863a841..b4caad3982 100644
--- a/testsuite/reftests/grid-spacing2.ref.ui
+++ b/testsuite/reftests/grid-spacing2.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box">
         <child>
diff --git a/testsuite/reftests/grid-spacing2.ui b/testsuite/reftests/grid-spacing2.ui
index 4c6fd8259b..4fd2b61347 100644
--- a/testsuite/reftests/grid-spacing2.ui
+++ b/testsuite/reftests/grid-spacing2.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid">
         <child>
diff --git a/testsuite/reftests/grid-spacing3.ref.ui b/testsuite/reftests/grid-spacing3.ref.ui
index 9aaba61583..4b1537c0b7 100644
--- a/testsuite/reftests/grid-spacing3.ref.ui
+++ b/testsuite/reftests/grid-spacing3.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="row-spacing">10</property>
diff --git a/testsuite/reftests/grid-spacing3.ui b/testsuite/reftests/grid-spacing3.ui
index bf6f584ce2..849785893e 100644
--- a/testsuite/reftests/grid-spacing3.ui
+++ b/testsuite/reftests/grid-spacing3.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="row-spacing">10</property>
diff --git a/testsuite/reftests/grid-wfh.ref.ui b/testsuite/reftests/grid-wfh.ref.ui
index ebea05d7e7..bc4cfcf42b 100644
--- a/testsuite/reftests/grid-wfh.ref.ui
+++ b/testsuite/reftests/grid-wfh.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/grid-wfh.ui b/testsuite/reftests/grid-wfh.ui
index 0e5396a7dd..c189382cb3 100644
--- a/testsuite/reftests/grid-wfh.ui
+++ b/testsuite/reftests/grid-wfh.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/gtk-icontheme-sizing.ref.ui b/testsuite/reftests/gtk-icontheme-sizing.ref.ui
index d93b42a014..0934db28ce 100644
--- a/testsuite/reftests/gtk-icontheme-sizing.ref.ui
+++ b/testsuite/reftests/gtk-icontheme-sizing.ref.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkImage" id="image1">
         <property name="pixel_size">100</property>
diff --git a/testsuite/reftests/gtk-icontheme-sizing.ui b/testsuite/reftests/gtk-icontheme-sizing.ui
index c1a1e6014b..350ea3627b 100644
--- a/testsuite/reftests/gtk-icontheme-sizing.ui
+++ b/testsuite/reftests/gtk-icontheme-sizing.ui
@@ -4,7 +4,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/gtk-image-effect-inherit.ref.ui 
b/testsuite/reftests/gtk-image-effect-inherit.ref.ui
index cc0482913b..47e969f3f9 100644
--- a/testsuite/reftests/gtk-image-effect-inherit.ref.ui
+++ b/testsuite/reftests/gtk-image-effect-inherit.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
diff --git a/testsuite/reftests/gtk-image-effect-inherit.ui b/testsuite/reftests/gtk-image-effect-inherit.ui
index 6ef4925023..4b71822b21 100644
--- a/testsuite/reftests/gtk-image-effect-inherit.ui
+++ b/testsuite/reftests/gtk-image-effect-inherit.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
diff --git a/testsuite/reftests/icon-effect-missing.ref.ui b/testsuite/reftests/icon-effect-missing.ref.ui
index 9200097442..0ace03c449 100644
--- a/testsuite/reftests/icon-effect-missing.ref.ui
+++ b/testsuite/reftests/icon-effect-missing.ref.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.16"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
diff --git a/testsuite/reftests/icon-effect-missing.ui b/testsuite/reftests/icon-effect-missing.ui
index 5d432aec96..3984d0033c 100644
--- a/testsuite/reftests/icon-effect-missing.ui
+++ b/testsuite/reftests/icon-effect-missing.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.16"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
diff --git a/testsuite/reftests/icon-shadow-no-transform.ref.ui 
b/testsuite/reftests/icon-shadow-no-transform.ref.ui
index b8c3d8157c..6d76cd1000 100644
--- a/testsuite/reftests/icon-shadow-no-transform.ref.ui
+++ b/testsuite/reftests/icon-shadow-no-transform.ref.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkSpinner" id="spinner1"/>
     </child>
diff --git a/testsuite/reftests/icon-shadow-no-transform.ui b/testsuite/reftests/icon-shadow-no-transform.ui
index 503a8b0393..3e61b6dd3d 100644
--- a/testsuite/reftests/icon-shadow-no-transform.ui
+++ b/testsuite/reftests/icon-shadow-no-transform.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkSpinner" id="spinner1">
         <style>
diff --git a/testsuite/reftests/icon-style-basics.ref.ui b/testsuite/reftests/icon-style-basics.ref.ui
index edf7842d9a..0dd818cb71 100644
--- a/testsuite/reftests/icon-style-basics.ref.ui
+++ b/testsuite/reftests/icon-style-basics.ref.ui
@@ -12,7 +12,6 @@
     </data>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/icon-style-basics.ui b/testsuite/reftests/icon-style-basics.ui
index 1d4c07f6de..3ee9539216 100644
--- a/testsuite/reftests/icon-style-basics.ui
+++ b/testsuite/reftests/icon-style-basics.ui
@@ -12,7 +12,6 @@
     </data>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/iconview-empty.ref.ui b/testsuite/reftests/iconview-empty.ref.ui
index 2ec7dcb502..502275ccc4 100644
--- a/testsuite/reftests/iconview-empty.ref.ui
+++ b/testsuite/reftests/iconview-empty.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid">
         <property name="row_spacing">5</property>
diff --git a/testsuite/reftests/iconview-empty.ui b/testsuite/reftests/iconview-empty.ui
index a483b42272..84d4c52847 100644
--- a/testsuite/reftests/iconview-empty.ui
+++ b/testsuite/reftests/iconview-empty.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid">
         <property name="row_spacing">5</property>
diff --git a/testsuite/reftests/image-icon-name-use-fallback.ref.ui 
b/testsuite/reftests/image-icon-name-use-fallback.ref.ui
index 8ba61ab4bd..0caeb88555 100644
--- a/testsuite/reftests/image-icon-name-use-fallback.ref.ui
+++ b/testsuite/reftests/image-icon-name-use-fallback.ref.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkImage" id="image1">
         <property name="icon_name">edit-delete</property>
diff --git a/testsuite/reftests/image-icon-name-use-fallback.ui 
b/testsuite/reftests/image-icon-name-use-fallback.ui
index 10fefbd028..244f15fb2c 100644
--- a/testsuite/reftests/image-icon-name-use-fallback.ui
+++ b/testsuite/reftests/image-icon-name-use-fallback.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkImage" id="image1">
         <property name="icon_name">edit-delete-lolwtfbbq</property>
diff --git a/testsuite/reftests/image-icon-shadow-clipping.ref.ui 
b/testsuite/reftests/image-icon-shadow-clipping.ref.ui
index 7573765213..c41be68692 100644
--- a/testsuite/reftests/image-icon-shadow-clipping.ref.ui
+++ b/testsuite/reftests/image-icon-shadow-clipping.ref.ui
@@ -4,7 +4,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkImage" id="image1">
         <property name="icon_name">edit-delete</property>
diff --git a/testsuite/reftests/image-icon-shadow-clipping.ui 
b/testsuite/reftests/image-icon-shadow-clipping.ui
index 4f88c0f0ee..21828c1b9d 100644
--- a/testsuite/reftests/image-icon-shadow-clipping.ui
+++ b/testsuite/reftests/image-icon-shadow-clipping.ui
@@ -4,7 +4,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box2">
         <property name="halign">center</property>
diff --git a/testsuite/reftests/image-load-from-file.ref.ui b/testsuite/reftests/image-load-from-file.ref.ui
index 6ebe6b9f90..29d50a96b5 100644
--- a/testsuite/reftests/image-load-from-file.ref.ui
+++ b/testsuite/reftests/image-load-from-file.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/image-load-from-file.ui b/testsuite/reftests/image-load-from-file.ui
index 8e7a5446ce..488e197d16 100644
--- a/testsuite/reftests/image-load-from-file.ui
+++ b/testsuite/reftests/image-load-from-file.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/label-attribute-preference.ref.ui 
b/testsuite/reftests/label-attribute-preference.ref.ui
index 2d45923300..d19ebd61b0 100644
--- a/testsuite/reftests/label-attribute-preference.ref.ui
+++ b/testsuite/reftests/label-attribute-preference.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">Hello linky World</property>
diff --git a/testsuite/reftests/label-attribute-preference.ui 
b/testsuite/reftests/label-attribute-preference.ui
index ae9fbfe046..8f2be8063d 100644
--- a/testsuite/reftests/label-attribute-preference.ui
+++ b/testsuite/reftests/label-attribute-preference.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="use-markup">1</property>
diff --git a/testsuite/reftests/label-background.ref.ui b/testsuite/reftests/label-background.ref.ui
index 1bda217d61..d8d5c8d8a9 100644
--- a/testsuite/reftests/label-background.ref.ui
+++ b/testsuite/reftests/label-background.ref.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">Hello World!</property>
diff --git a/testsuite/reftests/label-background.ui b/testsuite/reftests/label-background.ui
index 3f7117ee31..0a2414d0e2 100644
--- a/testsuite/reftests/label-background.ui
+++ b/testsuite/reftests/label-background.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
diff --git a/testsuite/reftests/label-box-shadow-clip.ref.ui b/testsuite/reftests/label-box-shadow-clip.ref.ui
index 97be53210b..8ddfde32e9 100644
--- a/testsuite/reftests/label-box-shadow-clip.ref.ui
+++ b/testsuite/reftests/label-box-shadow-clip.ref.ui
@@ -4,7 +4,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="halign">center</property>
diff --git a/testsuite/reftests/label-box-shadow-clip.ui b/testsuite/reftests/label-box-shadow-clip.ui
index 7672f7db14..511207b8c9 100644
--- a/testsuite/reftests/label-box-shadow-clip.ui
+++ b/testsuite/reftests/label-box-shadow-clip.ui
@@ -4,7 +4,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="halign">center</property>
diff --git a/testsuite/reftests/label-clipping.ref.ui b/testsuite/reftests/label-clipping.ref.ui
index 905cf05636..b498f064ec 100644
--- a/testsuite/reftests/label-clipping.ref.ui
+++ b/testsuite/reftests/label-clipping.ref.ui
@@ -3,7 +3,6 @@
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">fffffffff</property>
diff --git a/testsuite/reftests/label-clipping.ui b/testsuite/reftests/label-clipping.ui
index 058d66b280..39e9aa2a96 100644
--- a/testsuite/reftests/label-clipping.ui
+++ b/testsuite/reftests/label-clipping.ui
@@ -3,7 +3,6 @@
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box2">
         <property name="halign">center</property>
diff --git a/testsuite/reftests/label-ellipsize-small.ref.ui b/testsuite/reftests/label-ellipsize-small.ref.ui
index 20c9277b9d..8a0a8e6a97 100644
--- a/testsuite/reftests/label-ellipsize-small.ref.ui
+++ b/testsuite/reftests/label-ellipsize-small.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">d</property>
diff --git a/testsuite/reftests/label-ellipsize-small.ui b/testsuite/reftests/label-ellipsize-small.ui
index 7b7ca38894..bbbe967fb2 100644
--- a/testsuite/reftests/label-ellipsize-small.ui
+++ b/testsuite/reftests/label-ellipsize-small.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">d</property>
diff --git a/testsuite/reftests/label-ellipsize-with-big.ref.ui 
b/testsuite/reftests/label-ellipsize-with-big.ref.ui
index 18dff6e51a..209e1d4541 100644
--- a/testsuite/reftests/label-ellipsize-with-big.ref.ui
+++ b/testsuite/reftests/label-ellipsize-with-big.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes"> &lt;big&gt;&lt;b&gt;There&apos;s a space in 
front&lt;/b&gt;&lt;/big&gt;</property>
diff --git a/testsuite/reftests/label-ellipsize-with-big.ui b/testsuite/reftests/label-ellipsize-with-big.ui
index 18dff6e51a..209e1d4541 100644
--- a/testsuite/reftests/label-ellipsize-with-big.ui
+++ b/testsuite/reftests/label-ellipsize-with-big.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes"> &lt;big&gt;&lt;b&gt;There&apos;s a space in 
front&lt;/b&gt;&lt;/big&gt;</property>
diff --git a/testsuite/reftests/label-fonts.ref.ui b/testsuite/reftests/label-fonts.ref.ui
index 55a881b7c7..776c008930 100644
--- a/testsuite/reftests/label-fonts.ref.ui
+++ b/testsuite/reftests/label-fonts.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label3">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/label-fonts.ui b/testsuite/reftests/label-fonts.ui
index a7d468885f..2eb32689d7 100644
--- a/testsuite/reftests/label-fonts.ui
+++ b/testsuite/reftests/label-fonts.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label3">
         <property name="name">label</property>
diff --git a/testsuite/reftests/label-shadows.ref.ui b/testsuite/reftests/label-shadows.ref.ui
index 32c9c96922..89953db5dc 100644
--- a/testsuite/reftests/label-shadows.ref.ui
+++ b/testsuite/reftests/label-shadows.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
-    <property name="type">popup</property>
     <child>
       <object class="GtkFixed">
         <property name="width-request">200</property>
diff --git a/testsuite/reftests/label-shadows.ui b/testsuite/reftests/label-shadows.ui
index 56a6ac0a2d..f2645ac837 100644
--- a/testsuite/reftests/label-shadows.ui
+++ b/testsuite/reftests/label-shadows.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
-    <property name="type">popup</property>
     <child>
       <object class="GtkFixed">
         <property name="width-request">200</property>
diff --git a/testsuite/reftests/label-sizing.ref.ui b/testsuite/reftests/label-sizing.ref.ui
index d1ac565dc8..be327b8933 100644
--- a/testsuite/reftests/label-sizing.ref.ui
+++ b/testsuite/reftests/label-sizing.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <signal name="realize" handler="reftest:set_default_direction_ltr"/>
     <child>
       <object class="GtkGrid" id="grid1">
diff --git a/testsuite/reftests/label-sizing.ui b/testsuite/reftests/label-sizing.ui
index 69784ba8ee..2bda9caa0b 100644
--- a/testsuite/reftests/label-sizing.ui
+++ b/testsuite/reftests/label-sizing.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <signal name="realize" handler="reftest:set_default_direction_ltr"/>
     <child>
       <object class="GtkGrid" id="grid1">
diff --git a/testsuite/reftests/label-small-ellipsized.ref.ui 
b/testsuite/reftests/label-small-ellipsized.ref.ui
index bb047f0a15..d4638e8735 100644
--- a/testsuite/reftests/label-small-ellipsized.ref.ui
+++ b/testsuite/reftests/label-small-ellipsized.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes"> </property>
diff --git a/testsuite/reftests/label-small-ellipsized.ui b/testsuite/reftests/label-small-ellipsized.ui
index 260149d2c1..87082647ca 100644
--- a/testsuite/reftests/label-small-ellipsized.ui
+++ b/testsuite/reftests/label-small-ellipsized.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes"> </property>
diff --git a/testsuite/reftests/label-text-shadow-changes-modify-clip.ref.ui 
b/testsuite/reftests/label-text-shadow-changes-modify-clip.ref.ui
index b92d933f48..236a3bfc3b 100644
--- a/testsuite/reftests/label-text-shadow-changes-modify-clip.ref.ui
+++ b/testsuite/reftests/label-text-shadow-changes-modify-clip.ref.ui
@@ -4,7 +4,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">Hello World</property>
diff --git a/testsuite/reftests/label-text-shadow-changes-modify-clip.ui 
b/testsuite/reftests/label-text-shadow-changes-modify-clip.ui
index f69a690560..4c44d0300e 100644
--- a/testsuite/reftests/label-text-shadow-changes-modify-clip.ui
+++ b/testsuite/reftests/label-text-shadow-changes-modify-clip.ui
@@ -4,7 +4,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
     <signal name="map" handler="reftest:inhibit_for_3_frames" swapped="no"/>
     <child>
       <object class="GtkBox" id="box2">
diff --git a/testsuite/reftests/label-text-shadow-clipping.ref.ui 
b/testsuite/reftests/label-text-shadow-clipping.ref.ui
index 1b0ddf015a..b5e12ef61b 100644
--- a/testsuite/reftests/label-text-shadow-clipping.ref.ui
+++ b/testsuite/reftests/label-text-shadow-clipping.ref.ui
@@ -4,7 +4,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">Hello World</property>
diff --git a/testsuite/reftests/label-text-shadow-clipping.ui 
b/testsuite/reftests/label-text-shadow-clipping.ui
index 0e4873a3d0..28cc7d7ce1 100644
--- a/testsuite/reftests/label-text-shadow-clipping.ui
+++ b/testsuite/reftests/label-text-shadow-clipping.ui
@@ -4,7 +4,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">500</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box2">
         <property name="halign">center</property>
diff --git a/testsuite/reftests/label-width-chars-dont-shrink.ref.ui 
b/testsuite/reftests/label-width-chars-dont-shrink.ref.ui
index 852813ec0e..4375db2035 100644
--- a/testsuite/reftests/label-width-chars-dont-shrink.ref.ui
+++ b/testsuite/reftests/label-width-chars-dont-shrink.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/label-width-chars-dont-shrink.ui 
b/testsuite/reftests/label-width-chars-dont-shrink.ui
index 89f4631e1b..70e4e21cb1 100644
--- a/testsuite/reftests/label-width-chars-dont-shrink.ui
+++ b/testsuite/reftests/label-width-chars-dont-shrink.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/label-wrap-justify.ref.ui b/testsuite/reftests/label-wrap-justify.ref.ui
index a52a604f24..37bf2e7927 100644
--- a/testsuite/reftests/label-wrap-justify.ref.ui
+++ b/testsuite/reftests/label-wrap-justify.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/label-wrap-justify.ui b/testsuite/reftests/label-wrap-justify.ui
index 38d0597ac4..221587999b 100644
--- a/testsuite/reftests/label-wrap-justify.ui
+++ b/testsuite/reftests/label-wrap-justify.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/letter-spacing.ref.ui b/testsuite/reftests/letter-spacing.ref.ui
index 491cecd129..e7cedba980 100644
--- a/testsuite/reftests/letter-spacing.ref.ui
+++ b/testsuite/reftests/letter-spacing.ref.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label">abc</property>
diff --git a/testsuite/reftests/letter-spacing.ui b/testsuite/reftests/letter-spacing.ui
index 6ab4185af9..5b76045188 100644
--- a/testsuite/reftests/letter-spacing.ui
+++ b/testsuite/reftests/letter-spacing.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="name">spaced</property>
diff --git a/testsuite/reftests/linear-gradient-transition-to-other.ref.ui 
b/testsuite/reftests/linear-gradient-transition-to-other.ref.ui
index 489098df2d..d73af3f08d 100644
--- a/testsuite/reftests/linear-gradient-transition-to-other.ref.ui
+++ b/testsuite/reftests/linear-gradient-transition-to-other.ref.ui
@@ -3,7 +3,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">20</property>
     <property name="height_request">20</property>
-    <property name="type">popup</property>
     <property name="name">reference</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/linear-gradient-transition-to-other.ui 
b/testsuite/reftests/linear-gradient-transition-to-other.ui
index 6fa417228a..c569311f58 100644
--- a/testsuite/reftests/linear-gradient-transition-to-other.ui
+++ b/testsuite/reftests/linear-gradient-transition-to-other.ui
@@ -3,6 +3,5 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">20</property>
     <property name="height_request">20</property>
-    <property name="type">popup</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/linear-gradient.ref.ui b/testsuite/reftests/linear-gradient.ref.ui
index 27f85476a3..7ee6eb1dec 100644
--- a/testsuite/reftests/linear-gradient.ref.ui
+++ b/testsuite/reftests/linear-gradient.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/linear-gradient.ui b/testsuite/reftests/linear-gradient.ui
index e2fbdc6949..8801da71a2 100644
--- a/testsuite/reftests/linear-gradient.ui
+++ b/testsuite/reftests/linear-gradient.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/link-coloring.ref.ui b/testsuite/reftests/link-coloring.ref.ui
index 882e737e15..62762e572b 100644
--- a/testsuite/reftests/link-coloring.ref.ui
+++ b/testsuite/reftests/link-coloring.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/link-coloring.ui b/testsuite/reftests/link-coloring.ui
index 8d6ff5bcd6..ac0c9c7a43 100644
--- a/testsuite/reftests/link-coloring.ui
+++ b/testsuite/reftests/link-coloring.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/messagedialog-secondarytext.ref.ui 
b/testsuite/reftests/messagedialog-secondarytext.ref.ui
index 584ad22b19..987b006e6c 100644
--- a/testsuite/reftests/messagedialog-secondarytext.ref.ui
+++ b/testsuite/reftests/messagedialog-secondarytext.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkMessageDialog" id="messagedialog1">
-    <property name="type">popup</property>
     <property name="type_hint">dialog</property>
     <property name="buttons">ok</property>
     <property name="text" translatable="yes">Text</property>
diff --git a/testsuite/reftests/messagedialog-secondarytext.ui 
b/testsuite/reftests/messagedialog-secondarytext.ui
index 8f97175665..b13c4899c6 100644
--- a/testsuite/reftests/messagedialog-secondarytext.ui
+++ b/testsuite/reftests/messagedialog-secondarytext.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkMessageDialog" id="messagedialog1">
-    <property name="type">popup</property>
     <property name="type_hint">dialog</property>
     <property name="buttons">ok</property>
     <property name="text" translatable="yes">Text</property>
diff --git a/testsuite/reftests/named-colors.ref.ui b/testsuite/reftests/named-colors.ref.ui
index 6bbb850534..6a540f1fed 100644
--- a/testsuite/reftests/named-colors.ref.ui
+++ b/testsuite/reftests/named-colors.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid0">
         <child>
diff --git a/testsuite/reftests/named-colors.ui b/testsuite/reftests/named-colors.ui
index ddc39d742f..e455593c80 100644
--- a/testsuite/reftests/named-colors.ui
+++ b/testsuite/reftests/named-colors.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid0">
         <child>
diff --git a/testsuite/reftests/no-colors.ref.ui b/testsuite/reftests/no-colors.ref.ui
index 3278c9f53d..b0b357c8e8 100644
--- a/testsuite/reftests/no-colors.ref.ui
+++ b/testsuite/reftests/no-colors.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">no colors for you</property>
diff --git a/testsuite/reftests/no-colors.ui b/testsuite/reftests/no-colors.ui
index 3278c9f53d..b0b357c8e8 100644
--- a/testsuite/reftests/no-colors.ui
+++ b/testsuite/reftests/no-colors.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">no colors for you</property>
diff --git a/testsuite/reftests/nonresizable-size.ref.ui b/testsuite/reftests/nonresizable-size.ref.ui
index 56115658fe..fdd99a68c9 100644
--- a/testsuite/reftests/nonresizable-size.ref.ui
+++ b/testsuite/reftests/nonresizable-size.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">Hello World</property>
diff --git a/testsuite/reftests/nonresizable-size.ui b/testsuite/reftests/nonresizable-size.ui
index 532136d282..498471d2b4 100644
--- a/testsuite/reftests/nonresizable-size.ui
+++ b/testsuite/reftests/nonresizable-size.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <property name="resizable">0</property>
     <child>
       <object class="GtkLabel" id="label1">
diff --git a/testsuite/reftests/notebook-tab-position.ref.ui b/testsuite/reftests/notebook-tab-position.ref.ui
index c536009d68..4b9153e121 100644
--- a/testsuite/reftests/notebook-tab-position.ref.ui
+++ b/testsuite/reftests/notebook-tab-position.ref.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkNotebook" id="notebook1">
         <property name="width_request">50</property>
diff --git a/testsuite/reftests/notebook-tab-position.ui b/testsuite/reftests/notebook-tab-position.ui
index 209f3dc272..0a2e1aa5ad 100644
--- a/testsuite/reftests/notebook-tab-position.ui
+++ b/testsuite/reftests/notebook-tab-position.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkNotebook" id="notebook1">
         <property name="width_request">50</property>
diff --git a/testsuite/reftests/nth-child.ref.ui b/testsuite/reftests/nth-child.ref.ui
index f8143de95e..d314db405d 100644
--- a/testsuite/reftests/nth-child.ref.ui
+++ b/testsuite/reftests/nth-child.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/nth-child.ui b/testsuite/reftests/nth-child.ui
index b8001fd18c..ff7e106dbe 100644
--- a/testsuite/reftests/nth-child.ui
+++ b/testsuite/reftests/nth-child.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/opacity-initial.ref.ui b/testsuite/reftests/opacity-initial.ref.ui
index 40232e76a7..666e8d1620 100644
--- a/testsuite/reftests/opacity-initial.ref.ui
+++ b/testsuite/reftests/opacity-initial.ref.ui
@@ -4,6 +4,5 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">200</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/opacity-initial.ui b/testsuite/reftests/opacity-initial.ui
index cc08a18087..09465d5f12 100644
--- a/testsuite/reftests/opacity-initial.ui
+++ b/testsuite/reftests/opacity-initial.ui
@@ -4,7 +4,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">200</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkOverlay" id="overlay1">
         <child>
diff --git a/testsuite/reftests/opacity.ref.ui b/testsuite/reftests/opacity.ref.ui
index 535a35cb4e..515dd9d3ae 100644
--- a/testsuite/reftests/opacity.ref.ui
+++ b/testsuite/reftests/opacity.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
diff --git a/testsuite/reftests/opacity.ui b/testsuite/reftests/opacity.ui
index 69159109ed..c7f4e4763b 100644
--- a/testsuite/reftests/opacity.ui
+++ b/testsuite/reftests/opacity.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="name">alpha</property>
diff --git a/testsuite/reftests/paned-undersized.ref.ui b/testsuite/reftests/paned-undersized.ref.ui
index 7a2ea496c2..1ff2a9b233 100644
--- a/testsuite/reftests/paned-undersized.ref.ui
+++ b/testsuite/reftests/paned-undersized.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <property name="height_request">120</property>
     <child>
       <object class="GtkPaned" id="paned1">
diff --git a/testsuite/reftests/paned-undersized.ui b/testsuite/reftests/paned-undersized.ui
index aff21c97e7..7df9a4dd7b 100644
--- a/testsuite/reftests/paned-undersized.ui
+++ b/testsuite/reftests/paned-undersized.ui
@@ -2,7 +2,6 @@
 <interface>
   <object class="GtkWindow" id="window1">
     <property name="height_request">120</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkPaned" id="paned1">
         <property name="resize-child1">0</property>
diff --git a/testsuite/reftests/partial-rounded-border.ref.ui 
b/testsuite/reftests/partial-rounded-border.ref.ui
index 04bd817a67..2f67449e7c 100644
--- a/testsuite/reftests/partial-rounded-border.ref.ui
+++ b/testsuite/reftests/partial-rounded-border.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/partial-rounded-border.ui b/testsuite/reftests/partial-rounded-border.ui
index c0d272463c..a522455836 100644
--- a/testsuite/reftests/partial-rounded-border.ui
+++ b/testsuite/reftests/partial-rounded-border.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid">
         <child>
diff --git a/testsuite/reftests/picture-load-invalid-file.ref.ui 
b/testsuite/reftests/picture-load-invalid-file.ref.ui
index 3ae6f89153..01d22946af 100644
--- a/testsuite/reftests/picture-load-invalid-file.ref.ui
+++ b/testsuite/reftests/picture-load-invalid-file.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkPicture"/>
     </child>
diff --git a/testsuite/reftests/picture-load-invalid-file.ui b/testsuite/reftests/picture-load-invalid-file.ui
index 6b74b8a147..742302c3ee 100644
--- a/testsuite/reftests/picture-load-invalid-file.ui
+++ b/testsuite/reftests/picture-load-invalid-file.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkPicture">
         <property name="file">does://not.com/exist.png</property>
diff --git a/testsuite/reftests/pseudoclass-on-box.ref.ui b/testsuite/reftests/pseudoclass-on-box.ref.ui
index 15ebb3d267..cacfa2d643 100644
--- a/testsuite/reftests/pseudoclass-on-box.ref.ui
+++ b/testsuite/reftests/pseudoclass-on-box.ref.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/pseudoclass-on-box.ui b/testsuite/reftests/pseudoclass-on-box.ui
index 54255546f5..fd632af937 100644
--- a/testsuite/reftests/pseudoclass-on-box.ui
+++ b/testsuite/reftests/pseudoclass-on-box.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/pseudoclass-on-parent.ref.ui b/testsuite/reftests/pseudoclass-on-parent.ref.ui
index c60fc8c499..c6d3ccd891 100644
--- a/testsuite/reftests/pseudoclass-on-parent.ref.ui
+++ b/testsuite/reftests/pseudoclass-on-parent.ref.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkToggleButton" id="togglebutton1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/pseudoclass-on-parent.ui b/testsuite/reftests/pseudoclass-on-parent.ui
index 829aecc4ec..9402f07244 100644
--- a/testsuite/reftests/pseudoclass-on-parent.ui
+++ b/testsuite/reftests/pseudoclass-on-parent.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkToggleButton" id="togglebutton1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/quit-mnemonic.ref.ui b/testsuite/reftests/quit-mnemonic.ref.ui
index c5509ae0b4..07f42b4db0 100644
--- a/testsuite/reftests/quit-mnemonic.ref.ui
+++ b/testsuite/reftests/quit-mnemonic.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">Quit
diff --git a/testsuite/reftests/quit-mnemonic.ui b/testsuite/reftests/quit-mnemonic.ui
index b0f30e80a4..250fe4f969 100644
--- a/testsuite/reftests/quit-mnemonic.ui
+++ b/testsuite/reftests/quit-mnemonic.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/repeating-radial-gradient-at-beginning.ref.ui 
b/testsuite/reftests/repeating-radial-gradient-at-beginning.ref.ui
index d3f4a731a4..a423d0405a 100644
--- a/testsuite/reftests/repeating-radial-gradient-at-beginning.ref.ui
+++ b/testsuite/reftests/repeating-radial-gradient-at-beginning.ref.ui
@@ -3,7 +3,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">64</property>
     <property name="height_request">32</property>
-    <property name="type">popup</property>
     <property name="name">reference</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/repeating-radial-gradient-at-beginning.ui 
b/testsuite/reftests/repeating-radial-gradient-at-beginning.ui
index b91f9285a6..ef45118edb 100644
--- a/testsuite/reftests/repeating-radial-gradient-at-beginning.ui
+++ b/testsuite/reftests/repeating-radial-gradient-at-beginning.ui
@@ -3,6 +3,5 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">64</property>
     <property name="height_request">32</property>
-    <property name="type">popup</property>
   </object>
 </interface>
diff --git a/testsuite/reftests/revealer-extra-size.ref.ui b/testsuite/reftests/revealer-extra-size.ref.ui
index 73ad6e03c6..03a1c9ac7d 100644
--- a/testsuite/reftests/revealer-extra-size.ref.ui
+++ b/testsuite/reftests/revealer-extra-size.ref.ui
@@ -3,7 +3,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">400</property>
     <property name="height_request">300</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">Hello World</property>
diff --git a/testsuite/reftests/revealer-extra-size.ui b/testsuite/reftests/revealer-extra-size.ui
index 4b121f219c..1cdb7dd988 100644
--- a/testsuite/reftests/revealer-extra-size.ui
+++ b/testsuite/reftests/revealer-extra-size.ui
@@ -3,7 +3,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">400</property>
     <property name="height_request">300</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkRevealer" id="revealer1">
         <property name="transition_type">none</property>
diff --git a/testsuite/reftests/revealer-wrappable-contents.ref.ui 
b/testsuite/reftests/revealer-wrappable-contents.ref.ui
index 89b534249d..5129a7a9bc 100644
--- a/testsuite/reftests/revealer-wrappable-contents.ref.ui
+++ b/testsuite/reftests/revealer-wrappable-contents.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <property name="default_width">300</property>
     <property name="default_height">200</property>
     <child>
diff --git a/testsuite/reftests/revealer-wrappable-contents.ui 
b/testsuite/reftests/revealer-wrappable-contents.ui
index 434d249467..28630a086a 100644
--- a/testsuite/reftests/revealer-wrappable-contents.ui
+++ b/testsuite/reftests/revealer-wrappable-contents.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <property name="default_width">300</property>
     <property name="default_height">200</property>
     <child>
diff --git a/testsuite/reftests/rotated-layout.ref.ui b/testsuite/reftests/rotated-layout.ref.ui
index a6ae7ea6f8..db33443374 100644
--- a/testsuite/reftests/rotated-layout.ref.ui
+++ b/testsuite/reftests/rotated-layout.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/rotated-layout.ui b/testsuite/reftests/rotated-layout.ui
index ba9603afbe..7efa20302f 100644
--- a/testsuite/reftests/rotated-layout.ui
+++ b/testsuite/reftests/rotated-layout.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/separator-size.ref.ui b/testsuite/reftests/separator-size.ref.ui
index e3cd91644e..4bdc3862e2 100644
--- a/testsuite/reftests/separator-size.ref.ui
+++ b/testsuite/reftests/separator-size.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/separator-size.ui b/testsuite/reftests/separator-size.ui
index 8afd8a1b70..26feffe6f5 100644
--- a/testsuite/reftests/separator-size.ui
+++ b/testsuite/reftests/separator-size.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/set-default-direction.ref.ui b/testsuite/reftests/set-default-direction.ref.ui
index a64eebe5f3..2cda3da43c 100644
--- a/testsuite/reftests/set-default-direction.ref.ui
+++ b/testsuite/reftests/set-default-direction.ref.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <signal name="realize" handler="reftest:switch_default_direction" after="yes" swapped="no"/>
     <signal name="map" handler="reftest:swap_child" after="yes" swapped="no"/>
     <signal name="destroy" handler="reftest:switch_default_direction" after="yes" swapped="no"/>
diff --git a/testsuite/reftests/set-default-direction.ui b/testsuite/reftests/set-default-direction.ui
index 6f379a1f78..6f999428ba 100644
--- a/testsuite/reftests/set-default-direction.ui
+++ b/testsuite/reftests/set-default-direction.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <signal name="map" handler="reftest:switch_default_direction" swapped="no"/>
     <signal name="destroy" handler="reftest:switch_default_direction" swapped="no"/>
     <child>
diff --git a/testsuite/reftests/shadow-clip-rounding.ref.ui b/testsuite/reftests/shadow-clip-rounding.ref.ui
index 97be53210b..8ddfde32e9 100644
--- a/testsuite/reftests/shadow-clip-rounding.ref.ui
+++ b/testsuite/reftests/shadow-clip-rounding.ref.ui
@@ -4,7 +4,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="halign">center</property>
diff --git a/testsuite/reftests/shadow-clip-rounding.ui b/testsuite/reftests/shadow-clip-rounding.ui
index 7672f7db14..511207b8c9 100644
--- a/testsuite/reftests/shadow-clip-rounding.ui
+++ b/testsuite/reftests/shadow-clip-rounding.ui
@@ -4,7 +4,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">100</property>
     <property name="height_request">100</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="halign">center</property>
diff --git a/testsuite/reftests/shorthand-entry-border.ref.ui 
b/testsuite/reftests/shorthand-entry-border.ref.ui
index bd5c6d34a1..041f026ce3 100644
--- a/testsuite/reftests/shorthand-entry-border.ref.ui
+++ b/testsuite/reftests/shorthand-entry-border.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkEntry" id="entry1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/shorthand-entry-border.ui b/testsuite/reftests/shorthand-entry-border.ui
index 6c5efd2a3e..7b0d272caf 100644
--- a/testsuite/reftests/shorthand-entry-border.ui
+++ b/testsuite/reftests/shorthand-entry-border.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkEntry" id="entry1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/simple.ref.ui b/testsuite/reftests/simple.ref.ui
index 34efec74e8..c74aa47ad1 100644
--- a/testsuite/reftests/simple.ref.ui
+++ b/testsuite/reftests/simple.ref.ui
@@ -3,7 +3,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">10</property>
     <property name="height_request">10</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
diff --git a/testsuite/reftests/simple.ui b/testsuite/reftests/simple.ui
index 34efec74e8..c74aa47ad1 100644
--- a/testsuite/reftests/simple.ui
+++ b/testsuite/reftests/simple.ui
@@ -3,7 +3,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">10</property>
     <property name="height_request">10</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
diff --git a/testsuite/reftests/sizegroups-basics.ref.ui b/testsuite/reftests/sizegroups-basics.ref.ui
index 2dfae31713..d00710dd1a 100644
--- a/testsuite/reftests/sizegroups-basics.ref.ui
+++ b/testsuite/reftests/sizegroups-basics.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/sizegroups-basics.ui b/testsuite/reftests/sizegroups-basics.ui
index ae2239b426..92b3a44989 100644
--- a/testsuite/reftests/sizegroups-basics.ui
+++ b/testsuite/reftests/sizegroups-basics.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui 
b/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui
index 4f03d91f24..2e64104518 100644
--- a/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui
+++ b/testsuite/reftests/sizegroups-evolution-identity-page.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="row_spacing">6</property>
diff --git a/testsuite/reftests/sizegroups-evolution-identity-page.ui 
b/testsuite/reftests/sizegroups-evolution-identity-page.ui
index f1525ab882..9b8cf14a9f 100644
--- a/testsuite/reftests/sizegroups-evolution-identity-page.ui
+++ b/testsuite/reftests/sizegroups-evolution-identity-page.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/reftests/sizegroups-get-preferred-null.ref.ui 
b/testsuite/reftests/sizegroups-get-preferred-null.ref.ui
index b5151592fa..01e16a350d 100644
--- a/testsuite/reftests/sizegroups-get-preferred-null.ref.ui
+++ b/testsuite/reftests/sizegroups-get-preferred-null.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkFixed" id="grid1">
         <child>
diff --git a/testsuite/reftests/sizegroups-get-preferred-null.ui 
b/testsuite/reftests/sizegroups-get-preferred-null.ui
index b0f8074c84..d4c7ff7edf 100644
--- a/testsuite/reftests/sizegroups-get-preferred-null.ui
+++ b/testsuite/reftests/sizegroups-get-preferred-null.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkFixed" id="grid1">
         <child>
diff --git a/testsuite/reftests/statusbar-remove-all.ref.ui b/testsuite/reftests/statusbar-remove-all.ref.ui
index 169f08fc43..c036226055 100644
--- a/testsuite/reftests/statusbar-remove-all.ref.ui
+++ b/testsuite/reftests/statusbar-remove-all.ref.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkStatusbar" id="statusbar1">
         <property name="margin_start">10</property>
diff --git a/testsuite/reftests/statusbar-remove-all.ui b/testsuite/reftests/statusbar-remove-all.ui
index 26113ca552..8c31d4bbbb 100644
--- a/testsuite/reftests/statusbar-remove-all.ui
+++ b/testsuite/reftests/statusbar-remove-all.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkStatusbar" id="statusbar1">
         <property name="margin_start">10</property>
diff --git a/testsuite/reftests/style-context-save-inheritance.ref.ui 
b/testsuite/reftests/style-context-save-inheritance.ref.ui
index abbb2f709b..ec6294b273 100644
--- a/testsuite/reftests/style-context-save-inheritance.ref.ui
+++ b/testsuite/reftests/style-context-save-inheritance.ref.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/style-context-save-inheritance.ui 
b/testsuite/reftests/style-context-save-inheritance.ui
index c8395ae1b6..fa495477ae 100644
--- a/testsuite/reftests/style-context-save-inheritance.ui
+++ b/testsuite/reftests/style-context-save-inheritance.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">GREEN
diff --git a/testsuite/reftests/style-properties-only-child.ref.ui 
b/testsuite/reftests/style-properties-only-child.ref.ui
index 78bfbf4c79..63cdbec77a 100644
--- a/testsuite/reftests/style-properties-only-child.ref.ui
+++ b/testsuite/reftests/style-properties-only-child.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <property name="width_request">300</property>
     <property name="height_request">300</property>
     <child>
diff --git a/testsuite/reftests/style-properties-only-child.ui 
b/testsuite/reftests/style-properties-only-child.ui
index 415b9de3a1..88d116b7e0 100644
--- a/testsuite/reftests/style-properties-only-child.ui
+++ b/testsuite/reftests/style-properties-only-child.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <property name="width_request">300</property>
     <property name="height_request">300</property>
     <child>
diff --git a/testsuite/reftests/symbolic-icon-translucent-color.ref.ui 
b/testsuite/reftests/symbolic-icon-translucent-color.ref.ui
index 7d86e0b5f5..b7912afd0c 100644
--- a/testsuite/reftests/symbolic-icon-translucent-color.ref.ui
+++ b/testsuite/reftests/symbolic-icon-translucent-color.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkImage" id="image1">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/symbolic-icon-translucent-color.ui 
b/testsuite/reftests/symbolic-icon-translucent-color.ui
index 138fb2c578..cc04df0d89 100644
--- a/testsuite/reftests/symbolic-icon-translucent-color.ui
+++ b/testsuite/reftests/symbolic-icon-translucent-color.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkImage" id="image1">
         <property name="icon_name">media-playback-stop-symbolic</property>
diff --git a/testsuite/reftests/textview-border-windows.ref.ui 
b/testsuite/reftests/textview-border-windows.ref.ui
index 2d6ea088eb..d8bf150b2d 100644
--- a/testsuite/reftests/textview-border-windows.ref.ui
+++ b/testsuite/reftests/textview-border-windows.ref.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="window">
-    <property name="type">popup</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <child>
diff --git a/testsuite/reftests/textview-border-windows.ui b/testsuite/reftests/textview-border-windows.ui
index 711576acec..3bac7d3a5c 100644
--- a/testsuite/reftests/textview-border-windows.ui
+++ b/testsuite/reftests/textview-border-windows.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="window">
-    <property name="type">popup</property>
     <child>
       <object class="GtkTextView" id="textview1">
         <property name="width_request">160</property>
diff --git a/testsuite/reftests/textview-margins.ref.ui b/testsuite/reftests/textview-margins.ref.ui
index 3807b945fd..ea1aad33c3 100644
--- a/testsuite/reftests/textview-margins.ref.ui
+++ b/testsuite/reftests/textview-margins.ref.ui
@@ -5,7 +5,6 @@
     <property name="text" translatable="yes">Lorem ipsum dolor sit amet, consectetur adipisci elit, sed 
eiusmod tempor incidunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation 
ullamco laboris nisi ut aliquid ex ea commodi consequat. Quis aute iure reprehenderit in voluptate velit esse 
cillum dolore eu fugiat nulla pariatur. Excepteur sint obcaecat cupiditat non proident, sunt in culpa qui 
officia deserunt mollit anim id est laborum</property>
   </object>
   <object class="GtkWindow" id="window">
-    <property name="type">popup</property>
     <property name="default_width">150</property>
     <property name="resizable">0</property>
     <child>
diff --git a/testsuite/reftests/textview-margins.ui b/testsuite/reftests/textview-margins.ui
index 57f621b31b..2525f00374 100644
--- a/testsuite/reftests/textview-margins.ui
+++ b/testsuite/reftests/textview-margins.ui
@@ -5,7 +5,6 @@
     <property name="text" translatable="yes">Lorem ipsum dolor sit amet, consectetur adipisci elit, sed 
eiusmod tempor incidunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation 
ullamco laboris nisi ut aliquid ex ea commodi consequat. Quis aute iure reprehenderit in voluptate velit esse 
cillum dolore eu fugiat nulla pariatur. Excepteur sint obcaecat cupiditat non proident, sunt in culpa qui 
officia deserunt mollit anim id est laborum</property>
   </object>
   <object class="GtkWindow" id="window">
-    <property name="type">popup</property>
     <property name="default_width">150</property>
     <property name="resizable">0</property>
     <child>
diff --git a/testsuite/reftests/toplevel-vs-popup.ref.ui b/testsuite/reftests/toplevel-vs-popup.ref.ui
index 56115658fe..fdd99a68c9 100644
--- a/testsuite/reftests/toplevel-vs-popup.ref.ui
+++ b/testsuite/reftests/toplevel-vs-popup.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">Hello World</property>
diff --git a/testsuite/reftests/treeview-fixed-height.ref.ui b/testsuite/reftests/treeview-fixed-height.ref.ui
index 790665832b..eacf02ee6b 100644
--- a/testsuite/reftests/treeview-fixed-height.ref.ui
+++ b/testsuite/reftests/treeview-fixed-height.ref.ui
@@ -20,7 +20,6 @@
     </data>
   </object>
   <object class="GtkWindow" id="window">
-    <property name="type">popup</property>
     <child>
       <object class="GtkTreeView" id="treeview1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/treeview-fixed-height.ui b/testsuite/reftests/treeview-fixed-height.ui
index db871a56c5..b80f34dc98 100644
--- a/testsuite/reftests/treeview-fixed-height.ui
+++ b/testsuite/reftests/treeview-fixed-height.ui
@@ -20,7 +20,6 @@
     </data>
   </object>
   <object class="GtkWindow" id="window">
-    <property name="type">popup</property>
     <child>
       <object class="GtkTreeView" id="treeview1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/treeview-headers-hidden.ref.ui 
b/testsuite/reftests/treeview-headers-hidden.ref.ui
index 9a7b147dfc..5b3475bce3 100644
--- a/testsuite/reftests/treeview-headers-hidden.ref.ui
+++ b/testsuite/reftests/treeview-headers-hidden.ref.ui
@@ -14,7 +14,6 @@
     </data>
   </object>
   <object class="GtkWindow" id="window">
-    <property name="type">popup</property>
     <child>
       <object class="GtkTreeView" id="treeview1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/treeview-headers-hidden.ui b/testsuite/reftests/treeview-headers-hidden.ui
index 9a7b147dfc..5b3475bce3 100644
--- a/testsuite/reftests/treeview-headers-hidden.ui
+++ b/testsuite/reftests/treeview-headers-hidden.ui
@@ -14,7 +14,6 @@
     </data>
   </object>
   <object class="GtkWindow" id="window">
-    <property name="type">popup</property>
     <child>
       <object class="GtkTreeView" id="treeview1">
         <property name="can_focus">1</property>
diff --git a/testsuite/reftests/unresolvable.ref.ui b/testsuite/reftests/unresolvable.ref.ui
index b5ccb79617..56a6038196 100644
--- a/testsuite/reftests/unresolvable.ref.ui
+++ b/testsuite/reftests/unresolvable.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox">
         <property name="name">reference</property>
diff --git a/testsuite/reftests/unresolvable.ui b/testsuite/reftests/unresolvable.ui
index f12da9077d..3c687fb026 100644
--- a/testsuite/reftests/unresolvable.ui
+++ b/testsuite/reftests/unresolvable.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox">
         <property name="width_request">10</property>
diff --git a/testsuite/reftests/window-border-width.ref.ui b/testsuite/reftests/window-border-width.ref.ui
index ea309cc149..0f8deb3e4d 100644
--- a/testsuite/reftests/window-border-width.ref.ui
+++ b/testsuite/reftests/window-border-width.ref.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window_information_collection">
-    <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
diff --git a/testsuite/reftests/window-border-width.ui b/testsuite/reftests/window-border-width.ui
index d020f3e40d..dc75af5cee 100644
--- a/testsuite/reftests/window-border-width.ui
+++ b/testsuite/reftests/window-border-width.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window_information_collection">
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">Hello World</property>
diff --git a/testsuite/reftests/window-default-size.ref.ui b/testsuite/reftests/window-default-size.ref.ui
index 29b9330844..930d974f5d 100644
--- a/testsuite/reftests/window-default-size.ref.ui
+++ b/testsuite/reftests/window-default-size.ref.ui
@@ -3,7 +3,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">103</property>
     <property name="height_request">97</property>
-    <property name="type">popup</property>
     <child>
       <placeholder/>
     </child>
diff --git a/testsuite/reftests/window-default-size.ui b/testsuite/reftests/window-default-size.ui
index 143cac3e68..b45471444c 100644
--- a/testsuite/reftests/window-default-size.ui
+++ b/testsuite/reftests/window-default-size.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <property name="default_width">103</property>
     <property name="default_height">97</property>
     <child>
diff --git a/testsuite/reftests/window-show-contents-on-map.ref.ui 
b/testsuite/reftests/window-show-contents-on-map.ref.ui
index 897580cc48..8e7ad64290 100644
--- a/testsuite/reftests/window-show-contents-on-map.ref.ui
+++ b/testsuite/reftests/window-show-contents-on-map.ref.ui
@@ -4,7 +4,6 @@
   <object class="GtkWindow" id="window1">
     <property name="width_request">200</property>
     <property name="height_request">200</property>
-    <property name="type">popup</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label" translatable="yes">This label is only shown when the window is mapped. So the 
window does its first size allocation without the label being visible and has to resize.</property>
diff --git a/testsuite/reftests/window-show-contents-on-map.ui 
b/testsuite/reftests/window-show-contents-on-map.ui
index 3285b5f05a..569ed44d78 100644
--- a/testsuite/reftests/window-show-contents-on-map.ui
+++ b/testsuite/reftests/window-show-contents-on-map.ui
@@ -2,7 +2,6 @@
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="type">popup</property>
     <signal name="map" handler="gtk_widget_show" object="label1" after="yes" swapped="yes"/>
     <child>
       <object class="GtkLabel" id="label1">
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]