Merge branch 'child-props-followup' into 'master'

Child props followup

See merge request GNOME/gtk!719

3 files changed, 38 insertions, 36 deletions

diff --git a/gtk/gtkbuildable.h b/gtk/gtkbuildable.h
index ba899fa1f8..6972abedd6 100644
--- a/gtk/gtkbuildable.h
+++ b/gtk/gtkbuildable.h
@@ -65,8 +65,7 @@ typedef struct _GtkBuildableIface GtkBuildableIface;
  *  content below <child>. To handle an element, the implementation
  *  must fill in the @parser and @user_data and return %TRUE.
  *  #GtkWidget implements this to parse keyboard accelerators specified
- *  in <accelerator> elements. #GtkContainer implements it to map
- *  properties defined via <packing> elements to child properties.
+ *  in <accelerator> elements. 
  *  Note that @user_data must be freed in @custom_tag_end or @custom_finished.
  * @custom_tag_end: Called for the end tag of each custom element that is
  *  handled by the buildable (see @custom_tag_start).
diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index 7f4dacc512..267b3dbe5a 100644
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -93,18 +93,20 @@
  *   <child internal-child="notebook">
  *     <object class="GtkNotebook" id="notebook">
  *       <child>
- *         <object class="GtkLabel" id="tabcontent">
- *         <property name="label">Content on notebook tab</property>
- *         </object>
- *       </child>
- *       <child type="tab">
- *         <object class="GtkLabel" id="tablabel">
- *           <property name="label">Tab label</property>
- *         </object>
- *         <packing>
+ *         <object type="GtkNotebookPage">
  *           <property name="tab_expand">False</property>
  *           <property name="tab_fill">False</property>
- *         </packing>
+ *           <property name="tab">
+ *             <object class="GtkLabel" id="tablabel">
+ *               <property name="label">Tab label</property>
+ *             </object>
+ *           </property>
+ *           <property name="child">
+ *             <object class="GtkLabel" id="tabcontent">
+ *               <property name="label">Content on notebook tab</property>
+ *             </object>
+ *           </property>
+ *         </object>
  *       </child>
  *     </object>
  *   </child>
diff --git a/gtk/inspector/resource-list.ui b/gtk/inspector/resource-list.ui
index fa8c84c08b..7493d98f3a 100644
--- a/gtk/inspector/resource-list.ui
+++ b/gtk/inspector/resource-list.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <object class="GtkTreeStore" id="model">
     <columns>
@@ -129,64 +130,64 @@
                         <property name="label" translatable="yes">Name:</property>
                         <property name="halign">end</property>
                         <property name="valign">baseline</property>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">0</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="name_label">
                         <property name="halign">start</property>
                         <property name="valign">baseline</property>
                         <property name="selectable">1</property>
+                        <layout>
+                          <property name="left-attach">1</property>
+                          <property name="top-attach">0</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left-attach">1</property>
-                        <property name="top-attach">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="type">
                         <property name="label" translatable="yes">Type:</property>
                         <property name="halign">end</property>
                         <property name="valign">baseline</property>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">1</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">1</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="type_label">
                         <property name="halign">start</property>
                         <property name="valign">baseline</property>
+                        <layout>
+                          <property name="left-attach">1</property>
+                          <property name="top-attach">1</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left-attach">1</property>
-                        <property name="top-attach">1</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel">
                         <property name="label" translatable="yes">Size:</property>
                         <property name="halign">end</property>
                         <property name="valign">baseline</property>
+                        <layout>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">2</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">2</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="size_label">
                         <property name="halign">start</property>
                         <property name="valign">baseline</property>
+                        <layout>
+                          <property name="left-attach">1</property>
+                          <property name="top-attach">2</property>
+                        </layout>
                       </object>
-                      <packing>
-                        <property name="left-attach">1</property>
-                        <property name="top-attach">2</property>
-                      </packing>
                     </child>
                   </object>
                 </child>