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, 10 insertions, 65 deletions

diff --git a/mail/mail-config-druid.h b/mail/mail-config-druid.h
index c8c492316e..cc37c5aaaa 100644
--- a/mail/mail-config-druid.h
+++ b/mail/mail-config-druid.h
@@ -32,74 +32,24 @@ extern "C" {
 #include <glade/glade.h>
 #include <camel.h>
 #include "shell/Evolution.h"
+#include "mail-account-gui.h"
 
 #define MAIL_CONFIG_DRUID_TYPE        (mail_config_druid_get_type ())
 #define MAIL_CONFIG_DRUID(o)          (GTK_CHECK_CAST ((o), MAIL_CONFIG_DRUID_TYPE, MailConfigDruid))
 #define MAIL_CONFIG_DRUID_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), MAIL_CONFIG_DRUID_TYPE, MailConfigDruidClass))
-#define IS_MAIL_CONFIG_DRUID(o)       (GTK_CHECK_TYPE ((o), MAIL_CONFIG_DRUID_TYPE))
-#define IS_MAIL_CONFIG_DRUID_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), MAIL_CONFIG_DRUID_TYPE))
+#define MAIL_IS_CONFIG_DRUID(o)       (GTK_CHECK_TYPE ((o), MAIL_CONFIG_DRUID_TYPE))
+#define MAIL_IS_CONFIG_DRUID_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), MAIL_CONFIG_DRUID_TYPE))
 
-struct _MailConfigDruid {
+typedef struct {
 	GtkWindow parent;
 	
-	GNOME_Evolution_Shell shell;
-	
-	GladeXML *gui;
-	
-	GList *providers;
-	
 	GnomeDruid *druid;
-	
-	/* account management */
-	GtkWidget *account_text;
-	GtkEntry *account_name;
-	GtkCheckButton *default_account;
-	
-	/* identity */
-	GtkWidget *identity_text;
-	GtkEntry *full_name;
-	GtkEntry *email_address;
-	GtkEntry *organization;
-	GnomeFileEntry *signature;
-	
-	/* incoming mail */
-	GtkWidget *incoming_text;
-	GtkOptionMenu *incoming_type;
-	GtkEntry *incoming_hostname;
-	GtkEntry *incoming_username;
-	GtkEntry *incoming_path;
-	GtkCheckButton *incoming_keep_mail;
-	GtkCheckButton *incoming_auto_check;
-	GtkSpinButton  *incoming_auto_check_min;
-	GtkCheckButton *incoming_check_settings;
-	
-	/* source authentication */
-	gboolean have_source_auth_page;
-	GtkWidget *source_auth_text;
-	GtkOptionMenu *source_auth_type;
-	GtkEntry *source_password;
-	GtkCheckButton *save_source_password;
-	
-	/* outgoing mail */
-	GtkWidget *outgoing_text;
-	GtkOptionMenu *outgoing_type;
-	GtkEntry *outgoing_hostname;
-	GtkCheckButton *outgoing_requires_auth;
-	GtkCheckButton *outgoing_check_settings;
-	
-	/* transport authentication */
-	gboolean have_transport_auth_page;
-	GtkWidget *transport_auth_text;
-	GtkOptionMenu *transport_auth_type;
-	GtkEntry *transport_username;
-	GtkEntry *transport_password;
-	GtkCheckButton *save_transport_password;
-	
-	const CamelProvider *source_provider;
-	const CamelProvider *transport_provider;
-};
+	MailAccountGui *gui;
 
-typedef struct _MailConfigDruid MailConfigDruid;
+	GNOME_Evolution_Shell shell;
+	gboolean identity_copied;
+	CamelProvider *last_source;
+} MailConfigDruid;
 
 typedef struct {
 	GtkWindowClass parent_class;
@@ -115,13 +65,8 @@ MailConfigDruid *mail_config_druid_new (GNOME_Evolution_Shell shell);
 char *mail_config_druid_get_account_name (MailConfigDruid *druid);
 gboolean mail_config_druid_get_default_account (MailConfigDruid *druid);
 
-char *mail_config_druid_get_full_name (MailConfigDruid *druid);
-char *mail_config_druid_get_email_address (MailConfigDruid *druid);
-char *mail_config_druid_get_reply_to (MailConfigDruid *druid);
-char *mail_config_druid_get_organization (MailConfigDruid *druid);
-char *mail_config_druid_get_sigfile (MailConfigDruid *druid);
-
 char *mail_config_druid_get_source_url (MailConfigDruid *druid);
+
 gboolean mail_config_druid_get_keep_mail_on_server (MailConfigDruid *druid);
 gboolean mail_config_druid_get_save_source_password (MailConfigDruid *druid);
 gboolean mail_config_druid_get_auto_check (MailConfigDruid *druid);