Probably the very last new config dialog ever. (Ha ha). From Anna, based

	* mail-config.glade: Probably the very last new config dialog
	ever. (Ha ha). From Anna, based on a story by me.

	* mail-account-gui.c: New code for the new mail-config.glade. This
	abstracts out all of the common code between the account editor
	and the druid. It also handles the spiffy new provider-specific
	config stuff.

	FIXME: The code to check if a service is ok or not is no longer
	there... waiting until the online/offline stuff from the shell
	appears.

	* mail-account-editor.c, mail-config-druid.c: These are much
	smaller now, since most of the interesting bits moved to
	mail-account-gui.c

	* mail-accounts.c: Add an enabled/disabled column/button to
	replace the checkbox that used to be in the editor, because it
	really makes more sense to have it out here. This looks ugly.
	Probably ought to ETable it...
	(load_accounts): Fill in the enabled column.
	(mail_select, mail_unselect): toggle the sensitivity and name of
	the Enable/Disable button appropriately
	(mail_able): Handle the enable/disable button.

	* mail-config.c: Remove reply-to from MailConfigIdentity since it
	didn't belong there (and wasn't being saved anyway).
	(mail_config_check_service): Simplify this a bit. This really
	needs to pop up a dialog with a "connecting..." message and a
	cancel button.

svn path=/trunk/; revision=8971

1 files changed, 210 insertions, 1194 deletions

diff --git a/mail/mail-config-druid.c b/mail/mail-config-druid.c
index 6759879915..371769eb81 100644
--- a/mail/mail-config-druid.c
+++ b/mail/mail-config-druid.c
@@ -1,8 +1,10 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
+ *  Authors:
+ *    Jeffrey Stedfast <fejj@ximian.com>
+ *    Dan Winship <danw@ximian.com>
  *
- *  Copyright 2001 Helix Code, Inc. (www.helixcode.com)
+ *  Copyright 2001 Ximian, Inc. (www.ximian.com)
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -33,18 +35,10 @@
 #include <sys/types.h>
 #include <string.h>
 #include <unistd.h>
-
-#define d(x) x
-
-GtkWidget *mail_config_create_html (const char *name, const char *str1, const char *str2,
-				    int int1, int int2);
+#include <sys/utsname.h>
 
 static void mail_config_druid_class_init (MailConfigDruidClass *class);
-static void mail_config_druid_init       (MailConfigDruid *druid);
-static void mail_config_druid_finalise   (GtkObject *obj);
-
-static void construct_source_auth_menu (MailConfigDruid *druid, GList *authtypes);
-static void construct_transport_auth_menu (MailConfigDruid *druid, GList *authtypes);
+static void mail_config_druid_finalize   (GtkObject *obj);
 
 static GtkWindowClass *parent_class;
 
@@ -52,21 +46,21 @@ GtkType
 mail_config_druid_get_type (void)
 {
 	static GtkType type = 0;
-	
+
 	if (!type) {
 		GtkTypeInfo type_info = {
 			"MailConfigDruid",
 			sizeof (MailConfigDruid),
 			sizeof (MailConfigDruidClass),
 			(GtkClassInitFunc) mail_config_druid_class_init,
-			(GtkObjectInitFunc) mail_config_druid_init,
+			(GtkObjectInitFunc) NULL,
 			(GtkArgSetFunc) NULL,
 			(GtkArgGetFunc) NULL
 		};
-		
+
 		type = gtk_type_unique (gtk_window_get_type (), &type_info);
 	}
-	
+
 	return type;
 }
 
@@ -74,28 +68,20 @@ static void
 mail_config_druid_class_init (MailConfigDruidClass *class)
 {
 	GtkObjectClass *object_class;
-	
+
 	object_class = (GtkObjectClass *) class;
 	parent_class = gtk_type_class (gtk_window_get_type ());
-	
-	object_class->finalize = mail_config_druid_finalise;
-	/* override methods */
-	
-}
 
-static void
-mail_config_druid_init (MailConfigDruid *o)
-{
-	;
+	/* override methods */
+	object_class->finalize = mail_config_druid_finalize;
 }
 
 static void
-mail_config_druid_finalise (GtkObject *obj)
+mail_config_druid_finalize (GtkObject *obj)
 {
 	MailConfigDruid *druid = (MailConfigDruid *) obj;
-	
-	gtk_object_unref (GTK_OBJECT (druid->gui));
-	
+
+	mail_account_gui_destroy (druid->gui);
         ((GtkObjectClass *)(parent_class))->finalize (obj);
 }
 
@@ -104,18 +90,16 @@ static struct {
 	char *name;
 	char *text;
 } info[] = {
-	{ "htmlIdentity",
-	  "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send." },
-	{ "htmlIncoming",
-	  "Please enter information about your incoming mail server below. If you don't know what kind of server you use, contact your system administrator or Internet Service Provider." },
-	{ "htmlSourceAuthentication",
-	  "Your mail server supports the following types of authentication. Please select the type you want Evolution to use." },
-	{ "htmlTransport",
-	  "Please enter information about your outgoing mail protocol below. If you don't know which protocol you use, contact your system administrator or Internet Service Provider." },
-	{ "htmlTransportAuthentication",
-	  "Your mail transport supports the following types of authentication. Please select the type you want Evolution to use." },
-	{ "htmlAccountInfo",
-	  "You are almost done with the mail configuration process. The identity, incoming mail server and outgoing mail transport method which you provided will be grouped together to make an Evolution mail account. Please enter a name for this account in the space below. This name will be used for display purposes only." }
+	{ "identity_html",
+	  N_("Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send.") },
+	{ "source_html",
+	  N_("Please enter information about your incoming mail server below. If you don't know what kind of server you use, contact your system administrator or Internet Service Provider.") },
+	{ "extra_html",
+	  "The following options mostly don't work yet and are here only to taunt you. Ha ha!" },
+	{ "transport_html",
+	  N_("Please enter information about your outgoing mail protocol below. If you don't know which protocol you use, contact your system administrator or Internet Service Provider.") },
+	{ "management_html",
+	  N_("You are almost done with the mail configuration process. The identity, incoming mail server and outgoing mail transport method which you provided will be grouped together to make an Evolution mail account. Please enter a name for this account in the space below. This name will be used for display purposes only.") }
 };
 static int num_info = (sizeof (info) / sizeof (info[0]));
 
@@ -125,15 +109,15 @@ html_size_req (GtkWidget *widget, GtkRequisition *requisition)
 	 requisition->height = GTK_LAYOUT (widget)->height;
 }
 
-GtkWidget *
-mail_config_create_html (const char *name, const char *str1, const char *str2,
-			 int int1, int int2)
+static GtkWidget *
+create_html (const char *name)
 {
 	GtkWidget *scrolled, *html;
 	GtkHTMLStream *stream;
 	GtkStyle *style;
+	char *utf8;
 	int i;
-	
+
 	html = gtk_html_new ();
 	GTK_LAYOUT (html)->height = 0;
 	gtk_signal_connect (GTK_OBJECT (html), "size_request",
@@ -147,26 +131,27 @@ mail_config_create_html (const char *name, const char *str1, const char *str2,
 						       &style->bg[0]);
 	}
 	gtk_widget_show (html);
-	
+
 	scrolled = gtk_scrolled_window_new (NULL, NULL);
 	gtk_widget_show (scrolled);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
 					GTK_POLICY_NEVER, GTK_POLICY_NEVER);
 	gtk_container_add (GTK_CONTAINER (scrolled), html);
-	
+
 	for (i = 0; i < num_info; i++) {
 		if (!strcmp (name, info[i].name))
 			break;
 	}
 	g_return_val_if_fail (i != num_info, scrolled);
-	
+
 	stream = gtk_html_begin (GTK_HTML (html));
 	gtk_html_write (GTK_HTML (html), stream, "<html><p>", 9);
-	gtk_html_write (GTK_HTML (html), stream, info[i].text,
-			strlen (info[i].text));
+	utf8 = e_utf8_from_locale_string (_(info[i].text));
+	gtk_html_write (GTK_HTML (html), stream, utf8, strlen (utf8));
+	g_free (utf8);
 	gtk_html_write (GTK_HTML (html), stream, "</p></html>", 11);
 	gtk_html_end (GTK_HTML (html), stream, GTK_HTML_STREAM_OK);
