tpaw-account-widget: improve the size of the various fields

Fields in the main area now are at least 280px wide. This solves the
problem with fields being too small.

All the fields should expand to fix the available horizontal space. This
solves the problem with fields leaving empty space on their side (in
particular when the advanced section is expanded).

10 files changed, 161 insertions, 82 deletions

diff --git a/tp-account-widgets/tpaw-account-widget-aim.ui b/tp-account-widgets/tpaw-account-widget-aim.ui
index 8ceacbf4..3c0f4c6f 100644
--- a/tp-account-widgets/tpaw-account-widget-aim.ui
+++ b/tp-account-widgets/tpaw-account-widget-aim.ui
@@ -50,6 +50,8 @@
           <object class="GtkEntry" id="entry_screenname">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="width_request">280</property>
+            <property name="hexpand">True</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -60,6 +62,8 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="visibility">False</property>
+            <property name="width_request">280</property>
+            <property name="hexpand">True</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -226,6 +230,8 @@
               <object class="GtkEntry" id="entry_screenname_simple">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="width_request">280</property>
+                <property name="hexpand">True</property>
               </object>
               <packing>
                 <property name="position">0</property>
@@ -275,6 +281,8 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="visibility">False</property>
+            <property name="width_request">280</property>
+            <property name="hexpand">True</property>
           </object>
         </child>
       </object>
diff --git a/tp-account-widgets/tpaw-account-widget-groupwise.ui b/tp-account-widgets/tpaw-account-widget-groupwise.ui
index cfca2e34..c9255296 100644
--- a/tp-account-widgets/tpaw-account-widget-groupwise.ui
+++ b/tp-account-widgets/tpaw-account-widget-groupwise.ui
@@ -48,6 +48,8 @@
           <object class="GtkEntry" id="entry_id">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="width_request">280</property>
+            <property name="hexpand">True</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -74,6 +76,8 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="visibility">False</property>
+            <property name="width_request">280</property>
+            <property name="hexpand">True</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -149,6 +153,7 @@
               <object class="GtkEntry" id="entry_server">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -219,55 +224,59 @@
               <object class="GtkEntry" id="entry_id_simple">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-              </object>
-              <packing>
+                <property name="width_request">280</property>
+                <property name="hexpand">True</property>
+            </object>
+            <packing>
                 <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_example">
+            </packing>
+        </child>
+        <child>
+            <object class="GtkLabel" id="label_example">
                 <property name="visible">True</property>
                 <property name="xalign">0.10000000149011612</property>
                 <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; username</property>
                 <property name="use_markup">True</property>
                 <attributes>
-                  <attribute name="scale" value="0.8"/><!-- PANGO_SCALE_SMALL -->
+                    <attribute name="scale" value="0.8"/><!-- PANGO_SCALE_SMALL -->
                 </attributes>
-              </object>
-              <packing>
+            </object>
+            <packing>
                 <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
+            </packing>
         </child>
+    </object>
+</child>
       </object>
       <packing>
-        <property name="position">1</property>
+          <property name="position">1</property>
       </packing>
-    </child>
-    <child>
+  </child>
+  <child>
       <object class="GtkLabel" id="label_password_simple">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your GroupWise password?</property>
+          <property name="visible">True</property>
+          <property name="xalign">0</property>
+          <property name="label" translatable="yes">What is your GroupWise password?</property>
       </object>
       <packing>
-        <property name="position">2</property>
+          <property name="position">2</property>
       </packing>
-    </child>
-    <child>
+  </child>
+  <child>
       <object class="GtkAlignment" id="alignment2">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkEntry" id="entry_password_simple">
+          <property name="visible">True</property>
+          <property name="xalign">0</property>
+          <property name="yalign">0</property>
+          <property name="xscale">0.34999999403953552</property>
+          <property name="yscale">0.34999999403953552</property>
+          <property name="left_padding">12</property>
+          <child>
+              <object class="GtkEntry" id="entry_password_simple">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="visibility">False</property>
+            <property name="width_request">280</property>
+            <property name="hexpand">True</property>
           </object>
         </child>
       </object>
