From 5647bacfca1db9cca09b02534603ecfa6cd8415c Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu, 29 Sep 2011 13:56:32 +0200
Subject: streamed-media-window: use GtkGrid instead of GtkTable

https://bugzilla.gnome.org/show_bug.cgi?id=660429
---
 src/empathy-streamed-media-window.ui | 90 +-----------------------------------
 1 file changed, 2 insertions(+), 88 deletions(-)

(limited to 'src')

diff --git a/src/empathy-streamed-media-window.ui b/src/empathy-streamed-media-window.ui
index ecd00dfc1..5f1a16e8c 100644
--- a/src/empathy-streamed-media-window.ui
+++ b/src/empathy-streamed-media-window.ui
@@ -298,11 +298,8 @@
       <property name="right_padding">0</property>
 
       <child>
-        <object class="GtkTable" id="video">
+        <object class="GtkGrid" id="video">
           <property name="visible">True</property>
-          <property name="n_rows">4</property>
-          <property name="n_columns">2</property>
-          <property name="homogeneous">False</property>
           <property name="row_spacing">6</property>
           <property name="column_spacing">12</property>
 
@@ -329,11 +326,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -359,11 +352,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -390,11 +379,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">2</property>
-        <property name="bottom_attach">3</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -420,11 +405,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">2</property>
-        <property name="bottom_attach">3</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -451,11 +432,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">3</property>
-        <property name="bottom_attach">4</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -480,11 +457,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">3</property>
-        <property name="bottom_attach">4</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -496,11 +469,7 @@
             </object>
             <packing>
               <property name="left_attach">2</property>
-              <property name="right_attach">3</property>
               <property name="top_attach">3</property>
-              <property name="bottom_attach">4</property>
-              <property name="x_options">fill</property>
-              <property name="y_options"/>
             </packing>
           </child>
 
@@ -528,11 +497,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">4</property>
-        <property name="bottom_attach">5</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -557,11 +522,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">4</property>
-        <property name="bottom_attach">5</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -573,11 +534,7 @@
             </object>
             <packing>
               <property name="left_attach">2</property>
-              <property name="right_attach">3</property>
               <property name="top_attach">4</property>
-              <property name="bottom_attach">5</property>
-              <property name="x_options">fill</property>
-              <property name="y_options"/>
             </packing>
           </child>
 
@@ -646,11 +603,8 @@
       <property name="right_padding">0</property>
 
       <child>
-        <object class="GtkTable" id="audio">
+        <object class="GtkGrid" id="audio">
           <property name="visible">True</property>
-          <property name="n_rows">4</property>
-          <property name="n_columns">2</property>
-          <property name="homogeneous">False</property>
           <property name="row_spacing">6</property>
           <property name="column_spacing">12</property>
 
@@ -677,11 +631,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">0</property>
-        <property name="bottom_attach">1</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -706,11 +656,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">0</property>
-        <property name="bottom_attach">1</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -737,11 +683,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -766,11 +708,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">1</property>
-        <property name="bottom_attach">2</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -797,11 +735,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">2</property>
-        <property name="bottom_attach">3</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -826,11 +760,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">2</property>
-        <property name="bottom_attach">3</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -842,11 +772,7 @@
             </object>
             <packing>
               <property name="left_attach">2</property>
-              <property name="right_attach">3</property>
               <property name="top_attach">2</property>
-              <property name="bottom_attach">3</property>
-              <property name="x_options">fill</property>
-              <property name="y_options"/>
             </packing>
           </child>
 
@@ -873,11 +799,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="right_attach">1</property>
         <property name="top_attach">3</property>
-        <property name="bottom_attach">4</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -902,11 +824,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="right_attach">2</property>
         <property name="top_attach">3</property>
-        <property name="bottom_attach">4</property>
-        <property name="x_options">fill</property>
-        <property name="y_options"/>
       </packing>
           </child>
 
@@ -918,11 +836,7 @@
             </object>
             <packing>
               <property name="left_attach">2</property>
-              <property name="right_attach">3</property>
               <property name="top_attach">3</property>
-              <property name="bottom_attach">4</property>
-              <property name="x_options">fill</property>
-              <property name="y_options"/>
             </packing>
           </child>
 
-- 
cgit v1.2.3