-	
+
 	return scrolled;
 }
 
@@ -175,7 +160,7 @@ druid_cancel (GnomeDruid *druid, gpointer user_data)
 {
 	/* Cancel the setup of the account */
 	MailConfigDruid *config = user_data;
-	
+
 	gtk_widget_destroy (GTK_WIDGET (config));
 }
 
@@ -184,567 +169,143 @@ druid_finish (GnomeDruidPage *page, gpointer arg1, gpointer user_data)
 {
 	/* Cancel the setup of the account */
 	MailConfigDruid *druid = user_data;
-	MailConfigAccount *account;
-	MailConfigIdentity *id;
-	MailConfigService *source;
-	MailConfigService *transport;
-	CamelURL *url;
-	char *str;
-	
-	account = g_new0 (MailConfigAccount, 1);
-	account->name = mail_config_druid_get_account_name (druid);
-	account->default_account = mail_config_druid_get_default_account (druid);
-	
-	/* construct the identity */
-	id = g_new0 (MailConfigIdentity, 1);
-	id->name = mail_config_druid_get_full_name (druid);
-	id->address = mail_config_druid_get_email_address (druid);
-	id->organization = mail_config_druid_get_organization (druid);
-	id->signature = mail_config_druid_get_sigfile (druid);
-	
-	/* construct the source */
-	source = g_new0 (MailConfigService, 1);
-	source->keep_on_server = mail_config_druid_get_keep_mail_on_server (druid);
-	source->auto_check = mail_config_druid_get_auto_check (druid);
-	source->auto_check_time = mail_config_druid_get_auto_check_minutes (druid);
-	source->save_passwd = mail_config_druid_get_save_source_password (druid);
-	str = mail_config_druid_get_source_url (druid);
-	if (str) {
-		/* cache the password and rewrite the url without the password part */
-		url = camel_url_new (str, NULL);
-		g_free (str);
-		source->url = camel_url_to_string (url, FALSE);
-		if (source->save_passwd && url->passwd) {
-			mail_session_set_password (source->url, url->passwd);
-			mail_session_remember_password (source->url);
-		}
-		camel_url_free (url);
-		source->enabled = TRUE;
-	} else {
-		source->url = NULL;
-		source->enabled = FALSE;
-	}
-	
-	/* construct the transport */
-	transport = g_new0 (MailConfigService, 1);
-	transport->save_passwd = mail_config_druid_get_save_transport_password (druid);
-	str = mail_config_druid_get_transport_url (druid);
-	if (str) {
-		/* cache the password and rewrite the url without the password part */
-		url = camel_url_new (str, NULL);
-		g_free (str);
-		transport->url = camel_url_to_string (url, FALSE);
-		if (transport->save_passwd && url->passwd) {
-			mail_session_set_password (transport->url, url->passwd);
-			mail_session_remember_password (transport->url);
-		}
-		camel_url_free (url);
-		transport->enabled = TRUE;
-	}
-	
-	account->id = id;
-	account->source = source;
-	account->transport = transport;
-	
-	mail_config_add_account (account);
+	MailAccountGui *gui = druid->gui;
+	GSList *mini;
+
+	mail_account_gui_save (gui);
+	if (gui->account->source)
+		gui->account->source->enabled = TRUE;
+	mail_config_add_account (gui->account);
 	mail_config_write ();
-	
-	if (source->url) {
-		GSList *mini;
-		
-		mini = g_slist_prepend (NULL, account);
-		mail_load_storages (druid->shell, mini, TRUE);
-		g_slist_free (mini);
-	}
-	
-	gtk_widget_destroy (GTK_WIDGET (druid));
-}
 
-static gboolean
-is_email (const char *address)
-{
-	const char *at, *hname;
-	
-	g_return_val_if_fail (address != NULL, FALSE);
-	
-	at = strchr (address, '@');
-	/* make sure we have an '@' and that it's not the first or last char */
-	if (!at || at == address || *(at + 1) == '\0')
-		return FALSE;
-	
-	hname = at + 1;
-	/* make sure the first and last chars aren't '.' */
-	if (*hname == '.' || hname[strlen (hname) - 1] == '.')
-		return FALSE;
-	
-	return strchr (hname, '.') != NULL;
-}
+	mini = g_slist_prepend (NULL, gui->account);
+	mail_load_storages (druid->shell, mini, TRUE);
+	g_slist_free (mini);
 
-/* Identity Page */
-static void
-identity_check (MailConfigDruid *druid)
-{
-	char *address;
-	
-	address = gtk_entry_get_text (druid->email_address);
-	if (gtk_entry_get_text (druid->full_name) && is_email (address))
-		gnome_druid_set_buttons_sensitive (druid->druid, TRUE, TRUE, TRUE);
-	else
-		gnome_druid_set_buttons_sensitive (druid->druid, TRUE, FALSE, TRUE);
+	gtk_widget_destroy (GTK_WIDGET (druid));
 }
 
+/* Identity Page */
 static void
 identity_changed (GtkWidget *widget, gpointer data)
 {
 	MailConfigDruid *druid = data;
-	
-	identity_check (druid);
+	gboolean next_sensitive = mail_account_gui_identity_complete (druid->gui);
+
+	gnome_druid_set_buttons_sensitive (druid->druid, TRUE, next_sensitive, TRUE);
 }
 
 static void
 identity_prepare (GnomeDruidPage *page, GnomeDruid *druid, gpointer data)
 {
 	MailConfigDruid *config = data;
-	
-	gtk_widget_grab_focus (GTK_WIDGET (config->full_name));
-	
-	identity_check (config);
+
+	gtk_widget_grab_focus (GTK_WIDGET (config->gui->full_name));
+	identity_changed (NULL, config);
 }
 
 static gboolean
 identity_next (GnomeDruidPage *page, GnomeDruid *druid, gpointer data)
 {
-	/* go to the next page */
+	MailConfigDruid *config = data;
+
+	if (!config->identity_copied) {
+		char *username;
+
+		/* Copy the username part of the email address into
+		 * the Username field of the source and transport pages.
+		 */
+		username = gtk_entry_get_text (config->gui->email_address);
+		username = g_strndup (username, strcspn (username, "@"));
+		gtk_entry_set_text (config->gui->source.username, username);
+		gtk_entry_set_text (config->gui->transport.username, username);
+		g_free (username);
+
+		config->identity_copied = TRUE;
+	}
+
 	return FALSE;
 }
 
 /* Incoming mail Page */
 static void
-incoming_check (MailConfigDruid *druid)
-{
-	const CamelProvider *prov = druid->source_provider;
-	gboolean host = TRUE, user = TRUE, path = TRUE;
-	gboolean next_sensitive = TRUE;
-	
-	if (prov && CAMEL_PROVIDER_NEEDS (prov, CAMEL_URL_PART_HOST))
-		host = gtk_entry_get_text (druid->incoming_hostname) != NULL;
-	
-	if (prov && CAMEL_PROVIDER_NEEDS (prov, CAMEL_URL_PART_USER))
-		user = gtk_entry_get_text (druid->incoming_username) != NULL;
-	
-	if (prov && CAMEL_PROVIDER_NEEDS (prov, CAMEL_URL_PART_PATH))
-		path = gtk_entry_get_text (druid->incoming_path) != NULL;
-	
-	next_sensitive = host && user && path;
-	
-	gnome_druid_set_buttons_sensitive (druid->druid, TRUE, next_sensitive, TRUE);
-}
-
-static void
-auto_check_toggled (GtkToggleButton *button, gpointer data)
+source_changed (GtkWidget *widget, gpointer data)
 {
 	MailConfigDruid *druid = data;
-	
-	gtk_widget_set_sensitive (GTK_WIDGET (druid->incoming_auto_check_min),
-				  gtk_toggle_button_get_active (button));
-}
+	gboolean next_sensitive = mail_account_gui_source_complete (druid->gui);
 
-static void
-incoming_changed (GtkWidget *widget, gpointer data)
-{
-	MailConfigDruid *druid = data;
-	
-	incoming_check (druid);
+	gnome_druid_set_buttons_sensitive (druid->druid, TRUE, next_sensitive, TRUE);
 }
 
 static void
