oops, don't xexpand, that makes the dialog too wide.

svn path=/trunk/; revision=7607

2 files changed, 104 insertions, 104 deletions

diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index 2952d544c9..577b4becf9 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -1967,32 +1967,6 @@ Click &quot;Finish&quot; to save your settings.</text>
 	  </widget>
 
 	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>omenuSourceAuth</name>
-	    <can_focus>True</can_focus>
-	    <items>Plain Text
-Kerberos
-CRAM-MD5
-DIGEST-MD5
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <left_attach>4</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>6</top_attach>
-	      <bottom_attach>7</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
 	    <class>GtkEntry</class>
 	    <name>txtSourceHost</name>
 	    <can_focus>True</can_focus>
@@ -2242,6 +2216,32 @@ DIGEST-MD5
 	      <yfill>False</yfill>
 	    </child>
 	  </widget>
+
+	  <widget>
+	    <class>GtkOptionMenu</class>
+	    <name>omenuSourceAuth</name>
+	    <can_focus>True</can_focus>
+	    <items>Plain Text
+Kerberos
+CRAM-MD5
+DIGEST-MD5
+</items>
+	    <initial_choice>0</initial_choice>
+	    <child>
+	      <left_attach>4</left_attach>
+	      <right_attach>10</right_attach>
+	      <top_attach>6</top_attach>
+	      <bottom_attach>7</bottom_attach>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	      <xexpand>False</xexpand>
+	      <yexpand>False</yexpand>
+	      <xshrink>False</xshrink>
+	      <yshrink>False</yshrink>
+	      <xfill>True</xfill>
+	      <yfill>False</yfill>
+	    </child>
+	  </widget>
 	</widget>
 
 	<widget>
@@ -2307,30 +2307,6 @@ DIGEST-MD5
 	  </widget>
 
 	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>omenuTransportAuth</name>
-	    <can_focus>True</can_focus>
-	    <items>None
-CRAM-MD5
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <left_attach>4</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>3</top_attach>
-	      <bottom_attach>4</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
 	    <class>GtkEntry</class>
 	    <name>txtTransportHost</name>
 	    <can_focus>True</can_focus>
@@ -2355,30 +2331,6 @@ CRAM-MD5
 	  </widget>
 
 	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>omenuTransportType</name>
-	    <can_focus>True</can_focus>
-	    <items>Sendmail
-SMTP
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <left_attach>3</left_attach>
-	      <right_attach>10</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
 	    <class>GtkCheckButton</class>
 	    <name>chkTransportSSL</name>
 	    <sensitive>False</sensitive>
@@ -2479,6 +2431,54 @@ SMTP
 	      <yfill>False</yfill>
 	    </child>
 	  </widget>
+
+	  <widget>
+	    <class>GtkOptionMenu</class>
+	    <name>omenuTransportAuth</name>
+	    <can_focus>True</can_focus>
+	    <items>None
+CRAM-MD5
+</items>
+	    <initial_choice>0</initial_choice>
+	    <child>
+	      <left_attach>4</left_attach>
+	      <right_attach>10</right_attach>
+	      <top_attach>3</top_attach>
+	      <bottom_attach>4</bottom_attach>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	      <xexpand>False</xexpand>
+	      <yexpand>False</yexpand>
+	      <xshrink>False</xshrink>
+	      <yshrink>False</yshrink>
+	      <xfill>True</xfill>
+	      <yfill>False</yfill>
+	    </child>
+	  </widget>
+
+	  <widget>
+	    <class>GtkOptionMenu</class>
+	    <name>omenuTransportType</name>
+	    <can_focus>True</can_focus>
+	    <items>Sendmail
+SMTP
+</items>
+	    <initial_choice>0</initial_choice>
+	    <child>
+	      <left_attach>3</left_attach>
+	      <right_attach>10</right_attach>
+	      <top_attach>1</top_attach>
+	      <bottom_attach>2</bottom_attach>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	      <xexpand>False</xexpand>
+	      <yexpand>False</yexpand>
+	      <xshrink>False</xshrink>
+	      <yshrink>False</yshrink>
+	      <xfill>True</xfill>
+	      <yfill>False</yfill>
+	    </child>
+	  </widget>
 	</widget>
       </widget>
 
