From cc28f482cc2f14926ccf6dfd4db970a167063516 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@ximian.com>
Date: Mon, 8 Apr 2002 20:00:46 +0000
Subject: [PATCH] Re-added the config wizard interfaces. Ettore accidently
 removed them

2002-04-08  Jeffrey Stedfast  <fejj@ximian.com>

	* GNOME_Evolution_Mail.oaf.in: Re-added the config wizard
	interfaces. Ettore accidently removed them thinking they were
	duplicates of the new mail-config interfaces.

	* mail-config.glade: Remove the OK, Apply, Cancel buttons from the
	keyboard shortcut tab in the composer_prefs dialog.

	* mail-account-gui.c: No need to check gui->source before using
	gui->source->url, since gui->source *has* to exist.

svn path=/trunk/; revision=16391
---
 mail/ChangeLog                   | 12 +++++++++
 mail/GNOME_Evolution_Mail.oaf.in | 22 ++++++++++++++++
 mail/mail-account-gui.c          |  6 ++---
 mail/mail-config.glade           | 45 +-------------------------------
 4 files changed, 38 insertions(+), 47 deletions(-)

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 1677b92684..335d750bdd 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,15 @@
+2002-04-08  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* GNOME_Evolution_Mail.oaf.in: Re-added the config wizard
+	interfaces. Ettore accidently removed them thinking they were
+	duplicates of the new mail-config interfaces.
+
+	* mail-config.glade: Remove the OK, Apply, Cancel buttons from the
+	keyboard shortcut tab in the composer_prefs dialog.
+
+	* mail-account-gui.c: No need to check gui->source before using
+	gui->source->url, since gui->source *has* to exist.
+
 2002-04-06  JP Rosevear  <jpr@ximian.com>
 
 	* GNOME_Evolution_Mail.oaf.in: add config_item:type
diff --git a/mail/GNOME_Evolution_Mail.oaf.in b/mail/GNOME_Evolution_Mail.oaf.in
index 24bd7b11e2..a643c22a64 100644
--- a/mail/GNOME_Evolution_Mail.oaf.in
+++ b/mail/GNOME_Evolution_Mail.oaf.in
@@ -101,6 +101,28 @@
 		   _value="Evolution mail composer."/>
   </oaf_server>
 
+  <!-- Config Wizard interface -->
+  <oaf_server iid="OAFIID:GNOME_Evolution_MailConfig_Factory"
+              type="exe"
+              location="evolution-mail">
+
+    <oaf_attribute name="repo_ids" type="stringv">
+      <item value="IDL:GNOME/GenericFactory:1.0"/>
+    </oaf_attribute>
+  </oaf_server>
+
+  <oaf_server iid="OAFIID:GNOME_Evolution_MailConfig"
+              type="factory"
+              location="OAFIID:GNOME_Evolution_MailConfig_Factory">
+
+    <oaf_attribute name="repo_ids" type="stringv">
+      <item value="IDL:GNOME/Evolution/MailConfig:1.0"/>
+    </oaf_attribute>
+
+    <oaf_attribute name="description" type="string"
+                   _value="Mail configuration interface"/>
+  </oaf_server>
+
   <!-- MailConfig interface -->
 
   <!-- (factory) -->
diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c
index fac9966137..04047339f7 100644
--- a/mail/mail-account-gui.c
+++ b/mail/mail-account-gui.c
@@ -1826,14 +1826,14 @@ mail_account_gui_save (MailAccountGui *gui)
 	account->id->name = e_utf8_gtk_entry_get_text (gui->full_name);
 	account->id->address = e_utf8_gtk_entry_get_text (gui->email_address);
 	account->id->organization = e_utf8_gtk_entry_get_text (gui->organization);
-
+	
 	sig_set_and_write (gui);
-
+	
 	old_enabled = account->source && account->source->enabled;
 	service_destroy (account->source);
 	account->source = g_new0 (MailConfigService, 1);
 	save_service (&gui->source, gui->extra_config, account->source);
-	if (account->source && account->source->url) {
+	if (account->source->url) {
 		provider = camel_session_get_provider (session, account->source->url, NULL);
 		source_url = provider ? camel_url_new (account->source->url, NULL) : NULL;
 		
diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index 12a33f4dd8..013f317691 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -5825,7 +5825,7 @@ Quoted
 
     <widget>
       <class>GtkVBox</class>
-      <name>vbox154</name>
+      <name>vboxShortcuts</name>
       <homogeneous>False</homogeneous>
       <spacing>0</spacing>
 
@@ -6001,49 +6001,6 @@ Microsoft
 	  </widget>
 	</widget>
       </widget>
-
-      <widget>
-	<class>GtkHButtonBox</class>
-	<name>hbuttonbox22</name>
-	<layout_style>GTK_BUTTONBOX_END</layout_style>
-	<spacing>0</spacing>
-	<child_min_width>85</child_min_width>
-	<child_min_height>27</child_min_height>
-	<child_ipad_x>7</child_ipad_x>
-	<child_ipad_y>0</child_ipad_y>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button224</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button225</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button226</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <stock_button>GNOME_STOCK_BUTTON_CLOSE</stock_button>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	</widget>
-      </widget>
     </widget>
 
     <widget>