-incoming_prepare (GnomeDruidPage *page, GnomeDruid *druid, gpointer data)
+source_prepare (GnomeDruidPage *page, GnomeDruid *druid, gpointer data)
 {
 	MailConfigDruid *config = data;
-	
-	if (!gtk_object_get_data (GTK_OBJECT (page), "initialized")) {
-		char *username;
-		
-		/* Copy the username part of the email address into
-		 * the Username field.
-		 */
-		username = gtk_entry_get_text (config->email_address);
-		username = g_strndup (username, strcspn (username, "@"));
-		gtk_entry_set_text (config->incoming_username, username);
-		g_free (username);
-		
-		gtk_object_set_data (GTK_OBJECT (page), "initialized",
-				     GINT_TO_POINTER (1));
-	}
-	
-	incoming_check (config);
+
+	source_changed (NULL, config);
 }
 
 static gboolean
-incoming_next (GnomeDruidPage *page, GnomeDruid *druid, gpointer data)
+source_next (GnomeDruidPage *page, GnomeDruid *druid, gpointer data)
 {
 	MailConfigDruid *config = data;
 	GtkWidget *transport_page;
-	GList *authtypes = NULL;
-	gchar *source_url;
-	gboolean connect;
-	CamelURL *url;
-	
-	config->have_source_auth_page = TRUE;
-	
-	source_url = mail_config_druid_get_source_url (config);
-	if (!source_url) {
-		/* User opted to not setup a source for this account,
-		 * so jump past the auth page */
-		
-		/* Skip to transport page. */
-		config->have_source_auth_page = FALSE;
-		transport_page = glade_xml_get_widget (config->gui, "druidTransportPage");
-		gnome_druid_set_page (config->druid, GNOME_DRUID_PAGE (transport_page));
-		
-		return TRUE;
-	}
-	
-	url = camel_url_new (source_url, NULL);
-	g_free (source_url);
-	
-	connect = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (config->incoming_check_settings));
-	
-	/* If we can't connect, warn them and continue on to the Transport page. */
-	if (!mail_config_check_service (url, CAMEL_PROVIDER_STORE, connect, &authtypes)) {
-		GtkWidget *dialog;
-		char *source, *warning;
-		
-		source = camel_url_to_string (url, FALSE);
-		camel_url_free (url);
-		
-		warning = g_strdup_printf (_("Failed to verify the incoming mail configuration.\n"
-					     "You may experience problems retrieving your mail from %s"),
-					   source);
-		g_free (source);
-		dialog = gnome_warning_dialog_parented (warning, GTK_WINDOW (config));
-		g_free (warning);
-		
-		gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-		
-		return TRUE;
-	}
-	camel_url_free (url);
-	
-	/* If this service offers authentication, go to the next page. */
-	if (authtypes) {
-		construct_source_auth_menu (config, authtypes);
+
+	/* FIXME: if online, check that the data is good. */
+
+	if (config->gui->source.provider && config->gui->source.provider->extra_conf)
 		return FALSE;
-	}
-	
+
 	/* Otherwise, skip to transport page. */
-	config->have_source_auth_page = FALSE;
-	transport_page = glade_xml_get_widget (config->gui, "druidTransportPage");
+	transport_page = glade_xml_get_widget (config->gui->xml, "transport_page");
 	gnome_druid_set_page (config->druid, GNOME_DRUID_PAGE (transport_page));
-	
-	return TRUE;
-}
 
-static void
-incoming_type_changed (GtkWidget *widget, gpointer user_data)
-{
-	MailConfigDruid *druid = user_data;
-	GtkWidget *label, *dwidget = NULL;
-	CamelProvider *provider;
-	
-	provider = gtk_object_get_data (GTK_OBJECT (widget), "provider");
-	
-	druid->source_provider = provider;
-	
-	gtk_widget_set_sensitive (GTK_WIDGET (druid->incoming_auto_check), provider ? TRUE : FALSE);
-	gtk_widget_set_sensitive (GTK_WIDGET (druid->incoming_auto_check_min), provider ? TRUE : FALSE);
-	gtk_widget_set_sensitive (GTK_WIDGET (druid->incoming_check_settings), provider ? TRUE : FALSE);
-	
-	/* hostname */
-	label = glade_xml_get_widget (druid->gui, "lblSourceHost");
-	if (provider && CAMEL_PROVIDER_ALLOWS (provider, CAMEL_URL_PART_HOST)) {
-		dwidget = GTK_WIDGET (druid->incoming_hostname);
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->incoming_hostname), TRUE);
-		gtk_widget_set_sensitive (label, TRUE);
-	} else {
-		gtk_entry_set_text (druid->incoming_hostname, "");
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->incoming_hostname), FALSE);
-		gtk_widget_set_sensitive (label, FALSE);
-	}
-	
-	/* username */
-	label = glade_xml_get_widget (druid->gui, "lblSourceUser");
-	if (provider && CAMEL_PROVIDER_ALLOWS (provider, CAMEL_URL_PART_USER)) {
-		if (!dwidget)
-			dwidget = GTK_WIDGET (druid->incoming_username);
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->incoming_username), TRUE);
-		gtk_widget_set_sensitive (label, TRUE);
-	} else {
-		gtk_entry_set_text (druid->incoming_username, "");
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->incoming_username), FALSE);
-		gtk_widget_set_sensitive (label, FALSE);
-	}
-	
-	/* password */
-	label = glade_xml_get_widget (druid->gui, "lblSourcePasswd");
-	if (provider && CAMEL_PROVIDER_ALLOWS (provider, CAMEL_URL_PART_PASSWORD)) {
-		if (!dwidget)
-			dwidget = GTK_WIDGET (druid->source_password);
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->source_password), TRUE);
-		gtk_widget_set_sensitive (label, TRUE);
-	} else {
-		gtk_entry_set_text (druid->source_password, "");
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->source_password), FALSE);
-		gtk_widget_set_sensitive (label, FALSE);
-	}
-	
-	/* auth */
-	label = glade_xml_get_widget (druid->gui, "lblSourceAuthType");
-	if (provider && CAMEL_PROVIDER_ALLOWS (provider, CAMEL_URL_PART_AUTH)) {
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->source_auth_type), TRUE);
-		gtk_widget_set_sensitive (label, TRUE);
-	} else {
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->source_auth_type), FALSE);
-		gtk_widget_set_sensitive (label, FALSE);
-	}
-	
-	/* path */
-	label = glade_xml_get_widget (druid->gui, "lblSourcePath");
-	/* FIXME */
-	if (provider && !strcmp (provider->protocol, "imap"))
-		gtk_label_set_text (GTK_LABEL (label), _("Namespace:"));
-	else
-		gtk_label_set_text (GTK_LABEL (label), _("Path:"));
-	if (provider && CAMEL_PROVIDER_ALLOWS (provider, CAMEL_URL_PART_PATH)) {
-		if (!dwidget)
-			dwidget = GTK_WIDGET (druid->incoming_path);
-		
-		if (!strcmp (provider->protocol, "mbox")) {
-			char *path;
-			
-			if (getenv ("MAIL"))
-				path = g_strdup (getenv ("MAIL"));
-			else
-				path = g_strdup_printf (SYSTEM_MAIL_DIR "/%s", g_get_user_name ());
-			gtk_entry_set_text (druid->incoming_path, path);
-			g_free (path);
-		} else if (!strcmp (provider->protocol, "maildir") &&
-			   getenv ("MAILDIR")) {
-			gtk_entry_set_text (druid->incoming_path, getenv ("MAILDIR"));
-		} else {
-			gtk_entry_set_text (druid->incoming_path, "");
-		}
-		
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->incoming_path), TRUE);
-		gtk_widget_set_sensitive (label, TRUE);
-	} else {
-		gtk_entry_set_text (druid->incoming_path, "");
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->incoming_path), FALSE);
-		gtk_widget_set_sensitive (label, FALSE);
-	}
-	
-	/* keep mail on server */
-	if (provider && !(provider->flags & CAMEL_PROVIDER_IS_STORAGE))
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->incoming_keep_mail), TRUE);
-	else
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->incoming_keep_mail), FALSE);
-	
-	incoming_check (druid);
-	
-	if (dwidget)
-		gtk_widget_grab_focus (dwidget);
-}
-
-/* Source Authentication Page */
-static void
-source_auth_check (MailConfigDruid *druid)
-{
-	if (mail_config_druid_get_save_source_password (druid)) {
-		char *passwd = gtk_entry_get_text (druid->source_password);
-		
-		if (passwd && *passwd)
-			gnome_druid_set_buttons_sensitive (druid->druid, TRUE, TRUE, TRUE);
-		else
-			gnome_druid_set_buttons_sensitive (druid->druid, TRUE, FALSE, TRUE);
-	} else {
-		gnome_druid_set_buttons_sensitive (druid->druid, TRUE, TRUE, TRUE);
-	}
-}
-
-static void
-source_auth_changed (GtkWidget *widget, gpointer data)
-{
-	MailConfigDruid *druid = data;
-	
-	source_auth_check (druid);
+	return TRUE;
 }
 
