Don't load the storage if it isn't enabled. (mail_remove_storage_by_uri):

2001-08-08  Peter Williams  <peterw@ximian.com>

	* component-factory.c (mail_load_storages): Don't load the storage
	if it isn't enabled.
	(mail_remove_storage_by_uri): New function. Goes through the
	gymnastics of getting a CamelStore from the URI and calling
	mail_remove_storage. Copied from mail_delete().
	(mail_load_storage_by_uri): Break out the storage-loading part of
	mail_load_storages into a single function.
	(mail_load_storages): Just call mail_load_storage_by_uri several
	times.

	* mail.h: Prototype our new _by_uri functions.

	* mail-accounts.c (news_add_destroyed): Instead of hacking around
	mail_load_storages, call mail_load_storage_by_uri.
	(mail_delete): Move this chunk of code into
	mail_remove_storage_by_uri.
	(mail_able): Add or remove the storage as necessary, with our
	new _by_uri functions.

	* mail-config-druid.c (druid_finish): See news_add_destroyed above.

svn path=/trunk/; revision=11881

1 files changed, 1 insertions, 4 deletions

diff --git a/mail/mail-config-druid.c b/mail/mail-config-druid.c
index 84730f3cf0..118fb76b43 100644
--- a/mail/mail-config-druid.c
+++ b/mail/mail-config-druid.c
@@ -174,7 +174,6 @@ druid_finish (GnomeDruidPage *page, gpointer arg1, gpointer user_data)
 {
 	MailConfigDruid *druid = user_data;
 	MailAccountGui *gui = druid->gui;
-	GSList *mini;
 
 	/* Add the account to our list (do it first because future
            steps might want to access config->accounts) */
@@ -189,9 +188,7 @@ druid_finish (GnomeDruidPage *page, gpointer arg1, gpointer user_data)
 	mail_config_write ();
 
 	/* Load up this new account */
-	mini = g_slist_prepend (NULL, gui->account);
-	mail_load_storages (druid->shell, mini, TRUE);
-	g_slist_free (mini);
+	mail_load_storages (druid->shell, gui->account->source->url, gui->account->name);
 	
 	gtk_widget_destroy (GTK_WIDGET (druid));
 }