@@ -2591,48 +2591,48 @@ SMTP
 	  </widget>
 
 	  <widget>
-	    <class>GtkEntry</class>
-	    <name>txtSourcePath</name>
+	    <class>GtkCheckButton</class>
+	    <name>chkKeepMailOnServer</name>
 	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
+	    <label>Keep mail on server</label>
+	    <active>True</active>
+	    <draw_indicator>True</draw_indicator>
 	    <child>
-	      <left_attach>3</left_attach>
+	      <left_attach>1</left_attach>
 	      <right_attach>10</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
+	      <top_attach>2</top_attach>
+	      <bottom_attach>3</bottom_attach>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
+	      <xexpand>False</xexpand>
 	      <yexpand>False</yexpand>
 	      <xshrink>False</xshrink>
 	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
+	      <xfill>False</xfill>
 	      <yfill>False</yfill>
 	    </child>
 	  </widget>
 
 	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>chkKeepMailOnServer</name>
+	    <class>GtkEntry</class>
+	    <name>txtSourcePath</name>
 	    <can_focus>True</can_focus>
-	    <label>Keep mail on server</label>
-	    <active>True</active>
-	    <draw_indicator>True</draw_indicator>
+	    <editable>True</editable>
+	    <text_visible>True</text_visible>
+	    <text_max_length>0</text_max_length>
+	    <text></text>
 	    <child>
-	      <left_attach>1</left_attach>
+	      <left_attach>3</left_attach>
 	      <right_attach>10</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
+	      <top_attach>1</top_attach>
+	      <bottom_attach>2</bottom_attach>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
+	      <xexpand>True</xexpand>
 	      <yexpand>False</yexpand>
 	      <xshrink>False</xshrink>
 	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
+	      <xfill>True</xfill>
 	      <yfill>False</yfill>
 	    </child>
 	  </widget>
diff --git a/mail/mail-config.glade.h b/mail/mail-config.glade.h
index d73107a150..f56c824cb0 100644
--- a/mail/mail-config.glade.h
+++ b/mail/mail-config.glade.h
@@ -57,28 +57,28 @@ gchar *s = N_("Signature:");
 gchar *s = N_("General");
 gchar *s = N_("Incoming Mail Server");
 gchar *s = N_("Save password");
-gchar *s = N_("Plain Text\n"
-              "Kerberos\n"
-              "CRAM-MD5\n"
-              "DIGEST-MD5\n"
-              "");
 gchar *s = N_("This server requires a secure connection (SSL)");
 gchar *s = N_("Username:");
 gchar *s = N_("Password:");
 gchar *s = N_("Authentication:");
 gchar *s = N_("Hostname:");
 gchar *s = N_("Type:");
+gchar *s = N_("Plain Text\n"
+              "Kerberos\n"
+              "CRAM-MD5\n"
+              "DIGEST-MD5\n"
+              "");
 gchar *s = N_("Outgoing Mail Server");
+gchar *s = N_("This server requires a secure connection (SSL)");
+gchar *s = N_("Type:");
+gchar *s = N_("Hostname:");
+gchar *s = N_("Authentication:");
 gchar *s = N_("None\n"
               "CRAM-MD5\n"
               "");
 gchar *s = N_("Sendmail\n"
               "SMTP\n"
               "");
-gchar *s = N_("This server requires a secure connection (SSL)");
-gchar *s = N_("Type:");
-gchar *s = N_("Hostname:");
-gchar *s = N_("Authentication:");
 gchar *s = N_("Servers");
 gchar *s = N_("Miscellaneous");
 gchar *s = N_("Path:");