account-widget-*: port to GtkGrid

https://bugzilla.gnome.org/show_bug.cgi?id=662903

1 files changed, 24 insertions, 87 deletions

diff --git a/libempathy-gtk/empathy-account-widget-sip.ui b/libempathy-gtk/empathy-account-widget-sip.ui
index 5928d6077..171afd4c8 100644
--- a/libempathy-gtk/empathy-account-widget-sip.ui
+++ b/libempathy-gtk/empathy-account-widget-sip.ui
@@ -20,11 +20,9 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkTable" id="table_common_settings">
+      <object class="GtkGrid" id="grid_common_settings">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="n_rows">5</property>
-        <property name="n_columns">2</property>
         <property name="column_spacing">12</property>
         <property name="row_spacing">6</property>
         <child>
@@ -38,9 +36,6 @@
           </object>
           <packing>
             <property name="top_attach">2</property>
-            <property name="bottom_attach">3</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options"></property>
           </packing>
         </child>
         <child>
@@ -50,8 +45,6 @@
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="right_attach">2</property>
-            <property name="y_options"></property>
           </packing>
         </child>
         <child>
@@ -64,8 +57,7 @@
             <property name="mnemonic_widget">entry_password</property>
           </object>
           <packing>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options"></property>
+            <property name="left_attach">0</property>
           </packing>
         </child>
         <child>
@@ -82,11 +74,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">GTK_FILL</property>
-            <property name="y_options"></property>
           </packing>
         </child>
         <child>
@@ -96,11 +84,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">GTK_FILL</property>
-            <property name="y_options"></property>
           </packing>
         </child>
         <child>
@@ -115,11 +99,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">GTK_FILL</property>
-            <property name="y_options"></property>
           </packing>
         </child>
         <child>
@@ -134,10 +114,9 @@
             <property name="draw_indicator">True</property>
           </object>
           <packing>
-            <property name="right_attach">2</property>
             <property name="top_attach">4</property>
-            <property name="bottom_attach">5</property>
-            <property name="y_options"></property>
+            <property name="left_attach">0</property>
+            <property name="width">4</property>
           </packing>
         </child>
         <child>
@@ -176,11 +155,9 @@
                     <property name="top_padding">6</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <object class="GtkTable" id="table_advanced_sip_settings">
+                      <object class="GtkGrid" id="grid_advanced_sip_settings">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="n_rows">13</property>
-                        <property name="n_columns">4</property>
                         <property name="column_spacing">6</property>
                         <property name="row_spacing">6</property>
                         <child>
@@ -190,9 +167,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>
                           </packing>
                         </child>
                         <child>
@@ -202,9 +177,8 @@
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="right_attach">4</property>
                             <property name="top_attach">10</property>
-                            <property name="bottom_attach">11</property>
+                            <property name="width">3</property>
                           </packing>
                         </child>
                         <child>
@@ -214,9 +188,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
                             <property name="top_attach">5</property>
-                            <property name="bottom_attach">6</property>
                           </packing>
                         </child>
                         <child>
@@ -227,9 +199,8 @@
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="right_attach">4</property>
                             <property name="top_attach">8</property>
-                            <property name="bottom_attach">9</property>
+                            <property name="width">3</property>
                           </packing>
                         </child>
                         <child>
@@ -243,7 +214,6 @@
                             </attributes>
                           </object>
                           <packing>
-                            <property name="right_attach">4</property>
                           </packing>
                         </child>
                         <child>
@@ -257,9 +227,8 @@
                             </attributes>
                           </object>
                           <packing>
-                            <property name="right_attach">4</property>
                             <property name="top_attach">4</property>
-                            <property name="bottom_attach">5</property>
+                            <property name="left_attach">0</property>
                           </packing>
                         </child>
                         <child>
@@ -273,9 +242,8 @@
                             </attributes>
                           </object>
                           <packing>
-                            <property name="right_attach">4</property>
                             <property name="top_attach">9</property>
-                            <property name="bottom_attach">10</property>
+                            <property name="left_attach">0</property>
                           </packing>
                         </child>
                         <child>
@@ -295,9 +263,7 @@
                           </object>
                           <packing>
                             <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="left_attach">0</property>
                           </packing>
                         </child>
                         <child>
@@ -318,11 +284,9 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="right_attach">4</property>
                             <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="left_attach">0</property>
+                            <property name="width">4</property>
                           </packing>
                         </child>
                         <child>
@@ -342,9 +306,9 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="right_attach">4</property>
                             <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
+                            <property name="left_attach">0</property>
+                            <property name="width">4</property>
                           </packing>
                         </child>
                         <child>
@@ -363,7 +327,7 @@
                           </object>
                           <packing>
                             <property name="top_attach">5</property>
-                            <property name="bottom_attach">6</property>
+                            <property name="left_attach">0</property>
                           </packing>
                         </child>
                         <child>
@@ -377,9 +341,8 @@
                             </attributes>
                           </object>
                           <packing>
-                            <property name="right_attach">4</property>
                             <property name="top_attach">6</property>
-                            <property name="bottom_attach">7</property>
+                            <property name="left_attach">0</property>
                           </packing>
                         </child>
                         <child>
@@ -398,7 +361,7 @@
                           </object>
                           <packing>
                             <property name="top_attach">7</property>
-                            <property name="bottom_attach">8</property>
+                            <property name="left_attach">0</property>
                           </packing>
                         </child>
                         <child>
@@ -417,7 +380,7 @@
                           </object>
                           <packing>
                             <property name="top_attach">8</property>
-                            <property name="bottom_attach">9</property>
+                            <property name="left_attach">0</property>
                           </packing>
                         </child>
                         <child>
@@ -436,7 +399,7 @@
                           </object>
                           <packing>
                             <property name="top_attach">10</property>
-                            <property name="bottom_attach">11</property>
+                            <property name="left_attach">0</property>
                           </packing>
                         </child>
                         <child>
@@ -455,7 +418,7 @@
                           </object>
                           <packing>
                             <property name="top_attach">11</property>
-                            <property name="bottom_attach">12</property>
+                            <property name="left_attach">0</property>
                           </packing>
                         </child>
                         <child>
@@ -475,9 +438,9 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="right_attach">4</property>
                             <property name="top_attach">12</property>
-                            <property name="bottom_attach">13</property>
+                            <property name="left_attach">0</property>
+                            <property name="width">4</property>
                           </packing>
                         </child>
                         <child>
@@ -497,9 +460,9 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="right_attach">4</property>
                             <property name="top_attach">13</property>
-                            <property name="bottom_attach">14</property>
+                            <property name="left_attach">0</property>
+                            <property name="width">4</property>
                           </packing>
                         </child>
                         <child>
@@ -512,9 +475,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>
                           </packing>
                         </child>
                         <child>
@@ -526,9 +487,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">3</property>
-                            <property name="right_attach">4</property>
                             <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
                           </packing>
                         </child>
                         <child>
@@ -540,9 +499,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
-                            <property name="right_attach">3</property>
                             <property name="top_attach">5</property>
-                            <property name="bottom_attach">6</property>
                           </packing>
                         </child>
                         <child>
@@ -554,29 +511,9 @@
                           </object>
                           <packing>
                             <property name="left_attach">3</property>
-                            <property name="right_attach">4</property>
                             <property name="top_attach">5</property>
-                            <property name="bottom_attach">6</property>
                           </packing>
                         </child>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
                       </object>
                     </child>
                   </object>