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, 2 insertions, 0 deletions

diff --git a/mail/mail.h b/mail/mail.h
index b8254591c9..c1dc0d5acf 100644
--- a/mail/mail.h
+++ b/mail/mail.h
@@ -67,11 +67,13 @@ char *mail_identify_mime_part (CamelMimePart *part, MailDisplay *md);
 GtkWidget *mail_view_create (CamelFolder *source, const char *uid, CamelMimeMessage *msg);
 
 /* component factory for lack of a better place */
+void mail_load_storage_by_uri (GNOME_Evolution_Shell shell, const char *uri, const char *name);
 /*takes a GSList of MailConfigServices */
 void mail_load_storages (GNOME_Evolution_Shell shell, const GSList *sources, gboolean is_account_data);
 
 void mail_hash_storage (CamelService *store, EvolutionStorage *storage);
 EvolutionStorage *mail_lookup_storage (CamelStore *store);
+void mail_remove_storage_by_uri (const char *uri);
 void mail_remove_storage (CamelStore *store);
 void mail_storages_foreach (GHFunc func, gpointer data);
 int  mail_storages_count (void);