+/* Extra Config Page */
 static void
-source_auth_prepare (GnomeDruidPage *page, GnomeDruid *druid, gpointer data)
+extra_prepare (GnomeDruidPage *page, GnomeDruid *druid, gpointer data)
 {
 	MailConfigDruid *config = data;
-	
-	source_auth_check (config);
-}
-
-static gboolean
-source_auth_next (GnomeDruidPage *page, GnomeDruid *druid, gpointer data)
-{
-	/* go to the next page */
-	return FALSE;
-}
 
-static void
-source_auth_type_changed (GtkWidget *widget, gpointer user_data)
-{
-	MailConfigDruid *druid = user_data;
-	CamelServiceAuthType *authtype;
-	GtkWidget *label;
-	gboolean sensitive;
-	
-	authtype = gtk_object_get_data (GTK_OBJECT (widget), "authtype");
-	
-	gtk_object_set_data (GTK_OBJECT (druid), "source_authmech", authtype->authproto);
-	
-	if (authtype->need_password)
-		sensitive = TRUE;
-	else
-		sensitive = FALSE;
-	
-	label = glade_xml_get_widget (druid->gui, "lblSourcePasswd");
-	gtk_widget_set_sensitive (GTK_WIDGET (druid->source_password), sensitive);
-	gtk_widget_set_sensitive (GTK_WIDGET (druid->save_source_password), sensitive);
-	gtk_widget_set_sensitive (label, sensitive);
-	
-	if (!sensitive)
-		gtk_entry_set_text (druid->source_password, "");
-	
-	source_auth_check (druid);
-}
-
-static void
-construct_source_auth_menu (MailConfigDruid *druid, GList *authtypes)
-{
-	GtkWidget *menu, *item, *first = NULL;
-	CamelServiceAuthType *authtype;
-	GList *l;
-	
-	menu = gtk_menu_new ();
-	
-	l = authtypes;
-	while (l) {
-		authtype = l->data;
-		
-		item = gtk_menu_item_new_with_label (authtype->name);
-		gtk_object_set_data (GTK_OBJECT (item), "authtype", authtype);
-		gtk_signal_connect (GTK_OBJECT (item), "activate",
-				    GTK_SIGNAL_FUNC (source_auth_type_changed),
-				    druid);
-		
-		gtk_menu_append (GTK_MENU (menu), item);
-		
-		gtk_widget_show (item);
-		
-		if (!first)
-			first = item;
-		
-		l = l->next;
+	if (config->gui->source.provider != config->last_source) {
+		config->last_source = config->gui->source.provider;
+		mail_account_gui_build_extra_conf (config->gui, NULL);
 	}
-	
-	if (first)
-		gtk_signal_emit_by_name (GTK_OBJECT (first), "activate", druid);
-	
-	gtk_option_menu_remove_menu (druid->source_auth_type);
-	gtk_option_menu_set_menu (druid->source_auth_type, menu);
 }
 
 /* Transport Page */
 static void
-transport_check (MailConfigDruid *druid)
-{
-	const CamelProvider *prov = druid->transport_provider;
-	gboolean next_sensitive = TRUE;
-	
-	if (prov && CAMEL_PROVIDER_NEEDS (prov, CAMEL_URL_PART_HOST))
-		next_sensitive = gtk_entry_get_text (druid->outgoing_hostname) != NULL;
-	
-	gnome_druid_set_buttons_sensitive (druid->druid, TRUE, next_sensitive, TRUE);
-}
-
-static void
 transport_prepare (GnomeDruidPage *page, GnomeDruid *druid, gpointer data)
 {
 	MailConfigDruid *config = data;
-	
-	transport_check (config);
+	gboolean next_sensitive = mail_account_gui_transport_complete (config->gui);
+
+	gnome_druid_set_buttons_sensitive (config->druid, TRUE, next_sensitive, TRUE);
 }
 
 static gboolean
 transport_next (GnomeDruidPage *page, GnomeDruid *druid, gpointer data)
 {
-	MailConfigDruid *config = data;
-	GtkWidget *management_page;
-	GList *authtypes = NULL;
-	gboolean connect;
-	char *xport_url;
-	CamelURL *url;
-	
-	xport_url = mail_config_druid_get_transport_url (config);
-	if (!xport_url)
-		return TRUE;
-	
-	url = camel_url_new (xport_url, NULL);
-	g_free (xport_url);
-	
-	connect = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (config->outgoing_check_settings));
-	
-	/* If we can't connect, don't let them continue. */
-	if (!mail_config_check_service (url, CAMEL_PROVIDER_TRANSPORT, connect, &authtypes)) {
-		GtkWidget *dialog;
-		char *transport, *warning;
-		
-		transport = camel_url_to_string (url, FALSE);
-		
-		warning = g_strdup_printf (_("Failed to verify the outgoing mail configuration.\n"
-					     "You may experience problems sending your mail using %s"),
-					   transport);
-		g_free (transport);
-		dialog = gnome_warning_dialog_parented (warning, GTK_WINDOW (config));
-		g_free (warning);
-		
-		gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-	}
-	
-	camel_url_free (url);
-	
-	/* If this service offers authentication, go to the next page. */
-	if (authtypes && mail_config_druid_get_transport_requires_auth (config)) {
-		construct_transport_auth_menu (config, authtypes);
-		return FALSE;
-	}
-	
-	/* Otherwise, skip to management page. */
-	config->have_transport_auth_page = FALSE;
-	management_page = glade_xml_get_widget (config->gui, "druidManagementPage");
-	gnome_druid_set_page (config->druid, GNOME_DRUID_PAGE (management_page));
-	
-	return TRUE;
+	/* FIXME: if online, check that the data is good. */
+	return FALSE;
 }
 
 static gboolean
 transport_back (GnomeDruidPage *page, GnomeDruid *druid, gpointer data)
 {
 	MailConfigDruid *config = data;
-	
-	if (config->have_source_auth_page) {
+
+	if (config->gui->source.provider && config->gui->source.provider->extra_conf)
 		return FALSE;
-	} else {
-		/* jump to the source page, skipping over the auth page */
+	else {
+		/* jump to the source page, skipping over the extra page */
 		GtkWidget *widget;
-		
-		widget = glade_xml_get_widget (config->gui, "druidSourcePage");
+
+		widget = glade_xml_get_widget (config->gui->xml, "source_page");
 		gnome_druid_set_page (config->druid, GNOME_DRUID_PAGE (widget));
-		
+
 		return TRUE;
 	}
 }
@@ -752,154 +313,7 @@ transport_back (GnomeDruidPage *page, GnomeDruid *druid, gpointer data)
 static void
 transport_changed (GtkWidget *widget, gpointer data)
 {
-	MailConfigDruid *druid = data;
-	
-	transport_check (druid);
-}
-
-static void
-transport_type_changed (GtkWidget *widget, gpointer user_data)
-{
-	MailConfigDruid *druid = user_data;
-	CamelProvider *provider;
-	GtkWidget *label;
-	
-	provider = gtk_object_get_data (GTK_OBJECT (widget), "provider");
-	druid->transport_provider = provider;
-	
-	/* hostname */
-	label = glade_xml_get_widget (druid->gui, "lblTransportHost");
-	if (CAMEL_PROVIDER_ALLOWS (provider, CAMEL_URL_PART_HOST)) {
-		gtk_widget_grab_focus (GTK_WIDGET (druid->outgoing_hostname));
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->outgoing_hostname), TRUE);
-		gtk_widget_set_sensitive (label, TRUE);
-	} else {
-		gtk_entry_set_text (druid->outgoing_hostname, "");
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->outgoing_hostname), FALSE);
-		gtk_widget_set_sensitive (label, FALSE);
-	}
-	
-	/* auth */
-	if (CAMEL_PROVIDER_ALLOWS (provider, CAMEL_URL_PART_AUTH))
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->outgoing_requires_auth), TRUE);
-	else
-		gtk_widget_set_sensitive (GTK_WIDGET (druid->outgoing_requires_auth), FALSE);
-	
-	transport_check (druid);
-}
-
-/* Transport Authentication Page */
-static void
-transport_auth_check (MailConfigDruid *druid)
-{
-	char *user = gtk_entry_get_text (druid->transport_username);
-	gboolean sensitive = FALSE;
-	
-	if (user && *user) {
-		if (mail_config_druid_get_save_transport_password (druid)) {
-			char *passwd = gtk_entry_get_text (druid->transport_password);
-			
-			if (passwd && *passwd)
-				sensitive = TRUE;
-		} else {
-			sensitive = TRUE;
-		}
-	}
-	
-	gnome_druid_set_buttons_sensitive (druid->druid, TRUE, sensitive, TRUE);
-}
-
-static void
-transport_auth_changed (GtkWidget *widget, gpointer data)
-{
-	MailConfigDruid *druid = data;
-	
-	transport_auth_check (druid);
-}
-
-static void
-transport_auth_prepare (GnomeDruidPage *page, GnomeDruid *druid, gpointer data)
-{
-	MailConfigDruid *config = data;
-	
-	transport_auth_check (config);
-}
-
-static gboolean
-transport_auth_next (GnomeDruidPage *page, GnomeDruid *druid, gpointer data)
-{
-	/* go to the next page */
-	return FALSE;
-}
-
-static void
-transport_auth_type_changed (GtkWidget *widget, gpointer user_data)
-{
-	MailConfigDruid *druid = user_data;
-	CamelServiceAuthType *authtype;
-	GtkWidget *label;
-	gboolean sensitive;
-	
-	authtype = gtk_object_get_data (GTK_OBJECT (widget), "authtype");
-	
-	gtk_object_set_data (GTK_OBJECT (druid), "transport_authmech", authtype->authproto);
-	
-	if (authtype->need_password)
-		sensitive = TRUE;
-	else
-		sensitive = FALSE;
-	
-	label = glade_xml_get_widget (druid->gui, "lblTransportUsername");
-	gtk_widget_set_sensitive (GTK_WIDGET (druid->transport_username), sensitive);
-	gtk_widget_set_sensitive (label, sensitive);
-	
-	label = glade_xml_get_widget (druid->gui, "lblTransportPasswd");
-	gtk_widget_set_sensitive (GTK_WIDGET (druid->transport_password), sensitive);
-	gtk_widget_set_sensitive (GTK_WIDGET (druid->save_transport_password), sensitive);
-	gtk_widget_set_sensitive (label, sensitive);
-	
-	if (!sensitive) {
-		gtk_entry_set_text (druid->transport_username, "");
-		gtk_entry_set_text (druid->transport_password, "");
-	}
-	
-	transport_auth_check (druid);
-}
-
-static void
-construct_transport_auth_menu (MailConfigDruid *druid, GList *authtypes)
-{
-	GtkWidget *menu, *item, *first = NULL;
-	CamelServiceAuthType *authtype;
-	GList *l;
-	
-	menu = gtk_menu_new ();
-	
-	l = authtypes;
-	while (l) {
-		authtype = l->data;
-		
-		item = gtk_menu_item_new_with_label (authtype->name);
-		gtk_object_set_data (GTK_OBJECT (item), "authtype", authtype);
-		gtk_signal_connect (GTK_OBJECT (item), "activate",
-				    GTK_SIGNAL_FUNC (transport_auth_type_changed),
-				    druid);
-		
-		gtk_menu_append (GTK_MENU (menu), item);
-		
-		gtk_widget_show (item);
-		
-		if (!first)
-			first = item;
-		
-		l = l->next;
-	}
-	
-	if (first)
-		gtk_signal_emit_by_name (GTK_OBJECT (first), "activate", druid);
-	
-	gtk_option_menu_remove_menu (druid->transport_auth_type);
-	gtk_option_menu_set_menu (druid->transport_auth_type, menu);
+	transport_prepare (NULL, NULL, data);
 }
 
 /* Management page */