diff --git a/tp-account-widgets/tpaw-account-widget-icq.ui b/tp-account-widgets/tpaw-account-widget-icq.ui
index 865a33c0..6eef13c6 100644
--- a/tp-account-widgets/tpaw-account-widget-icq.ui
+++ b/tp-account-widgets/tpaw-account-widget-icq.ui
@@ -50,6 +50,8 @@
           <object class="GtkEntry" id="entry_uin">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="width_request">280</property>
+            <property name="hexpand">True</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -60,6 +62,8 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="visibility">False</property>
+            <property name="width_request">280</property>
+            <property name="hexpand">True</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -149,6 +153,7 @@
               <object class="GtkEntry" id="entry_server">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -191,6 +196,7 @@
               <object class="GtkEntry" id="entry_charset">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -247,6 +253,8 @@
               <object class="GtkEntry" id="entry_uin_simple">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="width_request">280</property>
+                <property name="hexpand">True</property>
               </object>
               <packing>
                 <property name="position">0</property>
@@ -296,6 +304,8 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="visibility">False</property>
+            <property name="width_request">280</property>
+            <property name="hexpand">True</property>
           </object>
         </child>
       </object>
diff --git a/tp-account-widgets/tpaw-account-widget-irc.ui b/tp-account-widgets/tpaw-account-widget-irc.ui
index fc72974b..be9fd7b5 100644
--- a/tp-account-widgets/tpaw-account-widget-irc.ui
+++ b/tp-account-widgets/tpaw-account-widget-irc.ui
@@ -100,6 +100,7 @@
                       <object class="GtkEntry" id="entry_network">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="hexpand">True</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -293,6 +294,8 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="visibility">False</property>
+            <property name="width_request">280</property>
+            <property name="hexpand">True</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -305,6 +308,8 @@
           <object class="GtkEntry" id="entry_nick">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="width_request">280</property>
+            <property name="hexpand">True</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -409,6 +414,7 @@
               <object class="GtkEntry" id="entry_quit_message">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -438,6 +444,7 @@
               <object class="GtkEntry" id="entry_fullname">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -487,6 +494,7 @@
               <object class="GtkEntry" id="entry_username">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -580,6 +588,8 @@
           <object class="GtkEntry" id="entry_nick_simple">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="width_request">280</property>
+            <property name="hexpand">True</property>
           </object>
         </child>
       </object>
diff --git a/tp-account-widgets/tpaw-account-widget-jabber.ui b/tp-account-widgets/tpaw-account-widget-jabber.ui
index 849d38c2..c5e848f9 100644
--- a/tp-account-widgets/tpaw-account-widget-jabber.ui
+++ b/tp-account-widgets/tpaw-account-widget-jabber.ui
@@ -37,6 +37,7 @@
           <object class="GtkEntry" id="entry_id_fb_simple">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="hexpand">True</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -91,6 +92,7 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
         <property name="can_focus">True</property>
         <property name="margin_left">12</property>
         <property name="visibility">False</property>
+        <property name="hexpand">True</property>
       </object>
       <packing>
         <property name="expand">False</property>
@@ -142,6 +144,7 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
           <object class="GtkEntry" id="entry_id_g_simple">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="hexpand">True</property>
           </object>
           <packing>
             <property name="expand">True</property>
@@ -193,6 +196,7 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
         <property name="can_focus">True</property>
         <property name="margin_left">12</property>
         <property name="visibility">False</property>
+        <property name="hexpand">True</property>
       </object>
       <packing>
         <property name="expand">False</property>
@@ -235,6 +239,8 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
             <property name="valign">start</property>
             <property name="hexpand">True</property>
             <property name="visibility">False</property>
+            <property name="width_request">280</property>
+            <property name="hexpand">True</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -248,6 +254,8 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="hexpand">True</property>
+            <property name="width_request">280</property>
+            <property name="hexpand">True</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -453,6 +461,7 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
                       <object class="GtkEntry" id="entry_resource">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="hexpand">True</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -615,6 +624,7 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="invisible_char">●</property>
