audio-video-properties: Switch to GTK4

Use new functions and syntax.  Minor code cleanup in order to
make debugging easier.  GTK4 doesn't use border width, use margins
consistent with main properties page.

3 files changed, 212 insertions, 364 deletions

diff --git a/extensions/audio-video-properties/bacon-video-widget-properties.c b/extensions/audio-video-properties/bacon-video-widget-properties.c
index fca9dfd7d..629feedc2 100644
--- a/extensions/audio-video-properties/bacon-video-widget-properties.c
+++ b/extensions/audio-video-properties/bacon-video-widget-properties.c
@@ -246,6 +246,7 @@ bacon_video_widget_properties_new (void)
 	GtkBuilder *xml;
 	GtkWidget *vbox;
 	GtkSizeGroup *group;
+	g_autoptr (GError) error = NULL;
 	const char *labels[] = { "title_label", "artist_label", "album_label",
 			"year_label", "duration_label", "comment_label", "container_label",
 			"dimensions_label", "vcodec_label", "framerate_label",
@@ -255,9 +256,9 @@ bacon_video_widget_properties_new (void)
 
 	xml = gtk_builder_new ();
 	gtk_builder_set_translation_domain (xml, GETTEXT_PACKAGE);
-	if (gtk_builder_add_from_resource (xml, "/org/gnome/nautilus/audio-video-properties/ui/properties.ui", NULL) == 0) {
-		g_object_unref (xml);
-		return NULL;
+	gtk_builder_add_from_resource (xml, "/org/gnome/nautilus/audio-video-properties/ui/properties.ui", &error);
+	if (error != NULL) {
+		g_error ("Failed to add nautilus-audio-video-properties properties.ui: %s", error->message);
 	}
 
 	props = BACON_VIDEO_WIDGET_PROPERTIES (g_object_new
@@ -265,7 +266,7 @@ bacon_video_widget_properties_new (void)
 
 	props->priv->xml = xml;
 	vbox = GTK_WIDGET (gtk_builder_get_object (props->priv->xml, "vbox1"));
-	gtk_box_pack_start (GTK_BOX (props), vbox, FALSE, FALSE, 0);
+	gtk_box_prepend (GTK_BOX (props), vbox);
 
 	bacon_video_widget_properties_reset (props);
 
diff --git a/extensions/audio-video-properties/resources/ui/properties.ui b/extensions/audio-video-properties/resources/ui/properties.ui
index e7bbf8885..e79a1fac7 100644
--- a/extensions/audio-video-properties/resources/ui/properties.ui
+++ b/extensions/audio-video-properties/resources/ui/properties.ui
@@ -1,692 +1,540 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
 <interface>
-  <requires lib="gtk+" version="3.11"/>
+  <requires lib="gtk" version="4.0"/>
   <object class="GtkBox" id="vbox1">
     <property name="width_request">375</property>
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="margin_bottom">12</property>
-    <property name="border_width">6</property>
+    <property name="margin-top">18</property>
+    <property name="margin-bottom">18</property>
+    <property name="margin-start">18</property>
+    <property name="margin-end">18</property>
     <property name="orientation">vertical</property>
     <property name="spacing">18</property>
     <child>
       <object class="GtkBox" id="general_vbox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">6</property>
         <child>
           <object class="GtkLabel" id="bvwp_general_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">General</property>
-            <property name="use_markup">True</property>
+            <property name="use_markup">1</property>
             <property name="xalign">0</property>
             <attributes>
-              <attribute name="weight" value="bold"/>
+              <attribute name="weight" value="bold"></attribute>
             </attributes>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkGrid" id="general">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="row_spacing">6</property>
             <property name="column_spacing">12</property>
             <child>
               <object class="GtkLabel" id="title_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="label" translatable="yes">Title:</property>
-                <property name="use_markup">True</property>
+                <property name="use_markup">1</property>
                 <property name="xalign">0</property>
                 <attributes>
-                  <attribute name="style" value="italic"/>
+                  <attribute name="style" value="italic"></attribute>
                 </attributes>
-                <accessibility>
-                  <relation type="label-for" target="title"/>
-                </accessibility>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="artist_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="label" translatable="yes">Artist:</property>
-                <property name="use_markup">True</property>
+                <property name="use_markup">1</property>
                 <property name="xalign">0</property>
                 <attributes>
-                  <attribute name="style" value="italic"/>
+                  <attribute name="style" value="italic"></attribute>
                 </attributes>
-                <accessibility>
-                  <relation type="label-for" target="artist"/>
-                </accessibility>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="duration_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="label" translatable="yes">Duration:</property>
-                <property name="use_markup">True</property>
+                <property name="use_markup">1</property>
                 <property name="xalign">0</property>
                 <attributes>
-                  <attribute name="style" value="italic"/>
+                  <attribute name="style" value="italic"></attribute>
                 </attributes>
-                <accessibility>
-                  <relation type="label-for" target="duration"/>
-                </accessibility>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">4</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">4</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="year_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="label" translatable="yes">Year:</property>
-                <property name="use_markup">True</property>
+                <property name="use_markup">1</property>
                 <property name="xalign">0</property>
                 <attributes>
-                  <attribute name="style" value="italic"/>
+                  <attribute name="style" value="italic"></attribute>
                 </attributes>
-                <accessibility>
-                  <relation type="label-for" target="year"/>
-                </accessibility>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">3</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="album_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="label" translatable="yes">Album:</property>
-                <property name="use_markup">True</property>
+                <property name="use_markup">1</property>
                 <property name="xalign">0</property>
                 <attributes>
-                  <attribute name="style" value="italic"/>
+                  <attribute name="style" value="italic"></attribute>
                 </attributes>
-                <accessibility>
-                  <relation type="label-for" target="album"/>
-                </accessibility>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="title">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="focusable">1</property>
                 <property name="label">Unknown</property>
-                <property name="wrap">True</property>
-                <property name="selectable">True</property>
+                <property name="wrap">1</property>
+                <property name="selectable">1</property>
                 <property name="ellipsize">end</property>
                 <property name="xalign">0</property>
                 <accessibility>
-                  <relation type="labelled-by" target="title_label"/>
+                  <relation name="labelled-by">title_label</relation>
                 </accessibility>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="artist">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="focusable">1</property>
                 <property name="label">Unknown</property>
-                <property name="wrap">True</property>
-                <property name="selectable">True</property>
+                <property name="wrap">1</property>
+                <property name="selectable">1</property>
                 <property name="ellipsize">end</property>
                 <property name="xalign">0</property>
                 <accessibility>
-                  <relation type="labelled-by" target="artist_label"/>
+                  <relation name="labelled-by">artist_label</relation>
                 </accessibility>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="album">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="focusable">1</property>
                 <property name="label">Unknown</property>
-                <property name="wrap">True</property>
-                <property name="selectable">True</property>
+                <property name="wrap">1</property>
+                <property name="selectable">1</property>
                 <property name="ellipsize">end</property>
                 <property name="xalign">0</property>
                 <accessibility>
-                  <relation type="labelled-by" target="album_label"/>
+                  <relation name="labelled-by">album_label</relation>
                 </accessibility>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="year">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="focusable">1</property>
                 <property name="label">Unknown</property>
-                <property name="selectable">True</property>
+                <property name="selectable">1</property>
                 <property name="ellipsize">end</property>
                 <property name="xalign">0</property>
                 <accessibility>
-                  <relation type="labelled-by" target="year_label"/>
+                  <relation name="labelled-by">year_label</relation>
                 </accessibility>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">3</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="duration">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="focusable">1</property>
                 <property name="label">0 seconds</property>
-                <property name="selectable">True</property>
+                <property name="selectable">1</property>
                 <property name="ellipsize">end</property>
                 <property name="xalign">0</property>
                 <accessibility>
-                  <relation type="labelled-by" target="duration_label"/>
+                  <relation name="labelled-by">duration_label</relation>
                 </accessibility>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">4</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">4</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="comment_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="label" translatable="yes">Comment:</property>
-                <property name="use_markup">True</property>
+                <property name="use_markup">1</property>
                 <property name="xalign">0</property>
                 <attributes>
-                  <attribute name="style" value="italic"/>
+                  <attribute name="style" value="italic"></attribute>
                 </attributes>
-                <accessibility>
-                  <relation type="label-for" target="comment"/>
-                </accessibility>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">5</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">5</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="comment">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="focusable">1</property>
                 <property name="label">Unknown</property>
-                <property name="wrap">True</property>
-                <property name="selectable">True</property>
+                <property name="wrap">1</property>
+                <property name="selectable">1</property>
                 <property name="ellipsize">end</property>
                 <property name="xalign">0</property>
                 <accessibility>
-                  <relation type="labelled-by" target="comment_label"/>
+                  <relation name="labelled-by">comment_label</relation>
                 </accessibility>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">5</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">5</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="container_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="label" translatable="yes">Container:</property>
                 <property name="xalign">0</property>
                 <attributes>
-                  <attribute name="style" value="italic"/>
+                  <attribute name="style" value="italic"></attribute>
                 </attributes>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">6</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">6</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="container">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label">Unknown</property>
-                <property name="selectable">True</property>
+                <property name="selectable">1</property>
                 <property name="xalign">0</property>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">6</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">6</property>
-              </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
         </child>
       </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
-      </packing>
     </child>
     <child>
       <object class="GtkBox" id="video_vbox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">6</property>
         <child>
           <object class="GtkLabel" id="bvwp_video_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Video</property>
-            <property name="use_markup">True</property>
+            <property name="use_markup">1</property>
             <property name="xalign">0</property>
             <attributes>
-              <attribute name="weight" value="bold"/>
+              <attribute name="weight" value="bold"></attribute>
             </attributes>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkGrid" id="video">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="row_spacing">6</property>
             <property name="column_spacing">12</property>
             <child>
               <object class="GtkLabel" id="dimensions_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="label" translatable="yes">Dimensions:</property>
-                <property name="use_markup">True</property>
+                <property name="use_markup">1</property>
                 <property name="xalign">0</property>
                 <attributes>
-                  <attribute name="style" value="italic"/>
+                  <attribute name="style" value="italic"></attribute>
                 </attributes>
-                <accessibility>
-                  <relation type="label-for" target="dimensions"/>
-                </accessibility>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="vcodec_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="label" translatable="yes">Codec:</property>
-                <property name="use_markup">True</property>
+                <property name="use_markup">1</property>
                 <property name="xalign">0</property>
                 <attributes>
-                  <attribute name="style" value="italic"/>
+                  <attribute name="style" value="italic"></attribute>
                 </attributes>
-                <accessibility>
-                  <relation type="label-for" target="vcodec"/>
-                </accessibility>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="framerate_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="label" translatable="yes">Frame rate:</property>
-                <property name="use_markup">True</property>
+                <property name="use_markup">1</property>
                 <property name="xalign">0</property>
                 <attributes>
-                  <attribute name="style" value="italic"/>
+                  <attribute name="style" value="italic"></attribute>
                 </attributes>
-                <accessibility>
-                  <relation type="label-for" target="framerate"/>
-                </accessibility>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="vbitrate_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="label" translatable="yes">Bit rate:</property>
-                <property name="use_markup">True</property>
+                <property name="use_markup">1</property>
                 <property name="xalign">0</property>
                 <attributes>
-                  <attribute name="style" value="italic"/>
+                  <attribute name="style" value="italic"></attribute>
                 </attributes>
-                <accessibility>
-                  <relation type="label-for" target="video_bitrate"/>
-                </accessibility>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">3</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="dimensions">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="focusable">1</property>
                 <property name="label">0 x 0</property>
-                <property name="selectable">True</property>
+                <property name="selectable">1</property>
                 <property name="ellipsize">end</property>
                 <property name="xalign">0</property>
                 <accessibility>
-                  <relation type="labelled-by" target="dimensions_label"/>
+                  <relation name="labelled-by">dimensions_label</relation>
                 </accessibility>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="vcodec">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="focusable">1</property>
                 <property name="label">N/A</property>
-                <property name="selectable">True</property>
+                <property name="selectable">1</property>
                 <property name="ellipsize">end</property>
                 <property name="xalign">0</property>
                 <accessibility>
-                  <relation type="labelled-by" target="vcodec_label"/>
+                  <relation name="labelled-by">vcodec_label</relation>
                 </accessibility>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="framerate">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="focusable">1</property>
                 <property name="label">0 frames per second</property>
-                <property name="selectable">True</property>
+                <property name="selectable">1</property>
                 <property name="ellipsize">end</property>
                 <property name="xalign">0</property>
                 <accessibility>
-                  <relation type="labelled-by" target="framerate_label"/>
+                  <relation name="labelled-by">framerate_label</relation>
                 </accessibility>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="video_bitrate">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="focusable">1</property>
                 <property name="label">0 kbps</property>
-                <property name="selectable">True</property>
+                <property name="selectable">1</property>
                 <property name="ellipsize">end</property>
                 <property name="xalign">0</property>
                 <accessibility>
-                  <relation type="labelled-by" target="vbitrate_label"/>
+                  <relation name="labelled-by">vbitrate_label</relation>
                 </accessibility>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">3</property>
-              </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
         </child>
       </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
     </child>
     <child>
       <object class="GtkBox" id="audio_vbox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">6</property>
         <child>
           <object class="GtkLabel" id="bvwp_audio_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Audio</property>
-            <property name="use_markup">True</property>
+            <property name="use_markup">1</property>
             <property name="xalign">0</property>
             <attributes>
-              <attribute name="weight" value="bold"/>
+              <attribute name="weight" value="bold"></attribute>
             </attributes>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkGrid" id="audio">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="row_spacing">6</property>
             <property name="column_spacing">12</property>
             <child>
               <object class="GtkLabel" id="samplerate_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="label" translatable="yes">Sample rate:</property>
-                <property name="use_markup">True</property>
+                <property name="use_markup">1</property>
                 <property name="xalign">0</property>
                 <attributes>
-                  <attribute name="style" value="italic"/>
+                  <attribute name="style" value="italic"></attribute>
                 </attributes>
-                <accessibility>
-                  <relation type="label-for" target="samplerate"/>
-                </accessibility>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="samplerate">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="focusable">1</property>
                 <property name="label">0 Hz</property>
-                <property name="selectable">True</property>
+                <property name="selectable">1</property>
                 <property name="xalign">0</property>
                 <accessibility>
-                  <relation type="labelled-by" target="samplerate_label"/>
+                  <relation name="labelled-by">samplerate_label</relation>
                 </accessibility>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="abitrate_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="label" translatable="yes">Bit rate:</property>
-                <property name="use_markup">True</property>
+                <property name="use_markup">1</property>
                 <property name="xalign">0</property>
                 <attributes>
-                  <attribute name="style" value="italic"/>
+                  <attribute name="style" value="italic"></attribute>
                 </attributes>
-                <accessibility>
-                  <relation type="label-for" target="audio_bitrate"/>
-                </accessibility>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">3</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="audio_bitrate">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="focusable">1</property>
                 <property name="label">0 kbps</property>
-                <property name="selectable">True</property>
+                <property name="selectable">1</property>
                 <property name="ellipsize">end</property>
                 <property name="xalign">0</property>
                 <accessibility>
-                  <relation type="labelled-by" target="abitrate_label"/>
+                  <relation name="labelled-by">abitrate_label</relation>
                 </accessibility>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">3</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">3</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="acodec_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="label" translatable="yes">Codec:</property>
-                <property name="use_markup">True</property>
+                <property name="use_markup">1</property>
                 <property name="xalign">0</property>
                 <attributes>
-                  <attribute name="style" value="italic"/>
+                  <attribute name="style" value="italic"></attribute>
                 </attributes>
-                <accessibility>
-                  <relation type="label-for" target="acodec"/>
-                </accessibility>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="acodec">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="focusable">1</property>
                 <property name="label">N/A</property>
-                <property name="selectable">True</property>
+                <property name="selectable">1</property>
                 <property name="ellipsize">end</property>
                 <property name="xalign">0</property>
                 <accessibility>
-                  <relation type="labelled-by" target="acodec_label"/>
+                  <relation name="labelled-by">acodec_label</relation>
                 </accessibility>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="channels_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <property name="label" translatable="yes">Channels:</property>
-                <property name="use_markup">True</property>
+                <property name="use_markup">1</property>
                 <property name="xalign">0</property>
                 <attributes>
-                  <attribute name="style" value="italic"/>
+                  <attribute name="style" value="italic"></attribute>
                 </attributes>
-                <accessibility>
-                  <relation type="label-for" target="channels"/>
-                </accessibility>
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="channels">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
+                <property name="focusable">1</property>
                 <property name="label">0 Channels</property>
-                <property name="selectable">True</property>
+                <property name="selectable">1</property>
                 <property name="xalign">0</property>
                 <accessibility>
-                  <relation type="labelled-by" target="channels_label"/>
+                  <relation name="labelled-by">channels_label</relation>
                 </accessibility>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-              </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
         </child>
       </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">2</property>
-      </packing>
     </child>
   </object>
 </interface>
diff --git a/extensions/audio-video-properties/totem-properties-main.c b/extensions/audio-video-properties/totem-properties-main.c
index 2bbd520c3..126aa0a29 100644
--- a/extensions/audio-video-properties/totem-properties-main.c
+++ b/extensions/audio-video-properties/totem-properties-main.c
@@ -117,7 +117,6 @@ totem_properties_get_pages (NautilusPropertyPageProvider *provider,
 	page = totem_properties_view_new (uri, label);
 	g_free (uri);
 
-	gtk_container_set_border_width (GTK_CONTAINER (page), 6);
 	property_page = nautilus_property_page_new ("video-properties",
 			label, page);