@@ -907,9 +321,11 @@ static void
 management_check (MailConfigDruid *druid)
 {
 	gboolean next_sensitive;
-	
-	next_sensitive = gtk_entry_get_text (druid->account_name) != NULL;
-	
+	char *text;
+
+	text = gtk_entry_get_text (druid->gui->account_name);
+	next_sensitive = text && *text;
+
 	gnome_druid_set_buttons_sensitive (druid->druid, TRUE, next_sensitive, TRUE);
 }
 
@@ -918,13 +334,11 @@ management_prepare (GnomeDruidPage *page, GnomeDruid *druid, gpointer data)
 {
 	MailConfigDruid *config = data;
 	char *name;
-	
-	name = e_utf8_gtk_entry_get_text (config->email_address);
-	if (name) {
-		e_utf8_gtk_entry_set_text (config->account_name, name);
-		g_free (name);
-	}
-	
+
+	name = gtk_entry_get_text (config->gui->email_address);
+	if (name && *name)
+		gtk_entry_set_text (config->gui->account_name, name);
+
 	management_check (config);
 }
 
@@ -932,211 +346,33 @@ static void
 management_changed (GtkWidget *widget, gpointer data)
 {
 	MailConfigDruid *druid = data;
-	
-	management_check (druid);
-}
 
-static gboolean
-management_next (GnomeDruidPage *page, GnomeDruid *druid, gpointer data)
-{
-	return FALSE;
+	management_check (druid);
 }
 
-static gboolean
-management_back (GnomeDruidPage *page, GnomeDruid *druid, gpointer data)
-{
-	MailConfigDruid *config = data;
-	
-	if (config->have_transport_auth_page) {
-		return FALSE;
-	} else {
-		/* jump to the source page, skipping over the auth page */
-		GtkWidget *widget;
-		
-		widget = glade_xml_get_widget (config->gui, "druidTransportPage");
-		gnome_druid_set_page (config->druid, GNOME_DRUID_PAGE (widget));
-		
-		return TRUE;
-	}
-}
 
-static gint
-provider_compare (const CamelProvider *p1, const CamelProvider *p2)
+static MailConfigAccount *
+make_default_account (void)
 {
-	/* sort providers based on "location" (ie. local or remote) */	
-	if (p1->flags & CAMEL_PROVIDER_IS_REMOTE) {
-		if (p2->flags & CAMEL_PROVIDER_IS_REMOTE)
-			return 0;
-		return -1;
-	} else {
-		if (p2->flags & CAMEL_PROVIDER_IS_REMOTE)
-			return 1;
-		return 0;
-	}
-}
+	MailConfigAccount *account;
+	char *name, *user;
+	struct utsname uts;
 
-static gboolean
-is_domain (const char *domain)
-{
-	/* domain && *domain should be enough but linux's
-           getdomainname() likes to return "(none)" */
-	return domain && *domain && strcmp (domain, "(none)");
-}
+	account = g_new0 (MailConfigAccount, 1);
+	if (!mail_config_get_default_account)
+		account->default_account = TRUE;
 
