[gtk/wip/baedert/box2: 11/12] UI files stop using GtkBox prop

[Timm Bäder <baedert src gnome org>]

commit 8ec5de4754f64f845f01e9cc0a29d1654f380979
Author: Timm Bäder <mail baedert org>
Date:   Wed Dec 26 09:48:45 2018 +0100

    UI files stop using GtkBox prop

 gtk/ui/gtkappchooserdialog.ui |  5 ++---
 gtk/ui/gtkprintunixdialog.ui  |  1 -
 testsuite/gtk/builder.c       | 27 +++++++++------------------
 3 files changed, 11 insertions(+), 22 deletions(-)
---
diff --git a/gtk/ui/gtkappchooserdialog.ui b/gtk/ui/gtkappchooserdialog.ui
index 3b67fe73db..27a0a62114 100644
--- a/gtk/ui/gtkappchooserdialog.ui
+++ b/gtk/ui/gtkappchooserdialog.ui
@@ -21,10 +21,9 @@
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="layout-style">end</property>
+            <property name="hexpand">1</property>
+            <property name="halign">end</property>
           </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="inner_box">
diff --git a/gtk/ui/gtkprintunixdialog.ui b/gtk/ui/gtkprintunixdialog.ui
index 04f224f22d..71ffe20151 100644
--- a/gtk/ui/gtkprintunixdialog.ui
+++ b/gtk/ui/gtkprintunixdialog.ui
@@ -1169,7 +1169,6 @@
                 </child>
               </object>
               <packing>
-                <property name="pack-type">end</property>
                 <property name="position">1</property>
               </packing>
             </child>
diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c
index a61a42b282..d47f91e5fc 100644
--- a/testsuite/gtk/builder.c
+++ b/testsuite/gtk/builder.c
@@ -982,22 +982,16 @@ test_child_properties (void)
     "  <object class=\"GtkBox\" id=\"vbox1\">"
     "    <child>"
     "      <object class=\"GtkLabel\" id=\"label1\"/>"
-    "      <packing>"
-    "        <property name=\"pack-type\">start</property>"
-    "      </packing>"
     "    </child>"
     "    <child>"
     "      <object class=\"GtkLabel\" id=\"label2\"/>"
-    "      <packing>"
-    "        <property name=\"pack-type\">end</property>"
-    "      </packing>"
     "    </child>"
     "  </object>"
     "</interface>";
 
   GObject *label, *vbox;
-  GtkPackType pack_type;
-  
+  int position;
+
   builder = builder_new_from_string (buffer1, -1, NULL);
   vbox = gtk_builder_get_object (builder, "vbox1");
   g_assert (GTK_IS_BOX (vbox));
@@ -1006,19 +1000,19 @@ test_child_properties (void)
   g_assert (GTK_IS_LABEL (label));
   gtk_container_child_get (GTK_CONTAINER (vbox),
                            GTK_WIDGET (label),
-                           "pack-type",
-                           &pack_type,
+                           "position",
+                           &position,
                            NULL);
-  g_assert (pack_type == GTK_PACK_START);
-  
+  g_assert_cmpint (position, ==, 0);
+
   label = gtk_builder_get_object (builder, "label2");
   g_assert (GTK_IS_LABEL (label));
   gtk_container_child_get (GTK_CONTAINER (vbox),
                            GTK_WIDGET (label),
-                           "pack-type",
-                           &pack_type,
+                           "position",
+                           &position,
                            NULL);
-  g_assert (pack_type == GTK_PACK_END);
+  g_assert_cmpint (position, ==, 1);
 
   g_object_unref (builder);
 }
@@ -1786,9 +1780,6 @@ test_reference_counting (void)
     "        <property name=\"orientation\">vertical</property>"
     "    <child>"
     "      <object class=\"GtkLabel\" id=\"label1\"/>"
-    "      <packing>"
-    "        <property name=\"pack-type\">start</property>"
-    "      </packing>"
     "    </child>"
     "  </object>"
     "</interface>";