Most (but not all) packing issues from Mail preferences

1 files changed, 60 insertions, 4 deletions

diff --git a/mail/mail-config.ui b/mail/mail-config.ui
index a38a0bfabe..289b052c3e 100644
--- a/mail/mail-config.ui
+++ b/mail/mail-config.ui
@@ -2465,6 +2465,8 @@ For example: "Work" or "Personal"</property>
                         </child>
                       </object>
                       <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
@@ -2489,6 +2491,8 @@ For example: "Work" or "Personal"</property>
                         </child>
                       </object>
                       <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -2496,6 +2500,8 @@ For example: "Work" or "Personal"</property>
                 </child>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -2813,6 +2819,8 @@ For example: "Work" or "Personal"</property>
                         </child>
                       </object>
                       <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
@@ -2826,6 +2834,8 @@ For example: "Work" or "Personal"</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -2928,6 +2938,8 @@ For example: "Work" or "Personal"</property>
                 </child>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -3022,6 +3034,8 @@ For example: "Work" or "Personal"</property>
               </object>
               <packing>
                 <property name="position">1</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
               </packing>
             </child>
           </object>
@@ -3254,6 +3268,8 @@ For example: "Work" or "Personal"</property>
                       </object>
                       <packing>
                         <property name="position">0</property>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                       </packing>
                     </child>
                     <child>
@@ -3306,6 +3322,8 @@ For example: "Work" or "Personal"</property>
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -3353,6 +3371,8 @@ For example: "Work" or "Personal"</property>
               </object>
               <packing>
                 <property name="position">1</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
               </packing>
             </child>
           </object>
@@ -3735,7 +3755,7 @@ For example: "Work" or "Personal"</property>
         <property name="visible">True</property>
         <property name="border_width">12</property>
         <property name="orientation">vertical</property>
-        <property name="spacing">18</property>
+        <property name="spacing">6</property>
         <child>
           <object class="GtkVBox" id="default-behavior-section">
             <property name="visible">True</property>
@@ -3839,6 +3859,7 @@ For example: "Work" or "Personal"</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
+                            <property name="fill">False</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
@@ -3848,6 +3869,8 @@ For example: "Work" or "Personal"</property>
                       </object>
                       <packing>
                         <property name="position">4</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
                       </packing>
                     </child>
                   </object>
@@ -3855,6 +3878,8 @@ For example: "Work" or "Personal"</property>
               </object>
               <packing>
                 <property name="position">1</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
               </packing>
             </child>
           </object>
@@ -3880,6 +3905,8 @@ For example: "Work" or "Personal"</property>
               </object>
               <packing>
                 <property name="position">0</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
               </packing>
             </child>
             <child>
@@ -4097,11 +4124,15 @@ For example: "Work" or "Personal"</property>
               </object>
               <packing>
                 <property name="position">1</property>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="position">0</property>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
           </packing>
         </child>
         <child>
@@ -4143,12 +4174,14 @@ For example: "Work" or "Personal"</property>
               </object>
               <packing>
                 <property name="position">1</property>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -4265,11 +4298,15 @@ For example: "Work" or "Personal"</property>
               </object>
               <packing>
                 <property name="position">1</property>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="position">0</property>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
           </packing>
         </child>
         <child>
@@ -4351,6 +4388,7 @@ For example: "Work" or "Personal"</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">False</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -4359,11 +4397,14 @@ For example: "Work" or "Personal"</property>
               </object>
               <packing>
                 <property name="position">1</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">False</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -4765,6 +4806,8 @@ for display purposes only. </property>
               </object>
               <packing>
                 <property name="position">0</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
               </packing>
             </child>
             <child>
@@ -4788,6 +4831,8 @@ for display purposes only. </property>
                       </object>
                       <packing>
                         <property name="position">0</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
                       </packing>
                     </child>
                     <child>
@@ -4802,6 +4847,8 @@ for display purposes only. </property>
                       </object>
                       <packing>
                         <property name="position">1</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
                       </packing>
                     </child>
                     <child>
@@ -4816,6 +4863,8 @@ for display purposes only. </property>
                       </object>
                       <packing>
                         <property name="position">2</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
                       </packing>
                     </child>
                     <child>
@@ -4990,6 +5039,7 @@ for display purposes only. </property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="fill">False</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
@@ -5004,6 +5054,7 @@ for display purposes only. </property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="fill">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -5014,7 +5065,7 @@ for display purposes only. </property>
                                 <child>
                                   <object class="GtkTable" id="table11">
                                     <property name="visible">True</property>
-                                    <property name="n_rows">2</property>
+                                    <property name="n_rows">3</property>
                                     <property name="n_columns">2</property>
                                     <property name="column_spacing">6</property>
                                     <property name="row_spacing">3</property>
@@ -5076,6 +5127,7 @@ for display purposes only. </property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="fill">False</property>
                                 <property name="position">2</property>
                               </packing>
                             </child>
@@ -5084,6 +5136,7 @@ for display purposes only. </property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">False</property>
                         <property name="position">3</property>
                       </packing>
                     </child>
@@ -5091,12 +5144,15 @@ for display purposes only. </property>
                 </child>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">False</property>
             <property name="position">0</property>
           </packing>
         </child>