+                        <property name="hexpand">True</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -689,6 +699,7 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
           <object class="GtkEntry" id="entry_id_simple">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="hexpand">True</property>
           </object>
           <packing>
             <property name="expand">True</property>
@@ -740,6 +751,7 @@ Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to cho
         <property name="can_focus">True</property>
         <property name="margin_left">12</property>
         <property name="visibility">False</property>
+        <property name="hexpand">True</property>
       </object>
       <packing>
         <property name="expand">False</property>
diff --git a/tp-account-widgets/tpaw-account-widget-local-xmpp.ui b/tp-account-widgets/tpaw-account-widget-local-xmpp.ui
index 460c41cb..a5a26aca 100644
--- a/tp-account-widgets/tpaw-account-widget-local-xmpp.ui
+++ b/tp-account-widgets/tpaw-account-widget-local-xmpp.ui
@@ -16,6 +16,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="hexpand">True</property>
+            <property name="width_request">280</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -27,6 +28,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="hexpand">True</property>
+            <property name="width_request">280</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -38,6 +40,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="hexpand">True</property>
+            <property name="width_request">280</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
diff --git a/tp-account-widgets/tpaw-account-widget-msn.ui b/tp-account-widgets/tpaw-account-widget-msn.ui
index 4b0614f3..621a476e 100644
--- a/tp-account-widgets/tpaw-account-widget-msn.ui
+++ b/tp-account-widgets/tpaw-account-widget-msn.ui
@@ -48,6 +48,8 @@
           <object class="GtkEntry" id="entry_id">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="width_request">280</property>
+            <property name="hexpand">True</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -74,6 +76,8 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="visibility">False</property>
+            <property name="width_request">280</property>
+            <property name="hexpand">True</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -149,76 +153,78 @@
               <object class="GtkEntry" id="entry_server">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-              </object>
-              <packing>
+                <property name="hexpand">True</property>
+            </object>
+            <packing>
                 <property name="left_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSpinButton" id="spinbutton_port">
+            </packing>
+        </child>
+        <child>
+            <object class="GtkSpinButton" id="spinbutton_port">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="adjustment">adjustment1</property>
                 <property name="climb_rate">1</property>
                 <property name="numeric">True</property>
-              </object>
-              <packing>
+            </object>
+            <packing>
                 <property name="left_attach">1</property>
                 <property name="top_attach">1</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-        <child type="label">
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Advanced</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
+            </packing>
         </child>
+    </object>
+</child>
+<child type="label">
+    <object class="GtkLabel" id="label1">
+        <property name="visible">True</property>
+        <property name="label" translatable="yes">Advanced</property>
+        <attributes>
+            <attribute name="weight" value="bold"/>
+        </attributes>
+    </object>
+</child>
       </object>
       <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
+          <property name="expand">True</property>
+          <property name="fill">True</property>
+          <property name="position">1</property>
       </packing>
-    </child>
+  </child>
   </object>
   <object class="GtkVBox" id="vbox_msn_simple">
-    <property name="visible">True</property>
-    <property name="orientation">vertical</property>
-    <property name="spacing">6</property>
-    <child>
-      <object class="GtkLabel" id="label_id_simple">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your Windows Live ID?</property>
-      </object>
-      <packing>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment1">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="bottom_padding">3</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkVBox" id="vbox1">
-            <property name="visible">True</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">4</property>
-            <child>
-              <object class="GtkEntry" id="entry_id_simple">
+      <property name="visible">True</property>
+      <property name="orientation">vertical</property>
+      <property name="spacing">6</property>
+      <child>
+          <object class="GtkLabel" id="label_id_simple">
+              <property name="visible">True</property>
+              <property name="xalign">0</property>
+              <property name="label" translatable="yes">What is your Windows Live ID?</property>
+          </object>
+          <packing>
+              <property name="position">0</property>
+          </packing>
+      </child>
+      <child>
+          <object class="GtkAlignment" id="alignment1">
+              <property name="visible">True</property>
+              <property name="xalign">0</property>
+              <property name="yalign">0</property>
+              <property name="xscale">0.34999999403953552</property>
+              <property name="yscale">0.34999999403953552</property>
+              <property name="bottom_padding">3</property>
+              <property name="left_padding">12</property>
+              <child>
+                  <object class="GtkVBox" id="vbox1">
+                      <property name="visible">True</property>
+                      <property name="orientation">vertical</property>
+                      <property name="spacing">4</property>
+                      <child>
+                          <object class="GtkEntry" id="entry_id_simple">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
               </object>
               <packing>
                 <property name="position">0</property>
