From 63c43c06ab55e11af6257e910db9f60e279d5e67 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@helixcode.com>
Date: Fri, 5 Jan 2001 20:33:11 +0000
Subject: Renamed from _delete_mail (mail_config_druid_get_transport_url): New

2001-01-05  Jeffrey Stedfast  <fejj@helixcode.com>

	* mail-config-druid.c (mail_config_druid_get_incoming_keep_mail):
	Renamed from _delete_mail
	(mail_config_druid_get_transport_url): New convenience function
	that replaces the get_hostname, get_protocol, etc.
	(mail_config_druid_get_source_url): Same.

	* mail-config-druid.glade: Changed "Delete mail from server" to
	"Keep mail on server" as this has a more positive ring to it. Both
	I and Aaron agree this is the better phrase.

svn path=/trunk/; revision=7272
---
 mail/mail-config-druid.glade | 60 ++++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

(limited to 'mail/mail-config-druid.glade')

diff --git a/mail/mail-config-druid.glade b/mail/mail-config-druid.glade
index 89cbb7eced..51bf799c71 100644
--- a/mail/mail-config-druid.glade
+++ b/mail/mail-config-druid.glade
@@ -189,8 +189,8 @@ Click &quot;Next&quot; to begin. </text>
 
 	      <widget>
 		<class>GtkLabel</class>
-		<name>identity-name-label</name>
-		<label>Full Name:</label>
+		<name>identity-address-label</name>
+		<label>Email Address:</label>
 		<justify>GTK_JUSTIFY_RIGHT</justify>
 		<wrap>False</wrap>
 		<xalign>1</xalign>
@@ -200,8 +200,8 @@ Click &quot;Next&quot; to begin. </text>
 		<child>
 		  <left_attach>0</left_attach>
 		  <right_attach>1</right_attach>
-		  <top_attach>0</top_attach>
-		  <bottom_attach>1</bottom_attach>
+		  <top_attach>1</top_attach>
+		  <bottom_attach>2</bottom_attach>
 		  <xpad>0</xpad>
 		  <ypad>0</ypad>
 		  <xexpand>False</xexpand>
@@ -215,8 +215,8 @@ Click &quot;Next&quot; to begin. </text>
 
 	      <widget>
 		<class>GtkLabel</class>
-		<name>identity-address-label</name>
-		<label>Email Address:</label>
+		<name>identity-name-label</name>
+		<label>Full Name:</label>
 		<justify>GTK_JUSTIFY_RIGHT</justify>
 		<wrap>False</wrap>
 		<xalign>1</xalign>
@@ -226,8 +226,8 @@ Click &quot;Next&quot; to begin. </text>
 		<child>
 		  <left_attach>0</left_attach>
 		  <right_attach>1</right_attach>
-		  <top_attach>1</top_attach>
-		  <bottom_attach>2</bottom_attach>
+		  <top_attach>0</top_attach>
+		  <bottom_attach>1</bottom_attach>
 		  <xpad>0</xpad>
 		  <ypad>0</ypad>
 		  <xexpand>False</xexpand>
@@ -907,8 +907,8 @@ Click &quot;Next&quot; to begin. </text>
 		  <initial_choice>0</initial_choice>
 		  <child>
 		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
+		    <expand>True</expand>
+		    <fill>True</fill>
 		  </child>
 		</widget>
 	      </widget>
@@ -1083,14 +1083,18 @@ Click &quot;Next&quot; to begin. </text>
 	      </child>
 
 	      <widget>
-		<class>GtkOptionMenu</class>
-		<name>omenuTransportType</name>
-		<can_focus>True</can_focus>
-		<items></items>
-		<initial_choice>0</initial_choice>
+		<class>GtkLabel</class>
+		<name>transport-type-label</name>
+		<label>Server Type: </label>
+		<justify>GTK_JUSTIFY_RIGHT</justify>
+		<wrap>False</wrap>
+		<xalign>1</xalign>
+		<yalign>0.5</yalign>
+		<xpad>2</xpad>
+		<ypad>0</ypad>
 		<child>
-		  <left_attach>1</left_attach>
-		  <right_attach>2</right_attach>
+		  <left_attach>0</left_attach>
+		  <right_attach>1</right_attach>
 		  <top_attach>0</top_attach>
 		  <bottom_attach>1</bottom_attach>
 		  <xpad>0</xpad>
@@ -1099,29 +1103,25 @@ Click &quot;Next&quot; to begin. </text>
 		  <yexpand>False</yexpand>
 		  <xshrink>False</xshrink>
 		  <yshrink>False</yshrink>
-		  <xfill>False</xfill>
+		  <xfill>True</xfill>
 		  <yfill>False</yfill>
 		</child>
 	      </widget>
 
 	      <widget>
-		<class>GtkLabel</class>
-		<name>transport-type-label</name>
-		<label>Server Type: </label>
-		<justify>GTK_JUSTIFY_RIGHT</justify>
-		<wrap>False</wrap>
-		<xalign>1</xalign>
-		<yalign>0.5</yalign>
-		<xpad>2</xpad>
-		<ypad>0</ypad>
+		<class>GtkOptionMenu</class>
+		<name>omenuTransportType</name>
+		<can_focus>True</can_focus>
+		<items></items>
+		<initial_choice>0</initial_choice>
 		<child>
-		  <left_attach>0</left_attach>
-		  <right_attach>1</right_attach>
+		  <left_attach>1</left_attach>
+		  <right_attach>2</right_attach>
 		  <top_attach>0</top_attach>
 		  <bottom_attach>1</bottom_attach>
 		  <xpad>0</xpad>
 		  <ypad>0</ypad>
-		  <xexpand>False</xexpand>
+		  <xexpand>True</xexpand>
 		  <yexpand>False</yexpand>
 		  <xshrink>False</xshrink>
 		  <yshrink>False</yshrink>
-- 
cgit v1.2.3