-static void
-set_defaults (MailConfigDruid *druid)
-{
-	const MailConfigService *default_xport;
-	GtkWidget *stores, *transports, *item;
-	GtkWidget *fstore = NULL, *ftransport = NULL;
-	int si = 0, hstore = 0, ti = 0, htransport = 0;
-	char *user, *realname;
-	char hostname[1024];
-	char domain[1024];
-	CamelURL *url;
-	GList *l;
-	
-	/* set the default Name field */
-	realname = g_get_real_name ();
-	if (realname)
-		e_utf8_gtk_entry_set_text (druid->full_name, realname);
-	
-	/* set the default E-Mail Address field */
+	account->id = g_new0 (MailConfigIdentity, 1);
+	name = g_get_real_name ();
+	account->id->name = g_strdup (name);
 	user = getenv ("USER");
-	if (user && !gethostname (hostname, 1023)) {
-		char *address;
-		
-		memset (domain, 0, sizeof (domain));
-		getdomainname (domain, 1023);
-		
-		address = g_strdup_printf ("%s@%s%s%s", user, hostname, is_domain (domain) ? "." : "",
-					   is_domain (domain) ? domain : "");
-		
-		gtk_entry_set_text (druid->email_address, address);
-		g_free (address);
-	}
-	
-	/* construct incoming/outgoing option menus */
-	stores = gtk_menu_new ();
-	transports = gtk_menu_new ();
-	druid->providers = camel_session_list_providers (session, TRUE);
-	
-	/* get the default transport */
-	default_xport = mail_config_get_default_transport ();
-	if (default_xport && default_xport->url)
-		url = camel_url_new (default_xport->url, NULL);
-	else
-		url = NULL;
-	
-	/* sort the providers, remote first */
-	druid->providers = g_list_sort (druid->providers, (GCompareFunc) provider_compare);
-	
-	l = druid->providers;
-	while (l) {
-		CamelProvider *provider = l->data;
-		
-		if (strcmp (provider->domain, "mail")) {
-			l = l->next;
-			continue;
-		}
-		
-		if (provider->object_types[CAMEL_PROVIDER_STORE] && provider->flags & CAMEL_PROVIDER_IS_SOURCE) {
-			item = gtk_menu_item_new_with_label (provider->name);
-			gtk_object_set_data (GTK_OBJECT (item), "provider", provider);
-			gtk_signal_connect (GTK_OBJECT (item), "activate",
-					    GTK_SIGNAL_FUNC (incoming_type_changed),
-					    druid);
-			
-			gtk_menu_append (GTK_MENU (stores), item);
-			
-			gtk_widget_show (item);
-			
-			if (!fstore) {
-				fstore = item;
-				hstore = si;
-			}
-			
-			si++;
-		}
-		
-		if (provider->object_types[CAMEL_PROVIDER_TRANSPORT]) {
-			item = gtk_menu_item_new_with_label (provider->name);
-			gtk_object_set_data (GTK_OBJECT (item), "provider", provider);
-			gtk_signal_connect (GTK_OBJECT (item), "activate",
-					    GTK_SIGNAL_FUNC (transport_type_changed),
-					    druid);
-			
-			gtk_menu_append (GTK_MENU (transports), item);
-			
-			gtk_widget_show (item);
-			
-			if (!ftransport) {
-				ftransport = item;
-				htransport = ti;
-			}
-			
-			if (url && !g_strcasecmp (provider->protocol, url->protocol)) {
-				ftransport = item;
-				htransport = ti;
-			}
-			
-			ti++;
-		}
-		
-		l = l->next;
-	}
-	
-	/* add a "None" option to the stores menu */
-	item = gtk_menu_item_new_with_label (_("None"));
-	gtk_object_set_data (GTK_OBJECT (item), "provider", NULL);
-	gtk_signal_connect (GTK_OBJECT (item), "activate",
-			    GTK_SIGNAL_FUNC (incoming_type_changed),
-			    druid);
-	
-	gtk_menu_append (GTK_MENU (stores), item);
-	
-	gtk_widget_show (item);
-	
-	if (!fstore) {
-		fstore = item;
-		hstore = si;
-	}
-	
-	/* set the menus on the optionmenus */
-	gtk_option_menu_remove_menu (druid->incoming_type);
-	gtk_option_menu_set_menu (druid->incoming_type, stores);
-	gtk_option_menu_set_history (druid->incoming_type, hstore);
-	
-	gtk_option_menu_remove_menu (druid->outgoing_type);
-	gtk_option_menu_set_menu (druid->outgoing_type, transports);
-	gtk_option_menu_set_history (druid->outgoing_type, htransport);
-	
-	if (fstore)
-		gtk_signal_emit_by_name (GTK_OBJECT (fstore), "activate", druid);
-	
-	if (ftransport)
-		gtk_signal_emit_by_name (GTK_OBJECT (ftransport), "activate", druid);
-	
-	if (url) {
-		if (url->host) {
-			char *hostname;
-			
-			if (url->port)
-				hostname = g_strdup_printf ("%s:%d", url->host, url->port);
-			else
-				hostname = g_strdup (url->host);
-			
-			gtk_entry_set_text (druid->outgoing_hostname, hostname);
-			g_free (hostname);
-		}
-		camel_url_free (url);
-	}
-}
+	if (user && !uname (&uts) && strchr (uts.nodename, '.'))
+		account->id->address = g_strdup_printf ("%s@%s", user, uts.nodename);
 