@@ -268,6 +274,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="visibility">False</property>
+            <property name="hexpand">True</property>
           </object>
         </child>
       </object>
diff --git a/tp-account-widgets/tpaw-account-widget-sip.ui b/tp-account-widgets/tpaw-account-widget-sip.ui
index 7caa7cad..9016a5e4 100644
--- a/tp-account-widgets/tpaw-account-widget-sip.ui
+++ b/tp-account-widgets/tpaw-account-widget-sip.ui
@@ -50,6 +50,8 @@
           <object class="GtkEntry" id="entry_userid">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="width_request">280</property>
+            <property name="hexpand">True</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -92,6 +94,8 @@
           <object class="GtkEntry" id="entry_password">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="width_request">280</property>
+            <property name="hexpand">True</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -176,6 +180,7 @@
                           <object class="GtkEntry" id="entry_stun-server">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="hexpand">True</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -186,6 +191,7 @@
                           <object class="GtkEntry" id="entry_auth-user">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="hexpand">True</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -197,6 +203,7 @@
                           <object class="GtkEntry" id="entry_proxy-host">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="hexpand">True</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -219,6 +226,7 @@
                          <object class="GtkEntry" id="entry_local-ip-address">
                            <property name="visible">True</property>
                            <property name="can_focus">True</property>
+                           <property name="hexpand">True</property>
                          </object>
                          <packing>
                            <property name="left_attach">1</property>
@@ -642,6 +650,7 @@
               <object class="GtkEntry" id="entry_userid_simple">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -702,6 +711,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="visibility">False</property>
+            <property name="hexpand">True</property>
           </object>
         </child>
       </object>
diff --git a/tp-account-widgets/tpaw-account-widget-yahoo.ui b/tp-account-widgets/tpaw-account-widget-yahoo.ui
index 9d002538..9d88b618 100644
--- a/tp-account-widgets/tpaw-account-widget-yahoo.ui
+++ b/tp-account-widgets/tpaw-account-widget-yahoo.ui
@@ -45,6 +45,8 @@
           <object class="GtkEntry" id="entry_id">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="width_request">280</property>
+            <property name="hexpand">True</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -55,6 +57,8 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="visibility">False</property>
+            <property name="width_request">280</property>
+            <property name="hexpand">True</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -159,6 +163,7 @@
                   <object class="GtkEntry" id="entry_locale">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="hexpand">True</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -169,6 +174,7 @@
                   <object class="GtkEntry" id="entry_charset">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="hexpand">True</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -257,6 +263,7 @@
               <object class="GtkEntry" id="entry_id_simple">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
               </object>
               <packing>
                 <property name="position">0</property>
@@ -306,6 +313,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="visibility">False</property>
+            <property name="hexpand">True</property>
           </object>
         </child>
       </object>
diff --git a/tp-account-widgets/tpaw-account-widget.c b/tp-account-widgets/tpaw-account-widget.c
index 8e5eb445..3626e97a 100644
--- a/tp-account-widgets/tpaw-account-widget.c
+++ b/tp-account-widgets/tpaw-account-widget.c
@@ -768,9 +768,11 @@ accounts_widget_generic_setup (TpawAccountWidget *self,
           gtk_widget_show (widget);
 
           widget = gtk_entry_new ();
+          g_object_set (widget, "hexpand", TRUE, NULL);
           if (g_strcmp0 (tp_connection_manager_param_get_name (param),
                 "account") == 0)
             {
+              g_object_set (widget, "width-request", 280, NULL);
               g_signal_connect (widget, "realize",
                   G_CALLBACK (gtk_widget_grab_focus),
                   NULL);