Redo this to not use the CORBA interfaces in the local case (in

	* mail-config-druid.c: Redo this to not use the CORBA interfaces
	in the local case (in preparation for redoing the CORBA
	interfaces).
	(mail_config_druid_new): Remove unused "shell" arg

	* mail-account-gui.c (mail_account_gui_transport_complete): Don't
	crash if there's no transport selected at all.
	(mail_account_gui_new): Don't try to set cc_addrs/bcc_addrs if
	they're NULL.

	* mail-accounts.c (account_add_clicked): Don't need to pass shell
	to mail_config_druid_new.

	* mail-callbacks.c (configure_mail): Don't need to pass shell to
	mail_config_druid_new.

svn path=/trunk/; revision=20051

1 files changed, 46 insertions, 55 deletions

diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index 8fe953432f..f62889af12 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -5,7 +5,7 @@
 <requires lib="gnome"/>
 
 <widget class="GtkWindow" id="account_druid">
-  <property name="title" translatable="yes">window1</property>
+  <property name="title" translatable="yes">Evolution Account Assistant</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
@@ -19,7 +19,7 @@
       <property name="show_help">False</property>
 
       <child>
-	<widget class="GnomeDruidPageEdge" id="druidpagestart1">
+	<widget class="GnomeDruidPageEdge" id="start_page">
 	  <property name="visible">True</property>
 	  <property name="position">GNOME_EDGE_START</property>
 	  <property name="title" translatable="yes">Mail Configuration</property>
@@ -729,7 +729,7 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
 	  <property name="border_width">3</property>
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
-	  <property name="spacing">3</property>
+	  <property name="spacing">0</property>
 
 	  <child>
 	    <widget class="GtkTable" id="table3">
@@ -752,7 +752,7 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
 		  <property name="selectable">False</property>
 		  <property name="xalign">1</property>
 		  <property name="yalign">0.5</property>
-		  <property name="xpad">2</property>
+		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
 		  <property name="mnemonic_widget">source_type_omenu</property>
 		</widget>
@@ -836,61 +836,52 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
 	  </child>
 
 	  <child>
-	    <widget class="GtkAlignment" id="alignment26">
+	    <widget class="GtkHBox" id="hbox163">
+	      <property name="border_width">3</property>
 	      <property name="visible">True</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xscale">0.97</property>
-	      <property name="yscale">3.91155e-07</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">3</property>
 
 	      <child>
-		<widget class="GtkHBox" id="hbox163">
+		<widget class="GtkLabel" id="label442">
 		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">3</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label442">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Description:</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_CENTER</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
+		  <property name="label" translatable="yes">Description:</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_CENTER</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
 
-		  <child>
-		    <widget class="GtkLabel" id="source_description">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">description</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_CENTER</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
+	      <child>
+		<widget class="GtkLabel" id="source_description">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">description</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
 		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
+		</packing>
 	      </child>
 	    </widget>
 	    <packing>
@@ -1607,7 +1598,7 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
 		  <property name="selectable">False</property>
 		  <property name="xalign">1</property>
 		  <property name="yalign">0.5</property>
-		  <property name="xpad">2</property>
+		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
 		  <property name="mnemonic_widget">transport_type_omenu</property>
 		</widget>
@@ -1684,7 +1675,7 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</property>
 		  <property name="selectable">False</property>
 		  <property name="xalign">1</property>
 		  <property name="yalign">0</property>
-		  <property name="xpad">2</property>
+		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
 		</widget>
 		<packing>