From bf2a93ca0ea9721e162deefe7fa9707563de87bc Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Fri, 29 Mar 2019 05:30:24 +0100
Subject: [PATCH] reftests: Fix image-load-from-file test

- Images are always correctly sized
- Use a GtkPicture for the large file
---
 testsuite/reftests/image-load-from-file.ref.ui | 10 +---------
 testsuite/reftests/image-load-from-file.ui     | 11 ++---------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/testsuite/reftests/image-load-from-file.ref.ui b/testsuite/reftests/image-load-from-file.ref.ui
index 1ade1d24a2..ca9be604f7 100644
--- a/testsuite/reftests/image-load-from-file.ref.ui
+++ b/testsuite/reftests/image-load-from-file.ref.ui
@@ -6,23 +6,15 @@
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkImage" id="image1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="width_request">20</property>
-            <property name="height_request">20</property>
             <property name="name">reference1</property>
             <property name="halign">center</property>
           </object>
         </child>
         <child>
-          <object class="GtkImage" id="image2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
+          <object class="GtkPicture" id="image2">
             <property name="width_request">384</property>
             <property name="height_request">384</property>
             <property name="name">reference2</property>
diff --git a/testsuite/reftests/image-load-from-file.ui b/testsuite/reftests/image-load-from-file.ui
index f494c3448f..2ea571d7e6 100644
--- a/testsuite/reftests/image-load-from-file.ui
+++ b/testsuite/reftests/image-load-from-file.ui
@@ -2,25 +2,18 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkImage" id="image1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="file">green-20x20.png</property>
           </object>
         </child>
         <child>
-          <object class="GtkImage" id="image2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="file">marble.xpm</property>
+          <object class="GtkPicture" id="image2">
+            <property name="paintable">marble.xpm</property>
           </object>
         </child>
       </object>