-static gboolean
-start_next (GnomeDruidPage *page, GnomeDruid *druid, gpointer data)
-{
-	return FALSE;
+	if (mail_config_get_default_transport ())
+		account->transport = service_copy (mail_config_get_default_transport ());
+
+	return account;
 }
 
 static struct {
@@ -1146,42 +382,32 @@ static struct {
 	GtkSignalFunc back_func;
 	GtkSignalFunc finish_func;
 } pages[] = {
-	{ "druidStartPage",
-	  GTK_SIGNAL_FUNC (start_next),
-	  GTK_SIGNAL_FUNC (NULL),
-	  GTK_SIGNAL_FUNC (NULL),
-	  GTK_SIGNAL_FUNC (NULL) },
-	{ "druidIdentityPage",
+	{ "identity_page",
 	  GTK_SIGNAL_FUNC (identity_next),
 	  GTK_SIGNAL_FUNC (identity_prepare),
 	  GTK_SIGNAL_FUNC (NULL),
 	  GTK_SIGNAL_FUNC (NULL) },
-	{ "druidSourcePage",
-	  GTK_SIGNAL_FUNC (incoming_next),
-	  GTK_SIGNAL_FUNC (incoming_prepare),
+	{ "source_page",
+	  GTK_SIGNAL_FUNC (source_next),
+	  GTK_SIGNAL_FUNC (source_prepare),
 	  GTK_SIGNAL_FUNC (NULL),
 	  GTK_SIGNAL_FUNC (NULL) },
-	{ "druidSourceAuthPage",
-	  GTK_SIGNAL_FUNC (source_auth_next),
-	  GTK_SIGNAL_FUNC (source_auth_prepare),
+	{ "extra_page",
+	  GTK_SIGNAL_FUNC (NULL),
+	  GTK_SIGNAL_FUNC (extra_prepare),
 	  GTK_SIGNAL_FUNC (NULL),
 	  GTK_SIGNAL_FUNC (NULL) },
-	{ "druidTransportPage",
+	{ "transport_page",
 	  GTK_SIGNAL_FUNC (transport_next),
 	  GTK_SIGNAL_FUNC (transport_prepare),
 	  GTK_SIGNAL_FUNC (transport_back),
 	  GTK_SIGNAL_FUNC (NULL) },
-	{ "druidTransportAuthPage",
-	  GTK_SIGNAL_FUNC (transport_auth_next),
-	  GTK_SIGNAL_FUNC (transport_auth_prepare),
+	{ "management_page",
 	  GTK_SIGNAL_FUNC (NULL),
-	  GTK_SIGNAL_FUNC (NULL) },
-	{ "druidManagementPage",
-	  GTK_SIGNAL_FUNC (management_next),
 	  GTK_SIGNAL_FUNC (management_prepare),
-	  GTK_SIGNAL_FUNC (management_back),
+	  GTK_SIGNAL_FUNC (NULL),
 	  GTK_SIGNAL_FUNC (NULL) },
-	{ "druidFinishPage",
+	{ "finish_page",
 	  GTK_SIGNAL_FUNC (NULL),
 	  GTK_SIGNAL_FUNC (NULL),
 	  GTK_SIGNAL_FUNC (NULL),
@@ -1196,33 +422,31 @@ static struct {
 static void
 construct (MailConfigDruid *druid)
 {
-	GladeXML *gui;
-	GtkWidget *widget;
+	GtkWidget *widget, *vbox;
+	MailConfigAccount *account;
 	int i;
-	
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/mail-config.glade", "mail-config-druid");
-	druid->gui = gui;
-	
-	/* get our toplevel widget */
-	widget = glade_xml_get_widget (gui, "druid");
-	
-	/* reparent */
+
+	account = make_default_account ();
+	druid->gui = mail_account_gui_new (account);
+
+	/* get our toplevel widget and reparent it */
+	widget = glade_xml_get_widget (druid->gui->xml, "druid");
 	gtk_widget_reparent (widget, GTK_WIDGET (druid));
-	
+
 	druid->druid = GNOME_DRUID (widget);
-	
+
 	/* set window title */
 	gtk_window_set_title (GTK_WINDOW (druid), _("Evolution Account Wizard"));
-	gtk_window_set_policy (GTK_WINDOW (druid), FALSE, TRUE, TRUE);
+	gtk_window_set_policy (GTK_WINDOW (druid), FALSE, TRUE, FALSE);
 	gtk_window_set_modal (GTK_WINDOW (druid), TRUE);
 	gtk_object_set (GTK_OBJECT (druid), "type", GTK_WINDOW_DIALOG, NULL);
-	
+
 	/* attach to druid page signals */
 	for (i = 0; pages[i].name != NULL; i++) {
-		GnomeDruidPage *page;
-		
-		page = GNOME_DRUID_PAGE (glade_xml_get_widget (gui, pages[i].name));
-		
+		GtkWidget *page;
+
+		page = glade_xml_get_widget (druid->gui->xml, pages[i].name);
+
 		if (pages[i].next_func)
 			gtk_signal_connect (GTK_OBJECT (page), "next",
 					    pages[i].next_func, druid);
@@ -1237,273 +461,65 @@ construct (MailConfigDruid *druid)
 					    pages[i].finish_func, druid);
 	}
 	gtk_signal_connect (GTK_OBJECT (druid->druid), "cancel", druid_cancel, druid);
-	
-	/* get our cared-about widgets */
-	druid->account_text = glade_xml_get_widget (gui, "htmlAccountInfo");
-	druid->account_name = GTK_ENTRY (glade_xml_get_widget (gui, "txtAccountName"));
-	gtk_signal_connect (GTK_OBJECT (druid->account_name), "changed", management_changed, druid);
-	druid->default_account = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkAccountDefault"));
-	
-	druid->identity_text = glade_xml_get_widget (gui, "htmlIdentity");
-	druid->full_name = GTK_ENTRY (glade_xml_get_widget (gui, "txtFullName"));
-	gtk_signal_connect (GTK_OBJECT (druid->full_name), "changed", identity_changed, druid);
-	druid->email_address = GTK_ENTRY (glade_xml_get_widget (gui, "txtAddress"));
-	gtk_signal_connect (GTK_OBJECT (druid->email_address), "changed", identity_changed, druid);
-	druid->organization = GTK_ENTRY (glade_xml_get_widget (gui, "txtOrganization"));
-	druid->signature = GNOME_FILE_ENTRY (glade_xml_get_widget (gui, "fileSignature"));
-	
-	druid->incoming_text = glade_xml_get_widget (gui, "htmlIncoming");
-	druid->incoming_type = GTK_OPTION_MENU (glade_xml_get_widget (gui, "omenuIncomingType"));
-	druid->incoming_hostname = GTK_ENTRY (glade_xml_get_widget (gui, "txtIncomingHostname"));
-	gtk_signal_connect (GTK_OBJECT (druid->incoming_hostname), "changed", incoming_changed, druid);
-	druid->incoming_username = GTK_ENTRY (glade_xml_get_widget (gui, "txtIncomingUsername"));
-	gtk_signal_connect (GTK_OBJECT (druid->incoming_username), "changed", incoming_changed, druid);
-	druid->incoming_path = GTK_ENTRY (glade_xml_get_widget (gui, "txtIncomingPath"));
-	gtk_signal_connect (GTK_OBJECT (druid->incoming_path), "changed", incoming_changed, druid);
-	druid->incoming_keep_mail = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkIncomingKeepMail"));
-	druid->incoming_auto_check = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkAutoCheck"));
-	gtk_signal_connect (GTK_OBJECT (druid->incoming_auto_check), "toggled", auto_check_toggled, druid);
-	druid->incoming_auto_check_min = GTK_SPIN_BUTTON (glade_xml_get_widget (gui, "spinAutoCheckMinutes"));
-	gtk_widget_set_sensitive (GTK_WIDGET (druid->incoming_auto_check_min),
-				  gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (druid->incoming_auto_check)));
-	druid->incoming_check_settings = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkIncomingCheckSettings"));
-	
-	druid->have_source_auth_page = TRUE;
-	druid->source_auth_text = glade_xml_get_widget (gui, "htmlSourceAuthentication");
-	druid->source_auth_type = GTK_OPTION_MENU (glade_xml_get_widget (gui, "omenuSourceAuthType"));
-	druid->source_password = GTK_ENTRY (glade_xml_get_widget (gui, "txtSourceAuthPasswd"));
-	gtk_signal_connect (GTK_OBJECT (druid->source_password), "changed", source_auth_changed, druid);
-	druid->save_source_password = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkSourceAuthSavePasswd"));
-	gtk_signal_connect (GTK_OBJECT (druid->save_source_password), "toggled", source_auth_changed, druid);
-	
-	druid->outgoing_text = glade_xml_get_widget (gui, "htmlTransport");
-	druid->outgoing_type = GTK_OPTION_MENU (glade_xml_get_widget (gui, "omenuTransportType"));
-	druid->outgoing_hostname = GTK_ENTRY (glade_xml_get_widget (gui, "txtTransportHostname"));
-	gtk_signal_connect (GTK_OBJECT (druid->outgoing_hostname), "changed", transport_changed, druid);
-	druid->outgoing_requires_auth = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkTransportNeedsAuth"));
-	druid->outgoing_check_settings = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkOutgoingCheckSettings"));
-	
-	druid->have_transport_auth_page = FALSE;
-	druid->transport_auth_text = glade_xml_get_widget (gui, "htmlTransportAuthentication");
-	druid->transport_auth_type = GTK_OPTION_MENU (glade_xml_get_widget (gui, "omenuTransportAuthType"));
-	druid->transport_username = GTK_ENTRY (glade_xml_get_widget (gui, "txtTransportAuthUsername"));
-	gtk_signal_connect (GTK_OBJECT (druid->transport_username), "changed", transport_auth_changed, druid);
-	druid->transport_password = GTK_ENTRY (glade_xml_get_widget (gui, "txtTransportAuthPasswd"));
-	gtk_signal_connect (GTK_OBJECT (druid->transport_password), "changed", transport_auth_changed, druid);
-	druid->save_transport_password = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkTransportAuthSavePasswd"));
-	gtk_signal_connect (GTK_OBJECT (druid->save_transport_password), "toggled", transport_auth_changed, druid);
-	
-	set_defaults (druid);
-	
+
+	/* Fill in the druid pages */
+	vbox = glade_xml_get_widget (druid->gui->xml, "druid_identity_vbox");
+	widget = create_html ("identity_html");
+	gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
+	widget = glade_xml_get_widget (druid->gui->xml, "identity_required_frame");
+	gtk_widget_reparent (widget, vbox);
+	gtk_box_set_child_packing (GTK_BOX (vbox), widget, FALSE, FALSE, 0, GTK_PACK_START);
+	widget = glade_xml_get_widget (druid->gui->xml, "identity_optional_frame");
+	gtk_widget_reparent (widget, vbox);
+	gtk_box_set_child_packing (GTK_BOX (vbox), widget, FALSE, FALSE, 0, GTK_PACK_START);
+
+	vbox = glade_xml_get_widget (druid->gui->xml, "druid_source_vbox");
+	widget = create_html ("source_html");
+	gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
+	widget = glade_xml_get_widget (druid->gui->xml, "source_vbox");
+	gtk_widget_reparent (widget, vbox);
+
+	vbox = glade_xml_get_widget (druid->gui->xml, "druid_extra_vbox");
+	widget = create_html ("extra_html");
+	gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
+	widget = glade_xml_get_widget (druid->gui->xml, "extra_vbox");
+	gtk_widget_reparent (widget, vbox);
+
+	vbox = glade_xml_get_widget (druid->gui->xml, "druid_transport_vbox");
+	widget = create_html ("transport_html");
+	gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
+	widget = glade_xml_get_widget (druid->gui->xml, "transport_vbox");
+	gtk_widget_reparent (widget, vbox);
+
+	vbox = glade_xml_get_widget (druid->gui->xml, "druid_management_vbox");
+	widget = create_html ("management_html");
+	gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
+	widget = glade_xml_get_widget (druid->gui->xml, "management_frame");
+	gtk_widget_reparent (widget, vbox);
+
+	/* set up signals, etc */
+	gtk_signal_connect (GTK_OBJECT (druid->gui->account_name), "changed", management_changed, druid);
+	gtk_signal_connect (GTK_OBJECT (druid->gui->full_name), "changed", identity_changed, druid);
+	gtk_signal_connect (GTK_OBJECT (druid->gui->email_address), "changed", identity_changed, druid);
+	gtk_signal_connect (GTK_OBJECT (druid->gui->source.hostname), "changed", source_changed, druid);
+	gtk_signal_connect (GTK_OBJECT (druid->gui->source.username), "changed", source_changed, druid);
+	gtk_signal_connect (GTK_OBJECT (druid->gui->source.path), "changed", source_changed, druid);
+	gtk_signal_connect (GTK_OBJECT (druid->gui->transport.hostname), "changed", transport_changed, druid);
+	gtk_signal_connect (GTK_OBJECT (druid->gui->transport.username), "changed", transport_changed, druid);
+
 	gnome_druid_set_buttons_sensitive (druid->druid, FALSE, TRUE, TRUE);
+
+	mail_account_gui_setup (druid->gui, GTK_WIDGET (druid));
 }
 
 MailConfigDruid *
 mail_config_druid_new (GNOME_Evolution_Shell shell)
 {
 	MailConfigDruid *new;
-	
+
 	new = (MailConfigDruid *) gtk_type_new (mail_config_druid_get_type ());
 	construct (new);
 	new->shell = shell;
-	
-	return new;
-}
-
-char *
-mail_config_druid_get_account_name (MailConfigDruid *druid)
-{
-	g_return_val_if_fail (IS_MAIL_CONFIG_DRUID (druid), NULL);
-	
-	return e_utf8_gtk_entry_get_text (druid->account_name);
-}
-
-
-gboolean
-mail_config_druid_get_default_account (MailConfigDruid *druid)
-{
-	g_return_val_if_fail (IS_MAIL_CONFIG_DRUID (druid), FALSE);
-	
-	return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (druid->default_account));
-}
-
-
-char *
-mail_config_druid_get_full_name (MailConfigDruid *druid)
-{
-	g_return_val_if_fail (IS_MAIL_CONFIG_DRUID (druid), NULL);
-	
-	return e_utf8_gtk_entry_get_text (druid->full_name);
-}
-
-
-char *
-mail_config_druid_get_email_address (MailConfigDruid *druid)
-{
-	g_return_val_if_fail (IS_MAIL_CONFIG_DRUID (druid), NULL);
-	
-	return e_utf8_gtk_entry_get_text (druid->email_address);
-}
-
-
-char *
-mail_config_druid_get_organization (MailConfigDruid *druid)
-{
-	g_return_val_if_fail (IS_MAIL_CONFIG_DRUID (druid), NULL);
-	
-	return e_utf8_gtk_entry_get_text (druid->organization);
-}
 
-
-char *
-mail_config_druid_get_sigfile (MailConfigDruid *druid)
-{
-	g_return_val_if_fail (IS_MAIL_CONFIG_DRUID (druid), NULL);
-	
-	return gnome_file_entry_get_full_path (druid->signature, TRUE);
-}
-
-
-char *
-mail_config_druid_get_source_url (MailConfigDruid *druid)
-{
-	char *source_url, *host, *pport, *str;
-	const CamelProvider *provider;
-	gboolean show_passwd;
-	CamelURL *url;
-	int port = 0;
-	
-	g_return_val_if_fail (IS_MAIL_CONFIG_DRUID (druid), NULL);
-	
-	provider = druid->source_provider;
-	if (!provider)
-		return NULL;
-	
-	url = g_new0 (CamelURL, 1);
-	url->protocol = g_strdup (provider->protocol);
-	
-	str = gtk_entry_get_text (druid->incoming_username);
-	url->user = str && *str ? g_strdup (str) : NULL;
-	
-	str = gtk_object_get_data (GTK_OBJECT (druid), "source_authmech");
-	url->authmech = str && *str ? g_strdup (str) : NULL;
-	
-	str = gtk_entry_get_text (druid->source_password);
-	url->passwd = str && *str ? g_strdup (str) : NULL;
-	
-	host = g_strdup (gtk_entry_get_text (druid->incoming_hostname));
-	if (host && (pport = strchr (host, ':'))) {
-		port = atoi (pport + 1);
-		*pport = '\0';
-	}
-	url->host = host;
-	url->port = port;
-	url->path = g_strdup (gtk_entry_get_text (druid->incoming_path));
-	
-	/* only 'show password' if we intend to save it */
-	show_passwd = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (druid->save_source_password));
-	source_url = camel_url_to_string (url, show_passwd);
-	camel_url_free (url);
-	
-	return source_url;
-}
-
-
-gboolean
-mail_config_druid_get_keep_mail_on_server (MailConfigDruid *druid)
-{
-	g_return_val_if_fail (IS_MAIL_CONFIG_DRUID (druid), FALSE);
-	
-	return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (druid->incoming_keep_mail));
-}
-
-
-gboolean
-mail_config_druid_get_auto_check (MailConfigDruid *druid)
-{
-	g_return_val_if_fail (IS_MAIL_CONFIG_DRUID (druid), FALSE);
-	
-	return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (druid->incoming_auto_check));
-}
-
-
-gint
-mail_config_druid_get_auto_check_minutes (MailConfigDruid *druid)
-{
-	g_return_val_if_fail (IS_MAIL_CONFIG_DRUID (druid), 0);
-	
-	return gtk_spin_button_get_value_as_int (druid->incoming_auto_check_min);
-}
-
-gboolean
-mail_config_druid_get_save_source_password (MailConfigDruid *druid)
-{
-	g_return_val_if_fail (IS_MAIL_CONFIG_DRUID (druid), FALSE);
-	
-	return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (druid->save_source_password));
-}
-
-char *
-mail_config_druid_get_transport_url (MailConfigDruid *druid)
-{
-	char *transport_url, *host, *pport;
-	const CamelProvider *provider;
-	gboolean show_passwd;
-	CamelURL *url;
-	int port = 0;
-	
-	g_return_val_if_fail (IS_MAIL_CONFIG_DRUID (druid), NULL);
-	
-	provider = druid->transport_provider;
-	if (!provider)
-		return NULL;
-	
-	url = g_new0 (CamelURL, 1);
-	url->protocol = g_strdup (provider->protocol);
-	
-	if (mail_config_druid_get_transport_requires_auth (druid)) {
-		char *str;
-		
-		str = gtk_object_get_data (GTK_OBJECT (druid), "transport_authmech");
-		if (str && *str) {
-			url->authmech = g_strdup (str);
-			
-			str = gtk_entry_get_text (druid->transport_username);
-			url->user = str && *str ? g_strdup (str) : NULL;
-			
-			str = gtk_entry_get_text (druid->transport_password);
-			url->passwd = str && *str ? g_strdup (str) : NULL;
-		}
-	}
-	
-	host = g_strdup (gtk_entry_get_text (druid->outgoing_hostname));
-	if (host && (pport = strchr (host, ':'))) {
-		port = atoi (pport + 1);
-		*pport = '\0';
-	}
-	url->host = host;
-	url->port = port;
-	
-	/* only 'show password' if we intend to save it */
-	show_passwd = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (druid->save_transport_password));
-	transport_url = camel_url_to_string (url, show_passwd);
-	camel_url_free (url);
-	
-	return transport_url;
-}
-
-gboolean
-mail_config_druid_get_save_transport_password (MailConfigDruid *druid)
-{
-	g_return_val_if_fail (IS_MAIL_CONFIG_DRUID (druid), FALSE);
-	
-	return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (druid->save_transport_password));
-}
-
-gboolean
-mail_config_druid_get_transport_requires_auth (MailConfigDruid *druid)
-{
-	g_return_val_if_fail (IS_MAIL_CONFIG_DRUID (druid), FALSE);
-	
-	return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (druid->outgoing_requires_auth));
+	return new;
 }